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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 42 insertions, 28 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/Manifest b/dev-python/pyfltk/Manifest
index 8109911f0b45..e1ad63e517ac 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX pyfltk-1.1.5-swig-2.patch 283 RMD160 c28662fd7067b1b51d5622e57472b2c1ae6e889f SHA1 b87b765c81e4eb641dc7a8a8e18196cd5c5ec8ea SHA256 2d0d03d92fe881f46e66bb214b8cf5e28b35bef30cbf78ebeadf08c3182643cf
 AUX pyfltk-1.3.0-linux-3.x-detection.patch 679 RMD160 9591e3c8b2712bba0adbe5812f66a12819105481 SHA1 6a04aaf5b12983beb48165cba290b8b4bbfb0997 SHA256 ccc7ce0949cdacace00b71c1e438f343c87255fd8fbfa6fc9aad1911670edc55
@@ -7,17 +7,24 @@ DIST pyFltk-1.1.5.tar.gz 864463 RMD160 df6a0ab3f88e1f8fddba9542a0217cb32a215333
 DIST pyFltk-1.3.0.tar.gz 915600 RMD160 4605c5ef277323a60da6edd91743f3a7e0f970ae SHA1 82c40bc11e0cef5b191949587b7e58c3a740cd88 SHA256 c52852d21ee17d495185259b46ac9603d683edde7d7e6d4b6f9268da4ee3de57
 DIST pyfltkmanual.pdf 206137 RMD160 ea55c11127e41e3617ff86fe44ef3097f6fe4ad9 SHA1 672003a9d44b285a79a7172b2e498047da7c74fd SHA256 17a4806e6a0f75f0b458ceca1cfa6d8738cee2f1fb2d092aa5bd83882f9dd122
 EBUILD pyfltk-1.1.5.ebuild 1437 RMD160 75f424f6722f723aa881acdf723e51aab6a6ef7d SHA1 44e14a8f28e0e5eef2ba2e2f43d6c50efcaa59e6 SHA256 ba8d0ff595ddec6b7dc0394f3748dab1b97e0c3b3937e339bc00456c3d1514f1
-EBUILD pyfltk-1.3.0.ebuild 1145 RMD160 2988af54a823844ef6fa225ef58de9517ed1f793 SHA1 6780acf39c3b5ad1527273ad3eed03ddf72d9b0e SHA256 f69b5d1916b98d9f71dd699faba0512dfb7182b2fdbcc8da4b61cba53b2f6399
-MISC ChangeLog 3948 RMD160 c9bace698170f45e463929a94d5125bf3aad61a1 SHA1 66c9154e10e13e6d6411cff6bf3844c9abaaee44 SHA256 34b165417a9d339b46797d2f7ddd0bbcb3a256c6c0566bda5a5321d3aac29c31
+EBUILD pyfltk-1.3.0.ebuild 1133 RMD160 433b841eb04bf92105d2211f2be3cdaa2da7af9f SHA1 73ca48dea9c69e7b4954926bf2229a9b646454ff SHA256 cb23d905e30b28b9295edbbe4e73c054a95abad08c8323d08569dbe1c6710634
+MISC ChangeLog 4152 RMD160 b241962d7dcf3efc77d6fcfc09ac5b645c8965b5 SHA1 8bd8d69a08da77bce9533f577a4b426d63968edf SHA256 f5cad96979c2c43f97e48b62fc324e3dde16636bf627ddd3c728d2e2e02d5666
 MISC metadata.xml 314 RMD160 bfa1d9d8065cbf737b7d9f8c76f927df04b5d6f9 SHA1 5d19fc1121d414307f541e22e056f197be58409b SHA256 cde0c68fc1ead45abf7718c8cbcec1d679f2419f571d649ed658e34034b1428d
+MISC pyfltk-1.3.0.ebuild.orig 1145 RMD160 2988af54a823844ef6fa225ef58de9517ed1f793 SHA1 6780acf39c3b5ad1527273ad3eed03ddf72d9b0e SHA256 f69b5d1916b98d9f71dd699faba0512dfb7182b2fdbcc8da4b61cba53b2f6399
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPBdtAAAoJEEdUh39IaPFNaO0H/0UWXO3qs8cJT8KRSUz0qFv6
-czr8q4FxWLK4vL1p3IsmFo8LznwRYv7p7HqLFpOVkYArw2cMm4YBG69pjTNocqGP
-kIiTtXNQHOeVTohMC+Qgl5NaqyBFs/TIcxQ3HGGpmyi1PPTLhs+IEcz9byqTARGY
-Sj3Udb8t7cpx9QXeGdCu8rPbbeLm5W61DJBeG9sGxE08iriBO8czBZ3uBdQ/vTSe
-xr7QLxTxkGXCNWMY3H5J3c2rw/e46eqohqK0nkXyq27OPLidPz6soB7qmio9xm5H
-DyweqIRePXOFZ0GfoBe/ya7Tp6D3nJrEUZTcM0PrEzjQgokDyjGgnfwMnu5S1E8=
-=JJC9
+iQIcBAEBCgAGBQJPB2aDAAoJEPqDWhW0r/LCEmkP/2yE7tbR6RCAt5zxWJdXKXQu
+B/4/2/1jGGD25dNbp3mcYtjUvsGzjwuQjQpCP+7Gxgv8WM3n3F52nRTr/+ExOkLq
+oDDM6nXCczKIPQbeZN8FtrLOQkf5nQyOpHHvoxuwCOXxgvi80X/00B0YJraGBd1r
+RQztGwUe3iUgIvt1q1XVL92J+HhDaKRp8v2Ov8T2u/a1QJAyfuwA4KVQZUAeSltT
+7qrOELJOfO+IwFedH47egSqltfyCnvhndCSoNe65UBUMkwYEnmB3zu21pTnRdje+
+3SjMPIAo4zByhZx/9sn+Q2aLZY5K4po9ECd/o0TrKq1Nq5COjPSyAfGiP+y4vgFj
+5jh6l1nlLFZrvP98L61/z+K3/fMvOQl1xet0ZZIIo51ikwfXGTVyq/1IHIZOAEcB
+gjVY4qOxR75DZLDvc3j2JjWKqM5WYbY2VceX9dXRFIbv4P0iAeGgmwCiY5FEzMTo
+PXGxoNZ19WwrQ7iIKa+U6EABC58z0Ixm9sn+mey9LEgd1OKx8ig9AQK+xRbM4UXq
+oR9sf2TKBzYeROygyoLKl1JWJ7gCcpqKTkIbqM4q2gX11fh6sYNZ9qfHu680csg+
+yE1ywQsCDC9MUkUgeO6heI/1cPgsr0wNZEf2J5r1q/Dpd3GJGZ7oLPOOOQ496ob4
+2aFkEIBlXN/SxtChbZEu
+=WWQE
 -----END PGP SIGNATURE-----
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
+
 }