Tree break #2 - re-add.

Package-Manager: portage-2.0.51.19

10 files changed, 376 insertions, 5 deletions

diff --git a/dev-perl/mod_perl/ChangeLog b/dev-perl/mod_perl/ChangeLog
index 91da1bdc3400..0be186c825c9 100644
--- a/dev-perl/mod_perl/ChangeLog
+++ b/dev-perl/mod_perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/mod_perl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.49 2005/03/16 23:09:56 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.50 2005/03/19 02:43:24 beu Exp $
+
+*mod_perl-1.27-r1 (19 Mar 2005)
+
+  19 Mar 2005; Elfyn McBratney <beu@gentoo.org> +mod_perl-1.27-r1.ebuild,
+  +mod_perl-1.27-r2.ebuild, +mod_perl-1.99.10.ebuild,
+  +mod_perl-1.99.11.ebuild:
+  Tree break #1 - re-add.
 
   16 Mar 2005; Elfyn McBratney <beu@gentoo.org> mod_perl-1.27-r4.ebuild,
   mod_perl-1.29.ebuild, mod_perl-1.99.16.ebuild, mod_perl-1.99.17-r1.ebuild,
diff --git a/dev-perl/mod_perl/Manifest b/dev-perl/mod_perl/Manifest
index 0157bd5c2961..e3b5317a2acf 100644
--- a/dev-perl/mod_perl/Manifest
+++ b/dev-perl/mod_perl/Manifest
@@ -4,8 +4,12 @@ Hash: SHA1
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 7efadfe82991cfc24a4307826a2dd6ec mod_perl-1.99.17-r1.ebuild 4199
 MD5 ca338a5b21b538037264797da47aee87 mod_perl-1.27-r4.ebuild 1812
-MD5 e1ca4ec4e64a4059ad154012c7b43ae9 ChangeLog 6950
+MD5 c0558b464d3400478955c6fbb98ddc0d mod_perl-1.27-r1.ebuild 1418
+MD5 a9949c15b0558867e3c8220102d73143 mod_perl-1.27-r2.ebuild 1437
+MD5 185d64ef439a87b325f3c7ef1f071009 ChangeLog 7166
 MD5 c8cba37890916ea37fd7a8542a621124 mod_perl-1.99.16.ebuild 3795
+MD5 9796f175307d7f662ec2fb0fedbeb129 mod_perl-1.99.11.ebuild 3782
+MD5 0c6cd64050430b1fa431bce203230e00 mod_perl-1.99.10.ebuild 3819
 MD5 3f2cb99ef028dafbe783268d9bb5f8a8 mod_perl-1.99.17.ebuild 3804
 MD5 ef6d6b3e5f25f1a4171d1d1dbdde7433 mod_perl-1.29.ebuild 2103
 MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
@@ -13,14 +17,18 @@ 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 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17-r1 69
+MD5 5ff16293368688eefecc4a6066eb8914 files/digest-mod_perl-1.99.10 69
 MD5 2937c8efc4e2d9dd8fff843ab63f5c14 files/digest-mod_perl-1.99.17 69
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
 MD5 300bce7b1dad6fda0b18cfdbf592a828 files/mod_perl-1.99.17-Apache2.pm 1149
+MD5 278c6266498d8bef49b54f30774aa305 files/digest-mod_perl-1.99.11 69
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCOLzNjUHll2nfF60RAsR2AJ9b+2NVHVXPvkwZqIatUqbEKItuRACgkyqw
-eY9d0A02RVlMMjCl7Iht6WM=
-=0P5j
+iD8DBQFCO5HVjUHll2nfF60RAtmeAKCmeg9GMGjspR22OQSpR7bPbYToRQCfey5g
+98LpJOVtyoiogYXeW9AG5jc=
+=OheY
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/mod_perl/files/digest-mod_perl-1.27-r1 b/dev-perl/mod_perl/files/digest-mod_perl-1.27-r1
new file mode 100644
index 000000000000..100b74cf1c13
--- /dev/null
+++ b/dev-perl/mod_perl/files/digest-mod_perl-1.27-r1
@@ -0,0 +1 @@
+MD5 bd07f4f1065eb0d0a8d8004219357d8c mod_perl-1.27.tar.gz 372525
diff --git a/dev-perl/mod_perl/files/digest-mod_perl-1.27-r2 b/dev-perl/mod_perl/files/digest-mod_perl-1.27-r2
new file mode 100644
index 000000000000..100b74cf1c13
--- /dev/null
+++ b/dev-perl/mod_perl/files/digest-mod_perl-1.27-r2
@@ -0,0 +1 @@
+MD5 bd07f4f1065eb0d0a8d8004219357d8c mod_perl-1.27.tar.gz 372525
diff --git a/dev-perl/mod_perl/files/digest-mod_perl-1.99.10 b/dev-perl/mod_perl/files/digest-mod_perl-1.99.10
new file mode 100644
index 000000000000..36c0d74770ac
--- /dev/null
+++ b/dev-perl/mod_perl/files/digest-mod_perl-1.99.10
@@ -0,0 +1 @@
+MD5 55345e460b5976b39da9aeb3b5a3b5db mod_perl-1.99_10.tar.gz 1063061
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.27-r1.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild
new file mode 100644
index 000000000000..db5c76670785
--- /dev/null
+++ b/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild
@@ -0,0 +1,57 @@
+# 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-r1.ebuild,v 1.13 2005/03/19 02:43:24 beu Exp $
+
+DESCRIPTION="A Perl Module for Apache"
+SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+SLOT="0"
+LICENSE="Apache-1.1 as-is"
+KEYWORDS="x86 amd64 ppc sparc alpha"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	dev-perl/libwww-perl
+	=net-www/apache-1*"
+
+src_compile() {
+	perl Makefile.PL USE_APXS=1 \
+		PREFIX=${D}/usr	\
+		WITH_APXS=/usr/sbin/apxs EVERYTHING=1
+
+	cp Makefile Makefile.orig
+	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
+	emake || die
+}
+
+src_install() {
+	make \
+		PREFIX=${D}/usr	\
+		INSTALLMAN1DIR=${D}/usr/share/man/man1	\
+		INSTALLMAN3DIR=${D}/usr/share/man/man3	\
+		install || die
+
+	dodoc Changes CREDITS MANIFEST README SUPPORT ToDo
+	dohtml -r ./
+
+	cd apaci
+	exeinto /usr/lib/apache-extramodules
+	doexe libperl.so
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libperl.so mod_perl.c perl_module \
+		define=PERL
+	:;
+}
diff --git a/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild
new file mode 100644
index 000000000000..8b09ebcff420
--- /dev/null
+++ b/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild
@@ -0,0 +1,59 @@
+# 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.11 2005/03/19 02:43:24 beu Exp $
+
+inherit eutils
+
+DESCRIPTION="A Perl Module for Apache"
+SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org/"
+
+SLOT="0"
+LICENSE="Apache-1.1 as-is"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	dev-perl/libwww-perl
+	=net-www/apache-1*"
+
+src_compile() {
+	perl Makefile.PL USE_APXS=1 \
+		PREFIX=${D}/usr	\
+		WITH_APXS=/usr/sbin/apxs EVERYTHING=1
+
+	cp Makefile Makefile.orig
+	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
+	emake || die
+}
+
+src_install() {
+	make \
+		PREFIX=${D}/usr	\
+		INSTALLMAN1DIR=${D}/usr/share/man/man1	\
+		INSTALLMAN3DIR=${D}/usr/share/man/man3	\
+		install || die
+
+	dodoc Changes CREDITS MANIFEST README SUPPORT ToDo
+	dohtml -r ./
+
+	cd apaci
+	exeinto /usr/lib/apache-extramodules
+	doexe libperl.so
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libperl.so mod_perl.c perl_module \
+		define=PERL
+	:;
+}
diff --git a/dev-perl/mod_perl/mod_perl-1.99.10.ebuild b/dev-perl/mod_perl/mod_perl-1.99.10.ebuild
new file mode 100644
index 000000000000..0338566eb522
--- /dev/null
+++ b/dev-perl/mod_perl/mod_perl-1.99.10.ebuild
@@ -0,0 +1,120 @@
+# 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.99.10.ebuild,v 1.7 2005/03/19 02:43:24 beu Exp $
+
+inherit eutils
+
+front=${PV%\.*}
+back=\_${PV##*\.}
+MY_PV=${PV:0:${#front}}${back}
+
+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"
+
+	# this one is because of sandbox problems trying to uninstall test.pm
+
+	epatch ${FILESDIR}/${P}-nonukes.patch || die
+}
+
+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
+
+	emake || 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}
+}
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..3b546e7d5381
--- /dev/null
+++ b/dev-perl/mod_perl/mod_perl-1.99.11.ebuild
@@ -0,0 +1,116 @@
+# 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.99.11.ebuild,v 1.10 2005/03/19 02:43:24 beu Exp $
+
+inherit eutils
+
+front=${PV%\.*}
+back=\_${PV##*\.}
+MY_PV=${PV:0:${#front}}${back}
+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 alpha ~ia64 ~sparc ~ppc"
+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}
+}