Version bump, bug 484038, thanks to Martin von Gagern <Martin.vGagern@gmx.net>

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

4 files changed, 306 insertions, 7 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index 0a12748f7240..0e761b08cedb 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.105 2012/11/27 19:27:09 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.106 2013/12/22 20:03:30 idl0r Exp $
+
+*mod_perl-2.0.8 (22 Dec 2013)
+
+  22 Dec 2013; Christian Ruppert <idl0r@gentoo.org> +mod_perl-2.0.8.ebuild,
+  +files/mod_perl-2.0.8-bundled-Apache-Test.patch:
+  Version bump, bug 484038, thanks to Martin von Gagern
+  <Martin.vGagern@gmx.net>
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop apache herd as discussed in http://www.gossamer-
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 61965010c9fd..ab61245e967b 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -5,14 +5,21 @@ AUX 2.0.3/75_mod_perl.conf 1221 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f1
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 SHA256 f77741fb3bb18928fb15f95c6908a17d8f06d7efbb6785e0732f201347e26544 SHA512 3af399b3aa0bf5421ddef581b1042cbd71fa3fc9d27aa87feafb4754cc8e7bf9659eb70082f0c73f0022b31e8870ff68021af692e41b391dec6c5e7608589e29 WHIRLPOOL 78518f0d5952246700424af8d85dae73a17061e009b7d89aa55c7c93fed877addc8550524ebf6fb5f353ee50210a3773dadac9e1c8f84f2b2bc32c4ab2df2981
 AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792 WHIRLPOOL a24853b0ada357b2a53d5ffe34969f792305a674388d6dc385912167a7ce45d376035a0810f75a1740872bac452187e7172f11afe06f8553f25560476a5fa1da
 AUX mod_perl-2.0.7-bundled-Apache-Test.patch 3929 SHA256 49ab69351e442e26d2d4ddcb5a41c702a2ce2e149fd70132b35b04017c85748d SHA512 113550c5dff0992d6289a1f6c990b2ded9800cdf285367ca677390a54e83e8628d78fdfe0697f7d1bda6fa43bfe079cae8654eb1640af89ff72e29a12fe64764 WHIRLPOOL 9e8de297c908548a77fe97fe804480dc98167138d982c2ced07abf11a4fa399f3f269f1583bd355689cee5b0687567935f4be7727f7c01de2ffa6df16998d6fb
+AUX mod_perl-2.0.8-bundled-Apache-Test.patch 3701 SHA256 d59d1596afcf77630482588fb4df07886912cbd8726811c0629c2a4912c6c123 SHA512 7e8e84b68533eeb6defb181972dd35f2610c65b162eaf8eec8d74132ff930f017a770504951e1a5989b0c73727b71e189a81c2ec135db5395a58eee9e20da086 WHIRLPOOL 5772ed34ec32846fe9b5025810d45b2690dd1c8335403b8c0b277df38a1357049fb31f9e36820ad783922c95174c0c28e86834b514e814421253887d93ddc609
 DIST mod_perl-2.0.7.tar.gz 3784950 SHA256 53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6 SHA512 b8ca808aebff35198b0a29e8ec98d10364cff15aab628697da135581675c254054e039e80afafc651743975a8795f40da450177be49bb5fd1934bcad7ebc4fed WHIRLPOOL 7b2a329f19d199426ae57ed5061adc2a38e42c4c0019f8fb372f41c1b36a3e809a41c1031c1c21346649980fccb54248d2888510604e77e7666a880d3957f663
+DIST mod_perl-2.0.8.tar.gz 3790026 SHA256 35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6 SHA512 d5090651699c4436fe8d0a525226543c971aa05db337dc1b1e89023183df1c7dd8b8775f3a0f7d3b9ec40e8c058ac23bd24141cf15a5fe5806226d634dfb4c87 WHIRLPOOL d22e1c353339b08ad752e9f9c7fc0ec4d6a173c4cd3004380b14098e1028737e0eb69d2f56dbe0da3cbfb01b31232c5073d7edb28bf4fed6b2ccd67b09ad7080
 EBUILD mod_perl-2.0.7.ebuild 5168 SHA256 9cf736f29b6d2a986defc4bb2b32120414240e491943480ff4a8e01b202a68a6 SHA512 f1ab442ffb6c95fccc000087dd8ff4a1c2b4541770e04c55d9d9140640af90ccbacb535099a1e6e1ea1d4b901bde462eb10f647499b418f6c7dd7efed2702d1e WHIRLPOOL fb6d1ab954b7c4d1efd41063233ceb985dbd799d2c4b079f76178e9b992abf6e702fd137d5f3668a4a916602ef29738958136cb0c86774a5d62d4f2a2ae91f6a
-MISC ChangeLog 23972 SHA256 3fa074c4cda717f7167710cd984e66c671e48588719eba8f45bb5460e467d5fb SHA512 deedc50467c4c55316149aa705cfac1bcfd5906b479ab89d595e8fce69e48e295c86cdc1ed6cc300f62da1df8a70f274957d3bb0c009e0b753b0b3f9b422d812 WHIRLPOOL db67606d14546541999b9d984d216b79294b677fbcbd5b7b0d0480260b159bae4381e974ea16682684ae6c0774631d0e439aa2894d05b3f004cbe95a52570f39
+EBUILD mod_perl-2.0.8.ebuild 5216 SHA256 0522a43fa1c58be0e202831f516d5492f854f3c992b617b3392354b69d65ed52 SHA512 7ebd4413f8ebcd1ea53cd2d92524e249d9eb04145493b974b5a84b99d411cd229cf7e941c601a318890d447e1099ef3ee23b10fa83e2fd0a768206e86f0d6730 WHIRLPOOL 5782b3dcd9fa6ea28392d8f2cc8c9eb03f4df16de756bda9c75b9e100de4f12f97d8512657b86fad82a0f568eb2ae0762bf89ad58211b932e5246239b90aae7a
+MISC ChangeLog 24214 SHA256 28f32ba511f7c2deb5dffe96487b8f938d5941cbb2f98d4e608f2aaa3bbaf12a SHA512 6f45cb77919095a08da9abb86ac9796e50cd5205a0929aebb2b7369d007cb1c54827aa703a7c137bca72b28bbb573fb90ca87f80bd479485a97f3a0ce10b4f18 WHIRLPOOL 00f52ad351b970635459edac6a7b04093c7db3cd93d290a08f25cf3cf325bfd5f561bc4dd372ba3a720dc3a5c2b302fa63facf5f117fed26d84759c45eccd15a
 MISC metadata.xml 254 SHA256 1f8ca2c8daaa36830720f986bda3a86f23e57f6fbba12cd92a2283bb84733889 SHA512 6e56dcfb66b408c6101c70b1efeebcc8effd67106cbb9ab4cf66165addaf5ce868a9b29072ce97cb0d6adab356ce060fa99d8569e982a56f6c80195e073af96f WHIRLPOOL b69bf46e1399f220cfbb51d43c64e6f84951e4aa8c43c4aef627f4fbee4b9da2370e4eed17151e46bfb2b55cbc64ffdc56f8cec2fb85925f4ea803334736ffd8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlC1FA4ACgkQCaWpQKGI+9TakACfSyDLuGrzKGTLihsUnCfZ+w3J
-9FAAn0G+q+clJrZ4j9r6IJBPb5uuH4AB
-=kNJ3
+iQEcBAEBCAAGBQJSt0WWAAoJEMOx0zmdw4Z1aCsIAJ+OfuaEjS4onMCWfoyIxk28
+raoB9YcbGdIU7lXAUnbNUOWILddd+CPMkXzDFkikHpVFvRnLoSrfNCSpu2DJhDem
+ODxXTOJpUZ7vhegU5QtSGqoWciTVFvdfmQXbNy7RMO9k2/PISlgY+zGdWAzRQY12
+YQZUS7TGLvsVICf8jTzUOFZVhhq/BbQI6SOMjcGJxSLVScAyPIa+nBokIZxoDFef
+Vz5BqXb8RuUbsu9tIdfew/4uR5DQWh4k+ff9GVzo1ec2tqX2MMPEb0nBALfvjNgz
+nrNoMre7juEzkwGbAoqsUk/l+g7S9Uw07vDWMT9M8SevBUr3WoSmMTVeSuhfick=
+=V4Wz
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch
new file mode 100644
index 000000000000..2e4da922aeaf
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.8-bundled-Apache-Test.patch
@@ -0,0 +1,127 @@
+--- 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;
+@@ -117,16 +117,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) {
+@@ -798,14 +788,9 @@ run_tests : test_clean
+ run_subtests ::
+ 	cd ModPerl-Registry && $(MAKE) test
+ 
+-run_subtests ::
+-	cd Apache-Reload && $(MAKE) test
+-
+ EOF
+ 
+     $preamble .= <<'EOF' unless $build->mpm_is_threaded();
+-run_subtests ::
+-	cd Apache-SizeLimit && $(MAKE) test
+ 
+ EOF
+ 
+@@ -816,37 +801,6 @@ EOF
+     return $preamble;
+ }
+ 
+-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/trunk  https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM)
+-	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
+--- a/ModPerl-Registry/Makefile.PL
++++ b/ModPerl-Registry/Makefile.PL
+@@ -14,7 +14,7 @@ use Apache::TestMM qw(test clean);
+ 
+ # prerequisites
+ my %require = (
+-    "Apache::Test" => "", # any version will do?
++    "Apache::Test" => 0, # any version will do?
+ );
+ 
+ my @scripts = qw(t/TEST t/SMOKE);
+--- a/lib/ModPerl/BuildMM.pm
++++ b/lib/ModPerl/BuildMM.pm
+@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE}
+ ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
+ use strict 'refs';
+ 
+-my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib";
+-
+ #to override MakeMaker MOD_INSTALL macro
+ sub mod_install {
+     q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .
+-    qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" .
++    qq{-MModPerl::BuildMM \\}."\n" .
+     q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
+ }
+ 
+@@ -269,7 +267,7 @@ sub ModPerl::BuildMM::MY::postamble {
+ 
+                 push @target,
+                     '$(FULLPERL) -I$(INST_LIB) ' .
+-                    "-I$apache_test_dir -MModPerl::BuildMM " .
++                    "-MModPerl::BuildMM " .
+                     "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";
+ 
+                 # Win32 doesn't normally install man pages
+--- a/lib/ModPerl/Manifest.pm
++++ b/lib/ModPerl/Manifest.pm
+@@ -33,7 +33,6 @@ our @EXPORT_OK = qw(mkmanifest);
+ my @add_files = qw{
+     MANIFEST
+     mod_perl.spec
+-    Apache-Test/META.yml
+ };
+ 
+ sub get_svn_files {
diff --git a/www-apache/mod_perl/mod_perl-2.0.8.ebuild b/www-apache/mod_perl/mod_perl-2.0.8.ebuild
new file mode 100644
index 000000000000..6f3571596674
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.8.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2013 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.8.ebuild,v 1.1 2013/12/22 20:03:30 idl0r Exp $
+
+EAPI="5"
+
+inherit depend.apache apache-module perl-module eutils
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="mirror://apache/perl/${P}.tar.gz"
+HOMEPAGE="https://projects.apache.org/projects/mod_perl.html"
+
+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/
+	sed -i -e 's:^Apache-\(Reload\|SizeLimit\|Test\).*::' \
+		-e 's:^lib/Bundle/Apache2.pm::' MANIFEST || die
+}
+
+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
+}