From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 2 Aug 2019 19:14:55 +0100
Subject: gentoo resync : 02.08.2019

---
 .../pysolfc/files/pysolfc-PIL-imports.patch        | 49 ----------------------
 games-board/pysolfc/files/pysolfc-pillow-6.patch   | 20 ---------
 2 files changed, 69 deletions(-)
 delete mode 100644 games-board/pysolfc/files/pysolfc-PIL-imports.patch
 delete mode 100644 games-board/pysolfc/files/pysolfc-pillow-6.patch

(limited to 'games-board/pysolfc/files')

diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch b/games-board/pysolfc/files/pysolfc-PIL-imports.patch
deleted file mode 100644
index 64d9980a881b..000000000000
--- a/games-board/pysolfc/files/pysolfc-PIL-imports.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://sourceforge.net/p/pysolfc/patches/10/
-https://bugs.gentoo.org/show_bug.cgi?id=471514
-
-Index: pysollib/mfxutil.py
-===================================================================
-diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
---- a/pysollib/mfxutil.py	(revision 279)
-+++ b/pysollib/mfxutil.py	(working copy)
-@@ -41,18 +41,18 @@
- Image = ImageTk = ImageOps = None
- if TOOLKIT == 'tk':
-     try: # PIL
--        import Image
--        import ImageTk
--        import ImageOps
-+        from PIL import Image
-+        from PIL import ImageTk
-+        from PIL import ImageOps
-     except ImportError:
-         Image = None
-     else:
-         # for py2exe
--        import GifImagePlugin
--        import PngImagePlugin
--        import JpegImagePlugin
--        import BmpImagePlugin
--        import PpmImagePlugin
-+        from PIL import GifImagePlugin
-+        from PIL import PngImagePlugin
-+        from PIL import JpegImagePlugin
-+        from PIL import BmpImagePlugin
-+        from PIL import PpmImagePlugin
-         Image._initialized = 2
- USE_PIL = False
- if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
-Index: scripts/cardset_viewer.py
-===================================================================
-diff --git a/scripts/cardset_viewer.py b/scripts/cardset_viewer.py
---- a/scripts/cardset_viewer.py	(revision 279)
-+++ b/scripts/cardset_viewer.py	(working copy)
-@@ -7,7 +7,7 @@
- from math import sqrt, sin, cos, pi
- from Tkinter import *
- try:
--    import Image, ImageTk
-+    from PIL import Image, ImageTk
- except ImportError:
-     Image = None
- 
diff --git a/games-board/pysolfc/files/pysolfc-pillow-6.patch b/games-board/pysolfc/files/pysolfc-pillow-6.patch
deleted file mode 100644
index 4682ed34683a..000000000000
--- a/games-board/pysolfc/files/pysolfc-pillow-6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py
---- PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py	2019-02-27 21:52:26.000000000 +0100
-+++ PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py	2019-04-03 14:09:51.059349643 +0200
-@@ -52,5 +52,5 @@
-         Image._initialized = 2
- USE_PIL = False
--if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
-+if TOOLKIT == 'tk' and Image:
-     USE_PIL = True
- 
-diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py
---- PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py	2019-02-27 21:52:26.000000000 +0100
-+++ PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py	2019-04-03 14:19:22.450363811 +0200
-@@ -354,5 +354,5 @@
-         return None
-     im = image._pil_image
--    if Image.VERSION >= '1.1.7':
-+    if True:
-         # use an alpha image
-         sh = Image.new('RGBA', im.size, color)
-- 
cgit v1.2.3