Convert to distutils-r1. Fix PIL imports, bug 471510.

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

3 files changed, 92 insertions, 1 deletions

diff --git a/dev-python/soya/ChangeLog b/dev-python/soya/ChangeLog
index 722714c6006c..1a0eb55569db 100644
--- a/dev-python/soya/ChangeLog
+++ b/dev-python/soya/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/soya
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.33 2013/02/14 22:12:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.34 2013/06/08 20:14:54 floppym Exp $
+
+*soya-0.14-r1 (08 Jun 2013)
+
+  08 Jun 2013; Mike Gilbert <floppym@gentoo.org> +files/soya-pillow.patch,
+  +soya-0.14-r1.ebuild:
+  Convert to distutils-r1. Fix PIL imports, bug 471510.
 
   14 Feb 2013; Agostino Sarubbo <ago@gentoo.org> soya-0.14.ebuild:
   Stable for ppc, wrt bug #457190
diff --git a/dev-python/soya/files/soya-pillow.patch b/dev-python/soya/files/soya-pillow.patch
new file mode 100644
index 000000000000..4f8df982ccf2
--- /dev/null
+++ b/dev-python/soya/files/soya-pillow.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471510
+--- a/editor/__init__.py
++++ b/editor/__init__.py
+@@ -52,7 +52,7 @@
+ 		
+ 		if obj.face.material and obj.face.material.texture:
+ 			try:
+-				import Image, ImageTk
++				from PIL import Image, ImageTk
+ 
+ 				self.image = Image.open(os.path.join(soya.path[0], obj.face.material.texture.filename))
+ 				
+@@ -71,7 +71,7 @@
+ 		self.cancel = self.master.cancel
+ 		
+ 	def label_conf(self, event = None):
+-		import Image, ImageTk
++		from PIL import Image, ImageTk
+ 		
+ 		if self.image_width != self.label.winfo_width():
+ 			self.image_width  = self.label.winfo_width()
diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
new file mode 100644
index 000000000000..4c32baf70844
--- /dev/null
+++ b/dev-python/soya/soya-0.14-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14-r1.ebuild,v 1.1 2013/06/08 20:14:54 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV="${PV/_}"
+MY_P="Soya-${MY_PV}"
+TUT_P="SoyaTutorial-${MY_PV}"
+
+DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
+HOMEPAGE="http://oomadness.nekeme.net/Soya/FrontPage"
+SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
+	doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
+	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples"
+
+DEPEND="=dev-games/ode-0.11.1
+	dev-python/editobj
+	>=dev-python/imaging-1.1.5[${PYTHON_USEDEP}]
+	>=dev-python/pyopenal-0.1.6[${PYTHON_USEDEP}]
+	media-fonts/freefonts
+	>=media-libs/cal3d-0.10
+	media-libs/freeglut
+	>=media-libs/freetype-2.1.5
+	>=media-libs/glew-1.3.3
+	>=media-libs/libsdl-1.2.8[opengl]
+	media-libs/openal
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glu.patch"
+	"${FILESDIR}/${PN}-pillow.patch"
+)
+
+python_compile() {
+	local CFLAGS=${CFLAGS}
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/${PF}
+	if use doc; then
+		cd "${WORKDIR}/${TUT_P}/doc"
+		doins soya_guide.pdf pudding/pudding.pdf || die "doins failed"
+	fi
+	if use examples; then
+		cd "${WORKDIR}/${TUT_P}"
+		doins -r tutorial || die "doins failed"
+	fi
+}