From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- dev-python/python-debian/Manifest | 5 +- .../files/0.1.39-disable-apt-pkg.patch | 146 +++++++++++++++++++++ .../python-debian/python-debian-0.1.37.ebuild | 6 +- .../python-debian/python-debian-0.1.39.ebuild | 37 ++++++ 4 files changed, 190 insertions(+), 4 deletions(-) create mode 100644 dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch create mode 100644 dev-python/python-debian/python-debian-0.1.39.ebuild (limited to 'dev-python/python-debian') diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest index e55604b4d046..aa5375d2a9b0 100644 --- a/dev-python/python-debian/Manifest +++ b/dev-python/python-debian/Manifest @@ -1,4 +1,7 @@ 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 -EBUILD python-debian-0.1.37.ebuild 879 BLAKE2B db1bd24d1e96fe70623fc2a3ee8732dc579a42f3815b2aa17699406e1ac14729e8e33469dc32c3577646da18ea1cc05cf6cd8ddd22d25f0757c5718f4a635149 SHA512 80f1168f2347f30997536f42fe5e6cf918c396a66a180ed9df57f12bffbdbcb836dae9f6511ab1b84f253c8772fe4886c6ae1787b096d45538499e76ce0cfe39 +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 MISC metadata.xml 447 BLAKE2B 3a50201209da0fe9153963a3c84fbfcd72eb2a9065c6ef2dc6d21436d12269d6188e7b5c3bf88688e91bdde0e8f33a1adf9d11e084cca4ef796435655ec32765 SHA512 54c833fe01cfe54156de60c39d5cab5f9324074ddb2efd0c8294cc55d3ef599c0c65e911855c93bbb4f42cdec489dc5b337b0a0a53113816110321ea291538e1 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 new file mode 100644 index 000000000000..6765b2f6c3a0 --- /dev/null +++ b/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch @@ -0,0 +1,146 @@ +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.37.ebuild b/dev-python/python-debian/python-debian-0.1.37.ebuild index 59f194993b5e..86681e27da74 100644 --- a/dev-python/python-debian/python-debian-0.1.37.ebuild +++ b/dev-python/python-debian/python-debian-0.1.37.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2011-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{7,8,9} ) inherit distutils-r1 DESCRIPTION="Python modules to work with Debian-related data formats" -HOMEPAGE="https://packages.debian.org/sid/python-debian" +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 x86" +KEYWORDS="amd64 arm x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/python-debian/python-debian-0.1.39.ebuild b/dev-python/python-debian/python-debian-0.1.39.ebuild new file mode 100644 index 000000000000..12bcdea23192 --- /dev/null +++ b/dev-python/python-debian/python-debian-0.1.39.ebuild @@ -0,0 +1,37 @@ +# 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.39-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}" +} -- cgit v1.2.3