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

(Portage version: 2.1.2_pre3-r5)

4 files changed, 168 insertions, 4 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/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"