gentoo resync : 15.01.2020

20 files changed, 14 insertions, 602 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index cbdf39b487b9..177fcb35dfe0 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index cebaff26df18..11fd95bcf316 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,29 +1,5 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
-DIST mod_http2-1.12.1.tar.gz 1030534 BLAKE2B cbe02be6dfd1d1563a86c020f7eb8f5922e5d171b3a5d4714539658d5a3e067774b4bbb803e67943ef9b04caef6f3d69291d9ab0f6d8334839a98f466bd3851b SHA512 72cb915bdd283742a7bc2676adf3440d5e30588df87e4dc5750886747b0026e0cd0a36f08a39c323e647c83ecef6b434b33c23c96bb7c00ad480d430c1f37f44
-DIST mod_http2-1.12.2.tar.gz 1030072 BLAKE2B efb829eb98bb40489e9a52267125d79093ed2055e50ef6ae6c5fed7616df050e9ec659dd72764534ec778d75e6c462764baff88193970d2bbadf85572d5535f2 SHA512 2fab9625ba7adaa85fa4b1c55e0e1420851d1e44766f81c1e5b60b0b310b071047651c07b44b0dbeaf2d3cb2c722b9de3c52f145eb12e63c08301cf8c1f294cc
-DIST mod_http2-1.12.3.tar.gz 1038823 BLAKE2B 86c0f0a6ba04e67976842aa8dae29f401eb594cb66dfb5790bee2838fd017437acfa83d0129d6d91f623304c0d5b3e0eace605adc655dc4e459725d3019a79b0 SHA512 864381a4610a58c962fc59ab885655b20a8bd8aa711688e4ee1b6c5fc3804de843a81c7c0976d5862c18d40657f8e7f5caf2650e4975d946581b32d93af6ef71
-DIST mod_http2-1.12.5.tar.gz 1039313 BLAKE2B 13871ad7af9581657e09d46e107ceb8330d673a0e5c4ce761ff6aa956a2d674694ffe985e21190e0efb960f1cdcd1dfe3b9c1aa775edb8c892a3c15b1bdaff38 SHA512 63e2e6cbb6a1b222e3bb0611170e6cbee2ff652c3b44004176af5e3ba02cf2484b8826289586d47be2b18d453a8042d52407e6d798c49d3ed37cf52796d0e4be
-DIST mod_http2-1.13.0.tar.gz 1037382 BLAKE2B 8df02fe48d65c08504adf8fad9f328a525c0e0d677132843240410ba2008422ffee1a836e7884b5907c60ee9906ada3fcb9ad50d4c9e301ad8807af6eca3da6b SHA512 1302d4e9255811411432043df606dee775fbecd986bb5d9da53b5ef5c8a3600f3e23904f59e3d35d67910b70bde0e1d906445d5e3037ac80e5381eefe3839082
-DIST mod_http2-1.13.1.tar.gz 1031498 BLAKE2B 53716d7973e5996d48a85cc96c2634d40d6908f15529cf1e17b94ffe23e171de63914c862ab6dcb968cd74a9ca042778f8004b3bfdb2461f3dd30314dd1ef1ad SHA512 e14fe9d1910e5f4a48e3c0f94b2aa7ac73380ee8417b74c6a3e38360fe5bffaa16f59f48b7a0d0d7f9f50f933273b6b96e7530699e2bfd3ea485f34752a55a5b
-DIST mod_http2-1.14.0.tar.gz 1034167 BLAKE2B f29d3937339562f0b8e21ab5eeaca8ff1cab26ce15c692fceffe8e6a1609a49ff6f7488cae4cc30b4fe0e97fe787e077ff771906d7d897afc5b47cc347d74b8f SHA512 dba17eb48af5c22dca3fcd75b4ecd5838dff72c9829bcf9475d8edabb0d2ce4ed2f55249ab1051c1a37e9f2f5a5a7f08f5aa47170f9c39c3b9c404c4ec6547ac
-DIST mod_http2-1.14.1.tar.gz 1032989 BLAKE2B 15359369f8332d9f9d35cb43468b2cd0d98529155d360176c41ac38c24a94824510b518aaa367cff10672bfdd3c7a24269cca4552d993bf7d63f28f857a1ae78 SHA512 04298f0fd9379ae22ba87f5dc95791091ff95cc90c2e898334cc33a0c5115905ec6cbc93676b3a28786436f351c8971721b2786e70cd498fd73ec64b5f46e611
-DIST mod_http2-1.15.0.tar.gz 1036567 BLAKE2B 1ed9fdd7bf13c8ec7ac14b2cd0a109f0cd6e6d1eb8047e1cf6cd107143e23ebb6d9f9ef753942d44ec4d2168e0783dd23dd66b338d8631c504d4cd81b0287b83 SHA512 c3541c930ceee81dfbd688ea155561b6e06aa8ef486830a95e6cfa621f3589aa9c9e15661a4b81463cbe716d02dd28a574e3a74894a74d7c751c88894d378858
-DIST mod_http2-1.15.1.tar.gz 1026120 BLAKE2B 724d09bfafc2fe6a288eeebd7fbdcbe2c3d3e146b0afae42ae72be16931904982b07fd55f4c96da6f8718b5058421813ecd186ac4b4161a74ea7b83c38394ed1 SHA512 3564e8e4cb896420b91669d710d70cdecbe45480078c790960fd7d8c788ac9b843517c2af0747932ad53eb048c39765c4ceb2b7de7e04a1bc7fcb57af0117eb9
-DIST mod_http2-1.15.2.tar.gz 1037495 BLAKE2B a6e1afcea50034affc2d505445f0227688a448ef1979de19df42db2e277ba0b1904f249bc55a114901039ce503d164bde92d70d69e70ddf03e3708ee5dd96233 SHA512 c919e9cd2a959d3ccde697424dc40580d52a2620ee476fc675b9f30a030044c2f9872b282e4ab08d4d576c0c7ee08ca2baad5a1d9a456dbd6c007cfef9fca6b3
-DIST mod_http2-1.15.3.tar.gz 1039368 BLAKE2B 79016846a66b27698343621a9cde23746b5408e1c328c578562f0ad300337d7eedc9b1fbcd680be671c6b428aded48969c688df9a6fde7856546c8ab198584cc SHA512 e6d4051a7fd6f27202951ac6a3c0ecd282e0bc3a086d319463effd031f4acff32599a8b0958ed75d31299585b90fe227ac5cbbf28ded0bf93175d8a1cefbdd00
-DIST mod_http2-1.15.4.tar.gz 1041291 BLAKE2B e59157b91551864f4934601373c494485cc202e077acfd51fb2efb8c7afffef4bb1b36097ae9ad1ed069fcac07cdd7116488743910cfc6a756982857dd7b0161 SHA512 c5d8fc4f8d869bff349c9de2101054aebb0eda7698ccee6e8125ec87b10a0663e5d2dd142d689c2487065b3fd0a1d166b9dc8295b35e39f5801fb330f8e7dff0
-EBUILD mod_h2-1.12.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.12.2.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.12.3.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.12.5.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.13.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.13.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.14.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.14.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.15.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.15.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.15.2.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.15.3.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
-EBUILD mod_h2-1.15.4.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
+DIST mod_http2-1.15.5.tar.gz 1041643 BLAKE2B 59591d919451a96595c8e75155f84e63876e95b13940af5473fe4cf0a29ac91f57d3df22911397de213482c5a81d093ce81ce3835136ace50de0d4f70f2a936a SHA512 6255a46a22e5df6f8fed9ce65079979a3c613cccf1a95559ff0832ab2efe5fb98d51abfe83c006b9a3c7452bb4e78e3e67e94d7c14618fa312c7236a34e6b280
+EBUILD mod_h2-1.15.5.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-9999.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.12.2.ebuild b/www-apache/mod_h2/mod_h2-1.12.2.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.12.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.12.3.ebuild b/www-apache/mod_h2/mod_h2-1.12.3.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.12.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.12.5.ebuild b/www-apache/mod_h2/mod_h2-1.12.5.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.12.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.13.0.ebuild b/www-apache/mod_h2/mod_h2-1.13.0.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.13.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.13.1.ebuild b/www-apache/mod_h2/mod_h2-1.13.1.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.13.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.14.0.ebuild b/www-apache/mod_h2/mod_h2-1.14.0.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.14.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.14.1.ebuild b/www-apache/mod_h2/mod_h2-1.14.1.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.14.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.15.0.ebuild b/www-apache/mod_h2/mod_h2-1.15.0.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.15.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.15.1.ebuild b/www-apache/mod_h2/mod_h2-1.15.1.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.15.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.15.2.ebuild b/www-apache/mod_h2/mod_h2-1.15.2.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.15.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.15.3.ebuild b/www-apache/mod_h2/mod_h2-1.15.3.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.15.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.15.4.ebuild b/www-apache/mod_h2/mod_h2-1.15.4.ebuild
deleted file mode 100644
index 3e6d435d3f82..000000000000
--- a/www-apache/mod_h2/mod_h2-1.15.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.12.1.ebuild b/www-apache/mod_h2/mod_h2-1.15.5.ebuild
index 3e6d435d3f82..3e6d435d3f82 100644
--- a/www-apache/mod_h2/mod_h2-1.12.1.ebuild
+++ b/www-apache/mod_h2/mod_h2-1.15.5.ebuild
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 3ca3dc8c8429..06c810fb63bd 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -3,8 +3,8 @@ DIST mod_wsgi-4.5.13.tar.gz 679121 BLAKE2B 310a6a56495883439fad4a5ee7b30e749aaec
 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
-EBUILD mod_wsgi-4.5.13.ebuild 833 BLAKE2B af3ad4d06adb387b897eb9d4a50d4a764757aa68e241dd45afda5dc736598dd43c85ed828b6abaa7c7e4043dd83baa9b7e8ef64b3df0411bb76de47ea2c950d5 SHA512 3214e77a78fc81094de8bd014cbd6f70f93a55361dff60465a349d6d6f6a694d3ef35d7e567c5f51b7e88939233e8f90d715bb9ab8a34a54e0224194d7022e7f
-EBUILD mod_wsgi-4.5.17.ebuild 836 BLAKE2B 363a4133ac4e19a378b39d714935cfd54b627f94e0b465e4bcabd4ef209cade2568df9b15d0c7d1145d8598d3906f623c6ca45e3a614ae12acfb5cc18586470a SHA512 0f58f98a963b4af8e5299d9e2c6162ff1dc280fe5fb433cb7f3235b70e07520f41bb0aca61d3db2c0c46f91eb40139ca7e867fb0bbc1f6fc3b34ab289a71d901
-EBUILD mod_wsgi-4.5.21.ebuild 836 BLAKE2B 363a4133ac4e19a378b39d714935cfd54b627f94e0b465e4bcabd4ef209cade2568df9b15d0c7d1145d8598d3906f623c6ca45e3a614ae12acfb5cc18586470a SHA512 0f58f98a963b4af8e5299d9e2c6162ff1dc280fe5fb433cb7f3235b70e07520f41bb0aca61d3db2c0c46f91eb40139ca7e867fb0bbc1f6fc3b34ab289a71d901
-EBUILD mod_wsgi-4.6.5.ebuild 843 BLAKE2B 130624a5a46eb338ceceda8dcd77e13f2b1c869bb892c6147dd9565705ed44d08fdb0690070a35777fafb0bafa8e87bd2fd7d156a697830eb735bb09c2f17467 SHA512 28cf3d0e2b7461fd6bf095453420686b8e11ff2fdf1129ab289548024f0d247868cf92e69d0957be685fda4625b7c7fcb3c2eceac7d40d80d651fef5956edde2
+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
 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
index fa178c373854..133181c02a6c 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads"
 
 inherit apache-module eutils python-single-r1
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.17.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.17.ebuild
index 23a7c1bab141..761d16957975 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.5.17.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.5.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads"
 
 inherit apache-module eutils python-single-r1
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.21.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.21.ebuild
index 23a7c1bab141..761d16957975 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.5.21.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.5.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads"
 
 inherit apache-module eutils python-single-r1
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
index 78edc30ace56..932deaac9770 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads"
 
 inherit apache-module eutils python-single-r1