From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- dev-python/python-debian/Manifest | 5 +- .../files/0.1.39-disable-apt-pkg.patch | 146 --------------------- .../python-debian/python-debian-0.1.40.ebuild | 36 ----- .../python-debian/python-debian-0.1.42.ebuild | 2 +- 4 files changed, 2 insertions(+), 187 deletions(-) delete mode 100644 dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch delete mode 100644 dev-python/python-debian/python-debian-0.1.40.ebuild (limited to 'dev-python/python-debian') diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest index 16c600938394..b30986ddd7f8 100644 --- a/dev-python/python-debian/Manifest +++ b/dev-python/python-debian/Manifest @@ -1,6 +1,3 @@ -AUX 0.1.39-disable-apt-pkg.patch 6815 BLAKE2B 443dfc1c0c60d47709f31f1d3f0196c703490a9491e8de61ea9a093a80e5d87fdf17e1b1ebd5b885a1e2c0104c243aef2dee4a8f1902b9b5f747ec1b797c93a9 SHA512 ffb0659feaaa1538bc7a40b896e6bfc53f51032aadf0c0642a3609d10a13a043c2bbea97e43fddd315fe5aa174a94c9fb3fbb9832bfebdf2acebd7a30cea3717 -DIST python-debian_0.1.40.tar.xz 319952 BLAKE2B 4d5c2d3202ef09fc8eba4e0c4f9a5861d0662f288768cb9026e1ab43309a57fb21c0b8e87734c9310f39646e071947b31b17bd48b71510e7d783af9f337c3ed1 SHA512 73ed735a3c7bb43208aa26ea9fd64fc658e111dc201ae8c1947a4e5835ebd675e37b78d2895d72bd5ed2b6afa491e77b50bd5f10d62ea8299fbdda6c0b9e5095 DIST python-debian_0.1.42.tar.xz 173928 BLAKE2B 615be084cba8ff11eaaefc1b40335b73a16604b864600dbeb717ba65ee94f1d3a62f845a59c3db5b915346de4211fdde811593db989b143f4d60e7b425b98d2d SHA512 923831077d0a42dafd22277579e714af33b99612e5282f5d95bc884b2faec05321f8caaad20b72b25ce88d8c2449a6a23913c5377ed0bdc30d4ef87e39341ff7 -EBUILD python-debian-0.1.40.ebuild 766 BLAKE2B 8fea06408430f15b62504d839772ca7ad173dacca896c02cf58690f345fdf9cca791ed1c9f359e7e1ddfb235e23ce309612c87e3a0e1694d3980612081121c13 SHA512 de70852ff43ba2cc9d1e4773d6ff1abc46b7b29f51a1ceb8d3fcd9fcb41380f407763cab6cc27585c9454b298bba3387122129e397e389403ba29940d3b9d1fb -EBUILD python-debian-0.1.42.ebuild 879 BLAKE2B afc292d7698e968c6ec4e6fb7a13064acff0c263f7ee020b2a0ae2619fb27491f3987d8366d442bd22252b2999a95af039b00419c32f946cbdf416fe456cb99a SHA512 36a4b9ec9306c5702a1adc81af42ddd1dfa20da0f17e68682c2f89001470b5a1c28e9a9cdd04ebe58d8f7633bd0f7809ef4df218f8a9688a02796a192d9ad2c5 +EBUILD python-debian-0.1.42.ebuild 876 BLAKE2B 4fc093bbf6488fa96525349b996abc239be001cc242cf736c3ed1f58d26387f60ca782e2f71f0c2bc5135b7fb3f52914522aa3b983a75578b059e3820fbcb531 SHA512 dcfb6c1a233c5719231ddcd0660a586f6c8f7f10a5e86bc28c951e954df7cb7f190aa4246aebab8dc56fc27d7a9ed41b41c4aa49b659b10433f5b77eaceb81de MISC metadata.xml 448 BLAKE2B bccb39bdfb24e81bc05028fc92033468f5256be096cb409b4413f69444d59d3d9a3469047337a7fec79ac707ddf4d269b44b20c725f7fc4935bd10335e1f9374 SHA512 8e3fb6ca4bf305e23a51ff56cf84648aad1e96d36aa7a4fb138f7136ea77a6a76a8985557ecb1c9da962479c8c9e36c253655d6e6602c1833f2a2230b44540aa diff --git a/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch b/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch deleted file mode 100644 index 6765b2f6c3a0..000000000000 --- a/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch +++ /dev/null @@ -1,146 +0,0 @@ -From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Mon, 8 Feb 2021 22:24:33 -0500 -Subject: [PATCH] Disable apt_pkg support - ---- - lib/debian/deb822.py | 4 +-- - lib/debian/tests/test_deb822.py | 58 --------------------------------- - 2 files changed, 2 insertions(+), 60 deletions(-) - -diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py -index 46cf81a..158033f 100644 ---- a/lib/debian/deb822.py -+++ b/lib/debian/deb822.py -@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin): - def iter_paragraphs(cls, - sequence, # type: InputDataType - 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[str, bool]] -@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin): - def iter_paragraphs(cls, - sequence, # type: InputDataType - 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[str, bool]] -diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py -index f386391..7fb11fa 100755 ---- a/lib/debian/tests/test_deb822.py -+++ b/lib/debian/tests/test_deb822.py -@@ -42,8 +42,6 @@ else: - from StringIO import StringIO - BytesIO = StringIO - --import apt_pkg -- - from debian import deb822 - from debian.debian_support import Version - -@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh: - 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): - # type: () -> None - text = StringIO() -@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh: - 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): - # type: () -> None -@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh: - 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) - -@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh: - s.write(b"\n") - self.assertEqual(s.getvalue(), packages_content) - -- def test_iter_paragraphs_apt_shared_storage_packages(self): -- # type: () -> None -- 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): -- # type: () -> None -- 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): - # type: () -> None - 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): -- # type: () -> None -- 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): -- # type: () -> None -- 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): - # type: () -> None - self._test_iter_paragraphs(find_test_file("test_Sources"), -@@ -1091,28 +1055,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): -- # type: () -> None -- """ 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): - # type: () -> None - paragraphs = list(deb822.Deb822.iter_paragraphs( --- -2.30.0 - diff --git a/dev-python/python-debian/python-debian-0.1.40.ebuild b/dev-python/python-debian/python-debian-0.1.40.ebuild deleted file mode 100644 index 093dbb450db3..000000000000 --- a/dev-python/python-debian/python-debian-0.1.40.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2011-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -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" - -RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" - -BDEPEND=" - test? ( app-arch/dpkg ) -" - -distutils_enable_tests unittest - -PATCHES=( "${FILESDIR}/0.1.39-disable-apt-pkg.patch" ) - -python_compile_all() { - ${EPYTHON} lib/debian/doc-debtags > README.debtags || die -} - -python_test() { - eunittest lib -} diff --git a/dev-python/python-debian/python-debian-0.1.42.ebuild b/dev-python/python-debian/python-debian-0.1.42.ebuild index 0064ad2018ff..7f51672b702e 100644 --- a/dev-python/python-debian/python-debian-0.1.42.ebuild +++ b/dev-python/python-debian/python-debian-0.1.42.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" RDEPEND=" dev-python/chardet[${PYTHON_USEDEP}] -- cgit v1.2.3