gentoo resync : 05.02.2020

6 files changed, 7 insertions, 47 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 177fcb35dfe0..c5eb27fcd3eb 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 64f7f553ae92..89d9d8d09df3 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -8,5 +8,5 @@ AUX mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch 1517 BLAKE2B 4546fd0ae82a99c335140
 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
-EBUILD mod_perl-2.0.10.ebuild 3865 BLAKE2B 6a2f53043296f897ccd1336385b465a04b79e3569c2ef4fd5db5d74212f97d8b37331fdd89d2c73de2fcfd02c1d08a2ff084023cd4aef256f449c20471e09853 SHA512 11bcbb2b7e2db6942a4154ac721a99429ff1d81bf492e20be6736ed73c8cf242508c204decec0d3ecf999336df6605f965f32bec2386d0e7e0f959a3d48f94c3
+EBUILD mod_perl-2.0.10.ebuild 3866 BLAKE2B 70fe62208a7e7f54e6a9729aa727694e691296a2eacd7d71dc210e66a9f3dfd29dec061732762a735657d1c61896689b3b8e00f75a230f56a95599595e3a8e28 SHA512 3d133bc65034235999484dcb48be6cae746737f0b867dc048295d97fd7623fb721eecab962836c57a398909bcdc5c1220045e85cc6f5083cd05b28d1b8325600
 MISC metadata.xml 376 BLAKE2B 39fd46f3791673d4878a8214042d5eed8d2c55acd0d319e0d9b7a684e07ef2a629be902691c612aeca89bf60e752f3ac70bcb9033a19c7daf121810f7c095137 SHA512 1ef3ea88131d2ed82c59f91f80b96003bd664178a51a64364f871427992cb8570b4ef8d1e880305a841da52dc87bac06c92e8c0cf3982e93ff639a4f8fb3d7bc
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index e5753be0181c..2d790667c129 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.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 06c810fb63bd..d0e336cae43c 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -1,10 +1,8 @@
 AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da22d336c1426c4f8f0379e1958b3599811b2efc3cdb16f9543ad3f72d6139da9be01897bf200c06100 SHA512 6e0310d3f5dd8da4653c8502ad297ffe73c04e04c5fdd87721c407e839ba81ba4060394bcd1f06ef26d2d98cf007b585a382eb5f566345817999cd237adfa833
 DIST mod_wsgi-4.5.13.tar.gz 679121 BLAKE2B 310a6a56495883439fad4a5ee7b30e749aaec4131bc039fd378018c30c9b61f1cb2c8b0ed6339c4a9cf556571e2713ff356b04007f1e2a10bcac52ddd5e5d14f SHA512 94bf6ae0d76ece67682a8ca3b7f202bb08a1f3e09e42c33f52b561a57ac8265ca2f5431f839bfe731eb014f279b0d865fd007f14a4839c934d372390d24a44a2
-DIST mod_wsgi-4.5.17.tar.gz 680160 BLAKE2B 496f81cea9256622bc6ee96308b47c264479701f64bcd5bef7699211a288a45d459df8f30b014cdf1e9b911b6aeff454ca7ccb5cb8eebe8b238e903a89fd8a26 SHA512 d40fb48b654bd49d36c4a249527c9190eb7aea2bd138c035ae304a48cb6e223aa34831a2eeec8aade9ac3bafe2493f35a2359caca1e8ec9dd6aff013693de973
-DIST mod_wsgi-4.5.21.tar.gz 682330 BLAKE2B 984437becb86e1df5bb3fcdb55c441d9634c98181f3704068617773f61048ccd38ea8617409b6e64413fb3584eaf46bd2c8fe67afd86993e4e0e85076d2bd98a SHA512 3180cf19bd5238586b288a030542c779533da8a35531f5d18edd85a1143e515b0906a599d2e1fd3251e3fa19bde6469fdc5c92850d9544e115736262c083d383
 DIST mod_wsgi-4.6.5.tar.gz 693825 BLAKE2B 1564c331505706548ed171a6f57ad8947eea257295ecae56c0d3e87c4d15743ea4bb0275ae94a6168912ff27fcfcd06eec823b8332d19895ed803ad6164da77b SHA512 5f1526b74ea59c8ef897b49b1b2f2de42d9d0144277fd74f9f8e1f3e0198735f98ec30f726883a3192d0ed33a4013232cb2adf8db9d817b4de0198890eaa7044
+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.5.17.ebuild 832 BLAKE2B d0cd4707346191f96e9163b1dde17472d228bd704aa2b74ec3cd31e14f3c6a42d2e8b1219a960d3bb4dedb8a9d35aa56493ba81edfa4b37dbbb8548c7f17d864 SHA512 122f2991615897850f96fcd58a9b7a33affbe042977683fb009411df3755d06dc9942f684caa7f76b7228338d8d8d8b89d0c4d70a4ef500a429c0c7b701478e1
-EBUILD mod_wsgi-4.5.21.ebuild 832 BLAKE2B d0cd4707346191f96e9163b1dde17472d228bd704aa2b74ec3cd31e14f3c6a42d2e8b1219a960d3bb4dedb8a9d35aa56493ba81edfa4b37dbbb8548c7f17d864 SHA512 122f2991615897850f96fcd58a9b7a33affbe042977683fb009411df3755d06dc9942f684caa7f76b7228338d8d8d8b89d0c4d70a4ef500a429c0c7b701478e1
 EBUILD mod_wsgi-4.6.5.ebuild 839 BLAKE2B 715d6e2e4b756050a723f579b82a805b0cbbd0e090ed58ca5db6ac394154e1cf80849fb912101affdc2aeef4389b3a6635124926e8c58b6b5dd740b69b100458 SHA512 e12c51ef37642deb2652b71eb6f030add2e0824c603e113eab4674315daaeef6ad048b9facae2fcae4e7c309249cd4d6c358c3d3cac45ca89904b025d1cac184
+EBUILD mod_wsgi-4.7.0.ebuild 852 BLAKE2B 8d874c65c2afa2fcf693e2f117e0690d302e6a098346276cd0c81998424474b3a05682cff394095c81d25a3baa9c0d9e8367a7a6e4caa67e9885e6d2ba9e597b SHA512 b6020aca982f38808f6dd9eb5612b033d81246e5af601ebe32ab52b811a0ad34da52197868412dbc1a029885d911828056c8ff3cdf87ac6c1f1cc96e01bdd223
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.21.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.21.ebuild
deleted file mode 100644
index 761d16957975..000000000000
--- a/www-apache/mod_wsgi/mod_wsgi-4.5.21.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads"
-
-inherit apache-module eutils python-single-r1
-
-DESCRIPTION="An Apache2 module for running Python WSGI applications"
-HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-
-APACHE2_MOD_CONF="70_${PN}"
-APACHE2_MOD_DEFINE="WSGI"
-APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
-
-DOCFILES="README.rst"
-
-need_apache2
-
-src_configure() {
-	econf --with-apxs=${APXS} --with-python=${PYTHON}
-}
-
-src_compile() {
-	default
-}
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.17.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
index 761d16957975..f52872557405 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.5.17.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads"
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_REQ_USE="threads(+)"
 
 inherit apache-module eutils python-single-r1
 
@@ -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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"