gentoo resync : 01.10.2021

6 files changed, 157 insertions, 4 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index b3d2e3e85d64..b51bd3304ec7 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 472db2a67ec6..1f450c2aa6cb 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,11 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_h2-1.15.24.tar.gz 664134 BLAKE2B 37795ee308d62f74583d7e37c262fca2ba235f025aa96314b1edb66e9900fef61f225d4143460e0bb29d46251c6aae8540ac667deb7eef8febc5fcc92c954b82 SHA512 3988e75b4b0ddb9361b559971a0e2c4c3af225d16bde6bf17ece33993487e6b4b6d66c874fede3cca97f40e9a83b500cf356546f7e83391fb81d5ec649a53fd0
+DIST mod_h2-2.0.0-rc2.tar.gz 655944 BLAKE2B d96d9196359bd7f6fb593a148a08a974e82a5e296c893526501c3e6c60f36581bc89548098e5ff6e42428d400cd8b7b44787ea97f7d0dbcd7d4da1db19c25ac8 SHA512 2c41fbe3d780452507d15b88fafe62c3386de023cc22181b7f077dd72e9c7738b6671494ba6e9c59f09df740ec4ec76dc42a9188e294b7900c97f1975038c0e2
+DIST mod_h2-2.0.0-rc3.tar.gz 656572 BLAKE2B 56001bb007ebb5114cd41c67e83221cc15d50e8ddc1d6ec5a512c26221577eea44bb5a74537bc39c6e50cc14ed6070177cf3ab0fff39d1c8f3147090a07aae0b SHA512 f236bb8aa137d8a3675938beae31e6cd27863b4fb91f9cb65d7704ecd977ecda08dc4c069a4c3be19cb64587a960dae69a0eed98d25f9e07ad223212bc208a51
+DIST mod_h2-2.0.0-rc4.tar.gz 656579 BLAKE2B 112fe4d41e0ddf769c0e7141584be823fd2e9849d95ea077347750019451937886cc6b88d123e004ba2fb799a4f0eea069337eaaa9627e8c70f4b74fb1c8ff08 SHA512 c061f97ebb13793067194a9bb531231b6aa424d2962c380de3769f04e09da3cf3434dd496e81c5f83137ea48cf197a4ee66ce7985c426c2b0b23eb1670e0e888
 EBUILD mod_h2-1.15.24.ebuild 904 BLAKE2B 5a0364fcff265b60e9f2eed81e821511bf66504000ce86358f2b0b5bc3638865b77059c5587d26842ba61d2f61856611b5cbf338d7f429d074448faa9cc2c774 SHA512 1e4483a00430182434a1871f177222d1c00007fbb27c400f7e2993a4fc1a0e71aa4de8641527c3da94b73e44b3ed637a6da374810e64bad4818b8d76190d8eed
-EBUILD mod_h2-9999.ebuild 904 BLAKE2B 5a0364fcff265b60e9f2eed81e821511bf66504000ce86358f2b0b5bc3638865b77059c5587d26842ba61d2f61856611b5cbf338d7f429d074448faa9cc2c774 SHA512 1e4483a00430182434a1871f177222d1c00007fbb27c400f7e2993a4fc1a0e71aa4de8641527c3da94b73e44b3ed637a6da374810e64bad4818b8d76190d8eed
+EBUILD mod_h2-2.0.0_rc2.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
+EBUILD mod_h2-2.0.0_rc3.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
+EBUILD mod_h2-2.0.0_rc4.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
+EBUILD mod_h2-9999.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 MISC metadata.xml 326 BLAKE2B 200b47b41409bd7167132c55b5e77b5efa2ec18859520ea38d61a625a6e68bbb1cb0095dda3fd7d273e17114e7cc0ff2fe5c1bbb66ea3a90b4796490fc04a2e8 SHA512 6d45faf84382555d53dc9f38f8d7a23454d763025bbb345f51bece78b36287372d86e173c894038839092adce210e444389b8c41644f44bce0c912880d788080
diff --git a/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild b/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild
new file mode 100644
index 000000000000..352e2e78dea4
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${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.48[-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-2.0.0_rc3.ebuild b/www-apache/mod_h2/mod_h2-2.0.0_rc3.ebuild
new file mode 100644
index 000000000000..352e2e78dea4
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-2.0.0_rc3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${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.48[-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-2.0.0_rc4.ebuild b/www-apache/mod_h2/mod_h2-2.0.0_rc4.ebuild
new file mode 100644
index 000000000000..352e2e78dea4
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-2.0.0_rc4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${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.48[-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-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
index 5b9dbe992073..352e2e78dea4 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -11,8 +11,10 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
 	inherit git-r3
 else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -27,8 +29,6 @@ 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() {