Cleanup

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

6 files changed, 21 insertions, 420 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index c6b52ef2a6dc..9d48a72015f6 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.102 2012/10/10 14:15:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.103 2012/10/30 20:25:29 idl0r Exp $
+
+  30 Oct 2012; Christian Ruppert <idl0r@gentoo.org> -mod_perl-2.0.4-r1.ebuild,
+  -mod_perl-2.0.5.ebuild, -files/mod_perl-2.0.5-bundled-Apache-Test.patch,
+  -files/CVE-2009-0796.patch:
+  Cleanup
 
   10 Oct 2012; Brent Baude <ranger@gentoo.org> mod_perl-2.0.7.ebuild:
   Marking mod_perl-2.0.7 ppc for bug 432610
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index a53a70a47e58..8214ec33c1b2 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,14 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.0.3/75_mod_perl.conf 1221 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a SHA512 caaf66604e385f24ddebf282c42b880362fa19f9195fca105171b3d3edfa5b995d7bda9899be60f78341e20e2fad75fbb097740ea43781a44a60a4a5b7f650b7 WHIRLPOOL 8601fb27162befa58c94009e4e726cbd6fec7f2014a23b68b93b88f18d0b44cbebeee3ebdb0970600aa9785b5cff6f86eb6edb33d59f874622dfb828b22b5d0b
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 SHA256 f77741fb3bb18928fb15f95c6908a17d8f06d7efbb6785e0732f201347e26544 SHA512 3af399b3aa0bf5421ddef581b1042cbd71fa3fc9d27aa87feafb4754cc8e7bf9659eb70082f0c73f0022b31e8870ff68021af692e41b391dec6c5e7608589e29 WHIRLPOOL 78518f0d5952246700424af8d85dae73a17061e009b7d89aa55c7c93fed877addc8550524ebf6fb5f353ee50210a3773dadac9e1c8f84f2b2bc32c4ab2df2981
-AUX CVE-2009-0796.patch 1284 SHA256 2ef34be0541cf9866d0af551e54d062c9c62d0e0f155d206bc710a3d125004d5 SHA512 aeb35ae7badaddd010f3123d8af918ede3b7319b14b09b37661e139be70ee11bd386ec73369671edcad88274a520db43a53f5617cfdc892b6230803f1ac6eecf WHIRLPOOL b26dfe5a7b952d3f2331994f767cc27f681fc091f4277a6d2e98349be4494d2dfc766271657fb3b0a0d86870e2ca29427b8893e6cc4595d441dc61ce82651321
 AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792 WHIRLPOOL a24853b0ada357b2a53d5ffe34969f792305a674388d6dc385912167a7ce45d376035a0810f75a1740872bac452187e7172f11afe06f8553f25560476a5fa1da
-AUX mod_perl-2.0.5-bundled-Apache-Test.patch 2075 SHA256 c02e8f270393854d7453adfe737f0802441630ed8e3a733e134fb2bccf3a31ae SHA512 ab18d8849180fcb4dbd4b3dddb1574d47a69c4709974f2fb5d56e74ec3c50cb9efc81cad5c076578c089ff69a83290bca80d4823471da1d11e5e39cf59ba41ee WHIRLPOOL e924e04dd1c95852baa42e3ce55c3d6fd67124dffc85665873e3ba75e4436b3ee1fed6aec398457db8e7e303de756fcdcac88527808a3bfa4a9e280552a7be5e
 AUX mod_perl-2.0.7-bundled-Apache-Test.patch 3929 SHA256 49ab69351e442e26d2d4ddcb5a41c702a2ce2e149fd70132b35b04017c85748d SHA512 113550c5dff0992d6289a1f6c990b2ded9800cdf285367ca677390a54e83e8628d78fdfe0697f7d1bda6fa43bfe079cae8654eb1640af89ff72e29a12fe64764 WHIRLPOOL 9e8de297c908548a77fe97fe804480dc98167138d982c2ced07abf11a4fa399f3f269f1583bd355689cee5b0687567935f4be7727f7c01de2ffa6df16998d6fb
-DIST mod_perl-2.0.4.tar.gz 3727717 SHA256 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0 SHA512 bcc0bd87cfd11bab712a6784757a84e2dd0cc08f3ce3d1d57fb774da820293222fe9e5f8ef0af3d00efb37a8826fb73f9aa1b4d4aa8d702168424ff02683d7ed WHIRLPOOL 518decd928356fb51a6d8dfa5b9052b83a0a06b0d6e69d6f51012104222c34a11852ab4fb5d968f7610cc4200627028d06ffec82f4b073788fbdf5b8d0733689
-DIST mod_perl-2.0.5.tar.gz 3778910 SHA256 fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa SHA512 a057c2fc887078a9cb896ee9633c30f4affddac9ba8654fe0eb6b1e8cf0ff56835a1ef6424e7387cc27f0fec83998326f35d28aa0359c4b2c06ef3703cfd8ef2 WHIRLPOOL 99f64434e101a1a9759a8a5e20890348f1e174ecccb8dff44e94d3ac959fd6f9b93e12d30a57401c5736a12b491cf27f72b6e036e78146fe09d755c5d26f3882
 DIST mod_perl-2.0.7.tar.gz 3784950 SHA256 53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6 SHA512 b8ca808aebff35198b0a29e8ec98d10364cff15aab628697da135581675c254054e039e80afafc651743975a8795f40da450177be49bb5fd1934bcad7ebc4fed WHIRLPOOL 7b2a329f19d199426ae57ed5061adc2a38e42c4c0019f8fb372f41c1b36a3e809a41c1031c1c21346649980fccb54248d2888510604e77e7666a880d3957f663
-EBUILD mod_perl-2.0.4-r1.ebuild 4339 SHA256 552c810199cdad956b4eeea451a006a44889fcb509a8b50418b9e93bf354bcfc SHA512 3bb9f96f7266572e65fe3009e437243c0be6b2f62afd9aaf471ec7b981e4f3444a9541d2c99a0949929980db4c9d555558d70f61f599f7c712074892d1f30c8f WHIRLPOOL 421a199ccbdbbd6a99b829899fa473e59586feaaf3b876e6309d2ee2af29a1c361c6cc6b6756b3360a811dd4cd48d3be624cc90c6567c52ff85ca22efe306a1b
-EBUILD mod_perl-2.0.5.ebuild 5068 SHA256 421ab6e1953f8076c90bc3d603bcd82062bac8c17815e22dfb81d380891814b7 SHA512 afdb32cb6ba534569b6080056931f93d7e2c93b1100a17bd5b4af7ecfc6668e099418379b0bb61e3dcc896df4bd2365b47b9f615e3230089a2699e023116d7f2 WHIRLPOOL 707f41d79690774862aa9948205a4e5da01a69b4d707f949a8c48058e05f93da5ff0b2930484cecf78ae342d31c5b94b0f77c551b29b9e6b6743d24a2a6b60df
 EBUILD mod_perl-2.0.7.ebuild 5169 SHA256 0b005ef590862f17643e169aca8dc094e5afc2da7ee76ef96121043966f54ac0 SHA512 a7e12acba1c9586dd01209e0b3862257db1dcd16f1da9e717dcf02481019147fbbcb1379b094062cb3500a3258ad6807d9b01a2c752a7d41a956215b57dabacc WHIRLPOOL 6405b8c5d882f0383764c9d83f17b8ce404023a3c4746200c88ad9348e3b8a50ac6ec6b24b903626d7f49c8f2db5230e5cef1b82c0a7fe737fb167f274d85d49
-MISC ChangeLog 23506 SHA256 93c9b2783421a729cd7d0c21e30f697a469813c89a98afb8b00e9ee9c2408dbb SHA512 0d3a16b6800acd254ff22f0501fd00cd018a0e5528b68d94f34d290cce6987e7f46ce3132e48b321fd8b6f45f52a903e0ed6ac5cdbdf57248038fe24ec08d795 WHIRLPOOL e92c21d0aa520ce769cce457a23b137b84608410278d515e61e9f6655c25bcd9d9fb349d184f6ad0916414061f2ec4860712471852a724899e0f7ea5809bf7fa
+MISC ChangeLog 23700 SHA256 1ef1039398929afea9c83175c4e416fd8f297891511e1f7a168522b90b3376bf SHA512 e570dca5b8a09d7251838dbb9710579a8167b30ffb46c621f3369fb00f5525adc992b2df4bae3cd95369d7321e84d44ef36d2207dc2b854e30e033ba942b9f81 WHIRLPOOL cf88882fd035df763e9300dcd3c0acba8a0d5a0891bd6acfea902c3c7d8aaa762e922072643498d055a3b292bd56210ad5e0fe5c120a2439c020f7894f1ecf1c
 MISC metadata.xml 275 SHA256 031d7de6b452dfe25c20e59c8a3da81e54a59cd2c4bb80524e4905b180eb66ab SHA512 0115b4665fe652306905a97103a7bf9236e3c1da9234cf5373e40241c157fddbd855aeece15fb01495c322c26569c3ddfb6521ebfc045c5bf0609d89e704aade WHIRLPOOL 3604ab17985b2a30d8ab4cc17bd28d42018db7d3e6eb8837c12189fee1180d16ba25704cfd777b430ee07046cdc35daf572f1cba66e1e2b8394810f012000f82
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQkDe6AAoJEMOx0zmdw4Z1pqIIALvX0zEe/xqV8SxqWgzZP6ZZ
+P+WxZrIOKPTm55vP0xKDZVyq5/BuVYXTuQSP8AluZ7+LDefytJkpE1JWQdJF/0Ir
+Z7P+cVeUX+ZzvCdOTwoTUoEZNWYjaVnLlSaXy8srSgjKg3oBb+Tdb+Bje3ez7nSk
+jyTqpmO6LmzmryWT9FrsPnJu0jNGMiN0Hv8yddHv4YV8EkSjGX+dYKxTjKX5GiMv
+3nMRpL1m3m5cbajaO0wAGDnmh7Hzx4OTcGKTRnO4lBlDbvS2iP5BcPjRYQV1VJDO
+9SKOOGueS6orBOSkKB3KXfdB0y8v7EQ0td1Ol5UpEI3taMpfoCUaCC34ii7Q4/w=
+=Efmw
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_perl/files/CVE-2009-0796.patch b/www-apache/mod_perl/files/CVE-2009-0796.patch
deleted file mode 100644
index c13db0de155a..000000000000
--- a/www-apache/mod_perl/files/CVE-2009-0796.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- perl/modperl/trunk/lib/Apache2/Status.pm	2007/12/31 08:05:11	607697
-+++ perl/modperl/trunk/lib/Apache2/Status.pm	2009/04/01 15:39:56	760926
-@@ -29,7 +29,7 @@
- 
- use Apache2::Const -compile => qw(OK);
- 
--$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0
-+$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0
- 
- use constant IS_WIN32 => ($^O eq "MSWin32");
- 
-@@ -126,7 +126,7 @@
-         $r->print(symdump($r, $qs));
-     }
-     else {
--        my $uri = $r->uri;
-+        my $uri = $r->location;
-         $r->print('<p>');
-         $r->print(
-             map { qq[<a href="$uri?$_">$status{$_}</a><br />\n] } sort { lc $a cmp lc $b } keys %status
-@@ -198,7 +198,7 @@
- sub status_inc {
-     my ($r) = @_;
- 
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my @retval = (
-         '<table border="1">',
-         "<tr>",
-@@ -289,7 +289,7 @@
-     my ($r) = @_;
- 
-     local $_;
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my $cache = __PACKAGE__->registry_cache;
- 
-     my @retval = "<h2>Compiled registry scripts grouped by their handler</h2>";
-@@ -765,7 +765,7 @@
-     my ($self, $package, $r) = @_;
- 
-     my @m = qw(<table>);
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my $is_main = $package eq "main";
- 
-     my $do_dump = has($r, "dumper");
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.5-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.5-bundled-Apache-Test.patch
deleted file mode 100644
index 1c7828b48949..000000000000
--- a/www-apache/mod_perl/files/mod_perl-2.0.5-bundled-Apache-Test.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/Makefile.PL b/Makefile.PL
-index ca80816..4196f8e 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -24,7 +24,7 @@ BEGIN {
- 
- }
- 
--use lib qw(lib Apache-Test/lib);
-+use lib qw(lib);
- 
- use Config;
- use File::Spec::Functions;
-@@ -116,16 +116,6 @@ sub get_DEFINE {
- }
- 
- sub configure {
--
--    # mod_perl test suite relies on having Apache-Test bundled with
--    # the mod_perl source, since any pre-installed version may not do
--    # the right thing
--    unless (-d "Apache-Test") {
--        error "Can't find a sub-directory Apache-Test. " .
--            "Make sure that you are using a complete source distribution";
--        exit 1;
--    }
--
-     set_modperl_version();
- 
-     if ($old_modperl_version) {
-@@ -794,47 +784,11 @@ run_tests : test_clean
- run_subtests ::
- 	$(MAKE) -C ModPerl-Registry test
- 
--run_subtests ::
--	$(MAKE) -C Apache-Reload test
--
--run_subtests ::
--	$(MAKE) -C Apache-SizeLimit test
--
- test :: pure_all run_tests test_clean
- EOF
- 
- }
- 
--sub MY::postamble {
--    my $self = shift;
--
--    my $string = $self->ModPerl::BuildMM::MY::postamble;
--
--    $string .= <<'EOF';
--mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
--
--rpm: dist
--	@[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm
--	rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \
--                 --define "_srcrpmdir $(PWD)/rpm" \
--                 $(DISTVNAME).tar.gz
--	@mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/
--	@rm -rf $(PWD)/rpm/*/
--    
--mod_perl.spec: build/make_rpm_spec
--	$(PERL) build/make_rpm_spec
--
--Apache-Test/META.yml:
--	cd Apache-Test && make metafile
--
--tag :
--	svn copy  https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM)  https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
--	svn copy  https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM)
--EOF
--
--    return $string;
--}
--
- # this is a workaround so that ModPerl::MM will move MY::constants
- # away, and Apache-Test/Makefile.PL which has its own MY::constants
- # won't get complaints on MY::constants redefined
diff --git a/www-apache/mod_perl/mod_perl-2.0.4-r1.ebuild b/www-apache/mod_perl/mod_perl-2.0.4-r1.ebuild
deleted file mode 100644
index 0a3827e310a5..000000000000
--- a/www-apache/mod_perl/mod_perl-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 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.4-r1.ebuild,v 1.16 2012/04/03 20:23:27 idl0r Exp $
-
-EAPI="2"
-
-inherit apache-module perl-module eutils multilib
-
-DESCRIPTION="An embedded Perl interpreter for Apache2"
-SRC_URI="mirror://apache/perl/${P}.tar.gz"
-HOMEPAGE="http://perl.apache.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-SLOT="1"
-
-DEPEND="<www-servers/apache-2.4
-	>=dev-perl/Apache-Test-1.27
-	>=virtual/perl-CGI-3.08
-	>=virtual/perl-IO-Compress-1.09
-	dev-lang/perl
-	|| ( www-servers/apache[-threads] dev-lang/perl[ithreads] )"
-RDEPEND="${DEPEND}"
-PDEPEND="dev-perl/Apache-Reload"
-
-APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
-APACHE2_MOD_CONF="2.0.3/75_${PN}"
-APACHE2_MOD_DEFINE="PERL"
-
-DOCFILES="Changes INSTALL LICENSE README STATUS"
-
-need_apache2
-
-src_prepare() {
-	# 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"
-
-	# 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
-
-	epatch "${FILESDIR}"/CVE-2009-0796.patch
-}
-
-src_configure() {
-	perl Makefile.PL \
-		PREFIX="${D}"/usr \
-		MP_TRACE=1 \
-		MP_DEBUG=1 \
-		MP_USE_DSO=1 \
-		MP_APXS=${APXS}  \
-		INSTALLDIRS=vendor </dev/null || die
-}
-
-src_compile() {
-	# reported that parallel make is broken in bug 30257
-	emake -j1 || die
-}
-
-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() {
-	apache-module_src_install
-
-	dodir "${APACHE_MODULESDIR}"
-	make install \
-		MODPERL_AP_LIBEXECDIR="${D}${APACHE_MODULESDIR}" \
-		MODPERL_AP_INCLUDEDIR="${D}${APACHE_INCLUDEDIR}" \
-		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
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
-	cp -pPR docs "${D}"/usr/share/doc/${PF}
-	cp -pPR todo "${D}"/usr/share/doc/${PF}
-
-	# 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.
-	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.5.ebuild b/www-apache/mod_perl/mod_perl-2.0.5.ebuild
deleted file mode 100644
index 8a2e5daedb9e..000000000000
--- a/www-apache/mod_perl/mod_perl-2.0.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 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.5.ebuild,v 1.9 2012/04/03 20:23:27 idl0r Exp $
-
-EAPI="3"
-
-inherit apache-module perl-module eutils
-
-DESCRIPTION="An embedded Perl interpreter for Apache2"
-SRC_URI="mirror://apache/perl/${P}.tar.gz"
-HOMEPAGE="http://perl.apache.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-SLOT="1"
-
-# Make sure we always use the latest Apache-Test version or even check the
-# version of the bundled Apache-Test!
-#
-# We need both, apache and perl but either apache without threads or perl with
-# ithreads, bug 373943
-DEPEND="<www-servers/apache-2.4
-	>=dev-perl/Apache-Test-1.360
-	>=virtual/perl-CGI-3.08
-	dev-lang/perl
-	www-servers/apache
-	|| ( www-servers/apache[-threads] dev-lang/perl[ithreads] )"
-RDEPEND="${DEPEND}"
-PDEPEND=">=dev-perl/Apache-Reload-0.11
-	>=dev-perl/Apache-SizeLimit-0.95"
-
-APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
-APACHE2_MOD_CONF="2.0.3/75_${PN}"
-APACHE2_MOD_DEFINE="PERL"
-
-SRC_TEST="do"
-
-DOCFILES="Changes INSTALL README STATUS"
-
-need_apache2
-
-src_prepare() {
-	perl-module_src_prepare
-
-	# 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"
-
-	# 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
-
-	# bug 352724
-	epatch "${FILESDIR}/${P}-bundled-Apache-Test.patch"
-	rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/
-}
-
-src_configure() {
-	local myargs=
-
-	if use debug; then
-		myargs="MP_TRACE=1 MP_DEBUG=1"
-	else
-		myargs="MP_TRACE=0 MP_DEBUG=0"
-	fi
-
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}"/usr \
-		INSTALLDIRS=vendor \
-		MP_USE_DSO=1 \
-		MP_APXS=${APXS} \
-		${myargs} || die
-}
-
-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}/" perl-module_src_test
-}
-
-src_install() {
-	apache-module_src_install
-
-	emake DESTDIR="${D}" install || die
-
-	# TODO: add some stuff from docs/ back?
-
-	# rendhalver - fix the perllocal.pod that gets installed
-	# it seems to me that this has been getting installed for ages
-	fixlocalpod
-	# Remove empty .bs files as well
-	perl_delete_packlist
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl || die
-
-	# 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.
-
-	# Sorry for this evil hack...
-	perlinfo # just to be sure...
-	sed -i -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
-		-e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
-		-e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
-
-	for fname in $(find "${D}" -type f -not -name '*.so'); do
-		grep -q "\(${D}\|${S}\)" "${fname}" && ewarn "QA: File contains a temporary path ${fname}"
-		sed -i -e "s:\(${D}\|${S}\):/:g" ${fname}
-	done
-	# All the rest
-	perl_remove_temppath
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-	apache-module_pkg_postinst
-}