From 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 Mar 2021 14:27:17 +0000 Subject: gentoo resync : 20.03.2021 --- dev-python/python-debian/Manifest | 5 +- .../files/0.1.36-disable-apt-pkg.patch | 140 --------------------- .../python-debian/python-debian-0.1.37.ebuild | 37 ------ .../python-debian/python-debian-0.1.39.ebuild | 2 +- 4 files changed, 2 insertions(+), 182 deletions(-) delete mode 100644 dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch delete mode 100644 dev-python/python-debian/python-debian-0.1.37.ebuild (limited to 'dev-python/python-debian') diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest index aa5375d2a9b0..c6470900e4c7 100644 --- a/dev-python/python-debian/Manifest +++ b/dev-python/python-debian/Manifest @@ -1,7 +1,4 @@ -AUX 0.1.36-disable-apt-pkg.patch 6718 BLAKE2B bd4cff4d6beb2ac85c2bc9c3b223774e9579a5d4d13ea5ce0eed55d9049a13a47dae712ee7d6165d7ab562321741bf4cc7476512ca7cc38ee23772e4855f69e8 SHA512 7937c8f21fb1e352c707cc87f6de4f6d9393ccd551007dc892ff6e2824c22bd48a66fc3c7ef718992d545b5b15f146b460ec09ba41e16f4a5db3827f30068e5f AUX 0.1.39-disable-apt-pkg.patch 6815 BLAKE2B 443dfc1c0c60d47709f31f1d3f0196c703490a9491e8de61ea9a093a80e5d87fdf17e1b1ebd5b885a1e2c0104c243aef2dee4a8f1902b9b5f747ec1b797c93a9 SHA512 ffb0659feaaa1538bc7a40b896e6bfc53f51032aadf0c0642a3609d10a13a043c2bbea97e43fddd315fe5aa174a94c9fb3fbb9832bfebdf2acebd7a30cea3717 -DIST python-debian_0.1.37.tar.xz 308568 BLAKE2B 7747ed21d3d6e06d5342ace6de83b79a93c76e44e8fd6d5738575e154f6d55dacd5dbb27d0210fac6f0a9db95b6d95b1fb9106da64ffbe7f77ec9d1a3e829d49 SHA512 0c13d6ee008bdcdfc28ac35d031a8486994a79a90d6b817349f09936c798211333604fd967bfde720fbc6b089bbec8e52b8c0977c430517e6f8c23d370fdff7c DIST python-debian_0.1.39.tar.xz 319020 BLAKE2B de38ddc6e4878404f9685a264e1198e513cb57f7bfea064e4512ee00049d007b6007ee7fea42e18bd2f12dc8132582fbea2235694b5f908c9ae5cbc830cfe98a SHA512 de29ef224a17b149dde8cf6bb4b9fe77aa1fdfc040463163fb97f7e4ed283f16af43422e26c352183fd74e9e0ff6b41a91ee18c63b5534d5c9de2ef663c8f4df -EBUILD python-debian-0.1.37.ebuild 895 BLAKE2B 3e13132caa9248cf1e2e28ef0c10a3b2671082b9972c41fa0e1ef7dcf5a8f62fc6e29341fccf85987b9985d3feeb965abdeb6df85a6f70151aaaec976fa4272d SHA512 6d6eece96f41114b6954d46367363261ca36b44e0b6cb4dcfe8e0c4d770bbc165fc8fb3344dac32a76ba728af10dccbc87a8dc28cfdc0fc06d61896ef4c4eedb -EBUILD python-debian-0.1.39.ebuild 898 BLAKE2B a950d0f95180c5513aef95ebb8a1b466ee5ff5d91a92588b896cdc8a00f3e02bf6f3a7daff19533543017cafb5b9939543eea425c32384fd11142e1eb0bd2511 SHA512 9ce85e513eef337347d5aaa6696eb3358a12f7d4fc28ae6e601a4232286a92367a6f65fedfbbb5065f65e14037375f99aa71dcdf18d86a17126558ce8b3e0e8d +EBUILD python-debian-0.1.39.ebuild 895 BLAKE2B fb7c8ffa21edafb840b8087ccde9c91a62571ddd65aa12c13db24d26c3ed643c0365ed0fc04458ecdd2b13e2f433c7cb10387f80cde652a94410f5e16250748a SHA512 ae69f7a467682520a865e1ab67a28a7b60b3669e9ed0b67dda4e3f05f8f78f3d687fa9906b393f849fcbb0417cebab9e6e00b785358b932c716e66e47acb64d5 MISC metadata.xml 447 BLAKE2B 3a50201209da0fe9153963a3c84fbfcd72eb2a9065c6ef2dc6d21436d12269d6188e7b5c3bf88688e91bdde0e8f33a1adf9d11e084cca4ef796435655ec32765 SHA512 54c833fe01cfe54156de60c39d5cab5f9324074ddb2efd0c8294cc55d3ef599c0c65e911855c93bbb4f42cdec489dc5b337b0a0a53113816110321ea291538e1 diff --git a/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch b/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch deleted file mode 100644 index b497986b6dab..000000000000 --- a/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 76b7c4e7d16e8f792323f8d14ebdb1678d9d12b0 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sat, 30 Nov 2019 23:18:05 -0500 -Subject: [PATCH] Disable apt_pkg support - ---- - lib/debian/deb822.py | 4 +-- - lib/debian/tests/test_deb822.py | 53 --------------------------------- - 2 files changed, 2 insertions(+), 55 deletions(-) - -diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py -index c679f4b..2e85956 100644 ---- a/lib/debian/deb822.py -+++ b/lib/debian/deb822.py -@@ -1913,7 +1913,7 @@ class Sources(Dsc, _PkgRelationMixin): - def iter_paragraphs(cls, - sequence, # type: IterableInputDataType - fields=None, # type: Optional[List[str]] -- use_apt_pkg=True, # type: bool -+ use_apt_pkg=False, # type: bool - shared_storage=False, # type: bool - encoding="utf-8", # type: str - strict=None, # type: Optional[Dict] -@@ -1955,7 +1955,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin): - def iter_paragraphs(cls, - sequence, # type: IterableInputDataType - fields=None, # type: Optional[List[str]] -- use_apt_pkg=True, # type: bool -+ use_apt_pkg=False, # type: bool - shared_storage=False, # type: bool - encoding="utf-8", # type: str - strict=None, # type: Optional[Dict] -diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py -index 7101727..64a724c 100755 ---- a/lib/debian/tests/test_deb822.py -+++ b/lib/debian/tests/test_deb822.py -@@ -40,8 +40,6 @@ else: - from StringIO import StringIO - BytesIO = StringIO - --import apt_pkg #type: ignore -- - from debian import deb822 - from debian.debian_support import Version - -@@ -465,11 +463,6 @@ class TestDeb822(unittest.TestCase): - for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False): - self.assertWellParsed(d, PARSED_PACKAGE) - -- with self.assertWarns(UserWarning): -- # The StringIO is not a real file so this will raise a warning -- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True): -- self.assertWellParsed(d, PARSED_PACKAGE) -- - def test_iter_paragraphs_file(self): - text = StringIO() - text.write(UNPARSED_PACKAGE) -@@ -487,10 +480,6 @@ class TestDeb822(unittest.TestCase): - for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False): - self.assertWellParsed(d, PARSED_PACKAGE) - -- fh.seek(0) -- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True): -- self.assertWellParsed(d, PARSED_PACKAGE) -- - - def test_iter_paragraphs_with_gpg(self): - for string in GPG_SIGNED: -@@ -556,12 +545,7 @@ class TestDeb822(unittest.TestCase): - test_count(deb822.Deb822.iter_paragraphs, 2) - test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False) - -- # apt_pkg used, should not split -- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True) -- - # Specialised iter_paragraphs force use of apt_pkg and don't split -- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True) -- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True) - test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False) - test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False) - -@@ -607,27 +591,11 @@ class TestDeb822(unittest.TestCase): - s.write(b"\n") - self.assertEqual(s.getvalue(), packages_content) - -- def test_iter_paragraphs_apt_shared_storage_packages(self): -- self._test_iter_paragraphs(find_test_file("test_Packages"), -- deb822.Packages, -- use_apt_pkg=True, shared_storage=True) -- def test_iter_paragraphs_apt_no_shared_storage_packages(self): -- self._test_iter_paragraphs(find_test_file("test_Packages"), -- deb822.Packages, -- use_apt_pkg=True, shared_storage=False) - def test_iter_paragraphs_no_apt_no_shared_storage_packages(self): - self._test_iter_paragraphs(find_test_file("test_Packages"), - deb822.Packages, - use_apt_pkg=False, shared_storage=False) - -- def test_iter_paragraphs_apt_shared_storage_sources(self): -- self._test_iter_paragraphs(find_test_file("test_Sources"), -- deb822.Sources, -- use_apt_pkg=True, shared_storage=True) -- def test_iter_paragraphs_apt_no_shared_storage_sources(self): -- self._test_iter_paragraphs(find_test_file("test_Sources"), -- deb822.Sources, -- use_apt_pkg=True, shared_storage=False) - def test_iter_paragraphs_no_apt_no_shared_storage_sources(self): - self._test_iter_paragraphs(find_test_file("test_Sources"), - deb822.Sources, -@@ -973,27 +941,6 @@ Description: python modules to work with Debian-related data formats - self.assertWellParsed(paragraphs[i], - PARSED_PARAGRAPHS_WITH_COMMENTS[i]) - -- def test_iter_paragraphs_comments_use_apt_pkg(self): -- """ apt_pkg does not support comments within multiline fields -- -- This test checks that a file with comments inside multiline fields -- generates an error from the apt_pkg parser. -- -- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35 -- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351 -- """ -- try: -- fd, filename = tempfile.mkstemp() -- fp = os.fdopen(fd, 'wb') -- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8')) -- fp.close() -- -- with open_utf8(filename) as fh: -- with self.assertRaises(apt_pkg.Error): -- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True)) -- finally: -- os.remove(filename) -- - def test_iter_paragraphs_comments_native(self): - paragraphs = list(deb822.Deb822.iter_paragraphs( - UNPARSED_PARAGRAPHS_WITH_COMMENTS.splitlines(), use_apt_pkg=False)) --- -2.24.0 - diff --git a/dev-python/python-debian/python-debian-0.1.37.ebuild b/dev-python/python-debian/python-debian-0.1.37.ebuild deleted file mode 100644 index 86681e27da74..000000000000 --- a/dev-python/python-debian/python-debian-0.1.37.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2011-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit distutils-r1 - -DESCRIPTION="Python modules to work with Debian-related data formats" -HOMEPAGE="https://salsa.debian.org/python-debian-team/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 arm x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" - -BDEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( app-arch/dpkg ) -" - -PATCHES=( "${FILESDIR}/0.1.36-disable-apt-pkg.patch" ) - -python_compile_all() { - ${EPYTHON} lib/debian/doc-debtags > README.debtags || die -} - -python_test() { - ${EPYTHON} -m unittest discover --verbose lib || die "Testing failed with ${EPYTHON}" -} diff --git a/dev-python/python-debian/python-debian-0.1.39.ebuild b/dev-python/python-debian/python-debian-0.1.39.ebuild index 12bcdea23192..372a80438504 100644 --- a/dev-python/python-debian/python-debian-0.1.39.ebuild +++ b/dev-python/python-debian/python-debian-0.1.39.ebuild @@ -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 ~arm ~x86" +KEYWORDS="amd64 arm x86" IUSE="test" RESTRICT="!test? ( test )" -- cgit v1.2.3