gentoo resync : 15.01.2020

5 files changed, 6 insertions, 91 deletions

diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 7ceff5a4fb32..2c3c30838cbf 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,10 +1,6 @@
 AUX 0.1.36-disable-apt-pkg.patch 6718 BLAKE2B bd4cff4d6beb2ac85c2bc9c3b223774e9579a5d4d13ea5ce0eed55d9049a13a47dae712ee7d6165d7ab562321741bf4cc7476512ca7cc38ee23772e4855f69e8 SHA512 7937c8f21fb1e352c707cc87f6de4f6d9393ccd551007dc892ff6e2824c22bd48a66fc3c7ef718992d545b5b15f146b460ec09ba41e16f4a5db3827f30068e5f
-DIST python-debian_0.1.28.tar.xz 292404 BLAKE2B 78634043fc0dabd378bae171a485931b080dc0d31cc7e2ea448c000a1c4250e322f900cf0a0a4c3a8505af6f10da692d0fad948bc253ede7a38e4fe98831924b SHA512 ffbc924fe2dfd5790d49aacf80109bbaa18126bb8d6c9b8ffa25e9ed8b1cdeb28024a8dc202587682088e2e558da1642385faa4afda925cbb2edf6f304592a0d
 DIST python-debian_0.1.31.tar.xz 295720 BLAKE2B 3b3a68ab5604571355a15afac181e488c278ca78ab4c8a6cba4c392a0a89fd778bfd37e69a369d50fbc72f5080cf37fdbd31771f5d973c386795c436112ea347 SHA512 d2bf071b088e53ac132f91e5983c092bddb9736b3fd1394dfd2654fb8b6af7f89982af8debba8c4af21086d4f8a3ef86393fdef25ef18bcf71dcb00a60a8ae5b
-DIST python-debian_0.1.32.tar.xz 296028 BLAKE2B 15e2678a1ec2f4d96baec8b9e3ce7b84d8ad37f520fe9f174d6fe9cac8adbcbb73f628d9c3cdf39eca2639855e797b8f8cef4c9517063d61aa1e3b3ce7f1df2c SHA512 2b55d9a3100028699ec63dd4861a4f60d44e03662cc144784a37cdd980f3ff276e6cd2e535a50cdc6db28bf44affdd576259d73e14e16a2bbeeeda0de0bdd194
 DIST python-debian_0.1.36.tar.xz 308364 BLAKE2B 1cc7e2844db8143a3a4cc4f59c4bbb90bb90ab024b2524335d8ab69947ffe8c64b2b41a54a5d199cd287a3d6b6a0173c75be708af9aedfeb871e354ac1873528 SHA512 3f2ca6d86f6b6d383a1628021a77d19b562b0c409d204dba4de6968d2cdd2c8fb4aa882429fa1ce6af5361352f7a51b339c481dd47937cb103a08132379d77c5
-EBUILD python-debian-0.1.28.ebuild 977 BLAKE2B fb35ea3ec33cc976c44d12f55c7a1dd8cef4c1a6b9941ee17780540f0833f4ddf15508419e651a64bcee1808f2de328a020b44151e4f8ddd817e2785808c3aa2 SHA512 00624b88e312930b8c152f09870ca1a43b90a35bb41b693926e1b7ef99578ab0a59872497877ab94dd180b7d49c435b7178863a2b83e407303edae41e2bb0032
-EBUILD python-debian-0.1.31.ebuild 1007 BLAKE2B fcb38efe2f9f98edd7fda796239d6a282b5bc5fbcc2c303a295547b32b84cb0f874c8b82553546a9cb37aa5b2d4ac595c30c65e95f45bb63b80d8b1523837358 SHA512 b824462197c0a8459d9a1e2ad520767f5f197872894c455123f6973317c586886fbcf367b5e1a8dce2026213365c4117fe7474ef5880526abe6f536cce23e0ea
-EBUILD python-debian-0.1.32.ebuild 1012 BLAKE2B 3d21e119cdcfa2f2037bd7c6b19a8e5bc8d22a67e005e74992375de7941a1e0392504dbf68dff953bbe67ae27d1c3acb02af5a4f4135eaed2544f123b36d5fb2 SHA512 5694d17336090fe21b7768b9d99f2259f9680f64cee3d0dfc5921ee29f988c41c8ac870a94d0595646e0e127983bb29b083ae03997f4ea895a6404791e569aca
-EBUILD python-debian-0.1.36.ebuild 970 BLAKE2B 1f7b5f7dbaf765791b03efbcd1086c1fc70d3eda2a1d15214d955e00081f5dfa6b1a94aac3879d0332fd2d05b6ce98982768bf61264ae106a86cdb0e9cee42ec SHA512 9072141ad503cf4af2c301de19091e84b8d973a17fe86b730924540797bf7da4a77ce5357a25b7155332585fff87e08d675a66e31d88bd02b18fd04f5c143ec6
+EBUILD python-debian-0.1.31.ebuild 998 BLAKE2B 6c58d96e7a3288d2ecedf7759b779527f9598e249d6e9176cf786732f514c9d9b32791f0dca8a6c982c40bfb1739418bf8b671fcc0e73e51582d4a57b1002b96 SHA512 b1fd0e382dccbf77f9a309416ff0fddda639e967d9916c37f8bba4e6c0a555558323fdf6c8f96457c77b4367db2ae40d4232d616dd91bd355d7003cd47e691e8
+EBUILD python-debian-0.1.36.ebuild 963 BLAKE2B 961bba936048931c1204cf83860fcc8be2136af686356384d1892567f5716e3b28c79801e6fab4b1246eb3b23055e2d0e4a9c4ffd9e92df12452be2d93a3cf0d SHA512 c01f67a94a794d5e4bce9d936ff2be1689b616c60f6f257df78e54a104830c8e582ef17ce41a19f35eeab49102150a689b69f915db4ca00228cda297def95eeb
 MISC metadata.xml 347 BLAKE2B ec810ad047c9d21228d5a0df18b78d6935168d4e474007c9aa057bc09bef0507cab59a1d087c72c880c98a055c36c4aea3d8ecadb1f6f746a0838d5630a61b00 SHA512 acad36081dda09984a3eee3348ea00e74a61c0d330ab5a9b14f1705fd1a5af82976d57e86a027d7c7c15bf9bda44dfce21eedc4c56f6337832769f8ed8cd1462
diff --git a/dev-python/python-debian/python-debian-0.1.28.ebuild b/dev-python/python-debian/python-debian-0.1.28.ebuild
deleted file mode 100644
index 4754c4177bd2..000000000000
--- a/dev-python/python-debian/python-debian-0.1.28.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
-
-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_compile_all() {
-	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	# Tests currently fail with >=app-crypt/gnupg-2.1
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782904
-	pushd tests > /dev/null || die
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
diff --git a/dev-python/python-debian/python-debian-0.1.31.ebuild b/dev-python/python-debian/python-debian-0.1.31.ebuild
index 2f0a73ed38a7..3f6380655255 100644
--- a/dev-python/python-debian/python-debian-0.1.31.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.31.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-debian/python-debian-0.1.32.ebuild b/dev-python/python-debian/python-debian-0.1.32.ebuild
deleted file mode 100644
index 6de64953b567..000000000000
--- a/dev-python/python-debian/python-debian-0.1.32.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-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 eb6ee829a2ec..524d945c32f1 100644
--- a/dev-python/python-debian/python-debian-0.1.36.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.36.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1