gentoo resync : 22.01.2019

5 files changed, 52 insertions, 3 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 03c73ed634db..e39dbaa92071 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 f1f5f18f28d5..496ad42c2fc0 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -3,9 +3,11 @@ DIST mod_http2-1.10.10.tar.gz 528560 BLAKE2B 7389441b1d30d0448bb17fc02a73957cf20
 DIST mod_http2-1.11.3.tar.gz 1028467 BLAKE2B 3a5d644f87104e1f7baae05396fefe94975e86e9289bb9c4e6d7ed94e45e1d9b38dfc79d0e0d9ee9270efedcd811db2374c898e419d4c16f73b38f53512e91ed SHA512 b97697f44eab9984b7dcaa7d941f23375cd5c2c81405842e17910a37dc2c952fc36a37e0802755457ccedd196c5fd2fb5b60467cb0ed16ed7aeb88cce4eabd2f
 DIST mod_http2-1.11.4.tar.gz 1028706 BLAKE2B f2c662913a30e96fe28d68690cf0fe33e4de2d7072bb46016f063a9aa979dfdbb9e39f88110c56bc3a319e1220365159fd0c15356bfbf981ae57377e137c1e96 SHA512 1347e8fe4d88d8d87ca547270a27ac63c7b7804b57a06a225ab4199a24a55ad3048cb4c7a50fb7cc2ea2a78b2cf0f1dd8f5bad6191d2854df30042f0d64e6a1c
 DIST mod_http2-1.12.0.tar.gz 1029587 BLAKE2B 10578491ce39b91e1d6363cb98d45c2c3ca74c5126af489b1c4261e80aef907b9b737a9322a54a144af7cd0892b8d0c0a86ba4467aeaf826199b989226593154 SHA512 50d8d8e44ba8d4516fac642aea9c2ce5afe766aaa1bb930ca64fd9fdb4983ee5db9677d4e9d10d88391d39b9a9be127594a90670493c39ef6368e073456034f0
+DIST mod_http2-1.12.1.tar.gz 1030534 BLAKE2B cbe02be6dfd1d1563a86c020f7eb8f5922e5d171b3a5d4714539658d5a3e067774b4bbb803e67943ef9b04caef6f3d69291d9ab0f6d8334839a98f466bd3851b SHA512 72cb915bdd283742a7bc2676adf3440d5e30588df87e4dc5750886747b0026e0cd0a36f08a39c323e647c83ecef6b434b33c23c96bb7c00ad480d430c1f37f44
 EBUILD mod_h2-1.10.10.ebuild 913 BLAKE2B 8efef07e602ac6dfd6db30f8b36ad91c5675c949b65848e6ec6948abd4e031aa86170406186d3e8a1294f2a6276618bc0cf98d868e56a938dc435836579bc614 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25
 EBUILD mod_h2-1.11.3.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 EBUILD mod_h2-1.11.4.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 EBUILD mod_h2-1.12.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
+EBUILD mod_h2-1.12.1.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.12.1.ebuild b/www-apache/mod_h2/mod_h2-1.12.1.ebuild
new file mode 100644
index 000000000000..3e6d435d3f82
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.12.1.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/passenger/Manifest b/www-apache/passenger/Manifest
index 5fb5a28b5857..2663f7d78165 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -6,7 +6,7 @@ DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed7
 DIST passenger-6.0.0.tar.gz 7202705 BLAKE2B 764e3072e1bed8caf87198442a11d660c8bb4d88007bf60fd77c3dc10c110a6e7836c35c1897484190df74281ff1027bdf7f2ed7eb98155ab4419b108aae1136 SHA512 f3fb7e29764397684bff58314db34d25d22a0a4f1420d149f8f43b2a1ff77407a1d67908bf89182f3ed8fbe9476938da91a13dd11c9eeeb6fe4f0af2f9646ec7
 DIST passenger-6.0.1.tar.gz 7203144 BLAKE2B 1c59a4e7c6e82fc57f507653d8648cc8c21fae6ce8fb008b0839b60e6a076227f139300d7521eaff281ce2f935f20a730b3b34cb2cf3527a807f38e78219277d SHA512 d2fdd27367a2adc8e5486038c7bb9a504c13bc675ba9640123c1a091e6a891238c90c54a75938cd119d74f40c8d0b28257704c83ebefa024057c744ea845997d
 EBUILD passenger-5.3.2.ebuild 3980 BLAKE2B 90f06491d9546734822f033e4f8acf0aeae40e2a8f8185ff48d9995869eea7aa6731a290d0f7e8066c4ef92d50f5ed458ec1de979df518b3b29e0bbf6fd31c51 SHA512 c0defec19d84def74d81f1b3e8fb2f69228a5f1805d3a7fd40ea2894b22662deda3dbce5ba4fbba8c4481483718618fe4a9602666a0fa8b6b06e0d795905b0c4
-EBUILD passenger-5.3.7.ebuild 3979 BLAKE2B 93e7172e6d1886aece5cee9e34f9d85479f226203424aa71c22bfce2acee354574fbe0144f2303c6a08a2adf4e5bebd07333a42dcf82ff6a6b859cf43c34aa86 SHA512 c237287d7c5a09f0ada83551c152d16660705da43af3a9b1d68a906f02e7eb5403b614125077f016b54856da561b20783150f6abbbc571612b0f1cb38e12c974
+EBUILD passenger-5.3.7.ebuild 3977 BLAKE2B da5ac9a4676d2ae1cd238be73803583619f2b0c5711761790a399cb19633f3f760de25dd7e04ad76a89cf2a7420fc74a60d150fc2fb2a25eff7aa7a8c6e60a5c SHA512 b6a6df0c2a3c0502632e6bb65511e9df1e468b013bbc56dbb430055e6dcca3dcf773f09fa108f9d993c1bddd5a2c41fd29cce889bc5a0985888b5cecc15bade2
 EBUILD passenger-6.0.0.ebuild 3979 BLAKE2B 93e7172e6d1886aece5cee9e34f9d85479f226203424aa71c22bfce2acee354574fbe0144f2303c6a08a2adf4e5bebd07333a42dcf82ff6a6b859cf43c34aa86 SHA512 c237287d7c5a09f0ada83551c152d16660705da43af3a9b1d68a906f02e7eb5403b614125077f016b54856da561b20783150f6abbbc571612b0f1cb38e12c974
 EBUILD passenger-6.0.1.ebuild 3986 BLAKE2B 0485d3f5041b1f833df6a475a824a9ae88f1ff86e6be1190b1c8a5719fe07d471c55a2d7ebe1aacc8a08e5d104cf02e9e4d4e54b934c5bc0b2a4dc818869c219 SHA512 be4cc479158cd2458e959fc96b9fe49808e4fde6baef440009c0b84c603ebb0c703ba454cdf69db62d8613eb3545faf4dbc7ecee185107693043fb3e54faf24e
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-5.3.7.ebuild b/www-apache/passenger/passenger-5.3.7.ebuild
index 3e6bbbe20254..a73ad98d9059 100644
--- a/www-apache/passenger/passenger-5.3.7.ebuild
+++ b/www-apache/passenger/passenger-5.3.7.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=6
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"