gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 46 deletions

diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 2c3c30838cbf..699973deaa0f 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,6 +1,4 @@
 AUX 0.1.36-disable-apt-pkg.patch 6718 BLAKE2B bd4cff4d6beb2ac85c2bc9c3b223774e9579a5d4d13ea5ce0eed55d9049a13a47dae712ee7d6165d7ab562321741bf4cc7476512ca7cc38ee23772e4855f69e8 SHA512 7937c8f21fb1e352c707cc87f6de4f6d9393ccd551007dc892ff6e2824c22bd48a66fc3c7ef718992d545b5b15f146b460ec09ba41e16f4a5db3827f30068e5f
-DIST python-debian_0.1.31.tar.xz 295720 BLAKE2B 3b3a68ab5604571355a15afac181e488c278ca78ab4c8a6cba4c392a0a89fd778bfd37e69a369d50fbc72f5080cf37fdbd31771f5d973c386795c436112ea347 SHA512 d2bf071b088e53ac132f91e5983c092bddb9736b3fd1394dfd2654fb8b6af7f89982af8debba8c4af21086d4f8a3ef86393fdef25ef18bcf71dcb00a60a8ae5b
 DIST python-debian_0.1.36.tar.xz 308364 BLAKE2B 1cc7e2844db8143a3a4cc4f59c4bbb90bb90ab024b2524335d8ab69947ffe8c64b2b41a54a5d199cd287a3d6b6a0173c75be708af9aedfeb871e354ac1873528 SHA512 3f2ca6d86f6b6d383a1628021a77d19b562b0c409d204dba4de6968d2cdd2c8fb4aa882429fa1ce6af5361352f7a51b339c481dd47937cb103a08132379d77c5
-EBUILD python-debian-0.1.31.ebuild 998 BLAKE2B 6c58d96e7a3288d2ecedf7759b779527f9598e249d6e9176cf786732f514c9d9b32791f0dca8a6c982c40bfb1739418bf8b671fcc0e73e51582d4a57b1002b96 SHA512 b1fd0e382dccbf77f9a309416ff0fddda639e967d9916c37f8bba4e6c0a555558323fdf6c8f96457c77b4367db2ae40d4232d616dd91bd355d7003cd47e691e8
-EBUILD python-debian-0.1.36.ebuild 963 BLAKE2B 961bba936048931c1204cf83860fcc8be2136af686356384d1892567f5716e3b28c79801e6fab4b1246eb3b23055e2d0e4a9c4ffd9e92df12452be2d93a3cf0d SHA512 c01f67a94a794d5e4bce9d936ff2be1689b616c60f6f257df78e54a104830c8e582ef17ce41a19f35eeab49102150a689b69f915db4ca00228cda297def95eeb
+EBUILD python-debian-0.1.36.ebuild 951 BLAKE2B 1abca73ddbeb0ef794d73e23f1941471a2512df2470cf3145a26ecff93627955a3f871d1680c9109294d25dbf31c4327c0dd6ba3ca6d0f9d3c0a65b47f863296 SHA512 280c21e8f9a25b7eaf7abafc8f073b85b7d2419b6886a9fb5ceb7b97c028399f0548b1ec018f67e6fbe84632b4185c4c49eb475a8b804471550459c8d1f0db4e
 MISC metadata.xml 347 BLAKE2B ec810ad047c9d21228d5a0df18b78d6935168d4e474007c9aa057bc09bef0507cab59a1d087c72c880c98a055c36c4aea3d8ecadb1f6f746a0838d5630a61b00 SHA512 acad36081dda09984a3eee3348ea00e74a61c0d330ab5a9b14f1705fd1a5af82976d57e86a027d7c7c15bf9bda44dfce21eedc4c56f6337832769f8ed8cd1462
diff --git a/dev-python/python-debian/python-debian-0.1.31.ebuild b/dev-python/python-debian/python-debian-0.1.31.ebuild
deleted file mode 100644
index 3f6380655255..000000000000
--- a/dev-python/python-debian/python-debian-0.1.31.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://packages.debian.org/sid/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( app-arch/dpkg )"
-
-RESTRICT="test"
-
-python_prepare_all() {
-	sed -i -e '/import apt_pkg/d' \
-		-e 's/test_iter_paragraphs_comments_use_apt_pkg/_&/' \
-		lib/debian/tests/test_deb822.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover lib || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-debian/python-debian-0.1.36.ebuild b/dev-python/python-debian/python-debian-0.1.36.ebuild
index 524d945c32f1..78fab194385a 100644
--- a/dev-python/python-debian/python-debian-0.1.36.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.36.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"