gentoo resync : 05.01.2018

5 files changed, 13 insertions, 7 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d1bdc36a39b0..32981faeef99 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 22a39426d1f7..8c18600ce7de 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -12,5 +12,5 @@ DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0e
 EBUILD apache-2.2.34.ebuild 2988 BLAKE2B af8830f0f443945d961ec0e14099e927e5b1f73d6fe7c70eeff13001e703767505fa0b58915f6dae42132d025c70d6a14e82f5b6dd1c97915b6f0973c6ddd95b SHA512 913dde770b5efd1e283d96403232aad75cb5ef6cbc9dbdefe90d307d2479dcb6245e2faffb47291118f48f576b1a0fae849e3ea481ff7208a755ef5b62033022
 EBUILD apache-2.4.27-r1.ebuild 7749 BLAKE2B da77f3a4ee8db2d576a075abdc056345bc594aad65a4b2cc431545368d05c42ea3fc8c96105a7c3aef0ca86552ec28dbb7e0f5f9d85ef6adb8903ef71a909ad9 SHA512 770580bb91e50ff071482638eb3d7361c0f782eaf9fbf2cfc3d803b1eb8785e7ba9fd67382caf75f87f8803e2379351fb4d43d733572965a9bc84f22974161b4
 EBUILD apache-2.4.28.ebuild 7776 BLAKE2B 292973370e0977f98d25f57a80a41e29b7887bdfcfc5b3bd0b42908aa10edd2f21563d87ac943c58362ba19fed4bd119829f0314a1e0a13a2826a59f30796d1a SHA512 48a4dcf833fb4896dee8ae571939e9f2066655e8e23cd8512ebabe202d8d9bb95ffd007881fc69930deb03c95988119645d1b169d8939fbdfed15cfea3ea150d
-EBUILD apache-2.4.29.ebuild 7776 BLAKE2B 292973370e0977f98d25f57a80a41e29b7887bdfcfc5b3bd0b42908aa10edd2f21563d87ac943c58362ba19fed4bd119829f0314a1e0a13a2826a59f30796d1a SHA512 48a4dcf833fb4896dee8ae571939e9f2066655e8e23cd8512ebabe202d8d9bb95ffd007881fc69930deb03c95988119645d1b169d8939fbdfed15cfea3ea150d
+EBUILD apache-2.4.29.ebuild 7823 BLAKE2B 41b13054544e46707a3d224c21f3abe74e1d37e7d93552bd7a854d420e96ac2644f4af371cf57b2391055312c3c3960d0b21f7f4721f7b2e5cff37f9813b4020 SHA512 613465fd87dd2aa50b982030a6b3b732196a977ea3ab5755d0854944cfe276e21d623a2c7f21c17f38453233fa8ccf227f25dfc92219cb166cd5a35027ead294
 MISC metadata.xml 3475 BLAKE2B 4d276e02b57d65997e8a6e57874644e81a4256302473fb11fd37a6de7f06488fb64fc91c3c581b31c7a2fdd863edc6be3ffde086f04a8f01b568ba1572929cab SHA512 3f27045fba988cb5bb5b4a7c19dd7bbcbd50f7e8de00edd8e153b24246263a90e355aa38fa050044c023f5a180af3559b0be708c414eae6d5e895e982629a8d9
diff --git a/www-servers/apache/apache-2.4.29.ebuild b/www-servers/apache/apache-2.4.29.ebuild
index b4dc41e3f33b..21c415055fd1 100644
--- a/www-servers/apache/apache-2.4.29.ebuild
+++ b/www-servers/apache/apache-2.4.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -129,7 +129,11 @@ LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
-DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
+CDEPEND+="
+	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
+"
+DEPEND+="${CDEPEND}"
+RDEPEND+="${CDEPEND}"
 
 REQUIRED_USE="apache2_modules_http2? ( ssl )"
 
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 74f7e2dcc533..5783bd941d3a 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -4,6 +4,6 @@ AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.15.tar.gz 794926 BLAKE2B 0bda44697d3e5f5fedb977d757fb418bb7064e0a5995448513c2c427d2c2694cf7242f76f516208d0ed5f6d3db3b1a157bb6992a714fea3a370d3a767fc67e60 SHA512 1a2a82cf99d3e6dfe62fa18fd6f04afd1dc727d61287a1c9f47f1448e76a4858dfd59286118c94672c84ff22bcd8444c0c1568ae46993fdbdb9414ad60474bf4
-EBUILD uwsgi-2.0.15-r1.ebuild 12677 BLAKE2B a718720b7e370c4aea588c0109626f871d00e64c420c97c36a2b02a80d8796f2c1d25b827445643288e6e85a3bfa4a092306222dcc6311e6583acb376c99526a SHA512 602131642d4cc96ffb4ea827a5c837e785911e7574546a6bef677ef532aa3e21c6ef8a95aa78ebfee1bde5e3ffba811b70d3dfe7cb4bb07df34bc13e00198548
+EBUILD uwsgi-2.0.15-r2.ebuild 12848 BLAKE2B b85660cc15fcb6673389974e1dcaefef4a57169be0d216a0a862b6776f551bcd5409eb25316d8bd6a619ac305b8739c4d409ce12e71297ff5f51cecad000609c SHA512 eac54b30cb1b5caa87adc87e0c64dcb5492c15e1acb24c7fffa676e69269e752b83785e5c9c09d9ee6fc85da052e0d9cce7952fc828ef7445d47b1a7eb35373c
 EBUILD uwsgi-2.0.15.ebuild 12659 BLAKE2B a9780429463f47ea09054cfb9029df521b434d1055054389270644ec9384afec9c660822c655ef8fe36c242d21266fcd71524e96ef4af2ced55457792cbe1a59 SHA512 d870f86ca5225ae9807fbf679f77a1d44b01bbced6700a743b5bc734e7092752209066c1839a03514a60a8c7277626fa8e047fbfc949dc148c730582b40ef432
 MISC metadata.xml 1597 BLAKE2B ddee6196349d4be8f3b5ba5a370eeae27bbc834d41e9f3803a2e6aef0966b01f4decbefe0cc4df3f174dde6fe8189120218a598d67dbcde20bf4fc20ad535871 SHA512 6f31168a12d1c3a95cb140624584214fcefda352b4c4904425d633a6d94a74d30186e7fa25c19b6f97cc0ca6ab0a8253cdbcedd11df3be2a32400a6292f2877b
diff --git a/www-servers/uwsgi/uwsgi-2.0.15-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild
index 5043eca69ae1..85b336d9b687 100644
--- a/www-servers/uwsgi/uwsgi-2.0.15-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ USE_RUBY="ruby22 ruby23 ruby24"
 PHP_EXT_INI="no"
 PHP_EXT_NAME="dummy"
 PHP_EXT_OPTIONAL_USE="php"
-USE_PHP="php5-6 php7-0" # deps must be registered separately below
+USE_PHP="php5-6 php7-0 php7-1 php7-2" # deps must be registered separately below
 
 MY_P="${P/_/-}"
 
@@ -69,7 +69,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 	uwsgi_plugins_router_xmldir? ( xml !expat )
 	pypy? ( python_targets_python2_7 )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	python_asyncio? ( python_targets_python3_4 python_gevent )
+	python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) python_gevent )
 	python_gevent? ( python )
 	expat? ( xml )"
 
@@ -113,6 +113,8 @@ CDEPEND="sys-libs/zlib
 	php? (
 		php_targets_php5-6? ( dev-lang/php:5.6[embed] )
 		php_targets_php7-0? ( dev-lang/php:7.0[embed] )
+		php_targets_php7-1? ( dev-lang/php:7.1[embed] )
+		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
 	)
 	pypy? ( virtual/pypy )
 	python? ( ${PYTHON_DEPS} )