Update EAPI. Fix dependencies. Fix PYTHON_MODNAME.

(Portage version: 2.2.0_alpha2_p2/cvs/Linux x86_64)

2 files changed, 38 insertions, 20 deletions

diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index 06df12e02f5a..054ee4592d9d 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.59 2010/10/30 23:06:27 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.60 2010/10/30 23:21:01 arfrever Exp $
+
+  30 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  imaging-1.1.7.ebuild:
+  Update EAPI. Fix dependencies. Fix PYTHON_MODNAME.
 
   30 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -imaging-1.1.6-r1.ebuild, -files/imaging-1.1.6-giftrans.patch,
diff --git a/dev-python/imaging/imaging-1.1.7.ebuild b/dev-python/imaging/imaging-1.1.7.ebuild
index 501cd3abd934..43f9a68ca33d 100644
--- a/dev-python/imaging/imaging-1.1.7.ebuild
+++ b/dev-python/imaging/imaging-1.1.7.ebuild
@@ -1,9 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7.ebuild,v 1.8 2010/03/07 12:51:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7.ebuild,v 1.9 2010/10/30 23:21:01 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+PYTHON_USE_WITH_OPT="tk"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit eutils distutils
 
@@ -20,25 +24,32 @@ IUSE="doc examples scanner tk X"
 
 DEPEND="media-libs/jpeg:0
 	media-libs/freetype:2
-	tk? ( dev-lang/python[tk?] )
 	scanner? ( media-gfx/sane-backends )
 	X? ( x11-misc/xdg-utils )"
 RDEPEND="${DEPEND}"
 
-RESTRICT_PYTHON_ABIS="3*"
-
-PYTHON_MODNAME=PIL
 S="${WORKDIR}/${MY_P}"
 
+DOCS="CHANGES CONTENTS"
+
+pkg_setup() {
+	PYTHON_MODNAME="PIL $(use scanner && echo sane.py)"
+	python_pkg_setup
+}
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-xv.patch
-	epatch "${FILESDIR}"/${P}-sane.patch
-	epatch "${FILESDIR}"/${P}-giftrans.patch
-	epatch "${FILESDIR}"/${P}-missing-math.patch
+	distutils_src_prepare
+
+	epatch "${FILESDIR}/${P}-no-xv.patch"
+	epatch "${FILESDIR}/${P}-sane.patch"
+	epatch "${FILESDIR}/${P}-giftrans.patch"
+	epatch "${FILESDIR}/${P}-missing-math.patch"
+
 	sed -i \
 		-e "s:/usr/lib\":/usr/$(get_libdir)\":" \
 		-e "s:\"lib\":\"$(get_libdir)\":g" \
 		setup.py || die "sed failed"
+
 	if ! use tk; then
 		# Make the test always fail
 		sed -i \
@@ -49,9 +60,11 @@ src_prepare() {
 
 src_compile() {
 	distutils_src_compile
+
 	if use scanner; then
-		cd "${S}/Sane"
+		pushd Sane > /dev/null
 		distutils_src_compile
+		popd > /dev/null
 	fi
 }
 
@@ -63,17 +76,17 @@ src_test() {
 }
 
 src_install() {
-	local DOCS="CHANGES CONTENTS"
 	distutils_src_install
 
-	use doc && dohtml Docs/*
+	if use doc; then
+		dohtml Docs/* || die "dohtml failed"
+	fi
 
 	if use scanner; then
-		cd "${S}/Sane"
+		pushd Sane > /dev/null
 		docinto sane
-		local DOCS="CHANGES sanedoc.txt"
-		distutils_src_install
-		cd "${S}"
+		DOCS="CHANGES sanedoc.txt" distutils_src_install
+		popd > /dev/null
 	fi
 
 	# Install headers required by media-gfx/sketch.
@@ -86,10 +99,11 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins Scripts/*
+		doins Scripts/* || die "doins failed"
+
 		if use scanner; then
 			insinto /usr/share/doc/${PF}/examples/sane
-			doins Sane/demo_*.py
+			doins Sane/demo_*.py || die "doins failed"
 		fi
 	fi
 }