Version bump. Allow mpm_prefork as upstream has tested it now.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 72 insertions, 27 deletions

diff --git a/www-apache/mod_h2/ChangeLog b/www-apache/mod_h2/ChangeLog
index 693fec9627ee..86c437a91674 100644
--- a/www-apache/mod_h2/ChangeLog
+++ b/www-apache/mod_h2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_h2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/ChangeLog,v 1.9 2015/06/22 13:23:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/ChangeLog,v 1.10 2015/06/26 01:39:28 vapier Exp $
+
+*mod_h2-0.7.3 (26 Jun 2015)
+
+  26 Jun 2015; Mike Frysinger <vapier@gentoo.org> +mod_h2-0.7.3.ebuild,
+  mod_h2-9999.ebuild:
+  Version bump.  Allow mpm_prefork as upstream has tested it now.
 
 *mod_h2-0.7.2 (22 Jun 2015)
 
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index a4716ef52a77..0ba1d75007e2 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -11,6 +11,7 @@ DIST mod_h2-0.6.5.tar.gz 2600818 SHA256 bc72199c5245b3339ce1c8d7fd799c9f6e322482
 DIST mod_h2-0.6.6.tar.gz 2601687 SHA256 1fe3bd66cd0f0663fc784fcda5730b1bfd880c5ef105556efd7489fe7eaddc9d SHA512 6328d45412888e88909602d4b380d7546e4dd0c006f3ec5d1a8078fedffe22253ab4218f13a5dfa3ddd35e6f9d83eba99d417f90149ea30db9645ff2a67f5d17 WHIRLPOOL 8144cb4666111bef40e3440493dbff22044e6872c31e88f29f9b7c0e6abde6b1b4a0ba1d65cca6fc1a4d57224309805613f2d903413804c2271205768eecfad6
 DIST mod_h2-0.7.0.tar.gz 2619539 SHA256 b5f79d5c36edc686ba277c1442ffb43419aa8409345ae7d372137fcab5d216fe SHA512 da85e8154879cad8029487c7eb3d8f181da6661dc266e3d89b76f3f8fac2951634c31e8431ec65f8949a2094bc1a4d41a2ea62176f6f2790270d866a2af3ae5b WHIRLPOOL 79936daebf71508a3a33903f2aa43b59dc2410edbbb54a6b0079f52dfbe03c27fb5388e52681aced665113b18dcc5d20c0832120c5e20d9c725e7924b3b5ceca
 DIST mod_h2-0.7.2.tar.gz 2619798 SHA256 55aadbe52a64149c664f012210a8d7dd86d3b4bbea88b6e207b51ff06e992af1 SHA512 ddff88fa32e04650bc0ba77a948317cf5aa6c77a1b0b44222369c5a124876dd9e3e33904c4f67badfd5919a927e2292456539180ab37f8a2b2210954bf46c351 WHIRLPOOL cdf3a3cb2fb42bea27ac4989a2fc81e00e748bed66fe9287977a60e542eb89bfb3db0e430bdee594263dc4cb44bc2c120b5194c1a199e1bb819a8ba42f755d98
+DIST mod_h2-0.7.3.tar.gz 2622569 SHA256 6c2263aa22b20a50500edaab38506af87822515ea7ce177494fd67351a80777c SHA512 6635ac5beefd2193b431bf0a89dd4ac2e9502bf963bb81de5e7ace11fa8bc6d89b2187b889c86b29343c922cd2488d62b7a2d0115af5f582c9719182ea7a2cac WHIRLPOOL 90c810d1b04c3dc5690ac5c8eb335d86ec48bb5ee55bba3b87ab58af6c7e151ef51f294e4f3e501389410a299b0af12661a4b9225703977993dd40b665c40a29
 EBUILD mod_h2-0.6.0.ebuild 942 SHA256 a0575e70d35b59bc8ecea22b3180d3ed11bd8905e4784722e6072bf60cc27e06 SHA512 7827b3bd50efeeefe03ce4b1c9c1865e8e735aeccd30231ca36644f61c0f6582b8e91b6fd0e9a4b743a41e9f8b1367654f0614f75f99f4b7d84c68ef683b3b9c WHIRLPOOL 3845b7d765d4e1722f90143f62df4c91b1b9e3d66ea879d325792947c8e59c2c0d8f43265b1a2dd28da2a54390ed3e1a1356cf54a2d30d13ba6d79d7b9e3ddba
 EBUILD mod_h2-0.6.1.ebuild 977 SHA256 217ad711ba3429e6cd060eea57c73701e43196e768de48bc73c14429fe889a15 SHA512 4a61a41b0b8d7cbbb6a0192cc272ca49ccbc39804806efff530787af9a35e0315d27af0cd3ef6a51f6cbc1a50c210f1ad42aa5e33252a9211c47952c0fb96c13 WHIRLPOOL b05bedf78de0a3295944a2768273e949f0ca70d3902d1d9e38667ac89fd8e6a0e02d7fb8d544fa138f48594b175b3cb10e1bae69d1872fcaf7d0ff5c939ba981
 EBUILD mod_h2-0.6.2.ebuild 977 SHA256 7391f646f4790468d594d19f912c0b1ced353404fe558047bb0e687274ee9b01 SHA512 091f9b0329555c0ea0ab1d19d0009d03f06ebc9555b27f0df7fcff39db7ab967fda687fa9cdae193f6c4192342c4c0dc90cafb5a7ded50324570d1b34f935232 WHIRLPOOL fb7909eb86637eca6f222173e7e9a9ce79b7abb28dc38a8717ab282494c17497cf82d94d9963d6c10d2ed54caa435bbf5761ba9514f348efb7a0dafa235403d3
@@ -20,23 +21,24 @@ EBUILD mod_h2-0.6.5.ebuild 1338 SHA256 30ff4ed598cfa7c8313a195928dc78aeb3dafb950
 EBUILD mod_h2-0.6.6.ebuild 1338 SHA256 ca1ad24507e76441674abb68d1340e693bf0f69335e51932475e9fb049ea7b6d SHA512 08fde26a78222c9b18cccd744bfbceb65f113c877a799add42674288c7481a5e996c9ac9d83d88ba4d4c71ba537af8370c0ed270b404ba452f81d4131d191ec9 WHIRLPOOL b95eca62a46ccae24c45617d694977f84ca8217cd0930ac542706b532a84263fc3237bf45b184dbca32ea5aa5010c8d29f5517abe28408d355751ca70e9179c7
 EBUILD mod_h2-0.7.0.ebuild 1338 SHA256 8f0e502eb1c9428c18069cf4d3a44e61dc54c2957caf3aa505e327b5a926540f SHA512 1acfec73435508b142bdc3639ba1066b6e7dd840bb515c35a34b43a2567e948e5402d0b711c158844de5787b4beeb70ca9c90f98b53f46c8cdacbd2eee74e41c WHIRLPOOL dc627288a5eb6bfdc68c1db3657a8798e78bad1dfc7afdd88e936fd7e2e7c4d9e9647fe816e42f78d64119aab2cd6d872758df647591ef06558a4a18b1175443
 EBUILD mod_h2-0.7.2.ebuild 1338 SHA256 ba4a1e76dd1704883512370795fae80ab0feb0358dc3ed5c80859ed8b1421094 SHA512 2dc08dbe0f18f1a6d3fb578b750e2444077aa993539872289bd656f352f9600f330d8093a4b25176658c798ae10f4b2d677be1821491e25a821b194619074ef1 WHIRLPOOL ba30f29efef09bf0304cb697f27bfba9cbd8f75e46f366cc32faecaea50b48cd12542ddcd3690e77accb54bd35868e16ff027b95ef1c3187ad316af06181fc90
-EBUILD mod_h2-9999.ebuild 1337 SHA256 cde51d37543331495f775f33ede781caac1a2d6f3061a77ae64e46fc92806b28 SHA512 78d64185a83faa4b80e6861df2c59c9a1e229d234f20ff64f3e950690011b9e682e94da6e99b070d5536c1649dee87d85bead5d8530636afa7bb5c7cb66f2922 WHIRLPOOL 245ec46c22e9a7a2bf5d2d8e9d9067c19c08705329cedb0ed36b3de7e76fb0fa51a41c3cc72b18d5650245251d87f5e253927b2eb6bde9b48818603b84dca6da
-MISC ChangeLog 1547 SHA256 817cf778213f89163a215d07612f598aa1b7a1161ca5b85774cbd9ed51ee030e SHA512 0ba4c42a80a66f86aa5cf194e9b9efe2c11f1138308afe4b88274c90ab751e4d124f0f6ffafb5e074de78cd8cd26dd83c486043fb0181f751df7f2539cc073c1 WHIRLPOOL c380d69891fce55c64ff91cdacaa02614c824048c0de17a1463b765d01905824028f53b022425be60c6e865669aedc45d363e0154217432dd6cf649008ee50fb
+EBUILD mod_h2-0.7.3.ebuild 977 SHA256 5d1f2956dc6bf96a4b734e65c9f9695196d8a863be327651fc16a94d15ce339b SHA512 3588d3d7626fea33c8c013f843154413223730e5e9ed6d05bb145efb1f4576aa122bbe430e1029db42f67f6e17a861e23e4f5bd58abc6c45ba125578abdab6fd WHIRLPOOL 7d54df5ebb8f1973459c5fc46ba9095364311ac8330bac7198ff78bd43874fab4cf46ad2283415aa49461b08d658f6f81db214e85a9ee007f4043f9fe962492d
+EBUILD mod_h2-9999.ebuild 976 SHA256 a3af7a598b6baa485a82ed7e7bf8e4e999240395a1ead454a657330ba3e07185 SHA512 ee22c97acff2700cd8bf0dd28c856f5aeb7f67d8c83df101bd388b99ed0ced5819116a6c0fe12b7055e8093b164f281d1041c4401bde637163c6e38645cb93fd WHIRLPOOL 83a39558363a84c5b3545aa7f1a5ec435d3549f1c0e95f9ae15a4def981b4d79dab2403d57ad81793bd129d78a711591eaecc4dc4918023ac3c985a475615df5
+MISC ChangeLog 1738 SHA256 44a196c77677b7410428b9a8ba60c5951a6754f7c242bb42ba2ab664e7915dcc SHA512 cba93a1f8abe53fa3cc7ff4a09e0cd428573fb3ae89ab0d7f27beb6dcb538e461f280a83f0e47c89b59522b677f18e5066a9a3efa421e44d580280433b1aa583 WHIRLPOOL 13571a235c396eff34cf6c9b7c4dc1b8ee250b526a235bf429b2f0a0181ee397c3c22591c51748fb43afbcabde1b0adbc805408f55539e1abb09f43e198cf370
 MISC metadata.xml 280 SHA256 ed8af2effd5fabf11ac96b6a82d8a1e914d503f308f39be9989569b8c161242a SHA512 350d78c520e21848cc97d716d905b54e915bc25aa122cadc8df7dad882bc8726c0dc3189b316ab217b2116eab3e40ca7e9224f868ceb900ce5741dc1f3a2e185 WHIRLPOOL a8238ffb793d5f08ccf8f84e23898682550e769fa97a0271b01d243a5fd2f6b346c85a91a14b2f36d5efa55a2dbe95ceb0597da79637654604c96fe6b06f45f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJViAxZAAoJEPGu1DbS6WIABDUQAJJWprZIwa7NedfOMYLPywZ+
-Z3rLm0NM+sZZksZZkbk/IdYnQa6T0K7XxlvaOglCGymMnSkRb8Dx2YH+xLJ1444e
-Qe4vNeX/farQz9PzjH0Tny9IJXWHnXnvg4XiWh6r/co7nNG1YiJIWOp36DRATqeK
-Em43xGqTV1gnSTRTFDCg6sGaZ8e259yb6fSYpLROjGOAvidtW5yn3eKvfrCXYFZc
-oeuGCPrsx4FK7uZLQr07+nx4+AubE1KJNW68Gq+/kAWd9PO0eWPAkWsLeY0XLN+w
-zGMm+rVnAmvQnIIyKzdyuJ3xGmxW8hBJPFbQnLKwz3Px9lwASeK7fgQqufSsndPH
-+napJyCKC+Wwx6HQr1iaASvL8333uMxG6tfVavkEoF8cXprtW35qyBos1m9qjGEZ
-3XLp9FFNUGPQabhusaTxNoP9VLQJowxhBQI6wUxw1tjqIGAdUJaY3OD3M066SZsL
-MFDrIb/ZinStTFK4tonP2lR9g3Y4iuoQZnfFIVri2ubo6tW1SRIm+Eq5G3G04xqG
-ysTsrFqsGPk9A9z/zR7S7YhN/I7yy8or0MaX/DwwDkbRdhyYplyJBeQR1SXgwJfA
-wdwk/uKV42FbWINow4pchOmesa8ORfw8y5U7oqcrUD2VsphiL0hEUdfMirvWLWLI
-otDotOVWHna6KI2b6WKU
-=WrQI
+iQIcBAEBCAAGBQJVjK1RAAoJEPGu1DbS6WIAT9gP/0UAd66p+TFbo2K2a7TFRXpA
+a5ZB1RO7EgInwYd7MzOqmobgacgtssunsvfZYd7juvlYYbgy1tlNBymL0nrd+1Ya
+f/BBPJU6MQjKJGpjIymwpVznmMO3TBHy72ToVWryXiNxx69pCnsYu3sTjUYz8niz
+yIrnElDd/aVc2lne2zKDr+G9wyuoetQb5VZV8Dqsk0orssm4ldoogRr0tC+tivD/
+jeolj3KTtTl40lCsjJwQ+e65tLdlj8zNrNPhUVyOVbBDWxR4qhkTVLtVMd9UmJIq
+hKmsL4BNO9uWqFfjz7R5rJDVtT9EeLDel+DsH/LsQlsWoiXvqspLINQbeUxDyhEk
+q34vDXdWeyrFepBK/CtmTAnu1Q6YiB99y5MTzqyvOtDP/QBQvIoU7A7dfnCvy8O/
+EZQ/hYi2wbu268f+Daw01789cX14ND5kixsFNldoA0qOxNVYydwh7hxbPNu7sfk3
+PtOBxuJ4Op9zhgLGYKo2x7Kvcmjh3qCLTM4EgducVsUKp3Zybcy2gCsdcQtdm0bZ
++INnSlRiG1NIoNfGLdKbbOYoxsuXMbPl24UCeRjtabAVQpiHs9ebAkYeFk8Gx+Le
+H8ON1dZKYK9zlamIcEflhWDKjckY1mNBmbruUcH/f+alOm7ZoYmLaov2Aat7IZ8u
+SjnuWlxHjUg8TvyWF4e3
+=MynM
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_h2/mod_h2-0.7.3.ebuild b/www-apache/mod_h2/mod_h2-0.7.3.ebuild
new file mode 100644
index 000000000000..ed97db15d230
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-0.7.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-0.7.3.ebuild,v 1.1 2015/06/26 01:39:28 vapier Exp $
+
+EAPI="5"
+
+inherit apache-module
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-2
+else
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${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
+	ssl? ( www-servers/apache[alpn] )"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_configure() {
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--disable-werror \
+		--disable-sandbox
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
index 7e561c4e349e..8fa8c6685784 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-9999.ebuild,v 1.4 2015/06/17 17:49:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-9999.ebuild,v 1.5 2015/06/26 01:39:28 vapier Exp $
 
 EAPI="5"
 
@@ -25,16 +25,6 @@ RDEPEND=">=net-libs/nghttp2-1.0
 	ssl? ( www-servers/apache[alpn] )"
 DEPEND="${RDEPEND}"
 
-# The mpm_prefork module doesn't work right.  See upstream docs.
-# The threads logic is to handle the default eclass behavior which selects a
-# default mpm via the USE=threads flag.
-RDEPEND+="
-	|| (
-		www-servers/apache[apache2_mpms_worker]
-		www-servers/apache[apache2_mpms_event]
-		www-servers/apache[threads,-apache2_mpms_prefork,-apache2_mpms_peruser]
-	)"
-
 need_apache2_4
 
 src_configure() {