Version bump.

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

4 files changed, 85 insertions, 22 deletions

diff --git a/www-apache/mod_h2/ChangeLog b/www-apache/mod_h2/ChangeLog
index dfd50fee8697..a2bf475cd227 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.7 2015/06/12 10:32:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/ChangeLog,v 1.8 2015/06/17 17:49:23 vapier Exp $
+
+*mod_h2-0.7.0 (17 Jun 2015)
+
+  17 Jun 2015; Mike Frysinger <vapier@gentoo.org> +mod_h2-0.7.0.ebuild,
+  mod_h2-9999.ebuild:
+  Version bump.
 
 *mod_h2-0.6.6 (12 Jun 2015)
 
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 04eaf4fb8783..4125fbac7a9e 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX mod_h2.conf 153 SHA256 076c8ff502ab71cc09895163ce79ef87d2deb8b08477609ff74ffaebe640c98f SHA512 318a24017144dc84f952c43dfb04cb2dc01a53a90e63272d7913bef8ade97f0f5fd838b61d4b0a86d56f60e86788218e09fa396556cfec4b937dff4029eeffd5 WHIRLPOOL 4e61ba3745a3c56e51a80103e5f8e9a4a3e317664b6aaea5743b27834c180f6e310377c82be24b303e7e85f423e13df0140cfcc00c8fb42b4af277b8ce0d18d2
 DIST mod_h2-0.6.0.tar.gz 2596664 SHA256 0d306096bfa0a134550adbdbaf4a1a067b66b1463d8041ba741322404f62ab67 SHA512 2b2e2c8152fc384d6f902859e33f65f05397ba61bcc91cff5c9c6c0e79384b3f5ad507c1878be914489a60c78942f41558fee571793e1ea8e82811faaa987223 WHIRLPOOL 150d23829718f7acdc476fbab3c7c106fd55fb574f1bac211d3937bbbd31f69b7457363eb261b87518e92997210ebd382e6870fa9481adc57428d1460955e1d3
@@ -9,6 +9,7 @@ DIST mod_h2-0.6.3.tar.gz 2596545 SHA256 64418954e7a99d963aa0fe8cbba23bfe24409b9a
 DIST mod_h2-0.6.4.tar.gz 2598459 SHA256 89b9ca3947d7c1ab23c92a38ec63cade445c7f97f15ec699b067d5f183f6c9c4 SHA512 e1f9944851f880bc1bd47a8e818a786b720c59d0703ce1675ba7f9d2947eb4957053764c5fca43b569416b6e4c3da4f940643eefeefe928c0c8cdf25d18a0462 WHIRLPOOL efb7868b89c6ffa33ad9a8641732285c0941d9d4d782082e1c4b4cada7840bc05374af74ae6da8074d87c7080cab7acd4414ac7890a62e174dc56acd2d2cd9b5
 DIST mod_h2-0.6.5.tar.gz 2600818 SHA256 bc72199c5245b3339ce1c8d7fd799c9f6e3224823b0d96dabd681c6fbde0f615 SHA512 f44a7aab3644f989cbb5117ae7f287fc005a9b09f322670b2de720db14d21755fe9bad66a186f7b9894c7b0b385f48c558fea0c27ce96b6c3c990601fef45223 WHIRLPOOL e6cab1f37c2a19d52fb927c77d8a5d50c867218202a863c9f897ff40854ab17990d3ff14a318942f37094d2b0f7cc4ba7b3e841e5d3060d6ea493ee9ae547a8d
 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
 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
@@ -16,25 +17,24 @@ EBUILD mod_h2-0.6.3.ebuild 977 SHA256 f26bce4c3966cb1062d753fda51d213bf4575b21f4
 EBUILD mod_h2-0.6.4.ebuild 1338 SHA256 89775b9428dbbf7bb94eded4cf98a74d75d35fd6258bfd1b404e677f1a9cd43d SHA512 d9a46c935f888c6f1fa842bd4c67274aeb2cb73a204fee24685890c62f3f71a0798d88aa5c14dcb897e5fe19b82536d7eb70634d2d5286ec74e5e4e1a928b99b WHIRLPOOL c5ac7d2bd9f2209e81f18f4190b7fcf9458d2ce20032352f180c3b4ad89de946a7ba34c573df42514f58b7414b6b50ee55916dd9bef1d9a2351a7e410562f48e
 EBUILD mod_h2-0.6.5.ebuild 1338 SHA256 30ff4ed598cfa7c8313a195928dc78aeb3dafb95018e322d855a9fefc4633e22 SHA512 f10297f074738600a89ec6f6830f71da95c3a8e5433479ee03fd85a00c6cdbb85ebf0ad617d241aba9f7758fe0d19edf17ee3e237829fa8ec933ebc3b380042d WHIRLPOOL 0307066cfa4360d1cfc25242c259441006cc15eaa47b369b808384d5c2e780ec6410fea605e115a57925ed1f778406efd8a214b069eb40ebfc25b6c7d75e26f3
 EBUILD mod_h2-0.6.6.ebuild 1338 SHA256 ca1ad24507e76441674abb68d1340e693bf0f69335e51932475e9fb049ea7b6d SHA512 08fde26a78222c9b18cccd744bfbceb65f113c877a799add42674288c7481a5e996c9ac9d83d88ba4d4c71ba537af8370c0ed270b404ba452f81d4131d191ec9 WHIRLPOOL b95eca62a46ccae24c45617d694977f84ca8217cd0930ac542706b532a84263fc3237bf45b184dbca32ea5aa5010c8d29f5517abe28408d355751ca70e9179c7
-EBUILD mod_h2-9999.ebuild 1337 SHA256 a4aa414fc49cc44c716d06bd99a2cddc06ffaec598dc3ccef4cccf9a48b5e8fa SHA512 2660198ce64ba75813fd52d3269f290ddabb45b264fb528378d6852fef3289feb817b059c45e593069cd661f35e619cc6dbf7fc3e864ca9ce2a6b0ba7d9a5d32 WHIRLPOOL e541cf14d35ec052ab4c1cdf9102c4b17cf202c575f030d70717aeb8f2f105c34e08bd2af75e0ccd3f171481a3a367e258da308781161584c2386840fee6f3ba
-MISC ChangeLog 1289 SHA256 367d17b42ec2129356bcd3e57b22df24fd95da5aa18b1c618875e1ec3766cb6c SHA512 0284c1d51c67c8cb39d126c34e3aaadda124a85544b8174ccda244babb09a6a3c06aeded2b8c1ed8d4d8869ed9f7a04caee0b8677ada4afce2407f56e1103b60 WHIRLPOOL ba74f3d521af9690e1a844cace3724a030ede5334bd2b73a1ae07fe5cab71e6a12c04a88afafa5dbbc98cd466f9f9984bab486771b9fbb2817c9b275c40170a3
+EBUILD mod_h2-0.7.0.ebuild 1338 SHA256 8f0e502eb1c9428c18069cf4d3a44e61dc54c2957caf3aa505e327b5a926540f SHA512 1acfec73435508b142bdc3639ba1066b6e7dd840bb515c35a34b43a2567e948e5402d0b711c158844de5787b4beeb70ca9c90f98b53f46c8cdacbd2eee74e41c WHIRLPOOL dc627288a5eb6bfdc68c1db3657a8798e78bad1dfc7afdd88e936fd7e2e7c4d9e9647fe816e42f78d64119aab2cd6d872758df647591ef06558a4a18b1175443
+EBUILD mod_h2-9999.ebuild 1337 SHA256 cde51d37543331495f775f33ede781caac1a2d6f3061a77ae64e46fc92806b28 SHA512 78d64185a83faa4b80e6861df2c59c9a1e229d234f20ff64f3e950690011b9e682e94da6e99b070d5536c1649dee87d85bead5d8530636afa7bb5c7cb66f2922 WHIRLPOOL 245ec46c22e9a7a2bf5d2d8e9d9067c19c08705329cedb0ed36b3de7e76fb0fa51a41c3cc72b18d5650245251d87f5e253927b2eb6bde9b48818603b84dca6da
+MISC ChangeLog 1429 SHA256 a983f42ca75550d6c2223cec1658477c5fbaa3f075fd2c69af7c66f8d4a76b40 SHA512 cc7f785a85fd55d874ce3debe8178b7aca7419870bbfca3cdce1324bc96dec3984f380f3245e2e33fa4efccd31c30eb731f2d971dee1bcd810555b0f36223de1 WHIRLPOOL 8aa79a5f59834efbe01ef354b7236588fae4e5f8b8921854437642ed370756c0742e8e2fcdf5cb0e4301a2ddd3b858bd409825fe42fbf6a279dd54e96ec7cbb7
 MISC metadata.xml 280 SHA256 ed8af2effd5fabf11ac96b6a82d8a1e914d503f308f39be9989569b8c161242a SHA512 350d78c520e21848cc97d716d905b54e915bc25aa122cadc8df7dad882bc8726c0dc3189b316ab217b2116eab3e40ca7e9224f868ceb900ce5741dc1f3a2e185 WHIRLPOOL a8238ffb793d5f08ccf8f84e23898682550e769fa97a0271b01d243a5fd2f6b346c85a91a14b2f36d5efa55a2dbe95ceb0597da79637654604c96fe6b06f45f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfy0wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwa4QAKDI14J/6O/mZHa540fK8yno
-Qia5EOr49TUFbBZiBK0aNKKYYZfXb/bIVZne+12kfLYpUR83wseAT/b4qOFqU8Fk
-kFQPDlZvnY4goV8BBpKtHeQktPLaYOxk6X7Go1k/Oi0mch+Wk6cNFjpYkNL1PfSz
-01UC2diY6Rv2DDc9+IJmnoP+qgrgym0LvSMhzvcyGTYl4hHPPPTMGdL5VmbNYOgq
-rov0vGKLXy+SOde/9SJaVbuE32tDrw6OMJslPlIexeGvChIDJ1LrF8K/vqeUU1QF
-jVjKUpb1eZQlAF9bHCyPgaYW1I2ZHhnzAiuea2Y+dV19dvXUulB9BELud8w2xgS9
-99Sr8VCkB2TvTXzfRGOhQnEDWXdf+Plqp5ajXIQdRiMVl0FYggnX+IVif0ObN9HO
-yWPvg/GvDVZ+jD+PLt9yg/3/pIWv0Cmgs/U4agdh4vxEEPOz2N3Whb5f7xcj9JFe
-2IzzDQ3l279VpAIYMVTXFx1zGm5OCRZu1EJl1FkUkLXuXaUSLEdxEmvJYSMJYtCq
-i7/xG+BULl4m5PBx0/5IUxZ46FKeMlRKh8v2hQmv5hCZjl/VPMaN7VT0SHjr3UR8
-SuanjIefc1i8QF361DtRSrGGyVzfvlznYadkavzEDNLrdGRLExD7DTdPcoZUf8v1
-odAdn6/CndrRdOoFqGIq
-=12ao
+iQIcBAEBCAAGBQJVgbMkAAoJEPGu1DbS6WIAqmwP/11jvyDBpl6ErpgvSON8vtfu
+PWkCuM0pyKLWD8E7INZ1LTeItfyOeY2EEIYQeM86aE71VXkX2CMoRWSZG8Y3vMDL
++ynK5D99VYp2KBjKof6KOFKE0ieYzg/8kA7YIGsvV/d+aL4tBMhMLthCV+wv9mJD
+ZtqzZw9svVk7r1D0AEk7B600bl8bVWxiQEV8RZGaG3htimyPU0taM1bKFB49zg1/
+5K2nhrlDcPdgWeEe3bqUk9+HiXwxG3LQOpJKAxBWi0R0lwcX/nTYj1LV2tJXdUyC
+LUbbwV0Sev7vTk31hhOZwQQn8CTQZEjp75fWowHGTWJ/ACIx658JLcBG+0JBpLVN
+8syk6l3kIQktkGIyazGOjyi44x8AMbGZODNCGmL2Y4/25Ok1zBAT2LL72pWqauPW
+3Exshfcs+9zzn6Kgtmb1Y2oJSgfNNZARysPleKVLCP/O98ymQwY7cpW6/wA3JQE9
+v1KVRNeAN/EgjmpCK7OkIhTUpfCzwNNVDDdJYOQq2PR69BP/tRiLLxx75PO0Jyjd
+d2sJVYE8laKJ2PwAoXKTVIEk5eOws/aE2dy2Rp3csbFSsfh/YZRmWangtwNV7uZw
+gix+TjNlfHmoSTyGc8UKLxgAHtOmA/D1Et3LcaaW7HrGbY3H0/AyeKXW0Y0b1d0v
+5js9C812f/q8JxzUPWQP
+=dYaa
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_h2/mod_h2-0.7.0.ebuild b/www-apache/mod_h2/mod_h2-0.7.0.ebuild
new file mode 100644
index 000000000000..cdbd7b3b5383
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-0.7.0.ebuild
@@ -0,0 +1,57 @@
+# 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.0.ebuild,v 1.1 2015/06/17 17:49:23 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}"
+
+# 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() {
+	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 6cb442be3448..7e561c4e349e 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.3 2015/06/10 11:30:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-9999.ebuild,v 1.4 2015/06/17 17:49:23 vapier Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="ssl"
 
-RDEPEND="=net-libs/nghttp2-0.7*
+RDEPEND=">=net-libs/nghttp2-1.0
 	ssl? ( www-servers/apache[alpn] )"
 DEPEND="${RDEPEND}"