gentoo resync : 16.09.2020

3 files changed, 19 insertions, 46 deletions

diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 76115b2b3753..f7e70b956a37 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -1,8 +1,6 @@
 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.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 819 BLAKE2B 186d7c0e8d7842708b466b3ec1a450831925dd3e167393c52e1cd9a8207d852848833431e06f3febb73dd7ee6a3d501d82110aa33c47057791059fa766d7bf41 SHA512 cc25d276d9fe3937a3ae0a1d8e41d2f5eb8d439aa77c7e67a45c605aaec7ea16948fcbd5087adaab731ea8899cebc0fde3e8c035b224a01b725128261b1f011c
-EBUILD mod_wsgi-4.6.5.ebuild 829 BLAKE2B c49a4777ecfed2cae09bb02dd8813346c2bb7e662ef3eeeadb3d786cb5ea0afcca149ff251fef51cfc729cd771d79b14be2c9799897215a43c1c7c4ea857dfa9 SHA512 258d9423ee750ab1904583d3ccf3534b764986e7de9c9806f1dcff7c012f48b583efc5c265ca6557e9a4da2ad98712e8c46cba630bee9b29cbc0ed95a3ebc5c7
+DIST mod_wsgi-4.7.1.tar.gz 696111 BLAKE2B 69fea421077f1ecbf1cef5c9eac4ba296fa676e0bfbb860ca8a7cb701701f405edb3760486b87e8d9dd93efcb4c23385197d770ca32e16a473d5d252d292fb76 SHA512 cbb5ec53d55e47a83f2b0630527c6a52b48ef21d5d2c18adcb875fc455795b39b3c93f4a86dfbf9738c0bd554d86cc4912cc9ff83c428af302ab94a61f66b5b4
 EBUILD mod_wsgi-4.7.0.ebuild 839 BLAKE2B b647de594d4eaa18a99402346c3fb549d15fa474f0d8144a880bf17cf0f3d714a4cc3a7724e1db0cc78d1f845102d7b3bc2f7cca5b1937ac0352a7311a6dc2b0 SHA512 ffaacb13a03e8ebb52b138eccf2548fe6173c37c726a097798ae0cbed17c2044ae9c534aa20b8985e8aeeca09f53ac799cf13eecb8e01e031e76cff4a8455b23
+EBUILD mod_wsgi-4.7.1.ebuild 1240 BLAKE2B ec3c657361e9490b534c2c2529f2ae7820451ae72a62d2b721859a5e5ea145ded8bf6d1f091c791463dc5a44f77960d9e20c046728a7533ef73b043676ad3cbd SHA512 76cbb9e16745d9f4ff78d267efa2af2c5b3739b33c8e7f5fcfd04d2679241a9fead3bbd723e29bff4672d0d7cf950759088a4e7768ef0a1fc6c98280b8f7a164
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
deleted file mode 100644
index e6f016aeca98..000000000000
--- a/www-apache/mod_wsgi/mod_wsgi-4.5.13.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=( 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.6.5.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
index ff0433a90fcd..9415402eae83 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit apache-module eutils python-single-r1
 
@@ -29,8 +29,21 @@ DOCFILES="README.rst"
 
 need_apache2
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	# Calling depend.apache_pkg_setup fails because we do not have
+	# "apache2" in IUSE but the function expects this in order to call
+	# _init_apache2_late which sets the APACHE_MODULESDIR variable.
+	_init_apache2
+	_init_apache2_late
+}
+
 src_configure() {
-	econf --with-apxs=${APXS} --with-python=${PYTHON}
+	# configure.ac contains bashisms
+	# (https://github.com/GrahamDumpleton/mod_wsgi/issues/567)
+	CONFIG_SHELL="/bin/bash" \
+	econf --with-apxs="${APXS}" --with-python="${PYTHON}"
 }
 
 src_compile() {