apply ipv6 patch more sparingly, bug 23332

4 files changed, 13 insertions, 10 deletions

diff --git a/dev-perl/mod_perl/ChangeLog b/dev-perl/mod_perl/ChangeLog
index 4a0db95b8389..888d2f06824d 100644
--- a/dev-perl/mod_perl/ChangeLog
+++ b/dev-perl/mod_perl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/mod_perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.22 2003/06/25 00:54:25 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.23 2003/06/25 20:04:36 rac Exp $
+
+  25 Jun 2003; <rac@gentoo.org> mod_perl-1.27-r2.ebuild,
+  mod_perl-1.27-r3.ebuild:
+  Fine-tune ipv6 patch application using has_version because the apache dep has
+  been relaxed.  Addresses bug #23332.
 
 *mod_perl-1.27-r3 (24 Jun 2003)
 
diff --git a/dev-perl/mod_perl/Manifest b/dev-perl/mod_perl/Manifest
index 219ddc114981..79f07a456c3d 100644
--- a/dev-perl/mod_perl/Manifest
+++ b/dev-perl/mod_perl/Manifest
@@ -1,10 +1,10 @@
 MD5 9eb488a8d217058474db6e04e22c62fa mod_perl-1.99.09.ebuild 3613
 MD5 b04e594ce1aa3379787924322454aba5 mod_perl-1.27.ebuild 1416
-MD5 a248818699df0c2bede5761b7b67cd4c mod_perl-1.27-r2.ebuild 1797
+MD5 0bf9316fb68b93b9bd9b72555e81b41b mod_perl-1.27-r2.ebuild 1821
 MD5 026fbb84b447f735b4c86b46860f2afb mod_perl-1.99.08.ebuild 1244
 MD5 58ceed38b57307fa4190170a23408524 mod_perl-1.27-r1.ebuild 1421
-MD5 7aecbe36dd285e1a1becaf941c760130 ChangeLog 3027
-MD5 60e7a045de6820eeb93486d0a7747405 mod_perl-1.27-r3.ebuild 2004
+MD5 26bb8d49740b8e6e457639009ead12df ChangeLog 3231
+MD5 b8bea8f6d6e415b81c96ea0ff36478eb mod_perl-1.27-r3.ebuild 2031
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r2 65
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r3 65
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 ca235fc293fc..2f7ff74069cb 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-2003 Gentoo Technologies, Inc.
 # 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.5 2003/06/24 20:26:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild,v 1.6 2003/06/25 20:04:36 rac Exp $
 
 inherit eutils
 
@@ -20,8 +20,7 @@ DEPEND="dev-lang/perl
 src_unpack() {
 	unpack ${A}
 
-	if [ "`use ipv6`" ]
-	then	
+	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
diff --git a/dev-perl/mod_perl/mod_perl-1.27-r3.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r3.ebuild
index 874d3026b9b4..7f93e60528e8 100644
--- a/dev-perl/mod_perl/mod_perl-1.27-r3.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.27-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r3.ebuild,v 1.1 2003/06/25 00:54:25 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r3.ebuild,v 1.2 2003/06/25 20:04:36 rac Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Perl Module for Apache"
@@ -20,8 +20,7 @@ inherit eutils
 src_unpack() {
 	unpack ${A}
 
-	if [ "`use ipv6`" ]
-	then	
+	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