gentoo resync : 22.10.2018

4 files changed, 6 insertions, 76 deletions

diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index eab3bd4d5fa8..4caefd01d423 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -2,9 +2,7 @@ AUX txaio-2.7.1.chained-callback.patch 1297 BLAKE2B 41aea0fac54ef4256e191d7d505d
 AUX txaio-2.7.1.f._result.patch 1140 BLAKE2B 675ffec2a0d4d9bb312492603765e79ddab23c063297f4ab79d3cbb57cace511b92e357cf54a283d0f096de9d3209fca266238282cd3a1e77039332c696ca00e SHA512 bcf4681ca1501dc9b21514dca68fb36d6b50550fe1760b4af00786a698b26c3fb64afebcf29c2404dd0923867da010bfa41afa9501f59f43306b55871d951a29
 AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7daa3cb5f20b88935a2c9dcd0784968edda8586a00ea69552e72ffd04647ce4ef96928059da SHA512 a82754ff4b81cdacd7010cb30065ae1a3408b2ed6e8a47021a2c7066adb614a87cc3d70b7980f10b9a6b063f4087ee44c5df2adab0d23ce90c1beb1368b4a498
 DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
-DIST txaio-2.8.2.tar.gz 43670 BLAKE2B e5238e59964b2ddb3ab400b2e2819c25a9ceed2da7db4c8a6e450f45314818b5c5dbb9f6e9bacbda738cb382a5b63ddc6650278b35734e48aa0e59c5c581b8fa SHA512 8b60a64ebfa1208995bc42e6ccbc87c4c3cd4687cb431435c6450cff31e5d0dba468c3f3494902e666cb2ee6dea84ded458fd8f1b3b9c25421b440dcd3fc5884
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
-EBUILD txaio-2.7.1.ebuild 1951 BLAKE2B 279769adca8634a3db2fcdb2bd8d6a34a2400e69394bb04f8b5b8e9d67e73721f566165871ae0cf85d4c5585901fa09411860c52e1cb800a71293fa7a99a2759 SHA512 4648355ea28264e43599a3b924497b8d6fccc68ed80e4b126aea7e90794a87af76db76b4d3c95feb3406a3e6482bbef88150d0adf26f089d949a9857643b7051
-EBUILD txaio-2.8.2.ebuild 1790 BLAKE2B 1e07b504a86e8189dc4a188980573e0188e134d6b6bb54a11a79d10fa7e2b5b3348ffdb65b3aa40812e845349f72a87f714e98f7c297af9cd9116c9a226f6e10 SHA512 103699f096bb49daf1ffcbb974eb6b3230cb413db178740b86e61133accc3c5b8b11d1aa6e668dd21b65d4a2dd5b8dd7021027c709c533224953f21fc62ca70d
-EBUILD txaio-2.9.0.ebuild 1413 BLAKE2B 5c37bc1d4a532405b952a5cf3137a3de7127e112389aa1b11939545fb4558e8102a731fd5d3a615a84fe03eee1b6af056633cc85db64a970b0360f7f589197fd SHA512 f49b6078a4619a26f02cce30d9df4b9da63c388d748e2aff02b630e99ddf74ae6d910f8130ddb4bf2d19904a404428c1c06b3c8c70055cef918f70aa026d8ac8
+EBUILD txaio-2.7.1.ebuild 1812 BLAKE2B 431e8137eb508b5ff8f6dede4f2340777091225abf8f4bfe0b9977be8e4e4c81d5d402d1db3202f864ca96d5ec43c900b8cdf4cbb2f65f6355006455a85cb736 SHA512 904986b3d0f8c0d4e1de68e7b2515bb36c99a0b611bf18b0a67ac3b0bc30c8077f236c371e204a2e267130f859c457347d93cd1a0651acf55ebbb62a571c15ea
+EBUILD txaio-2.9.0.ebuild 1411 BLAKE2B 6f0eaf570e404f1ed2e6098ff1d3f6ba1df7fc99f9a4f8cef3de8bc09dcccc593e94c4918f148cda0769606ac503b867b9304bd4d36b6b8200a94a7372350fa6 SHA512 b461afe759d5874d5b6bd5e425a3c6696ee82f05a6854d97e15cb4593c37cea449bd2e6403fff19a55a38e7483ac66b9059bdd16f7c8dde0f88d82ae6a62f788
 MISC metadata.xml 565 BLAKE2B 6ac243a37d1d168acb5af08993ea9ebe89003b5d1de5cc123f00f8bb09df9d106164c6b6fef4ab4923ec85b756efc175ad6ec5235bd0985f3af214003b27a33a SHA512 65e8db68004013282e5db56040eb37ec7d1016c5057accc2a1f512b72d66e0de1967cc6ec2ced38cadcd700e21a2c1b2c0206004eb72c26f2bd4b134eda9f77f
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
index 0d6b45adb066..b40110804ca1 100644
--- a/dev-python/txaio/txaio-2.7.1.ebuild
+++ b/dev-python/txaio/txaio-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,10 +29,7 @@ DEPEND="app-arch/unzip
 		dev-python/alabaster[${PYTHON_USEDEP}]
 	)
 	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
 		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
 		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
 	)
 "
@@ -66,6 +63,6 @@ python_test() {
 }
 
 python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
+	use doc && HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/txaio/txaio-2.8.2.ebuild b/dev-python/txaio/txaio-2.8.2.ebuild
deleted file mode 100644
index d75f1ebb10f8..000000000000
--- a/dev-python/txaio/txaio-2.8.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
-		dev-python/alabaster[${PYTHON_USEDEP}]
-	)
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	default_src_prepare
-	# Take out failing tests known to pass when run manually
-	# we certainly don't need to test "python setup.py sdist" here
-	rm "${S}/test/test_packaging.py" || die
-}
-
-python_prepare() {
-	# https://github.com/tavendo/txaio/issues/3
-	cp -r "${FILESDIR}"/util.py test || die
-
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index eff2bf41f96e..aed5bfe9cfb7 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,6 +48,6 @@ python_test() {
 }
 
 python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
+	use doc && HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }