gentoo resync : 15.12.2019

7 files changed, 55 insertions, 5 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 9968bed7c5f9..cbdf39b487b9 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest
index f28edc568812..2f64ea49c9e4 100644
--- a/www-apache/mod_authnz_external/Manifest
+++ b/www-apache/mod_authnz_external/Manifest
@@ -1,4 +1,4 @@
-AUX 10_mod_authnz_external.conf 987 BLAKE2B 840f46d25a51dad9614bfc1dc12f7e2362ede3c7f039e5101177689767c22bff0e05a5d65327c709e249d20fa8cac782edec3d003efbab9a732b814278e1b556 SHA512 3840a8f29c3575f700f7ad262d8fe01fe42b3273cb674c543715eb8af053cab990f08264739bac7c46dd16d54eb53cf6a8bed556376b29ad78b50e6c3031a061
+AUX 10_mod_authnz_external.conf 993 BLAKE2B 36daed95a23c58abb0749cfd4836f57b7913362f7dd98f18a5e0158b30754392756f9f9e0c3a8158d6e93e40f765ec440fa3f24069746a49ec16db9f2c8ca6b1 SHA512 66de4c74f5f72ee1f0483c8f5bcd0ff461ebcf0a7b2790692a3b6f4c2ac1be8e6510ffcaa7502903d1b5b611a1a8375a845ff14c3147df3614e5d73384a22ce4
 DIST mod_authnz_external-3.3.2.tar.gz 36160 BLAKE2B afc3e4b9b52628479163bf705a473edbb96b5c82ac74c43a0d15512adf59adb4a4122f83e59871a3a91d9094347287b1072e3f12b9689680acd91f4ea534cc6d SHA512 8216744dbaed8dbde0d33658e38594463409e613412bd94f3e5f5a816f5e793a395ddda7c582ff1d1e69e48efdd1efb48c168d4cbc37cc7807a0dcb92eace0be
 DIST mod_authnz_external-3.3.3.tar.gz 38266 BLAKE2B 03bdfe7efdcd832b7662be70e0e38cdfb4f025d3bdd3baf3e98b4d77efd538605db8f625006246515f427989aca3242626a4115e4534ecb75c09adc967227ea6 SHA512 65b643870dcfc5cdc0343bc606ff74697473617ce9f6fe27cae40ae1b2dca904bb71b6ec8347c6b5c5e3819785432798f6e78820cdf66fd17b245371a41322d2
 EBUILD mod_authnz_external-3.3.2.ebuild 557 BLAKE2B be9b71ac1d3c9518db7f53299c4d32c2dc8fc718cbf0c82a2ee5bb0a71a8068c7ad3bb5f3aeafda9af7b4d5941b273c9931b613b40c24a268390b5b272878c7d SHA512 13fcdfd45a9fe6e9150af4a3bf18295c446b7bad7acde88561d7187fee930ae98667d93d9a385a344d37f252b3c2789a544681ee1dd1fd34667e32e302af197c
diff --git a/www-apache/mod_authnz_external/files/10_mod_authnz_external.conf b/www-apache/mod_authnz_external/files/10_mod_authnz_external.conf
index fc59272caa0e..6d53e749ba11 100644
--- a/www-apache/mod_authnz_external/files/10_mod_authnz_external.conf
+++ b/www-apache/mod_authnz_external/files/10_mod_authnz_external.conf
@@ -1,11 +1,11 @@
 <IfDefine AUTHNZ_EXTERNAL>
 LoadModule authnz_external_module modules/mod_authnz_external.so
 
-# provided by net-www/pwauth
+# provided by www-apache/pwauth
 #AddExternalAuth  pwauth /etc/apache2/modules/pwauth
 #SetExternalAuthMethod  pwauth pipe
 
-# For external group check (provided by net-www/pwauth)
+# For external group check (provided by www-apache/pwauth)
 #AddExternalGroup unixgroup modules/unixgroup
 #SetExternalGroupMethod  unixgroup environment
 
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index ee96534a9f3f..cebaff26df18 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -11,6 +11,7 @@ DIST mod_http2-1.15.0.tar.gz 1036567 BLAKE2B 1ed9fdd7bf13c8ec7ac14b2cd0a109f0cd6
 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
@@ -23,5 +24,6 @@ EBUILD mod_h2-1.15.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993
 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
 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.15.4.ebuild b/www-apache/mod_h2/mod_h2-1.15.4.ebuild
new file mode 100644
index 000000000000..3e6d435d3f82
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.4.ebuild
@@ -0,0 +1,47 @@
+# 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_perl/Manifest b/www-apache/mod_perl/Manifest
index 6eb5931fcd8d..64f7f553ae92 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -8,5 +8,5 @@ AUX mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch 1517 BLAKE2B 4546fd0ae82a99c335140
 AUX mod_perl-2.0.10_rc1-bundled-Apache-Test.patch 2777 BLAKE2B b59cb23545dfa26af1181b5c4fa7f2d2ca5e049d6ec4056f6cac68389cc9fe6cb7ab010b8aa6c210aeaab1e98afb65ab3051a341856823debbb2fded47c63320 SHA512 ebb583607d4a8587d340384bb5c8deb50a3001beaaf9a536f4731baa3664a6d2667de309d1549175bf721643ad3f107988de4d2c9e213429888044dd726447ee
 AUX mod_perl-2.0.4-inline.patch 678 BLAKE2B 67da89c49904537df88e09fb4a171c03096993439d56d6fdd9e12b83d4cbca2cc1a734357ae6ee93ca20fd9906e1a0e74743d6d826f80763fda9387b42151597 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5
 DIST mod_perl-2.0.10.tar.gz 3846211 BLAKE2B de44c76d22cc90984be20193bb635f27d68fbc25cab39333be93ee15c4636025d9e6d8f7bfc661b50ac19cfeb5f697f957acb7fbbb38e1f3f712c81ac27737ab SHA512 0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca
-EBUILD mod_perl-2.0.10.ebuild 3838 BLAKE2B ccef90b4f55e919987ae22b75c53486e0e2bb51db4df705546fd63de8651092414cbae80464938e7d6728d4cb83b0ae57bd0ac3c57fe339e43650162eac25296 SHA512 98c093d9e8f56a5db2d1bc615ddaad1f82e4adf1249403fb84267d7e740791b1d185a299fcff9d0655a233c225d559c9a11452fd269025886a2f9f21a624a7a2
+EBUILD mod_perl-2.0.10.ebuild 3865 BLAKE2B 6a2f53043296f897ccd1336385b465a04b79e3569c2ef4fd5db5d74212f97d8b37331fdd89d2c73de2fcfd02c1d08a2ff084023cd4aef256f449c20471e09853 SHA512 11bcbb2b7e2db6942a4154ac721a99429ff1d81bf492e20be6736ed73c8cf242508c204decec0d3ecf999336df6605f965f32bec2386d0e7e0f959a3d48f94c3
 MISC metadata.xml 376 BLAKE2B 39fd46f3791673d4878a8214042d5eed8d2c55acd0d319e0d9b7a684e07ef2a629be902691c612aeca89bf60e752f3ac70bcb9033a19c7daf121810f7c095137 SHA512 1ef3ea88131d2ed82c59f91f80b96003bd664178a51a64364f871427992cb8570b4ef8d1e880305a841da52dc87bac06c92e8c0cf3982e93ff639a4f8fb3d7bc
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
index ef5bb45f7cab..e5753be0181c 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
 IUSE="debug ithreads test"
+RESTRICT="!test? ( test )"
 
 SRC_TEST=do