Merge branch 'edge' into next

4 files changed, 2 insertions, 109 deletions

diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index d4aecf5b0028..7dd79bb34bbe 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,6 +1,3 @@
-DIST cliff-2.12.0.tar.gz 77405 BLAKE2B 70b3865837bdba1396fd76b4937c594dfc9f50db24f684c6676c4ac1125ab34f6cdca29fe63a490d41abd49a268d6246afc873a5805446d06b07cd754aebb727 SHA512 5802cdd17b6aa81dbb344efb8ef53212de999ab33eaec1eb06e1d002ab513758d3634ae5013ece6375b1bb98c9fed99aa74cf92752c34e1132fa5ac20a969f4f
 DIST cliff-2.18.0.tar.gz 77905 BLAKE2B e371c4025fd3bf0543d3f4f038ff891a27f8116d3c833a2ded4e9f619879501868c3acf9e2f1c36023b79da404dcb69f8a8c31fbbbc2847b6c7dfabbd7ad666e SHA512 0748f8f392b11ceaa63f516860f6a339a9bc1233134562b13384bcbaff0b9e84e82a1544658ea3bf9c0fde973c563bfa1e92cc418a2fef0bfdced3f88d93058f
-EBUILD cliff-2.12.0-r2.ebuild 1781 BLAKE2B 7e476571c0759bbb5038dc2481aa88e513568d95771acb0893ce1df66e41db5851f12b1b161e2766a94cb1ba47f5b833f96af7c39f44278928d8387256374b4d SHA512 fd5d776421b7ee4706328f7e0bcfc5d6975a956321ceeecdad31ddde961595189e50bf3404863bdbfd65e735f0a28f578437a7e8f8f4bf2ceed816b567959732
-EBUILD cliff-2.12.0.ebuild 1555 BLAKE2B 63e7bb78b476a825a437f96f03c09ba97f95dbfd7ccf3e4c78ae5e1b0f73833117e3adbae62fdce3c20d9b58bc7658a2342e2f666a351b81d4db8b9374e28a9e SHA512 3015aec59236496cb012918238300deb1de5906f766e2d7928678493ba7d9e13d093ed6af5b004aa8b94618ac869779c499bf7e2bde11063664da5aeaf23f3a2
-EBUILD cliff-2.18.0.ebuild 1849 BLAKE2B 9a1bcfe9657c7ec9024191d672b37306b7b3e20b2cc3ed3cfcdd6cd0c91ae2720baf2cad27087294d8ab41f0d107629fdc1ebc52674205f68e63e926c6530524 SHA512 2eef15db3eebd81fc39a6016192c339f44c49c2cfffd20d7430577dcb4b7c5685ccd26c7332fa5aa7488420cc289595258388dfdfda6675a6846d599636d7e65
+EBUILD cliff-2.18.0-r1.ebuild 1851 BLAKE2B c258fa86ab69cf8af53bca784b94723809a14cfad0177e823cf1594adfea91453d5f315a63e94664eb0666dd9cfd5edfeb3f90edc4d206966e61695cdb6b88b4 SHA512 da3f4d9af4a7c8ff4a601336d1587b240626718075f2bb17ad4bcbf05f8670cf0dc3859ab52ec0210ce302b920e2811ccd3b0fcc326612f59cca694e008b741d
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-2.12.0-r2.ebuild b/dev-python/cliff/cliff-2.12.0-r2.ebuild
deleted file mode 100644
index d702e55c0eb1..000000000000
--- a/dev-python/cliff/cliff-2.12.0-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-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="~amd64 ~arm64 ~hppa ~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"
-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}]
-		>=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.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_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-2.12.0.ebuild b/dev-python/cliff/cliff-2.12.0.ebuild
deleted file mode 100644
index fcd3f69df19d..000000000000
--- a/dev-python/cliff/cliff-2.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-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 hppa ~mips s390 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"
-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}]
-	)
-"
-# 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_test() {
-	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cliff/cliff-2.18.0.ebuild b/dev-python/cliff/cliff-2.18.0-r1.ebuild
index ae96648b505c..9fa5d8c0e8d5 100644
--- a/dev-python/cliff/cliff-2.18.0.ebuild
+++ b/dev-python/cliff/cliff-2.18.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,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