Altered dep for Apache-Test to be >= 1.27 - 1.28 is in the tree and supercedes these versions.

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 187 insertions, 16 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index 9230e9d4a547..87710290e537 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.27 2006/10/16 02:07:39 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.28 2006/10/23 19:45:37 mcummings Exp $
+
+*mod_perl-2.0.1-r3 (23 Oct 2006)
+
+  23 Oct 2006; Michael Cummings <mcummings@gentoo.org>
+  +mod_perl-2.0.1-r3.ebuild, mod_perl-2.0.2.ebuild:
+  Altered dep for Apache-Test to be >= 1.27 - 1.28 is in the tree and
+  supercedes these versions.
 
   16 Oct 2006; Michael Cummings <mcummings@gentoo.org>
   -mod_perl-1.27-r1.ebuild, -mod_perl-1.27-r2.ebuild,
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 27ea28738f03..f7d066b35daf 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -57,14 +57,18 @@ EBUILD mod_perl-2.0.1-r2.ebuild 5287 RMD160 8668ac4ccd94ff6594681aa9e5c998e48a29
 MD5 1e1abe5d6a08fd1074da60abac6c798d mod_perl-2.0.1-r2.ebuild 5287
 RMD160 8668ac4ccd94ff6594681aa9e5c998e48a29084c mod_perl-2.0.1-r2.ebuild 5287
 SHA256 b0912040b7421da24a1287a1d31a326a2130b5712c3308444fa8288a1a9b088e mod_perl-2.0.1-r2.ebuild 5287
-EBUILD mod_perl-2.0.2.ebuild 5298 RMD160 543aa850e9ad561c6dc545d2439581ec4fddf2cf SHA1 de2f1c71b830d97f73e481ff7a209c9f154e614e SHA256 3e51b179533ed09a4abca01866b6a963abd0d1594453500b9558a2c05ed325ab
-MD5 9a32406d06678f9c72f3a83003d11898 mod_perl-2.0.2.ebuild 5298
-RMD160 543aa850e9ad561c6dc545d2439581ec4fddf2cf mod_perl-2.0.2.ebuild 5298
-SHA256 3e51b179533ed09a4abca01866b6a963abd0d1594453500b9558a2c05ed325ab mod_perl-2.0.2.ebuild 5298
-MISC ChangeLog 13621 RMD160 ceaf36df22e68baf1847a2ecb9e885cbfd27d757 SHA1 b1314a1096646fe705dc8cab3b6459f3f9fd9663 SHA256 c4afca1a120f324dfc98ee81a0504c594cb617135a4be1884ec8bb321590a525
-MD5 02e07979c49d784f56abf718a6529dca ChangeLog 13621
-RMD160 ceaf36df22e68baf1847a2ecb9e885cbfd27d757 ChangeLog 13621
-SHA256 c4afca1a120f324dfc98ee81a0504c594cb617135a4be1884ec8bb321590a525 ChangeLog 13621
+EBUILD mod_perl-2.0.1-r3.ebuild 5299 RMD160 d2b0355e2bccdb15e22f978fd22cdb5ef1e75d6d SHA1 392aa9c8b6f6dbdde6e8a7fa3821c654d9acd74f SHA256 23b9ce2f36b8721577a86d14ee8a1a2e4f9a432998818abac084212423b34baa
+MD5 53b1076a86a0d37844521b865905b197 mod_perl-2.0.1-r3.ebuild 5299
+RMD160 d2b0355e2bccdb15e22f978fd22cdb5ef1e75d6d mod_perl-2.0.1-r3.ebuild 5299
+SHA256 23b9ce2f36b8721577a86d14ee8a1a2e4f9a432998818abac084212423b34baa mod_perl-2.0.1-r3.ebuild 5299
+EBUILD mod_perl-2.0.2.ebuild 5292 RMD160 6f7fbbd25f8c11fb8c25c9c4d438aefc54e7a4f9 SHA1 db3f888bc4b5f17897f603eb42457d49b56e29e2 SHA256 4af76264ed4f8caa720df3ede32913776d0fb2d0eeffcfa90edf88ce257db01e
+MD5 d0ddd0cbeab6278e8c6d48c641c35265 mod_perl-2.0.2.ebuild 5292
+RMD160 6f7fbbd25f8c11fb8c25c9c4d438aefc54e7a4f9 mod_perl-2.0.2.ebuild 5292
+SHA256 4af76264ed4f8caa720df3ede32913776d0fb2d0eeffcfa90edf88ce257db01e mod_perl-2.0.2.ebuild 5292
+MISC ChangeLog 13862 RMD160 d05ffb8fdbcbb6ea351871b8687db8492416bc85 SHA1 09dd658447e34416619527ab63dfc09fb4c6cf9b SHA256 7e3bd7fbfc437d7e732eff9a5f95baf83620dd0417598ff82c2abdc7526f7931
+MD5 845f9ca509d36320acf7e2c9c0652c70 ChangeLog 13862
+RMD160 d05ffb8fdbcbb6ea351871b8687db8492416bc85 ChangeLog 13862
+SHA256 7e3bd7fbfc437d7e732eff9a5f95baf83620dd0417598ff82c2abdc7526f7931 ChangeLog 13862
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -78,13 +82,16 @@ SHA256 4387286e9fbf493722f7993026afdeefcffbc521034e3ca0d46beea2338e33d9 files/di
 MD5 598abf5bae9374d1487becf1fc62fe75 files/digest-mod_perl-2.0.1-r2 247
 RMD160 3d686e6a0a9383bdc00dbb3131ed5f3732784edf files/digest-mod_perl-2.0.1-r2 247
 SHA256 e81d562bc8866db9682f8988ef03c8c3a14445893d35a078eb18b46b30ca1146 files/digest-mod_perl-2.0.1-r2 247
+MD5 598abf5bae9374d1487becf1fc62fe75 files/digest-mod_perl-2.0.1-r3 247
+RMD160 3d686e6a0a9383bdc00dbb3131ed5f3732784edf files/digest-mod_perl-2.0.1-r3 247
+SHA256 e81d562bc8866db9682f8988ef03c8c3a14445893d35a078eb18b46b30ca1146 files/digest-mod_perl-2.0.1-r3 247
 MD5 1d8a4a065f61782d1d7a6391572f7a2a files/digest-mod_perl-2.0.2 247
 RMD160 bfb99bae5e4de09562fc79d164a55e9f799f0630 files/digest-mod_perl-2.0.2 247
 SHA256 2891e5a85d9566e61ea1eef0f49ed3a867b67b9159f14792e6ca0a63e64ee585 files/digest-mod_perl-2.0.2 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFMul0tG5z4I8BtQoRAmqCAJ92vPZ7tWeIZQuj7uqHtWUkp0pG5QCcDVCn
-dLRGBeGGmiN08B2gziAndCs=
-=+pZb
+iD8DBQFFPRvotG5z4I8BtQoRAva1AJ4myXFQVbI1pJswoLKzZ0MJVa3KyACcDkHl
+Xt3GBDZ3AUvAI+oZw/4geUQ=
+=jErT
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_perl/files/digest-mod_perl-2.0.1-r3 b/www-apache/mod_perl/files/digest-mod_perl-2.0.1-r3
new file mode 100644
index 000000000000..a25249354088
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-2.0.1-r3
@@ -0,0 +1,3 @@
+MD5 fd9cb8ce794bb3ae3c8c288e18bf5b8f mod_perl-2.0.1.tar.gz 3694355
+RMD160 06e921614c030a3b25d224cd88825d4b15aeb761 mod_perl-2.0.1.tar.gz 3694355
+SHA256 918588fc3944fb9c57ccf87ee8554a6f95b1d8fe6ba894d1111c16048070f136 mod_perl-2.0.1.tar.gz 3694355
diff --git a/www-apache/mod_perl/mod_perl-2.0.1-r3.ebuild b/www-apache/mod_perl/mod_perl-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..034820ee402f
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.1-r3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.1-r3.ebuild,v 1.1 2006/10/23 19:45:37 mcummings Exp $
+
+inherit apache-module perl-module eutils multilib
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="mirror://cpan/authors/id/G/GO/GOZER/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+SLOT="1"
+
+# see bug 30087 for why sudo is in here
+DEPEND=">=dev-perl/Apache-Test-1.27
+	dev-lang/perl
+	>=virtual/perl-CGI-3.08
+	>=dev-perl/Compress-Zlib-1.09
+	app-admin/sudo"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="75_${PN}.conf apache2-mod_perl-startup.pl"
+DOCFILES="Changes INSTALL LICENSE README STATUS"
+APACHE2_MOD_DEFINE="PERL"
+
+need_apache2
+
+src_unpack() {
+	INSTALLED_MPM="$(${ROOT}/usr/sbin/apxs2 -q MPM_NAME)"
+	eval `perl '-V:useithreads'`
+	ITHREADS="${useithreads}"
+	if [ "${INSTALLED_MPM}" != "prefork" ]; then
+		if [ "${ITHREADS}" == "undef" ]; then
+			ewarn "You cannot build mod_perl on a threaded apache"
+			ewarn "with an unthreaded perl. You must either emerge"
+			ewarn "perl with ithreads in your USE flags, or emerge"
+			ewarn "apache without threading support"
+			exit
+		fi
+	fi
+
+	unpack ${A}
+
+	cd ${S}
+
+	# I am not entirely happy with this solution, but here's what's
+	# going on here if someone wants to take a stab at another
+	# approach.  When userpriv compilation is off, then the make
+	# process drops to user "nobody" to run the test servers.  This
+	# server is closed, and then the socket is rebound using
+	# SO_REUSEADDR.  If the same user does this, there is no problem,
+	# and the socket may be rebound immediately.  If a different user
+	# (yes, in my testing, even root) attempts to rebind, it fails.
+	# Since the "is the socket available yet" code and the
+	# second-batch bind call both run as root, this will fail.  
+
+	# The upstream settings on my test machine cause the second batch
+	# of tests to fail, believing the socket to still be in use.  I
+	# tried patching various parts to make them run as the user
+	# specified in $config->{vars}{user} using getpwnam, but found
+	# this patch to be fairly intrusive, because the userid must be
+	# restored and the patch must be applied to multiple places.
+
+	# For now, we will simply extend the timeout in hopes that in the
+	# non-userpriv case, the socket will clear from the kernel tables
+	# normally, and the tests will proceed.
+
+	# If anybody is still having problems, then commenting out "make
+	# test" below should allow the software to build properly.
+
+	# Robert Coie <rac@gentoo.org> 2003.05.06
+
+	sed -i -e "s/sleep \$_/sleep \$_ << 2/" ${S}/Apache-Test/lib/Apache/TestServer.pm || die "problem editing TestServer.pm"
+
+	# i wonder if this is the same sandbox issue, but TMPDIR is not
+	# getting through via SetEnv.  sneak it through here.
+
+	# rendhalver - this got redone for 2.0.1 and seems to fix the make test problems
+	epatch ${FILESDIR}/${P}-sneak-tmpdir.patch
+}
+
+src_compile() {
+	perl Makefile.PL \
+		PREFIX=${D}/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_USE_DSO=1 \
+		MP_APXS=/usr/sbin/apxs2  \
+		CCFLAGS="${CFLAGS} -fPIC" \
+		TMPDIR=${T} \
+		INSTALLDIRS=vendor </dev/null || die
+
+	# reported that parallel make is broken in bug 30257
+	emake -j1 || die
+
+	# mcummings - disabling tests right, there's a bug i haven't found an override for
+	# rendhalver - i seem to have fixed this so turning them back on again. 
+	# yet that sets /tmp as your tmp dir
+	#hasq maketest $FEATURES && src_test
+}
+
+src_test() {
+	# make test notes whether it is running as root, and drops
+	# privileges all the way to "nobody" if so, so we must adjust
+	# write permissions accordingly in this case.
+
+	# IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail!
+
+	if [ "`id -u`" == '0' ]; then
+		chown nobody:nobody ${WORKDIR}
+		chown nobody:nobody ${T}
+	fi
+
+	# this does not || die because of bug 21325.  kudos to smark for
+	# the idea of setting HOME.
+
+	TMPDIR="${T}" HOME="${T}/" make test
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)/apache2/modules
+	make install \
+		MODPERL_AP_LIBEXECDIR=${D}/usr/$(get_libdir)/apache2/modules \
+		MODPERL_AP_INCLUDEDIR=${D}/usr/include/apache2 \
+		MP_INST_APACHE2=1 \
+		INSTALLDIRS=vendor || die
+
+	# rendhalver - fix the perllocal.pod that gets installed
+	# it seems to me that this has been getting installed for ages
+
+	fixlocalpod
+
+	# this is an attempt to get @INC in line with /usr/bin/perl.
+	# there is blib garbage in the mainstream one that can only be
+	# useful during internal testing, so we wait until here and then
+	# just go with a clean slate.  should be much easier to see what's
+	# happening and revert if problematic.
+
+	# this is not needed anymore because Apache2.pm no longer exists
+	#eval $(perl -V:vendorarch)
+	#cp ${FILESDIR}/${P}-Apache2.pm ${D}/${vendorarch}/Apache2.pm
+
+	insinto /etc/apache2/modules.d
+	doins ${FILESDIR}/${PV}/75_mod_perl.conf \
+		${FILESDIR}/${PV}/apache2-mod_perl-startup.pl
+
+	dodoc ${FILESDIR}/${PV}/75_mod_perl.conf Changes \
+		INSTALL LICENSE README STATUS
+	cp -pPR docs ${D}/usr/share/doc/${PF}
+	cp -pPR todo ${D}/usr/share/doc/${PF}
+	for FILE in `grep -lr portage ${D}/*|grep -v ".so"`; do
+		sed -i -e "s:${D}:/:g" ${FILE}
+	done
+}
diff --git a/www-apache/mod_perl/mod_perl-2.0.2.ebuild b/www-apache/mod_perl/mod_perl-2.0.2.ebuild
index f920cdd73cd1..b9f97ecf47b0 100644
--- a/www-apache/mod_perl/mod_perl-2.0.2.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.2.ebuild,v 1.5 2006/09/02 19:51:28 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.2.ebuild,v 1.6 2006/10/23 19:45:37 mcummings Exp $
 
 inherit apache-module perl-module eutils multilib
 DESCRIPTION="An embedded Perl interpreter for Apache2"
@@ -13,8 +13,7 @@ IUSE=""
 SLOT="1"
 
 # see bug 30087 for why sudo is in here
-DEPEND="!dev-perl/Apache-Test
-	dev-lang/perl
+DEPEND=">=dev-perl/Apache-Test-1.27
 	>=virtual/perl-CGI-3.08
 	>=dev-perl/Compress-Zlib-1.09
 	app-admin/sudo"