Fix PIL imports for pillow, bug 471524.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 91 insertions, 11 deletions

diff --git a/media-gfx/fontypython/ChangeLog b/media-gfx/fontypython/ChangeLog
index 96b745eb8da0..55a7eb379792 100644
--- a/media-gfx/fontypython/ChangeLog
+++ b/media-gfx/fontypython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/fontypython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/ChangeLog,v 1.17 2013/02/05 01:18:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/ChangeLog,v 1.18 2013/09/09 04:29:16 floppym Exp $
+
+*fontypython-0.4.4-r1 (09 Sep 2013)
+
+  09 Sep 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/fontypython-pillow.patch, +fontypython-0.4.4-r1.ebuild:
+  Fix PIL imports for pillow, bug 471524.
 
 *fontypython-0.4.4 (05 Feb 2013)
 
@@ -74,4 +80,3 @@
 
   15 Sep 2007; Samuli Suominen <drac@gentoo.org> +fontypython-0.2.0.ebuild:
   Initial commit.
-
diff --git a/media-gfx/fontypython/Manifest b/media-gfx/fontypython/Manifest
index 50bfa477bb26..29bd349814df 100644
--- a/media-gfx/fontypython/Manifest
+++ b/media-gfx/fontypython/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX fontypython-pillow.patch 1275 SHA256 fefb6a4c71a8ad99f19e0ea79987732a839ed997a58f9d9d7b8416a250bd6eec SHA512 6efce50dee7fd69b27803143371bb3bc9c51b1c027a2bcf4bc6543c130e71462ee79b20efa1ac15ad1215c225e053e8cf1203704ba41eefcbac82c93f597432e WHIRLPOOL ac1a0f06c3a36f48fc2dc3820754a3e04d631ccdc61738e78dc4ac9f82cf5da5db812a4ea61af42da5abb68ce5446be0f45b4e2a8406468c40ea1aa290dcc42f
 DIST fontypython-0.4.2.3.tar.gz 344039 SHA256 9e2da2fd79aa70fbc3cb2ebc93981ea450ebb48144cb489337537679b566edff SHA512 2df8576bc3b013e03090c2f41652ee040165c8de760b440869a642110e5d5692ff03e40a64301bd62a7861f389927d3af0e9f224929493bac2fe04d61ce83e66 WHIRLPOOL e4604f57bef9d693dfe8e8fe081df30670a1e7ec10cb999d375aa2479981ccfc9fb41badf693702a6534d3c28b32dc9a4c0dbfc1f1940fc022444086b5a98d16
 DIST fontypython-0.4.4.tar.gz 361335 SHA256 cb7ecba75f35b1db2ae0b171c06433cd119be98b589a5af2f7642a343ff97a4b SHA512 a89c654c9dcd8fc89d3ad91772f856d2d2570a96b3b60f52eed9db217f45e91a55f3044f0e4d1736c5402cde3a6598a353ae59285c892e80034f7baba15f9825 WHIRLPOOL c4a5364108bba2595cecf13f4532115bdaa24503ea9f1d949d618927b51e4d11df710e050fc93442cb42c012bb315e4e53ff8e2adf9f9c32b4b5cd6e1905e11b
 EBUILD fontypython-0.4.2.3.ebuild 853 SHA256 6188fd0930e56fb55f135082c76d7aaf9a0c59835f6b5d7a65a6849a289c423e SHA512 d6ca996d1b2a8d9a44b79c363958b45b7ce29fa902da93531cc274d9de5ebbf7698f3648aabad99100351e0c7f62097f43ea7dc7d1ee2bc829a4f768944296ec WHIRLPOOL 02db46eef4a6a7aac7c1d79e327c03e6c795a490ca6cb49560724411d926e740c17ea33dc4a1147be71360e323462364f5aced2e16512a7de1be7e99cab06a83
+EBUILD fontypython-0.4.4-r1.ebuild 926 SHA256 05344100356c10f22281b7131a5a7ceb8e4c540ba637c5b9dc86e9c44ef83f65 SHA512 bfac5452aee203089f97712b413354bccb2ebbfb955046c0806a18e6ae93edb04bdb40d67619c8da897552eafb71274eb156f0d23943a14ebccbea085aab5d16 WHIRLPOOL 75616076636d0ea96066b6a28065ce346cfc8d57c2bac076fc76a6a169e29e11897f4ec2cab90f86db330077a58a3b9a578f38fc6084238dd754da7ceb2a30d8
 EBUILD fontypython-0.4.4.ebuild 859 SHA256 0176ab451f92d0ff518732b9c75c264c26214cee2d36b2ff9f3aa94de886d50b SHA512 ba8458a5b084bbfdfacfcc4f644f9c27b4234f9fdb459d1754a0b8fd77c4499f233c8a5a5c371835360311b4e205e6bdc14b01b1dcbc726ce94b14f02cbcbe94 WHIRLPOOL 2d9ea9d9272fa655a7b4fb4bf9c9dc26690f7fa1366e168c73f4ae849088ca4502279f0e7630a9c7aef03d3b2fc31325ac6386f5f8d06330c1a5c9be8b53a2b4
-MISC ChangeLog 2610 SHA256 88cc4c669dff045bbf602af870f8977541f8362b2a38d91c0e6a8307bbaec73e SHA512 69e5130ab58a5d08cf385a63cee14947c526f1fc1519bd9fa5e1434d2791d197914c882227c1e5b9be2a1ca18c186ff5985aa14ea258d5b5e5472db5336d858f WHIRLPOOL 3de62e677277f6248be524e121703dc0aac1ae3449f6c06dbb9b9df5b9eb411fb9714895aea78a7a809fd101d9c9a84be1d1b28da4b9d3f5e29155d04838474a
+MISC ChangeLog 2801 SHA256 ceb4a471e00dfb834a73c6eaa9d441ace0b74448e701c624f755b048926fa005 SHA512 2f3ed91ce66ad4f592a83e758391d901ac8ae781a3a820e8c0a1c9d17d41c20afa31de4c78ee928bb773aaedc17ac633a1669cb5d0e735a73efee604dcb9f79a WHIRLPOOL 2c34814f58acd5ef549ab069fee74fd6d969611f6c5b632a78f62a160065105de3173cb44b5e48a77ffb50ac096d383f2f7f85a971f098fba689a8e42fc7587d
 MISC metadata.xml 184 SHA256 5976ad843386b1f0898c86c4d2737d683c372bce0e445a3408fbc09e700a6946 SHA512 7632236a8d4feac29b81decd1a17c114fb318bad5377faa6d01c88cfcd6d3df13044ef904321c523c3f432c6349593de99a1ac8cd04b7a2373bde20e32c0caf7 WHIRLPOOL f934d526a58203874358403ff94883aa9e3dbf1d9ef04d2cefb74272da1f75e055a788b330e83ce769ccfaaaf37e4efb090140481dd0bd9d7b62f2dc4e69691a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJREGBzAAoJEO04vUmVeoRjz2QH/Aodalf9oOAYZBMU89wq7S/7
-I3mN1AJ8lw/M6MFKhWKRZ4mZQk69fib0ZhuQUpy0AnHeP4yZe8hrWs+63qaoMQ+a
-MARNVRij88W3tMAu6UqDnWncomJ0LJyEaeHGsmb3v/7hfh2oUnAlMVxNb84PszBk
-fweewSaW1j+LVBbxNgl9qpgyDMFB3Oyp4cmfrugPwoBLZ73EGqcGyWY8ckqO2kCc
-2OHpMfQvExtymPBTZolJbTM82q4OG/ohBgc1zOLlc6Ali60L0fgYl88wEhOJa7zy
-HcxBo/xoQFqR9i+6efAMRQMe/1Ooi4Z0F/zTrTFYhzKVBS0o1YmMEHwNSVuEhP0=
-=DD5u
+iF4EAREIAAYFAlItTp0ACgkQC77qH+pIQ6Ry7QD/ZGeytW0LNfatHUw0lYR+3k+f
+9CcsDdiyk4Kdbx6n6poA/jtjSVF2PrYyA7deIdskCeJz5uu6TjKgs02PrxkIqoHm
+=f/Bm
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fontypython/files/fontypython-pillow.patch b/media-gfx/fontypython/files/fontypython-pillow.patch
new file mode 100644
index 000000000000..9b7966f55061
--- /dev/null
+++ b/media-gfx/fontypython/files/fontypython-pillow.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471524
+
+diff --git a/fontypythonmodules/fontcontrol.py b/fontypythonmodules/fontcontrol.py
+index e156758..cff34f5 100644
+--- a/fontypythonmodules/fontcontrol.py
++++ b/fontypythonmodules/fontcontrol.py
+@@ -16,7 +16,7 @@
+ ##	along with Fonty Python.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ import os, sys, locale, glob, errno
+-import Image, ImageFont, ImageDraw 
++from PIL import Image, ImageFont, ImageDraw 
+ import fontybugs, fpsys
+ from pathcontrol import *
+ 
+diff --git a/fontypythonmodules/fpsys.py b/fontypythonmodules/fpsys.py
+index f9572ae..fa1a98f 100644
+--- a/fontypythonmodules/fpsys.py
++++ b/fontypythonmodules/fpsys.py
+@@ -159,7 +159,7 @@ def checkFonts( dirtocheck, printer ):
+ 	global segfonts
+ 	
+ 	code = """
+-import ImageFont
++from PIL import ImageFont
+ try:
+ 	font=ImageFont.truetype("%s", 24, 0)
+ 	dud=font.getname()
+diff --git a/fontypythonmodules/sanitycheck.py b/fontypythonmodules/sanitycheck.py
+index cf4fcc1..7e46e9a 100644
+--- a/fontypythonmodules/sanitycheck.py
++++ b/fontypythonmodules/sanitycheck.py
+@@ -24,7 +24,7 @@ import imp
+ 
+ ## PIL : Is it there?
+ try: 
+-	import Image, ImageFont, ImageDraw 
++	from PIL import Image, ImageFont, ImageDraw 
+ except: 
+ 	print strings.PILError
+ 	raise SystemExit
diff --git a/media-gfx/fontypython/fontypython-0.4.4-r1.ebuild b/media-gfx/fontypython/fontypython-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..43e1e3c92a97
--- /dev/null
+++ b/media-gfx/fontypython/fontypython-0.4.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/fontypython-0.4.4-r1.ebuild,v 1.1 2013/09/09 04:29:16 floppym Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
+
+inherit distutils eutils multilib python
+
+DESCRIPTION="Font preview application"
+HOMEPAGE="http://savannah.nongnu.org/projects/fontypython"
+SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Crashes w/ debug build of wxGTK (#201315)
+DEPEND="dev-python/pillow
+	dev-python/wxpython:2.8
+	x11-libs/wxGTK:2.8[-debug]"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="fontypythonmodules"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-pillow.patch"
+}
+
+src_install() {
+	distutils_src_install
+	doman "${S}"/fontypython.1
+}