gentoo resync : 14.05.2020

8 files changed, 4 insertions, 204 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 1beef039a545..18c015d07b55 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 59bb6f78f607..1aef45f3b46b 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -2,13 +2,9 @@ AUX 2.0.3/75_mod_perl.2.2.conf 1221 BLAKE2B 6887e97fe210b9656e4a0b50ff3f536df1cc
 AUX 2.0.3/75_mod_perl.conf 1295 BLAKE2B be75ef503b400660aa24f72d7c8aa0592a7e1cfe277b508ebd158c9c3d6d4adea676fd4b0934929f05ea4613f3a871ca28bd6435203a913501bc4fdfd99686b7 SHA512 f6842055bf41b457e77f25de4fccb4981456669e269a01faf606f5de31050fe41c2741c2591bc89a46914c876bfebb914e7d3a07108db8220ec0b8218781c22e
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 BLAKE2B ec1bf3eb1119561396756706e501b904a2910f6ffec2db62aa08c10af0a79bc8dacc1455524818a46c54906096efd26f89f6114d932aeac30c036f9dd7ab6823 SHA512 3af399b3aa0bf5421ddef581b1042cbd71fa3fc9d27aa87feafb4754cc8e7bf9659eb70082f0c73f0022b31e8870ff68021af692e41b391dec6c5e7608589e29
 AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 BLAKE2B 029f4be8c295b83031454dc53511293d7e034947ae9f591008235a8a16dc322df9c144c106d0392709aeaeb2080ba2534e4f34aa571c7e78bd726823b8f7d6da SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792
-AUX mod_perl-2.0.10-apache24-tests-1.patch 993 BLAKE2B c1cb9d2f469bce1b99a19f09a86d657a1a7a8bdf99a06cea336e47be35195e04ebe81b75c43354d22caa50333ccc761a86e92ef81a09efebebad0fd133c7f33a SHA512 0b024d3622454391a38bed82d1ff868bf0a92ecb2328786c10c0c133bd1e7425a330f60a9600a8ec31a2b94268a34ee9f49dff8a76699e45b16da8a1051cbebf
-AUX mod_perl-2.0.10-apache24-tests-2.patch 1129 BLAKE2B 39eb2b92ac89d11dcbe287af515a24ff068ea74930c2f2b08dd06ce83697e49e2a334dc0bb427c867beb835c7e1cd8d590bde24b02fe1d84f0bfa3a3ef932f8e SHA512 42da7893f2d0d98207d299977d3943773d7b38b75566a0da1dd0ff0b2552409310eef0ba7211cf28a90ccdd5927c5ffd417bfe12d4a6bd441947731cafbd3875
 AUX mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch 1517 BLAKE2B 4546fd0ae82a99c335140c223b830321dd340393700e74d18130063b952d8249e0b1610b86ba93782d5798dcb66689cc2d30247a5f3e3866c34387dba4b0f6dc SHA512 4ac22d4e8942d2fb4d07f10897c7670acd77d28a7b47049e95dffe026d335c26681a0fa4a43c67b53fafa8c5bdba7991bad150e3bc00a8e3c40a7d7e59938c63
 AUX mod_perl-2.0.10_rc1-bundled-Apache-Test.patch 2777 BLAKE2B b59cb23545dfa26af1181b5c4fa7f2d2ca5e049d6ec4056f6cac68389cc9fe6cb7ab010b8aa6c210aeaab1e98afb65ab3051a341856823debbb2fded47c63320 SHA512 ebb583607d4a8587d340384bb5c8deb50a3001beaaf9a536f4731baa3664a6d2667de309d1549175bf721643ad3f107988de4d2c9e213429888044dd726447ee
 AUX mod_perl-2.0.4-inline.patch 678 BLAKE2B 67da89c49904537df88e09fb4a171c03096993439d56d6fdd9e12b83d4cbca2cc1a734357ae6ee93ca20fd9906e1a0e74743d6d826f80763fda9387b42151597 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5
-DIST mod_perl-2.0.10.tar.gz 3846211 BLAKE2B de44c76d22cc90984be20193bb635f27d68fbc25cab39333be93ee15c4636025d9e6d8f7bfc661b50ac19cfeb5f697f957acb7fbbb38e1f3f712c81ac27737ab SHA512 0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca
 DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B 8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272 SHA512 f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
-EBUILD mod_perl-2.0.10.ebuild 3866 BLAKE2B 03d3ea695a2d23e8359589574e8c4c10687ee7bf03aacc0f56754da3f6275a3f2d54bed42bd35bbe6d1bcf88c8323f7db6645b671c0a611e044f84e63c2b8185 SHA512 96c8068193e849f625a1ee30021cca0e1ccdadce77e45c15da7d204005b263ae09deab376541926d97461382dec4b6e8701646e55719e1fbd57adf7b15734970
-EBUILD mod_perl-2.0.11.ebuild 3760 BLAKE2B 131af30c9e6a2a42b8124e4175ac26de126bc71d9c9b62be7c488a67b9e703a988fda6d27a26ca782e593dfbdff1780ee649edfe430d0ad5bf7c7bf5611633ff SHA512 4f70a5b4143cfb89fb09282bd237cea4048165d24b1d7b6915b19b42f29ebe0542ec70de30e15d558e362a05eec8b8604adc561bb6516fac6ecce0106bd2575b
+EBUILD mod_perl-2.0.11.ebuild 3756 BLAKE2B 089e21199bbb01835f9ac0c6250c189f7e8e0d2929bd41b3724fd5418a18d20644fe8baa6993a43994a15ae54a54a61e3d88c3c3107f3190dd0489757b9384e2 SHA512 38a9c04dc29c18dacec065ccf110bc68ef442788889d7c007aae9357af57762abfa3a48176b4f8592d1d4e8406fa888c3eae37c4c6ec39ef5f2f2bddc96b7f99
 MISC metadata.xml 376 BLAKE2B 39fd46f3791673d4878a8214042d5eed8d2c55acd0d319e0d9b7a684e07ef2a629be902691c612aeca89bf60e752f3ac70bcb9033a19c7daf121810f7c095137 SHA512 1ef3ea88131d2ed82c59f91f80b96003bd664178a51a64364f871427992cb8570b4ef8d1e880305a841da52dc87bac06c92e8c0cf3982e93ff639a4f8fb3d7bc
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
deleted file mode 100644
index 822fb4e87550..000000000000
--- a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f4dd0394f0975892b51a889f023d0e207553a656 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Fri, 23 Dec 2016 18:27:23 +0200
-Subject: [PATCH 1/2] Fix t/apache/read.t HTTP syntax for Apache 2.4.25
- compatibility
-
-HTTP/1.1 RFC 7230, section 2.6. "Protocol Versioning" says the HTTP name
-is case sensitive. Starting with Apache 2.4.25, using lower case will
-make the server issue a 400 Bad request response, causing a test failure.
-
-https://tools.ietf.org/html/rfc7230#section-2.6
-
-Bug-Debian: https://bugs.debian.org/849082
----
- t/apache/read.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/apache/read.t b/t/apache/read.t
-index 83670c9..9f7f504 100644
---- a/t/apache/read.t
-+++ b/t/apache/read.t
-@@ -24,7 +24,7 @@ close $fh;
- 
- my $size = length $data;
- 
--for my $string ("POST $location http/1.0",
-+for my $string ("POST $location HTTP/1.0",
-                 "Content-length: $size",
-                 "") {
-     my $line = "$string\r\n";
--- 
-2.11.0
-
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch b/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
deleted file mode 100644
index 29e24cc770d6..000000000000
--- a/www-apache/mod_perl/files/mod_perl-2.0.10-apache24-tests-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Stefan Fritsch <sf@sfritsch.de>
-Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=849082
-
---- ./t/filter/TestFilter/in_bbs_inject_header.pm.orig	2016-10-27 22:11:16.000000000 +0200
-+++ ./t/filter/TestFilter/in_bbs_inject_header.pm	2016-12-24 06:55:19.049606491 +0100
-@@ -181,7 +181,7 @@
- 
-         if ($data and $data =~ /^POST/) {
-             # demonstrate how to add a header while processing other headers
--            my $header = "$header1_key: $header1_val\n";
-+            my $header = "$header1_key: $header1_val\r\n";
-             push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc, $header);
-             debug "queued header [$header]";
-         }
-@@ -199,7 +199,7 @@
-             # we hit the headers and body separator, which is a good
-             # time to add extra headers:
-             for my $key (keys %headers) {
--                my $header = "$key: $headers{$key}\n";
-+                my $header = "$key: $headers{$key}\r\n";
-                 push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc, $header);
-                 debug "queued header [$header]";
-             }
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
deleted file mode 100644
index 9e6cfc0edf7d..000000000000
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit depend.apache apache-module perl-module eutils
-
-DESCRIPTION="An embedded Perl interpreter for Apache2"
-HOMEPAGE="https://perl.apache.org/ https://projects.apache.org/project.html?perl-mod_perl"
-SRC_URI="mirror://apache/perl/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
-IUSE="debug ithreads test"
-RESTRICT="!test? ( test )"
-
-SRC_TEST=do
-
-# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
-# The minimum versions requested here are the bundled versions.
-
-# The test dependencies are from CPAN (Bundle::Apache2).
-
-# When all MPMs are disabled via useflags, the apache ebuild selects a
-# default one, which will likely need threading.
-
-RDEPEND="
-	dev-lang/perl[ithreads=]
-	>=dev-perl/Apache-Test-1.400.0
-	>=www-servers/apache-2.0.47
-	>=dev-libs/apr-util-1.4
-	!ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] )
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		>=dev-perl/CGI-3.110.0
-		dev-perl/Chatbot-Eliza
-		dev-perl/Devel-Symdump
-		dev-perl/HTML-Parser
-		dev-perl/IPC-Run3
-		dev-perl/libwww-perl
-		www-servers/apache[apache2_modules_version,-apache2_modules_unique_id]
-		!www-apache/mpm_itk
-	)
-"
-PDEPEND="
-	>=dev-perl/Apache-Reload-0.130.0
-	>=dev-perl/Apache-SizeLimit-0.970.0
-"
-
-APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
-APACHE2_MOD_CONF="2.0.3/75_${PN}"
-APACHE2_MOD_DEFINE="PERL"
-
-need_apache2
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.0.1-sneak-tmpdir.patch  # seems to fix the make test problem
-	"${FILESDIR}/${PN}"-2.0.4-inline.patch        # 550244
-	"${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
-	"${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
-	"${FILESDIR}/${PN}"-2.0.10-apache24-tests-1.patch # 614684
-	"${FILESDIR}/${PN}"-2.0.10-apache24-tests-2.patch # 614684
-)
-
-src_prepare() {
-	perl-module_src_prepare
-
-	# chainsaw unbundling
-	rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die
-}
-
-src_configure() {
-	local debug=$(usex debug 1 0)
-	local nothreads=$(usex ithreads 0 1)
-	myconf=(
-		MP_USE_DSO=1
-		MP_APXS=${APXS}
-		MP_APR_CONFIG=/usr/bin/apr-1-config
-		MP_TRACE=${debug}
-		MP_DEBUG=${debug}
-		MP_NO_THREADS=${nothreads}
-	)
-
-	perl-module_src_configure
-}
-
-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}" "${T}" || die
-	fi
-
-	# We force verbose tests for now to get meaningful bug reports.
-	MAKEOPTS+=" -j1"
-	TMPDIR="${T}" HOME="${T}/" TEST_VERBOSE=1 perl-module_src_test
-}
-
-src_install() {
-	apache-module_src_install
-
-	default
-
-	perl_delete_localpod
-	perl_delete_packlist
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
-
-	# 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.
-
-	perl_set_version
-	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
-
-	local fname
-	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} || die
-	done
-
-	perl_remove_temppath
-}
-
-pkg_postinst() {
-	apache-module_pkg_postinst
-}
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
index 891635df5c14..2443adbbfa23 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
 IUSE="debug ithreads test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index d0e336cae43c..a36443fea9d4 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -4,5 +4,5 @@ DIST mod_wsgi-4.6.5.tar.gz 693825 BLAKE2B 1564c331505706548ed171a6f57ad8947eea25
 DIST mod_wsgi-4.7.0.tar.gz 695658 BLAKE2B 4332e5c30219cde9cf44c8633f3052faa104524d5a2ccd151fe9675364760cb9c447001289094c57cef21df4e364962c93e85f3a3eef36325e9b96e7715dfc19 SHA512 4c40a07301ef7f42ff175cfd5efd9c4916ba90749780cdc470cc0c62b190af810ba4284504f2b342c1e92801637aa52ba5719e0b114a072fd50d68754abdf36f
 EBUILD mod_wsgi-4.5.13.ebuild 829 BLAKE2B d51fc6c41ac9e5762a90c53b166f61c12850104cc6cd84564f23983e71ff0d8e921a57f3b9c266f76127264b61645ef69018f2ad77d78d89ab16ddb7a30e091d SHA512 af12e71126137d37ee2343d3954223398c7dffbb57ba4936665f15a0af9c4bff810bd522bb8379c496f88922c0554eb7a998bc6ff2b1d12aeba963f32c13eccc
 EBUILD mod_wsgi-4.6.5.ebuild 839 BLAKE2B 715d6e2e4b756050a723f579b82a805b0cbbd0e090ed58ca5db6ac394154e1cf80849fb912101affdc2aeef4389b3a6635124926e8c58b6b5dd740b69b100458 SHA512 e12c51ef37642deb2652b71eb6f030add2e0824c603e113eab4674315daaeef6ad048b9facae2fcae4e7c309249cd4d6c358c3d3cac45ca89904b025d1cac184
-EBUILD mod_wsgi-4.7.0.ebuild 852 BLAKE2B 8d874c65c2afa2fcf693e2f117e0690d302e6a098346276cd0c81998424474b3a05682cff394095c81d25a3baa9c0d9e8367a7a6e4caa67e9885e6d2ba9e597b SHA512 b6020aca982f38808f6dd9eb5612b033d81246e5af601ebe32ab52b811a0ad34da52197868412dbc1a029885d911828056c8ff3cdf87ac6c1f1cc96e01bdd223
+EBUILD mod_wsgi-4.7.0.ebuild 849 BLAKE2B 6a5e372095918f7e1d822b539a38ee313c36a402d5749ba7b8d5d73651714d14e200dc38a8aa1dcff03ff750ea45507caefd28645de66553b823026d4688736e SHA512 e63c20222065ceb7ec7aba012e8e1a9865459f30d10423f2a1d06c2398336ea627124ade8ad107beb0cac37fc15667f32d702cea903f7ebcfb43f03220565d78
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
index f52872557405..e1a5e203bf0b 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"