gentoo resync : 08.07.2021

5 files changed, 54 insertions, 2 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 015433ac4d22..27d68018bd29 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 33918243e565..edd6b5171b12 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -4,10 +4,12 @@ DIST mod_h2-1.15.17.tar.gz 708333 BLAKE2B 7f7f4625d20dd85e88768cbc1b6347498d2d91
 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
+DIST mod_h2-1.15.21.tar.gz 720305 BLAKE2B 9abe84867a383b9dd9e0841403544abc94c95ddc9a735bdcfb420d5a14ddb7e6ff5832455659b62ed5e9c865f9c467970d1863510a4fa63c655242cdc83a54b6 SHA512 bf0ab88e07c59c38189f7c670512ff01abdf6110d05a344182c557724028734edf68eea5227ac9b5c400810621ae1d30efac2394a369fbf6ef9558e2b3bcd17c
 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-1.15.20.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
+EBUILD mod_h2-1.15.21.ebuild 1024 BLAKE2B 4ae8408022edd8f0cea2abfdd3c7b7e7833f915c6165d34cf61ee979252deb78249cf270c370e968236d3a1e9ac01d39366da8f61524e9f280fc021141257e7d SHA512 dc7ac717d8367c51b4d02afc16490ec98779a81dbb1cacd1f4974c857fd6b27e4a218c49854fad626ee4d99eb4464e6f61b674c7de09b8f6dffcb094d0d91736
 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.21.ebuild b/www-apache/mod_h2/mod_h2-1.15.21.ebuild
new file mode 100644
index 000000000000..6810ef8cd25a
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.21.ebuild
@@ -0,0 +1,50 @@
+# 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
+	sed -i -e 's#SBINDIR/apachectl#SBINDIR/apache2ctl#' configure.ac || die # https://github.com/icing/mod_h2/issues/218
+	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_jk/Manifest b/www-apache/mod_jk/Manifest
index f3c2224d23ef..27089f5a1c90 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,3 +1,3 @@
 DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150 SHA512 955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47
-EBUILD mod_jk-1.2.48.ebuild 1466 BLAKE2B fd56542ccb4a9e08012d2f221afbdc739eba512a171e0e72e4f069b8dcec27b6bb515080653d281ed105b3ca74bfd30bd504b0c4ecf4c950f72fce6e9bf72b5b SHA512 a2ebda076cb43d8af5dd41212ca1e80326a495db4509ad4a30357e698628013b129ae3d482e244bbb009efb2f3eebba78485c986d1a28ee33a9601ea5eba6f71
+EBUILD mod_jk-1.2.48.ebuild 1492 BLAKE2B 3a8fbf8edc8782aec316457dca32c62dd1e189069bb71078e55fe603318df392467050097053339ef1348ff96bf5d8277ed196e74cabb1d5707bd7659491c0ab SHA512 62fe35d8f59f6df0d5304a8027f0c9a2779ebe9f8a91686c8c5c5ec628895dc0510378f7b7fcc735a71628ae2f5e07c6117c72ad796ebc6f97b708fb02b3b06e
 MISC metadata.xml 616 BLAKE2B f72473ee9a28ed3078be60a38cc0a91ee1c3d2a13f1c41f10b162119f394fddbbabfa5cfd563338b419aabbabc2e722fcc34f6e89e6443336172348d6dda16d2 SHA512 70c4521ab59b7ce1d023826c03f63c743b033cd88091b74eb61bd99a210473e41f02ff9f375bbd18b2841fd7861e4d09b274dc0b06b92658a2b900702120b34d
diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index ef0ffb044097..f84c81d573c1 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"