remove versparse patch on 1.32

4 files changed, 14 insertions, 35 deletions

diff --git a/dev-perl/DBD-Pg/ChangeLog b/dev-perl/DBD-Pg/ChangeLog
index 65ef12ba9334..2fecb3eaa5be 100644
--- a/dev-perl/DBD-Pg/ChangeLog
+++ b/dev-perl/DBD-Pg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/DBD-Pg
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-Pg/ChangeLog,v 1.15 2004/06/05 17:10:41 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-Pg/ChangeLog,v 1.16 2004/06/06 21:51:58 rac Exp $
+
+  06 Jun 2004; Robert Coie <rac@gentoo.org>
+  -files/DBD-Pg-1.32-versparse.patch, DBD-Pg-1.32.ebuild:
+  Remove version parsing patch that doesn't apply any more. Believe it's fixed
+  upstream
 
 *DBD-Pg-1.32 (05 Jun 2004)
 
diff --git a/dev-perl/DBD-Pg/DBD-Pg-1.32.ebuild b/dev-perl/DBD-Pg/DBD-Pg-1.32.ebuild
index a5642dcd2e76..34e3cb61582d 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-1.32.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-1.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-Pg/DBD-Pg-1.32.ebuild,v 1.1 2004/06/05 17:10:41 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-Pg/DBD-Pg-1.32.ebuild,v 1.2 2004/06/06 21:51:58 rac Exp $
 
 inherit perl-module
 inherit eutils
@@ -23,10 +23,5 @@ export POSTGRES_LIB=/usr/lib/postgresql/
 
 mydoc="Changes README"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-versparse.patch
-}
 
 
diff --git a/dev-perl/DBD-Pg/Manifest b/dev-perl/DBD-Pg/Manifest
index d9496dfbb485..f53a305c8715 100644
--- a/dev-perl/DBD-Pg/Manifest
+++ b/dev-perl/DBD-Pg/Manifest
@@ -1,14 +1,13 @@
-MD5 9cb20ebbf2c5eaef0b433e6c3d732722 ChangeLog 2251
-MD5 c7cd153e007e6c250a413e9a221e6988 DBD-Pg-1.13-r1.ebuild 703
-MD5 cfbae7b273b7afa0f8dad5ecbf852830 DBD-Pg-1.13.ebuild 701
-MD5 90c5bdb4850163e212323479112ba18f DBD-Pg-1.22.ebuild 738
 MD5 b5ea4132f626e48eac6a60435dbb0fb9 DBD-Pg-1.31.ebuild 812
+MD5 90c5bdb4850163e212323479112ba18f DBD-Pg-1.22.ebuild 738
+MD5 cfbae7b273b7afa0f8dad5ecbf852830 DBD-Pg-1.13.ebuild 701
+MD5 c7cd153e007e6c250a413e9a221e6988 DBD-Pg-1.13-r1.ebuild 703
+MD5 6cc06b4ff31d6169f9928d0726a5d69d DBD-Pg-1.32.ebuild 729
+MD5 4b42d2cd26dd5e39f3058fc8e2dc2126 ChangeLog 2437
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 7543fb0b503123e211a2ca6d342c87fd DBD-Pg-1.32.ebuild 816
-MD5 37764ad0d89a1a98e0e870bab599c928 files/DBD-Pg-1.31-versparse.patch 937
 MD5 6c9cff890cc7888cdb2e5abf7b6aab98 files/digest-DBD-Pg-1.13 62
-MD5 6c9cff890cc7888cdb2e5abf7b6aab98 files/digest-DBD-Pg-1.13-r1 62
 MD5 29136c7e55049af2f4162a3b8c2d6afa files/digest-DBD-Pg-1.22 62
 MD5 0674ec6314e48e843cf18ca4ecf5eff1 files/digest-DBD-Pg-1.31 62
 MD5 55438f3f0a3ba704b84e737194edba59 files/digest-DBD-Pg-1.32 62
-MD5 37764ad0d89a1a98e0e870bab599c928 files/DBD-Pg-1.32-versparse.patch 937
+MD5 6c9cff890cc7888cdb2e5abf7b6aab98 files/digest-DBD-Pg-1.13-r1 62
+MD5 37764ad0d89a1a98e0e870bab599c928 files/DBD-Pg-1.31-versparse.patch 937
diff --git a/dev-perl/DBD-Pg/files/DBD-Pg-1.32-versparse.patch b/dev-perl/DBD-Pg/files/DBD-Pg-1.32-versparse.patch
deleted file mode 100644
index de8d9314748b..000000000000
--- a/dev-perl/DBD-Pg/files/DBD-Pg-1.32-versparse.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- t/lib/App/Info/RDBMS/PostgreSQL.pm.orig	2003-12-21 10:48:09.326376964 -0800
-+++ t/lib/App/Info/RDBMS/PostgreSQL.pm	2003-12-21 10:52:07.168963354 -0800
-@@ -246,14 +246,12 @@
- 
-     # Parse the version number.
-     if ($version) {
--        my ($x, $y, $z) = $version =~ /(\d+)\.(\d+).(\d+)/;
--        if (defined $x and defined $y and defined $z) {
-+        my ($x, $y, $z) = split( /\./, $version );
-+        if (defined $x and defined $y) {
-+					defined( $z ) or $z = 0;
-             @{$self}{qw(version major minor patch)} =
-               ($version, $x, $y, $z);
- 				## Beta/devel/release candidate versions are treated as patch level "0"
--        } elsif ($version =~ /(\d+)\.(\d+)\w+\d+/) {
--            @{$self}{qw(version major minor patch)} =
--              ($version, $1, $2, 0);
-         } else {
-             $self->error("Failed to parse PostgreSQL version parts from " .
-                          "string '$version'");