Version bump

Package-Manager: portage-2.1.2_rc4-r3

4 files changed, 178 insertions, 9 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index 6d274ef0810b..157301433f2c 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.29 2007/01/06 23:45:13 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.30 2007/01/09 20:06:36 mcummings Exp $
+
+*mod_perl-2.0.3 (09 Jan 2007)
+
+  09 Jan 2007; Michael Cummings <mcummings@gentoo.org>
+  +mod_perl-2.0.3.ebuild:
+  Version bump
 
   06 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> mod_perl-2.0.2.ebuild:
   Stable on Alpha.
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index f2d8ce16d252..bcb6e60e03d6 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -45,6 +45,7 @@ DIST mod_perl-1.27.tar.gz 372525 RMD160 a727844f7e6805422f4aa4adad3302adbe4b197a
 DIST mod_perl-1.29.tar.gz 378877 RMD160 4a6eb2223f0bdedf1608bac2dbba543475fed42b SHA1 6cdc30b5bc6db26997a18da02570bd2822cdf956 SHA256 b401efaa105dd5f82d6e61f0efa372d4018db15e0748ca34a52d8daa209dea6b
 DIST mod_perl-2.0.1.tar.gz 3694355 RMD160 06e921614c030a3b25d224cd88825d4b15aeb761 SHA1 173bc012a00fbe0ee8c51d6ce18c2fa7c33249b3 SHA256 918588fc3944fb9c57ccf87ee8554a6f95b1d8fe6ba894d1111c16048070f136
 DIST mod_perl-2.0.2.tar.gz 3692744 RMD160 8f58605283b78892e5e4fdac9d6da7d4e0b3b0b5 SHA1 aa2c8b24883d474a236c061a8d2c4eea621380d6 SHA256 64a3f54111c953c46ed7b1bafb4ebb034447ca6baba73a8657ad7a39ddeca906
+DIST mod_perl-2.0.3.tar.gz 3714974 RMD160 29662a131c1bef6e4adc551d4467d12931a4d919 SHA1 e5d8b3cd7273c284cfbd79acb953ce179322bdc9 SHA256 df257f233ed6a5c9f8589d6e059563f816bf417f164fc3364a2a434de13045f2
 EBUILD mod_perl-1.27-r4.ebuild 1781 RMD160 61143725260672d46aa76a8930da52fedaaf779d SHA1 9e664a4efca01aaa25bd40ce0a8edcb86ab5ea45 SHA256 8d8008ba1fdd67459f2072ef09825351886071f644f2c1c3e0e08f87a6f2464e
 MD5 c2fd4fe8201ab2452e399b0f620e376f mod_perl-1.27-r4.ebuild 1781
 RMD160 61143725260672d46aa76a8930da52fedaaf779d mod_perl-1.27-r4.ebuild 1781
@@ -65,10 +66,14 @@ EBUILD mod_perl-2.0.2.ebuild 5288 RMD160 9a0843bea567574648f044f6f31998250d70b50
 MD5 6839dc1f36fbfa27ad8d187e9da9b6ef mod_perl-2.0.2.ebuild 5288
 RMD160 9a0843bea567574648f044f6f31998250d70b504 mod_perl-2.0.2.ebuild 5288
 SHA256 348a23792e9b2beb372aeb6243689d6071371d1af92fbe9a4d3194a5ca0b0a4d mod_perl-2.0.2.ebuild 5288
-MISC ChangeLog 13955 RMD160 7e20b6255ad22e9a7cc71145df52c7065304d113 SHA1 d0303e93f89c9b5ddd8aae1a3cd95a6a204cfd50 SHA256 51c3d186e5faefa3f0e502a17438ec8126eb544648b93160444db202abc9edfe
-MD5 33eb305e73fb29fca6f00e050823cf78 ChangeLog 13955
-RMD160 7e20b6255ad22e9a7cc71145df52c7065304d113 ChangeLog 13955
-SHA256 51c3d186e5faefa3f0e502a17438ec8126eb544648b93160444db202abc9edfe ChangeLog 13955
+EBUILD mod_perl-2.0.3.ebuild 5249 RMD160 b4090927e89972e3032a4b160b4e34f613f228fb SHA1 9894fa1f69764f1a02a2f8140fa68edde44404a5 SHA256 ea12105c89712b76a94518f9153c8c00a65ef3d4e5ebfadce3f672bb0529077b
+MD5 7aba7243d9188f2ab11c0f7013a5c33d mod_perl-2.0.3.ebuild 5249
+RMD160 b4090927e89972e3032a4b160b4e34f613f228fb mod_perl-2.0.3.ebuild 5249
+SHA256 ea12105c89712b76a94518f9153c8c00a65ef3d4e5ebfadce3f672bb0529077b mod_perl-2.0.3.ebuild 5249
+MISC ChangeLog 14086 RMD160 ef9b09075ddb34c82e7c91cc2560650b517d7367 SHA1 0a7076ced5ae4f07dd2652b1f02ff57bcd069c7a SHA256 d92896f0a8e4134cb222948ae024a8f8f9ea34ff922ace516896a9155cc5a9ed
+MD5 2512148c4efb49ba1159b3a4c9d954ba ChangeLog 14086
+RMD160 ef9b09075ddb34c82e7c91cc2560650b517d7367 ChangeLog 14086
+SHA256 d92896f0a8e4134cb222948ae024a8f8f9ea34ff922ace516896a9155cc5a9ed ChangeLog 14086
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -88,10 +93,13 @@ SHA256 e81d562bc8866db9682f8988ef03c8c3a14445893d35a078eb18b46b30ca1146 files/di
 MD5 1d8a4a065f61782d1d7a6391572f7a2a files/digest-mod_perl-2.0.2 247
 RMD160 bfb99bae5e4de09562fc79d164a55e9f799f0630 files/digest-mod_perl-2.0.2 247
 SHA256 2891e5a85d9566e61ea1eef0f49ed3a867b67b9159f14792e6ca0a63e64ee585 files/digest-mod_perl-2.0.2 247
+MD5 2cee3dc20b5fa45bf9b68d7c1d48ea0a files/digest-mod_perl-2.0.3 247
+RMD160 67aa385d26608262c1984a6d0e1049aad6100fa7 files/digest-mod_perl-2.0.3 247
+SHA256 8fa24b53fca491ae5c32d3ca402e74417c2d1cb21be10cbd73319ca869b154ba files/digest-mod_perl-2.0.3 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFoDQ9ugEuf3OQ0akRAt4yAJ9EW8z6grbxzpLR5WsgMZyjBCvauACfZTAi
-/npTIJo3SUdG5JGqgEVO0Ic=
-=nc/D
+iD8DBQFFo/XTtG5z4I8BtQoRAhcCAJ0Rhgk3Y+XVqXjp6aZ6giU93F+RfACfZ266
+aWLf1ycKyC4cb59BPYw9JU0=
+=HoKo
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_perl/files/digest-mod_perl-2.0.3 b/www-apache/mod_perl/files/digest-mod_perl-2.0.3
new file mode 100644
index 000000000000..3678f6181c60
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-2.0.3
@@ -0,0 +1,3 @@
+MD5 b40e2adf67c6be15a0041af1c67b6997 mod_perl-2.0.3.tar.gz 3714974
+RMD160 29662a131c1bef6e4adc551d4467d12931a4d919 mod_perl-2.0.3.tar.gz 3714974
+SHA256 df257f233ed6a5c9f8589d6e059563f816bf417f164fc3364a2a434de13045f2 mod_perl-2.0.3.tar.gz 3714974
diff --git a/www-apache/mod_perl/mod_perl-2.0.3.ebuild b/www-apache/mod_perl/mod_perl-2.0.3.ebuild
new file mode 100644
index 000000000000..7d091c0ddf98
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2007 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.3.ebuild,v 1.1 2007/01/09 20:06:36 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
+DEPEND=">=dev-perl/Apache-Test-1.27
+	>=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}/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  \
+		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
+}