gentoo resync : 25.08.2020

5 files changed, 7 insertions, 103 deletions

diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 1e29db0d3b81..a302707aa11f 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,9 +1,5 @@
-DIST cliff-2.18.0.tar.gz 77905 BLAKE2B e371c4025fd3bf0543d3f4f038ff891a27f8116d3c833a2ded4e9f619879501868c3acf9e2f1c36023b79da404dcb69f8a8c31fbbbc2847b6c7dfabbd7ad666e SHA512 0748f8f392b11ceaa63f516860f6a339a9bc1233134562b13384bcbaff0b9e84e82a1544658ea3bf9c0fde973c563bfa1e92cc418a2fef0bfdced3f88d93058f
-DIST cliff-3.1.0.tar.gz 79037 BLAKE2B ab7fd085a222d93deab2d97649be45510f868c7b6ffc32bca6a6cfd7c6c66033f831fa5682d753d8111ce869d94c788c204610851034fdd020f829889062a066 SHA512 f6b74a91e75a0715949a245816f60563c78aa23b03f896240650a190b9d9486e0079081f3fb12acc8aa610c411c7571a330a94f2884ec00b6f893a0d9bebdcd4
-DIST cliff-3.2.0.tar.gz 78613 BLAKE2B 0d6a253b026142a91f70cc8af8041dbbef6854b86c36fac7fbe0929c9a13742aab7be8a26c1419947e6eea550ee3b6bb2985c92bdbfe7b76cb3fbab7fc82e56d SHA512 dfae68bb3ef66a562e9bbb0f15bed61f144d7be92eab0553d01dcf7c7349c8e41ef51f98c3a43997cda09031c08db6db1add643ecd6a9fd4d27ddd61f87233d5
 DIST cliff-3.3.0.tar.gz 79680 BLAKE2B 844910bc588fb80ee6645735c3be2518fb00fb255eba67d7cf8a572ee9153cc5c1af399296782254d1d94aab89dd14a7107174b5c580cd842eddd62f4aeae155 SHA512 644dc14817e18dbabe8a33bd48545b27f5053f3b2c5be386c7752fe0a89d3de02aa70f6a5d7b0dcc32fb26f73773c744ba17e916c1186d93b8609caee5f08d6c
-EBUILD cliff-2.18.0-r1.ebuild 1864 BLAKE2B 3d759bb8ccf4659e1699165a877c2eb596c318864576ccaa562c491061a0cfecb0445ca27bce9e38a4d41ca1d8c2e1a27fd67a6a14157aa0a43738b1f731cf17 SHA512 a4701406573674a09b2b1e95a7f03b0e3be5fa57be29edba7ac4f143c9adcfff68c73b95bc1151eea7b3537deab7cbbcbec2624e1c97743d43321cdcef66144f
-EBUILD cliff-3.1.0.ebuild 1043 BLAKE2B 1ba363c755b8c72e5edb5dd3ecb048ea4e2136c97c14e956262692d5cb05cfa31e7c62c8d52f5f380bc03ec761501b3bba6445a6aa78fbdf8d86cf0b9e169c7e SHA512 84428b3f44dc2830fac937cb5441b160dc16d730908e46a096148828a715fcf25e0fc293033aa6382a298ab1aa289b608c984bdfb2f0cd228713cc7fe1cb426b
-EBUILD cliff-3.2.0.ebuild 999 BLAKE2B 9467a5a29e1796e66c34a0fee637eb57de78ed78ce561819e8b3a60074f292ba55cfe25458a96802e66091d17a725d15f045456ca5bb5bbe3ebe8eba0147360b SHA512 d6c7a0a2ea053936f6e134067c1b65c10f22f5afbf1ecf754f67161965bd27e2b6cd93737b683c656169a3ec8b25ee1190f0c21998f7bb33126e2299a142f04b
-EBUILD cliff-3.3.0.ebuild 999 BLAKE2B 9467a5a29e1796e66c34a0fee637eb57de78ed78ce561819e8b3a60074f292ba55cfe25458a96802e66091d17a725d15f045456ca5bb5bbe3ebe8eba0147360b SHA512 d6c7a0a2ea053936f6e134067c1b65c10f22f5afbf1ecf754f67161965bd27e2b6cd93737b683c656169a3ec8b25ee1190f0c21998f7bb33126e2299a142f04b
+DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef045fe318143e71f9a240188c0fb74e831d868b31b6dafb4289f7beabfbb5fe1dade1df196f670c53a55549 SHA512 d625588f4eed0aeee549b4a21e604f1cb886b8c10a12df7c546a5292223ec5bf9067352b4d326d5710673dab56eec47e2fb46c9c5d5df6e9fbf026d030bcde1c
+EBUILD cliff-3.3.0.ebuild 1031 BLAKE2B 98bfd5e1b5ee9e4e9d4eb5573b0782ca5848e196f7287cb1b12a002ee1c91d4c2aaf1f289fec36996bea3100f332a4c081aa568b87385aa23d55f85a54bc1473 SHA512 1768688ae062bbd0248a11f0728ba97808f7fac02db5703d7a6b205b77d6be2e481cebc62f2cf9be0497288aab858cb950aeb6777dc1712e32537e99363569ab
+EBUILD cliff-3.4.0.ebuild 1036 BLAKE2B 9467964b55090ae43d9c9cc040eb95cf0808af4f4b89cc8e0f56e25854da0d9355b3b451851cbf79b3a1754da1f3d032353f5ffd4e9c2500595704b3ca9861be SHA512 7b0afda286110c34bcb9017d35ee071c9fc03bbe873466fd9cb70d25161957436accd4798d12fed564ab207e9f53e58ca5df089113664cb5c9dd2df6448a3652
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-2.18.0-r1.ebuild b/dev-python/cliff/cliff-2.18.0-r1.ebuild
deleted file mode 100644
index 41dccd095b23..000000000000
--- a/dev-python/cliff/cliff-2.18.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-# entry_points is added via [entry_points] in setup.cfg
-_DISTUTILS_SETUPTOOLS_WARNED=1
-
-VIRTUALX_REQUIRED="test"
-
-inherit distutils-r1 virtualx
-
-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="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-BDEPEND="
-	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/stestr-2.1.0[${PYTHON_USEDEP}]
-	)
-"
-# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${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.12.0[${PYTHON_USEDEP}]
-"
-
-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
-}
diff --git a/dev-python/cliff/cliff-3.1.0.ebuild b/dev-python/cliff/cliff-3.1.0.ebuild
deleted file mode 100644
index 3c74f32631a1..000000000000
--- a/dev-python/cliff/cliff-3.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cmd2-0.8.0[${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/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0
-	test? (
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.3.0.ebuild b/dev-python/cliff/cliff-3.3.0.ebuild
index a7fef18e7137..4830dc11016d 100644
--- a/dev-python/cliff/cliff-3.3.0.ebuild
+++ b/dev-python/cliff/cliff-3.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
@@ -27,6 +27,7 @@ RDEPEND="
 BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0
 	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/cliff/cliff-3.2.0.ebuild b/dev-python/cliff/cliff-3.4.0.ebuild
index a7fef18e7137..c64de385c651 100644
--- a/dev-python/cliff/cliff-3.2.0.ebuild
+++ b/dev-python/cliff/cliff-3.4.0.ebuild
@@ -21,12 +21,13 @@ RDEPEND="
 	<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/stevedore-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
 "
 BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0
 	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 	)