gentoo resync 08.09.2018

4 files changed, 69 insertions, 6 deletions

diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index dfb59b4961d8..72a141f603bf 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,6 @@
 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 1796 BLAKE2B 45b373a825128f6cbfdb751a068907609c1b87712843049329c1ccc2fe60f9e760ace69037c5c3e493d20fdcbc8aae93120c55237f4b9cfc7d98cfa8034d059a SHA512 9dde86186646b99511a1f3378f1d63d9a6f580cccd91a72ea81a15adea5285310aa6a4728849fda8eabc1fca2ee302d01131ebad4946313f2b98e4f97830cdb5
-EBUILD cliff-2.12.0.ebuild 1816 BLAKE2B 116dad4f946510b3e3d2305754a982ff7013f38e7969ffc22de1c61c313a9b426b9b1e0ea21410265c16629885a3e1c401bdd4ebe08003ef2815eccffb434b18 SHA512 609252565bcc6134db8b3752d0d0fdc7e2eff3e8208ae25aa2708a7b014c4c6d3e4872aeec757581ca1c7610caa6c8a66f182abb864dfcde6c00d80edea3d6e2
+EBUILD cliff-2.11.1.ebuild 1750 BLAKE2B 06016d806e98b30952753b14b0ad02dde34157031ce10e113f2c9e796cfd96640c8652d450d92d7be068c568ee1d1557622dd40a0ef9a52e02b2d7ea19bae3c6 SHA512 8ee15b50b9a0e0e12a43a23493fe2289646968c94f3555cf963cfd8530afdc4b652ecff69756ee49332d06901e3f252ae414bd2b3723e407e54381f020f4fa60
+EBUILD cliff-2.12.0-r1.ebuild 1975 BLAKE2B 32eefccf69a6e9e9632c334dd488cda48cdc0efe58be561bb206713feb849573d62d9542659fe4c12fae75b5002269764e37ef901a81421e676edeb86dd1ec6d SHA512 912ce592f8910dce8f6cc87a4f81ab724b9a3032764d6ccd14325ed7b42c17cf31d50e5a6ce59f716fca4c043a743b0fe583fc58428551cc0c89cec1d7e06eff
+EBUILD cliff-2.12.0.ebuild 1765 BLAKE2B 5e7d838a1a592a563a0dcb2b42265c09daf56ed1c89cf8579b5771bb612825f005d1a20c14a9d14b0cb40cddfcbce71fdcd7d3eacf1b0c26a8299df75077e297 SHA512 f992e4d4cc6332f6edfb7e640987c72eb17c8ac592928f5feb71cf3db46fa3b17bfb28aead76f5d476b99dc8868321d30a6a1d42deddb04f10d035b9ad1c5ec1
 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
index de7cbcd1f883..382fafe4dd58 100644
--- a/dev-python/cliff/cliff-2.11.1.ebuild
+++ b/dev-python/cliff/cliff-2.11.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/dreamhost/cliff"
+HOMEPAGE="https://github.com/openstack/cliff"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -29,7 +29,6 @@ DEPEND="
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 	)
 	doc? (
 		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/cliff-2.12.0-r1.ebuild b/dev-python/cliff/cliff-2.12.0-r1.ebuild
new file mode 100644
index 000000000000..d5fdba0dfe3a
--- /dev/null
+++ b/dev-python/cliff/cliff-2.12.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VIRTUALX_REQUIRED="test"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/dreamhost/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="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() {
+	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 c341567e56f8..982051ba5b1a 100644
--- a/dev-python/cliff/cliff-2.12.0.ebuild
+++ b/dev-python/cliff/cliff-2.12.0.ebuild
@@ -12,7 +12,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"
+KEYWORDS="amd64 arm64 hppa ~mips s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -29,7 +29,6 @@ DEPEND="
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 	)
 	doc? (
 		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]