gentoo resync : 03.03.2021

5 files changed, 54 insertions, 3 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 55e0b0eac06c..cafddcdebba2 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index 114cdd2efcd2..55a1447228c1 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -3,5 +3,5 @@ AUX libapreq2-2.08-doc.patch 1188 BLAKE2B 296bf0b1e23389c0d418df23768e68932c22f0
 DIST libapreq2-2.13.tar.gz 891320 BLAKE2B 6e896b95a17d7e4eede651bd74f21280d77b38c1c96be790c34993307a0435ea6d4626825dc215680e1fa2cd6a3ec635fcbeb9fda3b34e687ed8f7641b4fee7e SHA512 54553cb90c0d3f6fb34ff19364c5804976c4aff1bae551ae051fdd06f41695770f1e285c40e03dbd93ae738adc332f38f1a1994167598364071feaec833fdf05
 DIST libapreq2-2.15.tar.gz 839618 BLAKE2B 875aa8091512cf6b43c8654579b3d4779ea50835784380dcf69ca048f9b8d4ef6e573fef5ee03c0e47a929dcd8c4643d5dc861d875122095024bca6e8fbbf38c SHA512 abdc34f4867ba891966e7296c8110cffaa723f9b966522a1de352bc459e89e5cfc60de25dcd20cf0fa9b7cdf9282719b0276b621af8aa7bb770c89a7fbae4701
 EBUILD libapreq2-2.13-r1.ebuild 1431 BLAKE2B 3fb9ee38eca5794203c451fc80cce1b6c5871559142b0410a0ab639ca9333d82e29440a38eb09521b2af89c7e257794ec5973d846a4375a6dab280a36f5ea642 SHA512 751c34af300a3b020a0df6ad82882ffdf840f6fd28295c3bc388d3c902080efab7537e9ea349880a478e274b9966c8eefa8f27a1db4295dfe53df11ad189e60a
-EBUILD libapreq2-2.15-r1.ebuild 1650 BLAKE2B 9ce1e1c5d96f70b2f624efcbcf1d640f503b9aae3d6d972c8052dbea9ddea780b8b5147b9b9ed188b59ba14507086ea6c9b1a3cf3c6b8639d5445f92520b852d SHA512 53510d3b25dcb4a9e7c5dfa85e7eab647a5bd22f64889f233b676e1cfe25f049751f49f39e0c690415da3fc2f883827c9cdc4ea406696a05ab481863dd9fc464
+EBUILD libapreq2-2.15-r1.ebuild 1649 BLAKE2B aaf444f4864c1e0dfa07894c7eeeefde8b4251904633d8b98fd179f69ef3c89fe2170b94636e2f1a78dc3f1afb26704df76c05d558d56ca7ae5cf2176cb567db SHA512 7023eb743e9c92c4ce1d941c289f8d7c8d1b918eb58a56421e2a66fe2e7ced7eb5e6d4bc43bd71d264b6143a905142ebd641391242da62d15c648a03fcde788f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/libapreq2/libapreq2-2.15-r1.ebuild b/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
index 2b233532fee5..fa4bb408b239 100644
--- a/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.15-r1.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://httpd.apache.org/apreq/"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index dcb6a8526e3e..5b5c469dd20e 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,7 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_h2-1.15.16.tar.gz 702081 BLAKE2B 1f1ce9911c4dba5001d548b99fe08c5a13882a1f44b067a19c3edc178566895522e30d5b949c89754c322eb80a09fd5c07cba740783377b46e2d075e207ca04b SHA512 48e734bafc68acda75a2b9b72b503396bb8c4e58842e5b1ff395389835681a26485cd3795ca3c7fe7be5ad9614b89f305993d2753f1486856eff7599d2892c49
+DIST mod_h2-1.15.17.tar.gz 708333 BLAKE2B 7f7f4625d20dd85e88768cbc1b6347498d2d913b4e778fcac6e01ef2e6676ff4c180385610e5db990d7e9d3ceceafac7e1a08b421c7d99814f9c212b17ac8d76 SHA512 7d6af4123091171273093b4333699bda2469b3e2bd7412e226394f0dc79a5a7d684035538549e13d119c5134016c8b7a3e7aaf8559eec56ed15d849655f11521
 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-9999.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.15.17.ebuild b/www-apache/mod_h2/mod_h2-1.15.17.ebuild
new file mode 100644
index 000000000000..e59d601d9ddf
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.17.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.20[-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"
+}