Fix dependencies. Restrict PyPy ABIs. Add doc USE flag. Call distutils_src_prepare(). Don't install tests. Patch by Arfrever.

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

2 files changed, 25 insertions, 18 deletions

diff --git a/dev-python/pyfltk/ChangeLog b/dev-python/pyfltk/ChangeLog
index 4a25033aa382..bd514ce735b2 100644
--- a/dev-python/pyfltk/ChangeLog
+++ b/dev-python/pyfltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyfltk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.29 2012/01/05 17:19:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.30 2012/01/06 21:24:15 hwoarang Exp $
+
+  06 Jan 2012; Markos Chandras <hwoarang@gentoo.org> pyfltk-1.3.0.ebuild:
+  Fix dependencies. Restrict PyPy ABIs. Add doc USE flag. Call
+  distutils_src_prepare(). Don't install tests. Patch by Arfrever.
 
   05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> pyfltk-1.3.0.ebuild:
   amd64/x86 stable wrt #395739
diff --git a/dev-python/pyfltk/pyfltk-1.3.0.ebuild b/dev-python/pyfltk/pyfltk-1.3.0.ebuild
index 83be327f55a8..db98182ad099 100644
--- a/dev-python/pyfltk/pyfltk-1.3.0.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.0.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.0.ebuild,v 1.2 2012/01/05 17:19:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.0.ebuild,v 1.3 2012/01/06 21:24:15 hwoarang Exp $
 
 # FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
 
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
+EAPI="4"
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 
 inherit distutils eutils
 
-MY_P=pyFltk-${PV}
+MY_P="pyFltk-${PV}"
 
 DESCRIPTION="Python interface to Fltk library"
 HOMEPAGE="http://pyfltk.sourceforge.net/"
@@ -21,27 +20,31 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
+IUSE="doc"
 
-RDEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.4"
+DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
+RDEPEND="${DEPEND}"
 
 PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
-PYTHON_MODNAME="fltk"
+
 DOCS="CHANGES README TODO"
+PYTHON_MODNAME="fltk"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-linux-3.x-detection.patch
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-linux-3.x-detection.patch"
+
+	# Disable installation of documentation and tests.
+	sed -e "/package_data=/d" -i setup.py || die "sed failed"
 }
 
 src_install() {
 	distutils_src_install
 
-	# FIXME: Install documentation ourself. Would some argument to distutils_src_install
-	# instead help?
-	rm -rf "${ED}"/usr/lib*/python*/site-packages/fltk/docs
-	dohtml fltk/docs/*
+	if use doc; then
+		dohtml fltk/docs/*
+	fi
+
 }