clean up; new copy from cpan

Package-Manager: portage-2.0.51-r13

17 files changed, 110 insertions, 76 deletions

diff --git a/dev-perl/DBI/ChangeLog b/dev-perl/DBI/ChangeLog
index 60ca2e7fd424..7cb6c08c0b8d 100644
--- a/dev-perl/DBI/ChangeLog
+++ b/dev-perl/DBI/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-perl/DBI
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/ChangeLog,v 1.34 2004/12/29 23:23:56 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/ChangeLog,v 1.35 2005/01/24 23:59:25 mcummings Exp $
+
+*DBI-1.46 (24 Jan 2005)
+
+  24 Jan 2005; Michael Cummings <mcummings@gentoo.org>
+  -DBI-1.42.ebuild, -DBI-1.43.ebuild, -DBI-1.45.ebuild:
+  Clean up of unused and masked copies
+
+*DBI-1.46 (24 Jan 2005)
+
+  24 Jan 2005; Michael Cummings <mcummings@gentoo.org>
+  +files/CAN-2005-0077.patch, +DBI-1.46.ebuild:
+  New version from cpan
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-perl/DBI/DBI-1.21-r1.ebuild b/dev-perl/DBI/DBI-1.21-r1.ebuild
index 9ca7f145c75a..ec7d709aca5f 100644
--- a/dev-perl/DBI/DBI-1.21-r1.ebuild
+++ b/dev-perl/DBI/DBI-1.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.21-r1.ebuild,v 1.9 2004/10/16 23:57:21 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.21-r1.ebuild,v 1.10 2005/01/24 23:59:25 mcummings Exp $
 
 inherit perl-module
 
diff --git a/dev-perl/DBI/DBI-1.21.ebuild b/dev-perl/DBI/DBI-1.21.ebuild
index 1a080c575729..68baf786487b 100644
--- a/dev-perl/DBI/DBI-1.21.ebuild
+++ b/dev-perl/DBI/DBI-1.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.21.ebuild,v 1.16 2004/10/16 23:57:21 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.21.ebuild,v 1.17 2005/01/24 23:59:25 mcummings Exp $
 
 inherit perl-module
 
diff --git a/dev-perl/DBI/DBI-1.30-r1.ebuild b/dev-perl/DBI/DBI-1.30-r1.ebuild
index be46f017467f..370d455eef05 100644
--- a/dev-perl/DBI/DBI-1.30-r1.ebuild
+++ b/dev-perl/DBI/DBI-1.30-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.30-r1.ebuild,v 1.12 2004/10/16 23:57:21 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.30-r1.ebuild,v 1.13 2005/01/24 23:59:25 mcummings Exp $
 
 inherit perl-module
 
diff --git a/dev-perl/DBI/DBI-1.30.ebuild b/dev-perl/DBI/DBI-1.30.ebuild
index 475af72edf9d..55386559ecdf 100644
--- a/dev-perl/DBI/DBI-1.30.ebuild
+++ b/dev-perl/DBI/DBI-1.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.30.ebuild,v 1.13 2004/10/16 23:57:21 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.30.ebuild,v 1.14 2005/01/24 23:59:25 mcummings Exp $
 
 inherit perl-module
 
diff --git a/dev-perl/DBI/DBI-1.32.ebuild b/dev-perl/DBI/DBI-1.32.ebuild
index 12a9f074dcf8..b5eba4744a0a 100644
--- a/dev-perl/DBI/DBI-1.32.ebuild
+++ b/dev-perl/DBI/DBI-1.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.32.ebuild,v 1.10 2004/10/16 23:57:21 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.32.ebuild,v 1.11 2005/01/24 23:59:25 mcummings Exp $
 inherit perl-module
 
 DESCRIPTION="The Perl DBI Module"
diff --git a/dev-perl/DBI/DBI-1.37.ebuild b/dev-perl/DBI/DBI-1.37.ebuild
index 1d99309a8155..5dac7a11f379 100644
--- a/dev-perl/DBI/DBI-1.37.ebuild
+++ b/dev-perl/DBI/DBI-1.37.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.37.ebuild,v 1.10 2004/10/16 23:57:21 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.37.ebuild,v 1.11 2005/01/24 23:59:25 mcummings Exp $
 inherit perl-module
 
 DESCRIPTION="The Perl DBI Module"
diff --git a/dev-perl/DBI/DBI-1.38.ebuild b/dev-perl/DBI/DBI-1.38.ebuild
index fcc41a72bf75..747aee27fc41 100644
--- a/dev-perl/DBI/DBI-1.38.ebuild
+++ b/dev-perl/DBI/DBI-1.38.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.38.ebuild,v 1.16 2004/10/16 23:57:21 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.38.ebuild,v 1.17 2005/01/24 23:59:25 mcummings Exp $
 
 inherit perl-module
 
diff --git a/dev-perl/DBI/DBI-1.42.ebuild b/dev-perl/DBI/DBI-1.42.ebuild
deleted file mode 100644
index ff225a483a2d..000000000000
--- a/dev-perl/DBI/DBI-1.42.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.42.ebuild,v 1.5 2004/10/16 23:57:21 rac Exp $
-
-inherit perl-module
-
-DESCRIPTION="The Perl DBI Module"
-HOMEPAGE="http://www.cpan.org/modules/by-module/DBI/${P}.readme"
-SRC_URI="http://www.cpan.org/modules/by-module/DBI/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE=""
-
-DEPEND=">=dev-perl/PlRPC-0.2"
-
-mydoc="ToDo"
diff --git a/dev-perl/DBI/DBI-1.43.ebuild b/dev-perl/DBI/DBI-1.43.ebuild
deleted file mode 100644
index fee8ea78c99c..000000000000
--- a/dev-perl/DBI/DBI-1.43.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.43.ebuild,v 1.2 2004/10/16 23:57:21 rac Exp $
-
-inherit perl-module
-
-DESCRIPTION="The Perl DBI Module"
-HOMEPAGE="http://www.cpan.org/modules/by-module/DBI/${P}.readme"
-SRC_URI="http://www.cpan.org/modules/by-module/DBI/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE=""
-
-DEPEND=">=dev-perl/PlRPC-0.2"
-
-mydoc="ToDo"
diff --git a/dev-perl/DBI/DBI-1.45.ebuild b/dev-perl/DBI/DBI-1.46.ebuild
index 6e92b06a3d28..6b4b36438e8d 100644
--- a/dev-perl/DBI/DBI-1.45.ebuild
+++ b/dev-perl/DBI/DBI-1.46.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.45.ebuild,v 1.1 2004/10/17 22:19:16 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBI/DBI-1.46.ebuild,v 1.1 2005/01/24 23:59:25 mcummings Exp $
 
-inherit perl-module
+inherit perl-module eutils
 
 DESCRIPTION="The Perl DBI Module"
 HOMEPAGE="http://search.cpan.org/~timb/${P}/"
@@ -16,3 +16,9 @@ IUSE=""
 DEPEND=">=dev-perl/PlRPC-0.2"
 
 mydoc="ToDo"
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/CAN-2005-0077.patch
+}
diff --git a/dev-perl/DBI/Manifest b/dev-perl/DBI/Manifest
index f3358ce8bc3f..f4cf9585ca97 100644
--- a/dev-perl/DBI/Manifest
+++ b/dev-perl/DBI/Manifest
@@ -1,22 +1,29 @@
-MD5 7b9f925223a8cc73b3735c1e75ea4c9c DBI-1.37.ebuild 541
-MD5 673d82735b946c96850ad0a607fb536c DBI-1.43.ebuild 565
-MD5 41090ce484835ee1739ea589657dec9e DBI-1.21.ebuild 536
-MD5 442947d9163f54248bcd1e5e9f4f766f ChangeLog 4002
-MD5 86b1af622f8353e04ae85733ad4adba8 DBI-1.21-r1.ebuild 538
-MD5 55a28d4377ccf160df4f5e370c308e40 DBI-1.30.ebuild 535
-MD5 0800404c77a19932f8fac80300effec0 DBI-1.45.ebuild 545
-MD5 68dfa8213795c1de4e3f61164629c11b DBI-1.38.ebuild 556
-MD5 26617e1e53b346323c4a56cf21ae743b DBI-1.32.ebuild 540
-MD5 92bc82dd3ac3e9dfaad81fd9111f3c1d DBI-1.42.ebuild 565
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 66cd86accdd21ab0fbfcea05ea0188c4 DBI-1.21-r1.ebuild 545
+MD5 e8af9bf3b808190f9695266693165028 ChangeLog 4333
+MD5 e710deceab38a93d7b9e72e7e9ec76e5 DBI-1.30-r1.ebuild 564
+MD5 8fce370e5a2a4fbd5551262d87971ddc DBI-1.21.ebuild 542
+MD5 d620f9ae1bf76c82fe2bf63e30008276 DBI-1.46.ebuild 631
+MD5 21d88f54e8ec7fe39ae1ebb6f28131f9 DBI-1.30.ebuild 541
+MD5 34282326ed1593b33f80405fcba3b6f7 DBI-1.32.ebuild 546
+MD5 6079fa6962fb527963c4f5eb58cb60bf DBI-1.37.ebuild 547
+MD5 4907d3f502f5e401b12361df1f88754c DBI-1.38.ebuild 562
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 5122ba8391de26fef43b09514c1021c3 DBI-1.30-r1.ebuild 558
-MD5 15f938f674832cfacebcbe4846157499 files/digest-DBI-1.38 60
-MD5 ae08a79d639a4d996aa92e1eb256065f files/digest-DBI-1.43 60
-MD5 d04d31e4e0ff867a0e374f611870f573 files/digest-DBI-1.30 60
-MD5 732cdd79b1b2ec01fd3f4c627a4201cb files/digest-DBI-1.42 60
 MD5 5c1a1c7dd060be231a97a5bb2f77b1b0 files/digest-DBI-1.21-r1 60
 MD5 5c1a1c7dd060be231a97a5bb2f77b1b0 files/digest-DBI-1.21 60
-MD5 23839223cddac45582e44b00462c279a files/digest-DBI-1.37 60
-MD5 14a69642241ec767e39c9151f67f8a19 files/digest-DBI-1.32 60
 MD5 d04d31e4e0ff867a0e374f611870f573 files/digest-DBI-1.30-r1 60
-MD5 fc39f0f37ceb4e0b2bda8b3946de0616 files/digest-DBI-1.45 60
+MD5 d04d31e4e0ff867a0e374f611870f573 files/digest-DBI-1.30 60
+MD5 33d4cf52425aa1265dd00ae7831cd632 files/CAN-2005-0077.patch 1294
+MD5 14a69642241ec767e39c9151f67f8a19 files/digest-DBI-1.32 60
+MD5 23839223cddac45582e44b00462c279a files/digest-DBI-1.37 60
+MD5 15f938f674832cfacebcbe4846157499 files/digest-DBI-1.38 60
+MD5 921a7d3fd142e0a6e7cd10a852cfb99c files/digest-DBI-1.46 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB9YubtG5z4I8BtQoRAnCLAJ0Sb2LY7eQQGnj0O2dsifzDEyX00ACgijbN
+EV2CRP96EEXOWBvcyxeFspk=
+=Gqp9
+-----END PGP SIGNATURE-----
diff --git a/dev-perl/DBI/files/CAN-2005-0077.patch b/dev-perl/DBI/files/CAN-2005-0077.patch
new file mode 100644
index 000000000000..692944c0b4cc
--- /dev/null
+++ b/dev-perl/DBI/files/CAN-2005-0077.patch
@@ -0,0 +1,47 @@
+--- libdbi-perl-1.21.orig/lib/DBI/ProxyServer.pm
++++ libdbi-perl-1.21/lib/DBI/ProxyServer.pm
+@@ -33,12 +33,6 @@
+ package DBI::ProxyServer;
+ 
+ 
+-my $haveFileSpec = eval { require File::Spec };
+-my $tmpDir = $haveFileSpec ? File::Spec->tmpdir() :
+-    ($ENV{'TMP'} || $ENV{'TEMP'} || '/tmp');
+-my $defaultPidFile = $haveFileSpec ?
+-    File::Spec->catdir($tmpDir, "dbiproxy.pid") : "/tmp/dbiproxy.pid";
+-
+ 
+ ############################################################################
+ #
+@@ -107,7 +101,8 @@
+     } else {
+ 	$o->{'mode'} = 'single';
+     }
+-    $o->{'pidfile'}    = $defaultPidFile;
++    # No pidfile by default, configuration must provide one if needed
++    $o->{'pidfile'}    = 'none';
+     $o->{'user'}       = undef;
+ };
+ 
+@@ -491,7 +486,7 @@
+ =item I<pidfile> (B<--pidfile=file>)
+ 
+ (UNIX only) If this option is present, a PID file will be created at the
+-given location.
++given location. Default is do not create a pidfile.
+ 
+ =item I<user> (B<--user=uid>)
+ 
+only in patch2:
+unchanged:
+--- libdbi-perl-1.21.orig/dbiproxy.PL
++++ libdbi-perl-1.21/dbiproxy.PL
+@@ -143,7 +143,7 @@
+ =item B<--pidfile=file>
+ 
+ (UNIX only) If this option is present, a PID file will be created at the
+-given location.
++given location. Default is do not create a pidfile.
+ 
+ =item B<--user=uid>
+ 
diff --git a/dev-perl/DBI/files/digest-DBI-1.42 b/dev-perl/DBI/files/digest-DBI-1.42
deleted file mode 100644
index e671db1603d6..000000000000
--- a/dev-perl/DBI/files/digest-DBI-1.42
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca8c8a1a4797d98121b41c1d0a5b3b7c DBI-1.42.tar.gz 348167
diff --git a/dev-perl/DBI/files/digest-DBI-1.43 b/dev-perl/DBI/files/digest-DBI-1.43
deleted file mode 100644
index faa34e2de666..000000000000
--- a/dev-perl/DBI/files/digest-DBI-1.43
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ceaa35210d70e9762a3de5426d4d9235 DBI-1.43.tar.gz 359797
diff --git a/dev-perl/DBI/files/digest-DBI-1.45 b/dev-perl/DBI/files/digest-DBI-1.45
deleted file mode 100644
index 817ccefa3110..000000000000
--- a/dev-perl/DBI/files/digest-DBI-1.45
+++ /dev/null
@@ -1 +0,0 @@
-MD5 31ac7c8aea0ebc61c3a9fc120a770fbd DBI-1.45.tar.gz 369502
diff --git a/dev-perl/DBI/files/digest-DBI-1.46 b/dev-perl/DBI/files/digest-DBI-1.46
new file mode 100644
index 000000000000..f757b5176310
--- /dev/null
+++ b/dev-perl/DBI/files/digest-DBI-1.46
@@ -0,0 +1 @@
+MD5 93e00b7a2f6e15a6ea5642b5eb506dba DBI-1.46.tar.gz 372350