Fix PIL imports for pillow, bug 471524.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 84 insertions, 2 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/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
+}