gentoo resync : 29.06.2020

3 files changed, 0 insertions, 42 deletions

diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index ecb3d9df705e..d556cdf025e2 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,5 +1,3 @@
-AUX reportlab-3.5.13-disable-network-tests.patch 886 BLAKE2B fec5e11e9219e0ca320263539ca50016fa94829029b36922bf213544b827e736c6e060cd6946bc1584cf1b2b0a1a026b7df41c68d1081acba50956686663777b SHA512 561fd5f5a3cca662317fad3ae8262880b825765537fd2746042c92f290a0ced95ace7cd8d02316250f02843b4a27e0cf916bba6fb2efd4166cb19f3da6c7d6f2
-AUX reportlab-3.5.13-pillow-VERSION.patch 915 BLAKE2B 91f1177441882f055f0d9b1fb3c5eceb2acc0130e81e98ea0fc9ca1e9de332d438ecb223771e2c91a4b6d12d368f7974cdb3e1389a36be735c7fbeb9679214f9 SHA512 04d2c6a5f93f0fd00e903cc64ed71a03cdc898b3dbd94e8065712acff3b9f55c8e04fa78832ee90d91dbad129767a0357b59646f7284ff545236f5a4978b4ae3
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.42.tar.gz 2883081 BLAKE2B 22f4e7ebc233895a036eeb94c5beb9206be561a8a44895b36291a4f840603a2fec90107ac60e749f99be629202801c63ff67d5034d19b42383f2df12d457104d SHA512 f52717867190bf7812fd566d9ec3044198db809cdd0f53cc9dbfa92503a202540db659369e20bba3de07cd28eb10515d03b85700ac138c9394dc9eed1f08b8f8
 EBUILD reportlab-3.5.42.ebuild 1341 BLAKE2B d87fa7cb343d0b5d306045bc1e69f10566eb0f142b599131350eec98cd984ea91c2db5d20b386723771c206bc2aec88d06acec1fe6d15409d9790f73499ae625 SHA512 cab97db2c7a559bc516d7d9be0340280103294f3d2448939dbe64b3457214329b379aed40637e5f18cd0c07367400bac7d746b74e0e2472d131853493d94ea36
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 e1a760d4d464..000000000000
--- 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 3b2093d9a8c5..000000000000
--- 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)