commit: d8c97b5d5cbf73fa665225bfa04e7f6a9daa6d83 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Jun 21 07:44:20 2020 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Thu Jun 25 07:30:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c97b5d
dev-python/reportlab: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/16354 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../reportlab-3.5.13-disable-network-tests.patch | 23 ---------------------- .../files/reportlab-3.5.13-pillow-VERSION.patch | 17 ---------------- 2 files changed, 40 deletions(-) diff --git a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch b/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch deleted file mode 100644 index e1a760d4d46..00000000000 --- a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -r f52d1198146d tests/test_lib_utils.py ---- a/tests/test_lib_utils.py Tue Jan 15 16:06:40 2019 +0000 -+++ b/tests/test_lib_utils.py Sun Jan 27 10:21:29 2019 -0500 -@@ -112,7 +112,7 @@ - "test open and read of a relative file: URL" - b = _rel_open_and_read('file:../docs/images/Edit_Prefs.gif') - -- def test9(self): -+ def xtest9(self): - "test open and read of an http: URL" - from reportlab.lib.utils import open_and_read - b = open_and_read('http://www.reportlab.com/rsrc/encryption.gif') -diff -r f52d1198146d tests/test_platypus_general.py ---- a/tests/test_platypus_general.py Tue Jan 15 16:06:40 2019 +0000 -+++ b/tests/test_platypus_general.py Sun Jan 27 10:21:29 2019 -0500 -@@ -587,7 +587,7 @@ - - class PlatypusTestCase(unittest.TestCase): - -- def test0(self): -+ def xtest0(self): - "Make a platypus document" - run() diff --git a/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch b/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch deleted file mode 100644 index 3b2093d9a8c..00000000000 --- a/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/reportlab/lib/utils.py -+++ b/src/reportlab/lib/utils.py -@@ -883,7 +883,13 @@ - im = self._image - mode = self.mode = im.mode - if mode in ('LA','RGBA'): -- if Image.VERSION.startswith('1.1.7'): im.load() -+ # Pillow 6.0.0 and above have removed the 'VERSION' attribute -+ # https://bitbucket.org/rptlab/reportlab/issues/176/incompatibility-with-pillow-600 -+ try: -+ im_ver = Image.__version__ -+ except AttributeError: -+ im_ver = Image.VERSION -+ if im_ver.startswith('1.1.7'): im.load() - self._dataA = ImageReader(im.split()[3 if mode=='RGBA' else 1]) - nm = mode[:-1] - im = im.convert(nm)
