gentoo resync : 16.06.2018

10 files changed, 146 insertions, 13 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 8c5129632ed1..a997e563cd87 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
index 0fc2b1a9a60e..470a8fab4b6f 100644
--- a/www-servers/adsf/Manifest
+++ b/www-servers/adsf/Manifest
@@ -3,5 +3,5 @@ DIST adsf-1.4.0.tar.gz 170180 BLAKE2B 2a5c741351908ad37d964b755a4a9a5d8f3137099d
 DIST adsf-1.4.1.tar.gz 170221 BLAKE2B 41a87135b74e62c9d39c64839e7802b3decc47bee04cdd93eb0e1bec6361a654378e9c310bbd18a0bddeb834f444ff67aa0f8efe21dd7ffc94c876db3230b469 SHA512 b0334102308b6ecaead6db1f7b28c3bc27a9ac853fd055e9695e9bcf36ba25db890cae57a91195d398debdfd84b5d6c7ce9142d6bd5bdd30220170210b3cdf6f
 EBUILD adsf-1.3.1.ebuild 730 BLAKE2B 3a1970bd82694d015478bcf79da58426b58d713c8b5440e69d7790d7d33c826da1b20e371304a0b69967246fc727dbbc5c634483fe6dce54bb5799aaa673fbe0 SHA512 851cfd74af2bfba18604437db7a75e6d2eb017e0b7cf5242ed7fe1324f27884bdcc3887175d86d643109ea9230d351f71f2bf627b26feedd107e96a1ec26d034
 EBUILD adsf-1.4.0.ebuild 917 BLAKE2B f59ab428982e745fc1dd223f63d29ca36c350a53e39276e18695c827a21f1cb426b1e55b52bbea0c7b7ab555a1c7712165da29a20f35b4e6b525bab61add41ed SHA512 007b923132018edbd1c54255cb47876ba0c207e953f0ddd856974c2bcf5b883d5214a72245877e533b6a02bd2ab336056638c9beb6d65f1244a5cee2d0f9d7d2
-EBUILD adsf-1.4.1.ebuild 917 BLAKE2B f59ab428982e745fc1dd223f63d29ca36c350a53e39276e18695c827a21f1cb426b1e55b52bbea0c7b7ab555a1c7712165da29a20f35b4e6b525bab61add41ed SHA512 007b923132018edbd1c54255cb47876ba0c207e953f0ddd856974c2bcf5b883d5214a72245877e533b6a02bd2ab336056638c9beb6d65f1244a5cee2d0f9d7d2
+EBUILD adsf-1.4.1.ebuild 917 BLAKE2B 01345ed3e0fd8c4b6feebb89f0c011792c29e0aeba9e35d5223b38c30943818936d1e7008e252cd64b24d21eff0bddc7b1c1abc7f346af768378a72aa83de524 SHA512 b28b70a18c70cef4eda1b68e17821aaad2a138d0c4ac5cb91b97225c446a1e93f3d94a4cf69a9a6984090fcd46078f44ca70a273abb34b5c5d6dc8a9332e6284
 MISC metadata.xml 295 BLAKE2B 300607324d7aca3f9af7cf195244b3426a78be1ab6875fc10e645d50e8aad1e4fc6abbaa555cd94248db86afc83bfdd5d58fa78cbf74d0c56b1cfa303dc87b75 SHA512 640f33b2433c2259e00d0fa1daca377084010d7fc28da599ea0d3d4264567691bd4d0ad3033f1c1d852d1cdcf179b88c1e22c75e5955e344c9dfca1e82a79e9c
diff --git a/www-servers/adsf/adsf-1.4.1.ebuild b/www-servers/adsf/adsf-1.4.1.ebuild
index 206630297375..abfe4e1bd3f5 100644
--- a/www-servers/adsf/adsf-1.4.1.ebuild
+++ b/www-servers/adsf/adsf-1.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="../NEWS.md ../README.md"
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index d3ff4fce803a..bc0dbf207fe4 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -14,5 +14,5 @@ DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f4
 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
 EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4faf04d3c66b8b0a759311e6b03102485fc4758a65437c5c9bd12f63e3afdd50730c196f3e5785c3c6aa25fb2cf2c5 SHA512 bd2df8d64f22fd28af9e2225492de2d3dc2d8172220f14f495841fec587aeb39c02d4d7021d4f96430f9821922baa84a78a7b8470f56d5c5305bd124d763afd2
 EBUILD apache-2.4.29-r1.ebuild 7878 BLAKE2B 3798d1ac5cc708adef4561d647cfb14cccdf83485c4701e42f4498c556dd6004d8176acb1d46c4b0088fa0b44e421577119dd88f982a71489260465c86423743 SHA512 abc125622dd7b362819639893b463db80a960390b2ab16fc859506f22026094a540ddc646df50d99a636708c944db982a0594bc6c1d8806bc2e983a29ca8fa84
-EBUILD apache-2.4.33-r1.ebuild 8288 BLAKE2B fd0630d5c6d90293101df05cc1f379a177705b52192bf3a8a94984d41f0a382745d0ebe7ffeb951c913d839cc42ceda5f577a9b297500d6d10f557c4900c65d6 SHA512 5ee3a135141e887d3d95cd54755c95c662a2837743656a83ee5930d52ad95e227f05a5b340b0b6cb95f48e50c5738ead1ec2dde00325f886b821322b93585a50
+EBUILD apache-2.4.33-r1.ebuild 8287 BLAKE2B a22f5316cbea9e914700df09c6b02a74884be8a9f183fe1b8b0ff1b97822f076ca3267d8f05c785da783e8123403c03e4f97914ab07c98408fe23bfd8f271686 SHA512 8b6653a444afa086833c2768d7aeb11e7c67e795544d1130ba808ff6413b6991783058c20f0b52547fe6c76ee80f189da7a295940f4ff2af0b09e3dfcf0065fc
 MISC metadata.xml 3682 BLAKE2B aa3bc5eae781b31eb423f51fcb7d56dbcd228bb0b0514863e11271a5256e916705907bf4c60fdb64e98f3fede628c2f49f83c10f64bbc778b4ab350944f00812 SHA512 4b4b07871cce8b85654659627d420456527289c3d5d6b64a6551d7bc9332d362004ad97009b0144e1d9bd63f0909a6de0100d553f51934d6695c048914b25c8e
diff --git a/www-servers/apache/apache-2.4.33-r1.ebuild b/www-servers/apache/apache-2.4.33-r1.ebuild
index bde56cae7a6c..13fbf91148b0 100644
--- a/www-servers/apache/apache-2.4.33-r1.ebuild
+++ b/www-servers/apache/apache-2.4.33-r1.ebuild
@@ -130,7 +130,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 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 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
 IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
diff --git a/www-servers/mongrel2/Manifest b/www-servers/mongrel2/Manifest
index 93b7d5141a6f..0a3587fd8b4d 100644
--- a/www-servers/mongrel2/Manifest
+++ b/www-servers/mongrel2/Manifest
@@ -2,4 +2,4 @@ AUX mongrel2-1.11.0-polarssl-platform-590512.patch 617 BLAKE2B 96493ff66f36c9b80
 AUX systemtls.mak 4506 BLAKE2B 60a448a3f1ed77646003cacb8d5adcf34899532c00fd461a67337f2ded6cc7a6204f72a1b25b3787f692487e502eb313ee0bc7dafb04c902c81d82edfc8fe96b SHA512 9b1fc5bf23d60267d64c08e0f0956deee0c421b03556138f994822abdcb324702bde744559e6629488cb05669b3228078180cb4f30af8fa09c10bc110ce7e3e1
 DIST mongrel2-1.11.0.tar.gz 1060770 BLAKE2B cbf27e148385e0f659015bf0fae3e027996ba2a4b3189658503faf7b3083c9356ea61cd7bb0d5516fecedd30f1cde8fc3ed74f5f1221a50442df1e209770b87c SHA512 60ee5036c2ac826a08bb1300969f5ad7ec2bc67c7f47635a3b458a0bad6d7e2fa37183c2708d512632c86101f537a4eb64eeef0775137705898480da70d61e90
 EBUILD mongrel2-1.11.0-r1.ebuild 692 BLAKE2B e1580b2a5cd45234beffa9ab341f6c6b3030fc671186437a952c583eb8924c515aca0f3fd148edcbfa7528021a04aef92bb3e042eb5901d4d82682be35253572 SHA512 421dd70d910b3bcd9a53ec0031a40a2d14c74e3064410d5255eebd556edc8cf6c3134246d4166b6f2a8bc308f2de17428b0738f5bb24245aea73bdb1afb105a4
-MISC metadata.xml 465 BLAKE2B d368c86e90a8629a284505ca89a2539f4f3b72a9330504c477694b9c850f0b313f4b96f26673afff9bffec2505966c84355e1241e051d00d969625f90a514457 SHA512 81c89b2b259cb5ef69b68b64f9e1bebd13431db578862ecac4a10b607aab0a1b123d46332d905055c11652789bf815f0f2cdc90a2c0c9b6e9748f9e5e5bc88e0
+MISC metadata.xml 257 BLAKE2B adec48923f12ab0f7e9fc4595c967d05bb7c5ea8c5540c43b14786be2d16be4beb8f456cf39be77a1bae0ec23e28a9d4243b755c313f4b7ebc5a8e3e0bf25b5b SHA512 a62ddbc194ab32158cdffeb2994a1f86c3e60f64efc1bf17eee73e2897e53d7faf2dfeed90a9a9b2d89208ccd4c9848fbfb3658582ca3ec30764555ba259c3b7
diff --git a/www-servers/mongrel2/metadata.xml b/www-servers/mongrel2/metadata.xml
index 7bddc1dfeb10..985a4585129b 100644
--- a/www-servers/mongrel2/metadata.xml
+++ b/www-servers/mongrel2/metadata.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>Aidenn0@geocities.com</email>
-    <name>Jason Miller</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>proxy-mintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
       <remote-id type="github">mongrel2/mongrel2</remote-id>
   </upstream>
 </pkgmetadata>
+
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 094def4011f9..67e91b567701 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -3,6 +3,10 @@ AUX 4.4.1-options-test.patch 651 BLAKE2B 02bfe56623948ce64b5e790fb4cdea60ed4f943
 AUX 4.5.1-drop-intersphinx.patch 717 BLAKE2B e9a2ea61b68302b796aa2e7bd7d7745d0f86a35bb6fe2315ce21f525112b42d6176af85c5d9b922cfadd1dd4ca0378acf1e5e4a6df7e7d2e6c8ed0dd53cb0ea5 SHA512 1959062a395544a9557ff8603debb58e73cbd146e501b4d9f9e04bb4a1d9531899a8cfe5cbd41c474638245755e040cd10156a3b1874f66489757447a1af815e
 DIST tornado-4.4.2.tar.gz 460193 BLAKE2B 4586397e8899af19582e07ac9ecdf56980a552a8c15458f1c16d83dc8ec7bf73b6a1eb341a5402d8555319c3d7528702567d13c4b56a995597e7dba4576f694b SHA512 f330bc62433576708e3c566577cede07c54c19996f374df82d5abc19a669ade549e7b6c27dcae3d421921fec506fae39473443cdb04692553c5ea2f8ec11a327
 DIST tornado-4.5.1.tar.gz 483225 BLAKE2B 261a5da8a7cc43b11b8504162a030fdad9c3c1409d653f86ab37deb5e4398f39ac05bee1da58944c2d1a2fa92dd5894256b748910f90926834305d6c6adf7ab4 SHA512 b31b3572bf58df8b758694c32b2233c547d6600b0c27f56cff3521abaad38a1646a528d2c2dfcf13214159bf5ba0f59470ba3d538edf16dc014a8b03f0d3bb87
+DIST tornado-4.5.3.tar.gz 484221 BLAKE2B 7b3682fa85a7f6ad32351d40993516a3e397b7b0a5de9d807bcd8b2b21325a6170f3670cb13e12aa208b6590313cf165ddf40537dba1fee61fa9d71954265a66 SHA512 c17dd7a3b541c26950d27c8a399ae4fdff1d99d16ff0c5de9871fe2de4c0f797c96712b23b5ed5efdaee06bb251f7def114c83fe6f7f37f344cdac9996d14448
+DIST tornado-5.0.2.tar.gz 506544 BLAKE2B 616298761f5e0cdcacfa96c3a14efaf2cc1d7579d582dc8b2fae2a3a3e45405804aa2a1409665a9af38d2f415908b373c1c34e4ff5868f989bb1bd29fe81a569 SHA512 fbd360df34fe29ed3e5f406992923e2af2815f93446fb9d9810f7575fe06300a2cb15c3f36bd93150284ba297772f94c94a4227acca2dc65c94cf7d100cb5974
 EBUILD tornado-4.4.2-r1.ebuild 1859 BLAKE2B bdd5e41507e83ebc9e2ce2d81e81363b316772653c4faeeda7768cdf75803b025b27d599a5d90a0c314c3fa0569756bb3d1a390d3fea8a70fecdc24e58ae0423 SHA512 138be95d29e4e2185a9212ed108d4236a70b207256a861b1d9b654977f2b051332b12e4a2e9f1b93e1713c1574d64ad9e5a4b6d4db0d73ef42f5919acc159765
 EBUILD tornado-4.5.1.ebuild 1868 BLAKE2B 722e23f6ecdb3d110a61cb074933b2b61b080bc21948fd42fae4099275f8c4114aeed18c6635aa1c569581c2364105c86278f31769dba27dd9d826aa95c29964 SHA512 a844f5b5b52ae13ada511f50c3979b1a96683bb81f52c93d71d89d38da98817e677bccc41113941d996594622e4dd312254a93c636c77d951f31c5b900312447
+EBUILD tornado-4.5.3.ebuild 1868 BLAKE2B 722e23f6ecdb3d110a61cb074933b2b61b080bc21948fd42fae4099275f8c4114aeed18c6635aa1c569581c2364105c86278f31769dba27dd9d826aa95c29964 SHA512 a844f5b5b52ae13ada511f50c3979b1a96683bb81f52c93d71d89d38da98817e677bccc41113941d996594622e4dd312254a93c636c77d951f31c5b900312447
+EBUILD tornado-5.0.2.ebuild 1791 BLAKE2B c5be3458eac03a96dd4bdd248c6548aebd0eb03e2363c2cf2de79311e8f51d290ae320f97a7b9eda1e42fd21ea97b3e58b362883289e87bd6b3797bee1730b04 SHA512 7541ae290aba4adc0e32ed771ac3a8567a091a6dc000d1a76d829d895ba3fb2e793b2f0f084e975618c9ac0495264ce96b474cfbe8a1e2a6a5ebd9860c056ad1
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-4.5.3.ebuild b/www-servers/tornado/tornado-4.5.3.ebuild
new file mode 100644
index 000000000000..455bb5303a0c
--- /dev/null
+++ b/www-servers/tornado/tornado-4.5.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4')
+	|| (
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		(	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
+			$(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' 'python2_7')
+		)
+	)
+	virtual/python-backports_abc[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+# doc without intersphinx does not build (asyncio error)
+#PATCHES=(
+#	"${FILESDIR}"/4.5.1-drop-intersphinx.patch
+#)
+
+python_compile_all() {
+	use doc && emake -C docs sphinx
+}
+
+python_test() {
+	"${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+fi
+	distutils-r1_python_install_all
+}
diff --git a/www-servers/tornado/tornado-5.0.2.ebuild b/www-servers/tornado/tornado-5.0.2.ebuild
new file mode 100644
index 000000000000..8eec00be8a45
--- /dev/null
+++ b/www-servers/tornado/tornado-5.0.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
+	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		(	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
+			$(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' 'python2_7')
+		)
+	)
+	virtual/python-backports_abc[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+# doc without intersphinx does not build (asyncio error)
+#PATCHES=(
+#	"${FILESDIR}"/4.5.1-drop-intersphinx.patch
+#)
+
+python_compile_all() {
+	use doc && emake -C docs sphinx
+}
+
+python_test() {
+	"${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+fi
+	distutils-r1_python_install_all
+}