gentoo resync : 31.05.2021

3 files changed, 2 insertions, 63 deletions

diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index 51b7013066d5..ea1d2858888f 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,5 +1,3 @@
-DIST hacking-2.0.0.tar.gz 53296 BLAKE2B 50606d700c324acc8695499ee97cd592b051fe0cfc020efdfe7bf82b44d2f6ac858ed2f923ea08343066820c7da1686aa0b172bbab541cc564dc5ecc016cfac6 SHA512 d44d62f694c79af4c2044e745b140f0582fb5a6bbfa8050d45b17e8cb354198e8eac3a06586cf96d516844bb079d429d73ce9755a23e256857c4de19aca7ffe3
 DIST hacking-4.1.0.tar.gz 61910 BLAKE2B 95ced5b2fbafbb890478b5ef598a836520b4d1a3f1f2a0e708aa3f3135f394aab9e1ca8eaafa9d2f9f8dfcd1043d925b0232228234021ac89d2882ad6c7918a5 SHA512 44741548b5031777b0a508255129893da63a076615dc4245fdcb2368711be0ff6e16702c12c75a7f2c6b13257e2257c58e6e95dfad6da6640ff077fbf2b507db
-EBUILD hacking-2.0.0.ebuild 1744 BLAKE2B e82c8b0a3d32bab379ed9f7103afd5ba4e54ec5b1a71a44db5d0bd14f574d224b4d27e99a3b1bb1f27f79f8da12d06e06b022f23fe889302a6674f2a91f2bfc2 SHA512 4f61452313d00d0b35e739ab80ff557c7fefff3ba269edcf34a7db159c187f06b877c49b825c1e51cb6ab4c34a3d3c62e1be0f607be3c1d6096520ee967e4e4a
-EBUILD hacking-4.1.0.ebuild 1657 BLAKE2B a217c48d5dbcee6d87af164705e9b214241093112a6d2b58da74cf15ccd835681115db3058b0eaed2b3a7478e401fbbf7d64ad4365f4ba4d32ba1faef73a43e1 SHA512 fc9dbf5fd16b718ef305fb1a5a2c190f626066d264434bee172f6e0ccf3b5ad07104e23a1ede5d1d1135e494c1a8b05786ea5933858a1d73f031e6ed7cafe1be
+EBUILD hacking-4.1.0.ebuild 1654 BLAKE2B e73d791dc4360decdd129754b15cb21461571a71f7156f6a68b9d9db0692c12dd7fce0187f2b19a7b372851562c0904dc81f8fd2cf0b3899e14dabacdd018764 SHA512 226384eedbb2ff45118806d8ffe556deb07be8870a709f27bc189b83c925e430a0c705efeb43e276c5b2b09f765a22438bd9a1ea49ac6f1742ff8f7e340b0b9c
 MISC metadata.xml 745 BLAKE2B 7108120bb708480a5a2db0fd0424cbc51b996fa26ba4d457a2bfe726ccc74405bb7475363e025977cea12426e01e00f0ed1748e8f4fd61f32367b53ec30c422a SHA512 5d546066e8e9e3578739508a442c668eaf48c69974ac7de2fa849f6310e19b6e20337c73bd8a6de2e8074f87b8d2a6089f46d3273f87ab75dee613dd350aeb70
diff --git a/dev-python/hacking/hacking-2.0.0.ebuild b/dev-python/hacking/hacking-2.0.0.ebuild
deleted file mode 100644
index 29f8280c4cd2..000000000000
--- a/dev-python/hacking/hacking-2.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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 ~arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=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}]
-	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/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.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}]
-	)"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	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"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-4.1.0.ebuild b/dev-python/hacking/hacking-4.1.0.ebuild
index 3a8ad04c9035..300c203adc98 100644
--- a/dev-python/hacking/hacking-4.1.0.ebuild
+++ b/dev-python/hacking/hacking-4.1.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 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"