Bug 77551 and friends: 1.29 unmasked; 2.0.1 unmasked; 2.0.2 added; all should be installing appropritately for new-style apaches.

(Portage version: 2.1_pre3-r1)

6 files changed, 189 insertions, 40 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index 9d3013c95372..6445ddc50352 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,15 @@
 # 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.14 2006/02/13 15:11:46 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.15 2006/02/26 14:53:31 mcummings Exp $
+
+*mod_perl-2.0.2 (26 Feb 2006)
+
+  26 Feb 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/2.0.2/75_mod_perl.conf, +files/2.0.2/apache2-mod_perl-startup.pl,
+  +files/1.29/75_mod_perl.conf, mod_perl-1.29.ebuild,
+  mod_perl-2.0.1-r2.ebuild, +mod_perl-2.0.2.ebuild:
+  Bug 77551 and friends: 1.29 unmasked; 2.0.1 unmasked; 2.0.2 added; all
+  should be installing appropritately for new-style apaches.
 
   13 Feb 2006; Michael Cummings <mcummings@gentoo.org>
   mod_perl-1.99.11.ebuild, mod_perl-1.99.16.ebuild,
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index b045d23f3ced..360d765a28a5 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,9 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d154f4922008512cfce2f66aebc990e5 ChangeLog 11387
+MD5 69c875b495ad39b70b13342cf7381ca4 files/1.29/75_mod_perl.conf 114
 MD5 4dcf07748f65bc0682e4d739ec14535d files/2.0.1/75_mod_perl.conf 1527
 MD5 39bbf08146125b9be7559d5c2d16b400 files/2.0.1/apache2-mod_perl-startup.pl 478
+MD5 4dcf07748f65bc0682e4d739ec14535d files/2.0.2/75_mod_perl.conf 1527
+MD5 39bbf08146125b9be7559d5c2d16b400 files/2.0.2/apache2-mod_perl-startup.pl 478
 MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
 MD5 6dbf85f6df302959fc9decf11eb6e5f5 files/apache2-mod_perl-startup.pl 485
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
@@ -14,6 +14,7 @@ MD5 278c6266498d8bef49b54f30774aa305 files/digest-mod_perl-1.99.11 69
 MD5 13d314750ba5772dc7de4d9023d137ad files/digest-mod_perl-1.99.16 69
 MD5 8971805d7e08351fee8312e9f621398b files/digest-mod_perl-2.0.1-r1 67
 MD5 8971805d7e08351fee8312e9f621398b files/digest-mod_perl-2.0.1-r2 67
+MD5 019a1b1281a558ff624a28140ba9a527 files/digest-mod_perl-2.0.2 67
 MD5 8c8ec63f03d3ffb51fa26b6df03a5710 files/mod_perl-1.99.16-sneak-tmpdir.patch 395
 MD5 300bce7b1dad6fda0b18cfdbf592a828 files/mod_perl-1.99.17-Apache2.pm 1149
 MD5 0729531d2489b4ef91e247076f46ed1e files/mod_perl-2.0.1-sneak-tmpdir.patch 337
@@ -21,15 +22,9 @@ MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 ac6aeaec7d125dc21dde650f46535017 mod_perl-1.27-r1.ebuild 1387
 MD5 7ac6d91054592e43920b8eae6134648e mod_perl-1.27-r2.ebuild 1406
 MD5 65045ffc7af1203b1168775407c25680 mod_perl-1.27-r4.ebuild 1781
-MD5 9b399f01876b16face507372264119fc mod_perl-1.29.ebuild 2078
+MD5 0af3ffdaaa03237d972bb31add9bbe51 mod_perl-1.29.ebuild 1865
 MD5 649bc1ee2ad5420453053010dcc141cb mod_perl-1.99.11.ebuild 3796
 MD5 9923645f9ba0b7d7efcefa76f182d405 mod_perl-1.99.16.ebuild 3811
 MD5 a960dceefeacaaef755e148535304195 mod_perl-2.0.1-r1.ebuild 4833
-MD5 1b119c7b901b1d98ddd5f337ad948919 mod_perl-2.0.1-r2.ebuild 5298
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD8KGotG5z4I8BtQoRAt2eAKCUYmMOQSB6fHXlbsVyUmvbc9JJvwCfdt2/
-rRG3tbKMIMS1yz0b64Bo+To=
-=94qB
------END PGP SIGNATURE-----
+MD5 9521a238c5012ad73b983e6c8045f428 mod_perl-2.0.1-r2.ebuild 5297
+MD5 cd4524eff6d1a20d03e3a763ee9088b5 mod_perl-2.0.2.ebuild 5203
diff --git a/www-apache/mod_perl/files/digest-mod_perl-2.0.2 b/www-apache/mod_perl/files/digest-mod_perl-2.0.2
new file mode 100644
index 000000000000..34007fb16d5d
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-2.0.2
@@ -0,0 +1 @@
+MD5 ad0a509fd34e3b8452887d80a1d45dea mod_perl-2.0.2.tar.gz 3692744
diff --git a/www-apache/mod_perl/mod_perl-1.29.ebuild b/www-apache/mod_perl/mod_perl-1.29.ebuild
index 5e51a9d4fcb7..e162558db5bc 100644
--- a/www-apache/mod_perl/mod_perl-1.29.ebuild
+++ b/www-apache/mod_perl/mod_perl-1.29.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-1.29.ebuild,v 1.3 2005/11/12 16:25:09 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.29.ebuild,v 1.4 2006/02/26 14:53:31 mcummings Exp $
 
-inherit eutils
+inherit eutils apache-module
 
 DESCRIPTION="A Perl Module for Apache"
 SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
@@ -10,12 +10,18 @@ HOMEPAGE="http://perl.apache.org"
 
 SLOT="0"
 LICENSE="Apache-1.1 as-is"
-KEYWORDS="alpha ~amd64 ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ia64 ~ppc ppc64 sparc x86"
 
 DEPEND="dev-lang/perl dev-perl/libwww-perl =net-www/apache-1*"
 
+APACHE1_MOD_DEFINE="PERL"
+APACHE1_MOD_CONF="${PV}/75_mod_perl"
+APACHE1_MOD_FILE="${S}/apaci/libperl.so"
+
 IUSE=""
 
+need_apache1
+
 src_unpack() {
 	unpack ${A}
 
@@ -30,11 +36,11 @@ src_unpack() {
 src_compile() {
 	perl Makefile.PL USE_APXS=1 \
 		INSTALLDIRS=vendor \
-		WITH_APXS=/usr/sbin/apxs EVERYTHING=1 PERL_DEBUG=1
+		WITH_APXS=${APXS1} EVERYTHING=1 PERL_DEBUG=1
 
 	cp Makefile Makefile.orig
 	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
-	emake || die
+	emake -j1 || die
 }
 
 src_install () {
@@ -58,24 +64,7 @@ src_install () {
 		sed -i -e "s:${D}:/:g" ${FILE}
 	done
 
+	apache-module_src_install
 
-	cd apaci
-	exeinto /usr/lib/apache-extramodules
-	doexe libperl.so
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Execute emerge --config =${PF}"
-	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
-	:;
+	fperms 600 ${APACHE1_MODULES_CONFDIR}/$(basename ${APACHE1_MOD_CONF})
 }
diff --git a/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild
index 2fac8ce0493d..f17625a21e7e 100644
--- a/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.1-r2.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.1-r2.ebuild,v 1.5 2006/02/13 15:11:46 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild,v 1.6 2006/02/26 14:53:31 mcummings Exp $
 
 inherit apache-module perl-module eutils multilib
 DESCRIPTION="An embedded Perl interpreter for Apache2"
@@ -8,7 +8,7 @@ SRC_URI="mirror://cpan/authors/id/G/GO/GOZER/${P}.tar.gz"
 HOMEPAGE="http://perl.apache.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~alpha ~ia64 ~sparc ~ppc ~ppc64"
+KEYWORDS="x86 ~amd64 ~alpha ~ia64 ~sparc ~ppc ~ppc64"
 IUSE=""
 SLOT="1"
 
diff --git a/www-apache/mod_perl/mod_perl-2.0.2.ebuild b/www-apache/mod_perl/mod_perl-2.0.2.ebuild
new file mode 100644
index 000000000000..ece0f8fd3805
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.2.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.2.ebuild,v 1.1 2006/02/26 14:53:31 mcummings Exp $
+
+inherit apache-module perl-module eutils multilib
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="mirror://cpan/authors/id/P/PG/PGOLLUCCI/${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
+need_apache2
+
+DEPEND="!dev-perl/Apache-Test
+	dev-lang/perl
+	>=virtual/perl-CGI-3.08
+	>=dev-perl/Compress-Zlib-1.09
+	>=net-www/apache-2.0.47
+	app-admin/sudo"
+
+APACHE2_MOD_CONF="75_${PN}.conf apache2-mod_perl-startup.pl"
+DOCFILES="Changes INSTALL LICENSE README STATUS"
+APACHE2_MOD_DEFINE="PERL"
+
+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}/mod_perl-2.0.1-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
+}