3 files changed, 2 insertions, 28 deletions
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index 2eb542e0b4dc..a2a9279745fd 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,4 +1,3 @@
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
-EBUILD ipaddr-2.2.0-r1.ebuild 623 BLAKE2B 80633c471957188636cb2cd820fd3efb503fe5f867fa7e3619bd453eea712dd67ece822f79784bf79369f0c0871125f7ae9ba432e7fde718628b1a851ff018d3 SHA512 c06a415e6c772644da2b910da0bf0b1b0124c1bb3116d14b763bbf1501a116ef47db4f5bccaff18f2720b43980446ffd8fa98ec81d4aa121bea37af91a18f72a
-EBUILD ipaddr-2.2.0-r2.ebuild 626 BLAKE2B ef3c1b8af33ba89dbfe4eab64a439eeec87f6d0868e16eb8346690bde5fdc920499cb3abfbea6d8515a355359475d4d1cb27c01d4dc6d190fea07814e44083da SHA512 97e1870e5d0c65c1a631791005bbdc81d2445f89271201a07431ad57fb424f4b008aedc3bbe8957a307671725bb214b043bc8092e42dd26c36e26e89e6c04829
+EBUILD ipaddr-2.2.0-r2.ebuild 622 BLAKE2B 59c65db3688cf6a4c71ab1f6035156d47ed42f575eabd04d3552d5998a20f7943c995626351cf2b65f4529096f76375990dc09f20c4c96f4056a9dc98c384007 SHA512 9f231ad375958749b02ee2161a95136cdb827843d79ebb4bb2554bb41f7587e3b2915dec11cc417c0ef881c59797e33bb0923f6fcb08fa57e3ff7c0fb28b791f
 MISC metadata.xml 403 BLAKE2B 20388c02656f1a87e0032c284161f913a30bda5716879339249c0f34956e57574c9e7af29a814d38da42f3094916e3505665999f6fa0b03201e1b0191d908303 SHA512 d94c229859ea52aab215372b43023c55542437f16614acc0866cf02af5b349b44527a6733431090e731ae5fdb1e128ef0cd5b6ef3b7fa4a826e19eec7665f119
diff --git a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
deleted file mode 100644
index 481f1ab53644..000000000000
--- a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python IP address manipulation library"
-HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
-
-python_prepare() {
-	2to3 -n -w --no-diffs *.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" ipaddr_test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild b/dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild
index d3ee873cc8c5..f0e1f7480d7c 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 
 python_configure_all() {
 	"${EPYTHON}" -m lib2to3 -n -w --no-diffs *.py || die