Drop IPv6 patches.

(Portage version: 2.0.51.19)

7 files changed, 39 insertions, 127 deletions

diff --git a/dev-perl/mod_perl/ChangeLog b/dev-perl/mod_perl/ChangeLog
index 720302fdb74f..79ad6aab8b02 100644
--- a/dev-perl/mod_perl/ChangeLog
+++ b/dev-perl/mod_perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/mod_perl
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.46 2004/12/30 19:03:27 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.47 2005/03/11 18:04:51 beu Exp $
+
+  11 Mar 2005; Elfyn McBratney <beu@gentoo.org>
+  -files/mod_perl-1.27-ipv6.patch, -files/mod_perl-1.29-ipv6.patch,
+  mod_perl-1.27-r2.ebuild, mod_perl-1.27-r4.ebuild, mod_perl-1.29.ebuild:
+  Drop the IPv6 patches (which don't add functionality as Apache 1.3 isn't
+  IPv6-aware).
 
   30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-perl/mod_perl/Manifest b/dev-perl/mod_perl/Manifest
index 784ac8c21269..1a7bebb49e11 100644
--- a/dev-perl/mod_perl/Manifest
+++ b/dev-perl/mod_perl/Manifest
@@ -1,33 +1,31 @@
-MD5 a1141c430c0b7356ce812dd1bfd8854a mod_perl-1.99.08.ebuild 1237
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 5ae689acb9f9ed419a3b1542bab72e5b mod_perl-1.99.17-r1.ebuild 4217
+MD5 8d14755a3efca0ac30af6653f9555656 mod_perl-1.27-r4.ebuild 1834
+MD5 bfb9cdc72acb74032ddf255b4d1a5a2e mod_perl-1.27-r1.ebuild 1423
+MD5 3690cfac5404f5f1a445577e92693152 mod_perl-1.27-r2.ebuild 1441
+MD5 8e56fe8bc973a08ff3d5f6cbabf7d347 ChangeLog 6421
+MD5 8d2945f86f75caca1f479d2053b912ac mod_perl-1.99.16.ebuild 3813
 MD5 0525b089ad91f31dffd83c0d1300ffc4 mod_perl-1.99.11.ebuild 3783
+MD5 a366c1cb1f861c8f0041d9ce4e210698 mod_perl-1.99.10.ebuild 3824
 MD5 66a0226a2c0f697be1dabcaecac8adfa mod_perl-1.99.17.ebuild 3825
-MD5 8d2945f86f75caca1f479d2053b912ac mod_perl-1.99.16.ebuild 3813
-MD5 e48765f4129ef6e27824df62a47fd14a mod_perl-1.29.ebuild 2470
-MD5 0013befe326225d2f22917b3e5d39e4f ChangeLog 6164
-MD5 883e4913a359e585ff84d4f53f629035 mod_perl-1.27-r4.ebuild 2179
 MD5 b101308b1017072f3d62def1ed834ab1 mod_perl-1.99.09.ebuild 3673
-MD5 8a0d2f0c7b7d8c36e2ddb832c504ed9f mod_perl-1.27-r2.ebuild 1817
-MD5 5ae689acb9f9ed419a3b1542bab72e5b mod_perl-1.99.17-r1.ebuild 4217
-MD5 bfb9cdc72acb74032ddf255b4d1a5a2e mod_perl-1.27-r1.ebuild 1423
+MD5 a1141c430c0b7356ce812dd1bfd8854a mod_perl-1.99.08.ebuild 1237
 MD5 c614eea076228afa05a30a7f0dbadf2a mod_perl-1.27.ebuild 1417
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 a366c1cb1f861c8f0041d9ce4e210698 mod_perl-1.99.10.ebuild 3824
-MD5 4869c6ea8e02d871a03455d28b6f6cfb files/digest-mod_perl-1.99.08 68
-MD5 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17 69
-MD5 1e0341f9b7bd3c3f74c25e60eb3188c8 files/mod_perl-1.29-ipv6.patch 1207
-MD5 e749acb150e339917257be38febb568e files/mod_perl-1.99.10-nonukes.patch 777
+MD5 e48765f4129ef6e27824df62a47fd14a mod_perl-1.29.ebuild 2470
+MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r4 65
+MD5 8c8ec63f03d3ffb51fa26b6df03a5710 files/mod_perl-1.99.16-sneak-tmpdir.patch 395
 MD5 39a4d91d1d90d32f90dea3c00a1680d7 files/apache2-mod_perl-startup.pl 483
-MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27 65
 MD5 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17-r1 69
-MD5 300bce7b1dad6fda0b18cfdbf592a828 files/mod_perl-1.99.17-Apache2.pm 1149
 MD5 5ff16293368688eefecc4a6066eb8914 files/digest-mod_perl-1.99.10 69
-MD5 1e0341f9b7bd3c3f74c25e60eb3188c8 files/mod_perl-1.27-ipv6.patch 1207
-MD5 5fb9123a821e261a210c5fca0ff94976 files/digest-mod_perl-1.99.09 68
-MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r2 65
+MD5 e749acb150e339917257be38febb568e files/mod_perl-1.99.10-nonukes.patch 777
+MD5 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17 69
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
-MD5 33270eaaa2c9bc9cef3a4a45afaeca34 files/digest-mod_perl-1.29 65
-MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
-MD5 13d314750ba5772dc7de4d9023d137ad files/digest-mod_perl-1.99.16 69
-MD5 8c8ec63f03d3ffb51fa26b6df03a5710 files/mod_perl-1.99.16-sneak-tmpdir.patch 395
+MD5 300bce7b1dad6fda0b18cfdbf592a828 files/mod_perl-1.99.17-Apache2.pm 1149
 MD5 278c6266498d8bef49b54f30774aa305 files/digest-mod_perl-1.99.11 69
-MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r4 65
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27 65
+MD5 5fb9123a821e261a210c5fca0ff94976 files/digest-mod_perl-1.99.09 68
+MD5 4869c6ea8e02d871a03455d28b6f6cfb files/digest-mod_perl-1.99.08 68
+MD5 13d314750ba5772dc7de4d9023d137ad files/digest-mod_perl-1.99.16 69
+MD5 33270eaaa2c9bc9cef3a4a45afaeca34 files/digest-mod_perl-1.29 65
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r2 65
diff --git a/dev-perl/mod_perl/files/mod_perl-1.27-ipv6.patch b/dev-perl/mod_perl/files/mod_perl-1.27-ipv6.patch
deleted file mode 100644
index d11d61a6b7c8..000000000000
--- a/dev-perl/mod_perl/files/mod_perl-1.27-ipv6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru mod_perl-1.27+ipv6/src/modules/perl/Connection.xs mod_perl-1.27/src/modules/perl/Connection.xs
---- mod_perl-1.27/src/modules/perl/Connection.xs	Fri Sep 29 16:41:30 2000
-+++ mod_perl-1.27+ipv6/src/modules/perl/Connection.xs	Sun Aug 25 23:02:42 2002
-@@ -78,13 +78,14 @@
-     RETVAL = newSVpv((char *)&conn->remote_addr,
-                       sizeof conn->remote_addr);
-     if(sv_addr) {
--        struct sockaddr_in addr; 
-+        struct sockaddr_storage addr; 
-         STRLEN sockaddrlen; 
-         char * new_addr = SvPV(sv_addr,sockaddrlen); 
-         if (sockaddrlen != sizeof(addr)) { 
-             croak("Bad arg length for remote_addr, length is %d, should be %d", 		  sockaddrlen, sizeof(addr)); 
-         } 
--        Copy(new_addr, &addr, sizeof addr, char); 
-+	memset(&addr, 0, sizeof addr);
-+        Copy(new_addr, &addr, sizeof new_addr, char); 
-         conn->remote_addr = addr;
-     }
- 
-@@ -106,7 +107,7 @@
- #else
-         conn->remote_ip = pstrdup(conn->pool, (char *)SvPV(ST(1),na));
- #endif
--        conn->remote_addr.sin_addr.s_addr = inet_addr(conn->remote_ip);
-+	((struct sockaddr_in *) &conn->remote_addr)->sin_addr.s_addr = inet_addr(conn->remote_ip);
-     }
- 
-     OUTPUT:
diff --git a/dev-perl/mod_perl/files/mod_perl-1.29-ipv6.patch b/dev-perl/mod_perl/files/mod_perl-1.29-ipv6.patch
deleted file mode 100644
index d11d61a6b7c8..000000000000
--- a/dev-perl/mod_perl/files/mod_perl-1.29-ipv6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru mod_perl-1.27+ipv6/src/modules/perl/Connection.xs mod_perl-1.27/src/modules/perl/Connection.xs
---- mod_perl-1.27/src/modules/perl/Connection.xs	Fri Sep 29 16:41:30 2000
-+++ mod_perl-1.27+ipv6/src/modules/perl/Connection.xs	Sun Aug 25 23:02:42 2002
-@@ -78,13 +78,14 @@
-     RETVAL = newSVpv((char *)&conn->remote_addr,
-                       sizeof conn->remote_addr);
-     if(sv_addr) {
--        struct sockaddr_in addr; 
-+        struct sockaddr_storage addr; 
-         STRLEN sockaddrlen; 
-         char * new_addr = SvPV(sv_addr,sockaddrlen); 
-         if (sockaddrlen != sizeof(addr)) { 
-             croak("Bad arg length for remote_addr, length is %d, should be %d", 		  sockaddrlen, sizeof(addr)); 
-         } 
--        Copy(new_addr, &addr, sizeof addr, char); 
-+	memset(&addr, 0, sizeof addr);
-+        Copy(new_addr, &addr, sizeof new_addr, char); 
-         conn->remote_addr = addr;
-     }
- 
-@@ -106,7 +107,7 @@
- #else
-         conn->remote_ip = pstrdup(conn->pool, (char *)SvPV(ST(1),na));
- #endif
--        conn->remote_addr.sin_addr.s_addr = inet_addr(conn->remote_ip);
-+	((struct sockaddr_in *) &conn->remote_addr)->sin_addr.s_addr = inet_addr(conn->remote_ip);
-     }
- 
-     OUTPUT:
diff --git a/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild
index c54a986fe9d4..075c0df8dcaf 100644
--- a/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.27-r2.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/mod_perl/mod_perl-1.27-r2.ebuild,v 1.8 2004/06/25 00:46:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild,v 1.9 2005/03/11 18:04:51 beu Exp $
 
 inherit eutils
 
@@ -11,26 +11,12 @@ HOMEPAGE="http://perl.apache.org/"
 SLOT="0"
 LICENSE="Apache-1.1 as-is"
 KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
-IUSE="ipv6"
+IUSE=""
 
 DEPEND="dev-lang/perl
 	dev-perl/libwww-perl
 	=net-www/apache-1*"
 
-src_unpack() {
-	unpack ${A}
-
-	if has_version '>=apache-1.3.27-r4' && use ipv6; then
-		# This patch originally came from
-		# http://pasky.ji.cz/~pasky/dev/apache/mod_perl-1.27+ipv6.patch.
-		# It allows mod_perl to correctly build with an IPv6-enabled
-		# Apache (bug #6986).
-		# Robert Coie <rac@gentoo.org> 2002.02.19
-
-		cd ${S}; epatch ${FILESDIR}/${P}-ipv6.patch
-	fi
-}
-
 src_compile() {
 	perl Makefile.PL USE_APXS=1 \
 		PREFIX=${D}/usr	\
diff --git a/dev-perl/mod_perl/mod_perl-1.27-r4.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r4.ebuild
index e56930d8ef94..fce96af104b9 100644
--- a/dev-perl/mod_perl/mod_perl-1.27-r4.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.27-r4.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/mod_perl/mod_perl-1.27-r4.ebuild,v 1.6 2004/07/14 19:39:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r4.ebuild,v 1.7 2005/03/11 18:04:51 beu Exp $
 
 inherit eutils
 
@@ -14,21 +14,11 @@ KEYWORDS="x86 amd64 ~ppc sparc ~alpha ~mips"
 
 DEPEND="dev-lang/perl dev-perl/libwww-perl =net-www/apache-1* >=sys-apps/sed-4"
 
-IUSE="ipv6"
+IUSE=""
 
 src_unpack() {
 	unpack ${A}
 
-	if has_version '>=apache-1.3.27-r4' && use ipv6; then
-		# This patch originally came from
-		# http://pasky.ji.cz/~pasky/dev/apache/mod_perl-1.27+ipv6.patch.
-		# It allows mod_perl to correctly build with an IPv6-enabled
-		# Apache (bug #6986).
-		# Robert Coie <rac@gentoo.org> 2002.02.19
-
-		cd ${S}; epatch ${FILESDIR}/${P}-ipv6.patch
-	fi
-
 	cd ${S}
 	for f in "apaci/mod_perl.config.sh" "apaci/libperl.module"
 	do
diff --git a/dev-perl/mod_perl/mod_perl-1.29.ebuild b/dev-perl/mod_perl/mod_perl-1.29.ebuild
index ec95439502a6..16e3f5a47380 100644
--- a/dev-perl/mod_perl/mod_perl-1.29.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.29.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/mod_perl/mod_perl-1.29.ebuild,v 1.7 2004/07/14 19:39:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.29.ebuild,v 1.8 2005/03/11 18:04:51 beu Exp $
 
 inherit eutils
 
@@ -14,21 +14,11 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc alpha ia64"
 
 DEPEND="dev-lang/perl dev-perl/libwww-perl =net-www/apache-1* >=sys-apps/sed-4"
 
-IUSE="ipv6"
+IUSE=""
 
 src_unpack() {
 	unpack ${A}
 
-	if has_version '>=apache-1.3.27-r4' && use ipv6; then
-		# This patch originally came from
-		# http://pasky.ji.cz/~pasky/dev/apache/mod_perl-1.27+ipv6.patch.
-		# It allows mod_perl to correctly build with an IPv6-enabled
-		# Apache (bug #6986).
-		# Robert Coie <rac@gentoo.org> 2002.02.19
-
-		cd ${S}; epatch ${FILESDIR}/${P}-ipv6.patch
-	fi
-
 	cd ${S}
 	for f in "apaci/mod_perl.config.sh" "apaci/libperl.module"
 	do