Version bump.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 152 insertions, 14 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index f6b749da1e18..4cb158cc12f7 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.4 2005/05/29 16:06:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.5 2005/06/04 18:15:28 beu Exp $
+
+*mod_perl-2.0.0 (04 Jun 2005)
+
+  04 Jun 2005; Elfyn McBratney <beu@gentoo.org> +mod_perl-2.0.0.ebuild:
+  Version bump; this revision is for current-stable apache _only_, and
+  _will_ not work with the 'refreshed' apache versions in testing - -r1
+  will shortly follow for that.
 
   29 May 2005; Markus Rothe <corsair@gentoo.org> mod_perl-1.29.ebuild,
   mod_perl-1.99.17-r1.ebuild:
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index cff323514c90..ef8b74d29225 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,24 +1,26 @@
-MD5 d895272bde0bb1f85fae47cc78b8d203 ChangeLog 8694
+MD5 8a3282dd3a16deb4647459f81ad70abe mod_perl-1.99.11.ebuild 3789
+MD5 6f8d9a41c4da88f2496879444f8aef04 mod_perl-2.0.0.ebuild 4126
+MD5 6ffa394f7ac27d3e2f5b3224d18d63f3 mod_perl-1.99.10.ebuild 3828
+MD5 881662554e021b9040cf9bf44a754678 mod_perl-1.99.17.ebuild 3813
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 03b7e719ebc03b0bbdb703ce809b510b mod_perl-1.27-r1.ebuild 1419
-MD5 77e5ef5905ee1527577ba7b9c27328d7 mod_perl-1.27-r2.ebuild 1438
 MD5 e8751cafb99a9036567933b4b3c5d7d6 mod_perl-1.27-r4.ebuild 1813
+MD5 95e7130d8a5e305eb406de7a639144c8 ChangeLog 8969
+MD5 77e5ef5905ee1527577ba7b9c27328d7 mod_perl-1.27-r2.ebuild 1438
 MD5 f0f522c1a4dfb370f786da11f0dd6ff1 mod_perl-1.29.ebuild 2114
-MD5 6ffa394f7ac27d3e2f5b3224d18d63f3 mod_perl-1.99.10.ebuild 3828
-MD5 8a3282dd3a16deb4647459f81ad70abe mod_perl-1.99.11.ebuild 3789
+MD5 03b7e719ebc03b0bbdb703ce809b510b mod_perl-1.27-r1.ebuild 1419
 MD5 05f614537c52c42b923462192096468e mod_perl-1.99.16.ebuild 3804
 MD5 38cdc0172508cd318003c73db0375f3c mod_perl-1.99.17-r1.ebuild 4213
-MD5 881662554e021b9040cf9bf44a754678 mod_perl-1.99.17.ebuild 3813
-MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
-MD5 39a4d91d1d90d32f90dea3c00a1680d7 files/apache2-mod_perl-startup.pl 483
-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-r4 65
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
 MD5 33270eaaa2c9bc9cef3a4a45afaeca34 files/digest-mod_perl-1.29 65
-MD5 5ff16293368688eefecc4a6066eb8914 files/digest-mod_perl-1.99.10 69
 MD5 278c6266498d8bef49b54f30774aa305 files/digest-mod_perl-1.99.11 69
-MD5 13d314750ba5772dc7de4d9023d137ad files/digest-mod_perl-1.99.16 69
+MD5 f8a5f42c2b66da81ae9ae3c3317e0f19 files/digest-mod_perl-2.0.0 67
+MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r4 65
 MD5 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17 69
-MD5 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17-r1 69
 MD5 8c8ec63f03d3ffb51fa26b6df03a5710 files/mod_perl-1.99.16-sneak-tmpdir.patch 395
+MD5 39a4d91d1d90d32f90dea3c00a1680d7 files/apache2-mod_perl-startup.pl 483
+MD5 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17-r1 69
+MD5 13d314750ba5772dc7de4d9023d137ad files/digest-mod_perl-1.99.16 69
 MD5 300bce7b1dad6fda0b18cfdbf592a828 files/mod_perl-1.99.17-Apache2.pm 1149
+MD5 5ff16293368688eefecc4a6066eb8914 files/digest-mod_perl-1.99.10 69
diff --git a/www-apache/mod_perl/files/digest-mod_perl-2.0.0 b/www-apache/mod_perl/files/digest-mod_perl-2.0.0
new file mode 100644
index 000000000000..f675ffc268f5
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-2.0.0
@@ -0,0 +1 @@
+MD5 99325d82e2c42361123f6a242e57a593 mod_perl-2.0.0.tar.gz 1440319
diff --git a/www-apache/mod_perl/mod_perl-2.0.0.ebuild b/www-apache/mod_perl/mod_perl-2.0.0.ebuild
new file mode 100644
index 000000000000..f443eaf02762
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2005 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.0.ebuild,v 1.1 2005/06/04 18:15:28 beu Exp $
+
+inherit eutils
+
+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="~x86"
+IUSE=""
+SLOT="1"
+
+# see bug 30087 for why sudo is in here
+
+DEPEND="dev-lang/perl
+	=net-www/apache-2*
+	>=perl-core/CGI-3.08
+	>=dev-perl/Compress-Zlib-1.09
+	app-admin/sudo"
+
+src_unpack() {
+	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.
+	#epatch ${FILESDIR}/${PN}-1.99.16-sneak-tmpdir.patch
+}
+
+src_compile() {
+	# taken out:
+	# MP_INST_APACHE2=1
+
+	perl Makefile.PL \
+		PREFIX=${D}/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_PROMPT_DEFAULT=1 \
+		MP_USE_DSO=1 \
+		MP_APXS=/usr/sbin/apxs2  \
+		CCFLAGS="${CFLAGS} -fPIC" \
+		INSTALLDIRS=vendor \
+		|| die "\`perl Makefile.PL\` failed"
+
+	# reported that parallel make is broken in bug 30257
+	emake -j1 || die
+}
+
+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 [ "`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.
+
+	HOME="${T}/" make test
+}
+
+src_install() {
+	dodir /usr/lib/apache2-extramodules
+	make install \
+		MODPERL_AP_LIBEXECDIR=${D}/usr/lib/apache2-extramodules \
+		MODPERL_AP_INCLUDEDIR=${D}/usr/include/apache2 \
+		MP_INST_APACHE2=1 \
+		INSTALLDIRS=vendor || die
+
+	# 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.
+
+	eval $(perl -V:vendorarch)
+	cp ${FILESDIR}/${P}-Apache2.pm ${D}/${vendorarch}/Apache2.pm
+
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/75_mod_perl.conf \
+		${FILESDIR}/apache2-mod_perl-startup.pl
+
+	# take this out once all <15 versions are out of the tree
+	sed -i -e 's/Apache::Server /Apache::ServerRec /' ${D}/etc/apache2/conf/modules.d/apache2-mod_perl-startup.pl
+
+	dodoc ${FILESDIR}/75_mod_perl.conf Changes \
+		INSTALL LICENSE README STATUS
+	cp -a docs ${D}/usr/share/doc/${PF}
+	cp -a todo ${D}/usr/share/doc/${PF}
+}