gentoo resync : 13.10.2019

4 files changed, 4 insertions, 91 deletions

diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index cd4840732ad9..f090e7d8ed5b 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,6 +1,4 @@
-DIST cliff-2.11.1.tar.gz 76570 BLAKE2B dc0b4a702c6807077f830941516e8c5f2dc6b732e7a7788eb2c2e5fc5c3fa8d893e7156d6ad76904deb2d1cf31d1ef50d08b73b750422b84bb053a09e4930bb2 SHA512 ba494cc26e103c6043de49a59b3e9c0c9bb1658416095f02c6bccd3536f24615239a66941fb971c289926c88e85eeb29eb10065379e4f21645828f6aa4a2755e
 DIST cliff-2.12.0.tar.gz 77405 BLAKE2B 70b3865837bdba1396fd76b4937c594dfc9f50db24f684c6676c4ac1125ab34f6cdca29fe63a490d41abd49a268d6246afc873a5805446d06b07cd754aebb727 SHA512 5802cdd17b6aa81dbb344efb8ef53212de999ab33eaec1eb06e1d002ab513758d3634ae5013ece6375b1bb98c9fed99aa74cf92752c34e1132fa5ac20a969f4f
-EBUILD cliff-2.11.1.ebuild 1743 BLAKE2B 52f19ee972c8cece42b37affb358e5babe18b29153c97f91a438d29d50bfe1b653e499f12a99485e9cdd2d6f19da42756ec1a02c7e7fb947cb759ae7ef43953c SHA512 e7b575e9bcc1c8711334b366b3480888d884d5e228e767b8b3fbb93383ada15db467c1ccf84cfad4c2324480c454de42cbdbf7eb682513d883e43367a7ed539c
-EBUILD cliff-2.12.0-r2.ebuild 2018 BLAKE2B 2071052a2fbd6ad0a5ab7a430d1221f4d393f6e028a54ee63bba32a9e2e2af566cab2af7244e80c33dead43948992138541d5480e4ccd4a4fa04de7763e6cc16 SHA512 d939241c519b1987554955b5b63ff3efa5ba2ac58e1e51d8b4f73c9bec7dbc2137bd5c8609bbfb83e134d9b209e972354e70e4169eef13327e02678302e72932
-EBUILD cliff-2.12.0.ebuild 1762 BLAKE2B 285eaa7740896c67c03ba4787d9981401970214daf0e0e9d600c51bf9925aadc07cff88812e77bfa0722a796db64135c608dc6b55244521e4a931c66f87b7bcf SHA512 35a0c741e958832d1e6186593a97826c356d95face710ef48a94c9eebcfb3651a7aca633d963e539cbffa852a9f1faca06ef27306c82584529116e1e727cbe60
+EBUILD cliff-2.12.0-r2.ebuild 1792 BLAKE2B 8f5dcafe386ff0a1aa09671a4763c7ba200b71f545a316772c838086954afe4c602e401d466267b98c4919c81f725b7513df87b6ccc068dfb211294d67f83ce8 SHA512 f78f02f790e2c265d0ee5470df87bcaa32f097d227edbb3c7626b5b35530ea23ceab2aa9cd5ea8f43d78680b8711cd746540282bf2e7f4ed27049a89e3561e59
+EBUILD cliff-2.12.0.ebuild 1536 BLAKE2B 784acc7098ccb3ebafad8238e15b6e417d15637017f6fd31fb1334cf2ff0e4c9ad9e92ed84514f3242ea396c38a1709b017d9023897b9ccc18ed354710a6f5a1 SHA512 76c76299e07dfaabfa19e07050797271af521c61d53d0e65741327987ee8fb8326ace22ee19612ae421b73e50b3adb60fe910b0d8863a919d513d8be97d31199
 MISC metadata.xml 709 BLAKE2B 05e69832a5cff97a52caebc4c113a39342e62803fd523a753a8ba119f4326a9814c7c382e88906514e539922c1f22683a09dd46b2c11e3d60b8f885072a08e72 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892
diff --git a/dev-python/cliff/cliff-2.11.1.ebuild b/dev-python/cliff/cliff-2.11.1.ebuild
deleted file mode 100644
index da502475db3d..000000000000
--- a/dev-python/cliff/cliff-2.11.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)
-"
-# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	"
-
-python_compile() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cliff/cliff-2.12.0-r2.ebuild b/dev-python/cliff/cliff-2.12.0-r2.ebuild
index 00c2e417af09..ac9f1fbe5384 100644
--- a/dev-python/cliff/cliff-2.12.0-r2.ebuild
+++ b/dev-python/cliff/cliff-2.12.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
+IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
@@ -32,9 +32,6 @@ DEPEND="
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		>=dev-python/stestr-2.1.0[${PYTHON_USEDEP}]
 	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)
 "
 # source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
 RDEPEND="
@@ -49,17 +46,8 @@ RDEPEND="
 	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
 	"
 
-python_compile() {
-	use doc && esetup.py build_sphinx
-}
-
 python_test() {
 	stestr init || die "stestr init failed under ${EPYTHON}"
 	# needs outside access, so blacklist the test
 	virtx stestr run --black-regex cliff.tests.test_app.TestIO.test_writer_encoding || die "stestr run failed under ${EPYTHON}"
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cliff/cliff-2.12.0.ebuild b/dev-python/cliff/cliff-2.12.0.ebuild
index 9a870593d9ab..5471b0269370 100644
--- a/dev-python/cliff/cliff-2.12.0.ebuild
+++ b/dev-python/cliff/cliff-2.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm64 hppa ~mips s390 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
+IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
@@ -30,9 +30,6 @@ DEPEND="
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)
 "
 # source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
 RDEPEND="
@@ -47,15 +44,6 @@ RDEPEND="
 	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
 	"
 
-python_compile() {
-	use doc && esetup.py build_sphinx
-}
-
 python_test() {
 	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}