gentoo resync : 24.06.2021

4 files changed, 54 insertions, 3 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 75991a96917e..1c6f1092261e 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 f72b73882ff8..33918243e565 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -3,9 +3,11 @@ DIST mod_h2-1.15.16.tar.gz 702081 BLAKE2B 1f1ce9911c4dba5001d548b99fe08c5a13882a
 DIST mod_h2-1.15.17.tar.gz 708333 BLAKE2B 7f7f4625d20dd85e88768cbc1b6347498d2d913b4e778fcac6e01ef2e6676ff4c180385610e5db990d7e9d3ceceafac7e1a08b421c7d99814f9c212b17ac8d76 SHA512 7d6af4123091171273093b4333699bda2469b3e2bd7412e226394f0dc79a5a7d684035538549e13d119c5134016c8b7a3e7aaf8559eec56ed15d849655f11521
 DIST mod_h2-1.15.18.tar.gz 708704 BLAKE2B 1ad8bd317c42f517baf015cbdeb89040a743753f19a0fd6ae20a3d2f1c48ae4a76dcb926ad71060f25e64e8e89c07e7e95f938b2a346b92c7c961808816fd19f SHA512 4582e815f582c66e0d119925a1b19ecd74afedc4e7db4410a8552384ad6d2e113dc4e428fa88214ef23f0d7b0b3a64c2fa6f9a42b9e0a8b1239d891826b56cdc
 DIST mod_h2-1.15.19.tar.gz 708753 BLAKE2B 9193e9b307ead341e90dffe4547de444a3f47340f23e3a7171f8a0fdbd0c5749eddfd7f9e6b3e4a3afccda521437183a8e7039a79e554a4c6e18415678dfec57 SHA512 52717d173df26faaa82e1335366de448bd0b125032066e436546027580707ba872ae07e1e4e9b8b4fc5dbd02e212441d44b96092aac8732627117e109b95671a
+DIST mod_h2-1.15.20.tar.gz 707590 BLAKE2B 245b21d55c5659ed4ada3bfa5ec369ca3154e629820980caa1badefeca05399a31fb4f94594068607af20a6936e8ac2439b23e31ddcb9db8d4bb2c907400a152 SHA512 3492b24fdcb6371a5734b85253d800baa6f1650ae3c6b4d08539ec5436cbaaee2ed41fa9515fa36a94c281048f08970b20ccb6373077251a475f6831aaae8524
 EBUILD mod_h2-1.15.16.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
 EBUILD mod_h2-1.15.17.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
 EBUILD mod_h2-1.15.18.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
 EBUILD mod_h2-1.15.19.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
-EBUILD mod_h2-9999.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
+EBUILD mod_h2-1.15.20.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
+EBUILD mod_h2-9999.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.15.20.ebuild b/www-apache/mod_h2/mod_h2-1.15.20.ebuild
new file mode 100644
index 000000000000..9d7e1b600b10
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.20.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 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/archive/v${PV}.tar.gz -> ${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.48[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+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-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
index b158648fdb59..9d7e1b600b10 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="ssl"
 
 RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}"