add 1.99.11

4 files changed, 123 insertions, 4 deletions

diff --git a/dev-perl/mod_perl/ChangeLog b/dev-perl/mod_perl/ChangeLog
index 693455b14818..1793bc170278 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.25 2003/10/15 06:22:23 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.26 2003/12/17 00:30:46 rac Exp $
+
+*mod_perl-1.99.11 (16 Dec 2003)
+
+  16 Dec 2003; <rac@gentoo.org> mod_perl-1.99.11.ebuild:
+  New upstream bump, fix bug 30257 by disabling parallel make
 
 *mod_perl-1.27-r4 (14 Oct 2003)
 
diff --git a/dev-perl/mod_perl/Manifest b/dev-perl/mod_perl/Manifest
index e3786d8c07ca..0051a376f4bf 100644
--- a/dev-perl/mod_perl/Manifest
+++ b/dev-perl/mod_perl/Manifest
@@ -2,14 +2,13 @@ MD5 9eb488a8d217058474db6e04e22c62fa mod_perl-1.99.09.ebuild 3613
 MD5 b04e594ce1aa3379787924322454aba5 mod_perl-1.27.ebuild 1416
 MD5 0bf9316fb68b93b9bd9b72555e81b41b mod_perl-1.27-r2.ebuild 1821
 MD5 8b395a2985103819def72cc269b3dbc8 mod_perl-1.99.10.ebuild 3811
-MD5 12704b63ae8ef6108061baccceb4c773 mod_perl-1.99.11.ebuild~ 3864
 MD5 ca7b02d02b05f693bb730fd5eb8e6627 mod_perl-1.27-r4.ebuild 2196
 MD5 026fbb84b447f735b4c86b46860f2afb mod_perl-1.99.08.ebuild 1244
 MD5 58ceed38b57307fa4190170a23408524 mod_perl-1.27-r1.ebuild 1421
-MD5 249d51b33f2a08cfa0a518b6fbe07a31 ChangeLog 3704
+MD5 58a23902bcc6b02377052c0fd8f8fac2 ChangeLog 3857
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 b8bea8f6d6e415b81c96ea0ff36478eb mod_perl-1.27-r3.ebuild 2031
-MD5 52e8dfe8403f30c8c5f5292c6539b54a mod_perl-1.99.11.ebuild 3869
+MD5 36e45151ca1f70491b941ed4707ea0c1 mod_perl-1.99.11.ebuild 3750
 MD5 e749acb150e339917257be38febb568e files/mod_perl-1.99.10-nonukes.patch 777
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r2 65
diff --git a/dev-perl/mod_perl/files/digest-mod_perl-1.99.11 b/dev-perl/mod_perl/files/digest-mod_perl-1.99.11
new file mode 100644
index 000000000000..f2a9965e0454
--- /dev/null
+++ b/dev-perl/mod_perl/files/digest-mod_perl-1.99.11
@@ -0,0 +1 @@
+MD5 855adb033de193dc999a5a2bd714f675 mod_perl-1.99_11.tar.gz 1093014
diff --git a/dev-perl/mod_perl/mod_perl-1.99.11.ebuild b/dev-perl/mod_perl/mod_perl-1.99.11.ebuild
new file mode 100644
index 000000000000..320316286f5e
--- /dev/null
+++ b/dev-perl/mod_perl/mod_perl-1.99.11.ebuild
@@ -0,0 +1,114 @@
+# 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.99.11.ebuild,v 1.1 2003/12/17 00:30:46 rac Exp $
+
+inherit eutils
+
+MY_PV=$(echo $PV | perl -pe 's/\.([^.]+)$/_\1/')
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="http://perl.apache.org/dist/${MY_P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 amd64"
+IUSE=""
+SLOT="1"
+
+# see bug 30087 for why sudo is in here
+
+DEPEND="dev-lang/perl
+	=net-www/apache-2*
+	>=dev-perl/CGI-2.93
+	>=sys-apps/sed-4
+	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"
+}
+
+src_compile() {
+	perl Makefile.PL \
+		PREFIX=${D}/usr \
+		MP_TRACE=1 \
+		MP_DEBUG=1 \
+		MP_AP_PREFIX=/usr \
+		MP_USE_DSO=1 \
+		MP_INST_APACHE2=1 \
+		MP_APXS=/usr/sbin/apxs2  \
+		CCFLAGS="${CFLAGS} -fPIC" \
+		INSTALLDIRS=vendor </dev/null || die
+
+	# reported that parallel make is broken in bug 30257
+	emake -j1 || die
+
+	# 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
+
+	# these next two stanzas avoid sandbox problems with make test
+	# tell mod_cgid to make the socket here instead of /var/run/cgisock
+	echo -e "\nScriptSock logs/cgisock" >> ${S}/t/conf/extra.conf.in
+	echo -e "\nScriptSock logs/cgisock" >> ${S}/ModPerl-Registry/t/conf/extra.conf.in
+	# tell CGI.pm to create new tmpfiles in this directory
+	echo -e "\nSetEnv TMPDIR ${T}" >> ${S}/t/conf/extra.conf.in
+
+	# this does not || die because of bug 21325.
+
+	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
+
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/75_mod_perl.conf \
+		${FILESDIR}/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}
+}