gentoo resync : 05.02.2020

5 files changed, 9 insertions, 208 deletions

diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index b05aa9ac640a..e9f20c030f2b 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,9 +1,3 @@
-DIST hacking-0.10.3.tar.gz 41119 BLAKE2B fe43b31f356c9469925bf43ff381c1e24d6976961140e2e3f0988d2c693db87de98b27b38ce456b4fc681bfbaff428882e7fc072cd4511935585d789850b85a4 SHA512 020f58220d6c3d09dcc1b0ab886796087c9fe4e9eccae1e331f6f2056b5b106ffa4ba2545af086cf4ee53e21bcc124fef203c7bac36456ac86f09b4c6ff07417
-DIST hacking-0.9.2.tar.gz 43956 BLAKE2B f4bad9ca0ffaaaf05d9f0b8536ccc72c51de4547de8d38ea31f9bae1ebbb52362d75fc286075b13631362fa00e3a7081db6a128584067896bf4daf7b32f4bfeb SHA512 76aa59b4cdfb8036d6471e35cba43d502de3a72edc3883a05822063cbb92eaa072cef3144d21ee82ac763c3385c65bc9dec4b66fda5a5a2090191ba5b6388d41
-DIST hacking-0.9.6.tar.gz 43287 BLAKE2B e67090fe103849fd9cb4cd4ea36065d49500448cc291ffa2c36273095a2de4a704af2f3a926aef0ffe4aa4689ef7f810f317f0ed46e9c7143039ab776b04bfe5 SHA512 e4225754a85ff474b724130a0c3d6a6b9c480a953ea35a18833378cf2a5df4687819f510b50a95f42890cc69836033a8af933bc0a5a4e330ae94532bcee189b4
-DIST hacking-1.1.0.tar.gz 55620 BLAKE2B 6a6f30ef8a1eef3aa1b1b630dd43e1d2e9adff1623d8db19a545f186f60ce367e4b820582893e6444b7d58573b4a70a47a30cdc8d2ce1202666cf6e1b0e7456f SHA512 d326995976c04469c9d164ff31d02471346af715730d97fee23261988100156c4598ea8968cb483e8f386ee3f94a6bdffb5f67d8a7dfc238f4607fb7fe09e128
-EBUILD hacking-0.10.3.ebuild 2129 BLAKE2B dc8ea1ef953a3e7140bce6393068dc0a9f6d39a10c5900536ce37be887d300550154ccf8609db7d3c779b2b2d30aef0c13c7bad87d7403afd6544b217fcf9222 SHA512 97c8b6238dd38e4477360cca312acc7b5f4b79467c5fa92cc5bd5ca4b47db94fce6198c9753cf3ec1081db03be7339af340d17dd7e68e0bd71267770489fcfaa
-EBUILD hacking-0.9.2.ebuild 1950 BLAKE2B 22819bef7fab3a4d69fe9d342f6ee29df70ac9e86c96126424f0360e265ccb34e021f224e8a87f2cf685899491fa6075124588adbeb5f049434b82904c4509f0 SHA512 0f6531b003d659763b92b40120f0f95658f8fc138c15c8691d30ea6f1559a312355c9f92c7b7425f68e495a930cb974254b603210b66a7fdcbe792cbf33695ab
-EBUILD hacking-0.9.6.ebuild 1941 BLAKE2B cb87554c06cba525552af3b33cfcb014a093d0526f193a22a015f1c6b3f4e84f6e710a99cabd8f1c009dd7a3f5788f5ffefa3980269c84e987f83ffa94bc5d6d SHA512 ae4d6c696bf75dfbe86fadb95ef8916731da038ecc3888a5122a8915088f7e24ee962c004cacf48fdfa767bf222a4d471cdf9701a91010a55e24390783ed0d1a
-EBUILD hacking-1.1.0.ebuild 1748 BLAKE2B 25eba7c6d7732d8dc7d332634afb860fa7135140594491cf4861c96e41d9fb995b59527d0e128d17d71261adb46fe568ac4fc8463a2fc30d3d9866b1003e6afb SHA512 fe77ca29a0cdc84f10bad23f560ed8a8c93af6f77e08f950f10a4b1f2c40cb83e9da8412e430edd5ea060a8d3e11b08147b8b2b439fc274a7589ab529dfe5aa0
+DIST hacking-2.0.0.tar.gz 53296 BLAKE2B 50606d700c324acc8695499ee97cd592b051fe0cfc020efdfe7bf82b44d2f6ac858ed2f923ea08343066820c7da1686aa0b172bbab541cc564dc5ecc016cfac6 SHA512 d44d62f694c79af4c2044e745b140f0582fb5a6bbfa8050d45b17e8cb354198e8eac3a06586cf96d516844bb079d429d73ce9755a23e256857c4de19aca7ffe3
+EBUILD hacking-2.0.0.ebuild 1746 BLAKE2B 1f2691e15a39bc1c36e4c98bfef7a1598b5ab33d9df134c1b3e8bda20adb140ebdc957ce525b9fd2905500ce102f450d3a608093687e11c9f49fc67668c07995 SHA512 84ad3bde29dffd3f08edfbb67ad9ca2b50e686cde7d27e6bb40815429d85873fc476e8103a296ff0c776b8ae1384dd70530377bd8618216c9d7f964facb6e691
 MISC metadata.xml 749 BLAKE2B 29b4d37179a1c8f36f3c66ec80d0c2044f3457542114dd8753b1c50303e3dc5fe499ff52d4554f434a89026c4aee544ccb5049d0b2a8e2ea98042228234de01a SHA512 723ea94c939f789ba8112fc54d2de3abea87795407ce15ea8982140ce3bd446cdca885c2680471fbb70551e275b426fdab219f1f0394b581bd495fd643f5e0c2
diff --git a/dev-python/hacking/hacking-0.10.3.ebuild b/dev-python/hacking/hacking-0.10.3.ebuild
deleted file mode 100644
index 70c5421423ad..000000000000
--- a/dev-python/hacking/hacking-0.10.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack-dev/hacking"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-	doc? (
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 )
-	)"
-RDEPEND="
-	~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	~dev-python/flake8-2.2.5[${PYTHON_USEDEP}]
-	~dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
-	sed -e 's:intersphinx_mapping:#&:' \
-		-e 's:oslosphinx:oslo.sphinx:' \
-		-i doc/source/conf.py || die
-	# relax deps
-	rm *requirements.txt hacking.egg-info/requires.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-0.9.2.ebuild b/dev-python/hacking/hacking-0.9.2.ebuild
deleted file mode 100644
index b354c8fcd79b..000000000000
--- a/dev-python/hacking/hacking-0.9.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack-dev/hacking"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
-		~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-		~dev-python/flake8-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		!=dev-python/pbr-0.7[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		${RDEPEND} )
-	doc? ( >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 ) )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
-	sed -e 's:intersphinx_mapping:#&:' \
-		-e 's:oslosphinx:oslo.sphinx:' \
-		-i doc/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-0.9.6.ebuild b/dev-python/hacking/hacking-0.9.6.ebuild
deleted file mode 100644
index 82e43007dffe..000000000000
--- a/dev-python/hacking/hacking-0.9.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack-dev/hacking"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
-		~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-		~dev-python/flake8-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.11.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		${RDEPEND} )
-	doc? ( >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 ) )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
-	sed -e 's:intersphinx_mapping:#&:' \
-		-e 's:oslosphinx:oslo.sphinx:' \
-		-i doc/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-1.1.0.ebuild b/dev-python/hacking/hacking-2.0.0.ebuild
index 806a3495fd58..0e24beabae69 100644
--- a/dev-python/hacking/hacking-1.1.0.ebuild
+++ b/dev-python/hacking/hacking-2.0.0.ebuild
@@ -18,26 +18,26 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/flake8-3.6.0[${PYTHON_USEDEP}]
+	<dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		${RDEPEND}
 	)
 	doc? (
-		>=dev-python/sphinx-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
 		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
 		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
 	)"
@@ -48,8 +48,8 @@ python_compile_all() {
 }
 
 python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
+	stestr init || die "stestr init died"
+	stestr run || die "testsuite failed under ${EPYTHON}"
 	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
 }