commit:     24b83c988f5e24127dfab2c9430618ddb16d7e24
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 04:41:44 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 04:41:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b83c98

dev-python/python-debian: disable apt_pkg by default

Package-Manager: Portage-2.3.79_p3, Repoman-2.3.18_p2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 ...-apt-pkg.patch => 0.1.36-disable-apt-pkg.patch} | 29 +++++++++++++++++++---
 .../python-debian/python-debian-0.1.36.ebuild      |  2 +-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch 
b/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch
similarity index 77%
rename from dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch
rename to dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch
index 64b040852b7..b497986b6da 100644
--- a/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch
+++ b/dev-python/python-debian/files/0.1.36-disable-apt-pkg.patch
@@ -1,12 +1,35 @@
-From 0b4e4e02e62ab6069e855fc44fec1cbfba3e2f2a Mon Sep 17 00:00:00 2001
+From 76b7c4e7d16e8f792323f8d14ebdb1678d9d12b0 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <[email protected]>
 Date: Sat, 30 Nov 2019 23:18:05 -0500
-Subject: [PATCH] Remove tests that rely on apt_pkg
+Subject: [PATCH] Disable apt_pkg support
 
 ---
+ lib/debian/deb822.py            |  4 +--
  lib/debian/tests/test_deb822.py | 53 ---------------------------------
- 1 file changed, 53 deletions(-)
+ 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

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 49012658cf5..eb6ee829a2e 100644
--- a/dev-python/python-debian/python-debian-0.1.36.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.36.ebuild
@@ -29,7 +29,7 @@ BDEPEND="${RDEPEND}
        )
 "
 
-PATCHES=( "${FILESDIR}/0.1.36-test-no-apt-pkg.patch" )
+PATCHES=( "${FILESDIR}/0.1.36-disable-apt-pkg.patch" )
 
 python_compile_all() {
        ${EPYTHON} lib/debian/doc-debtags > README.debtags || die

Reply via email to