dev-python/mpmath: Bump EAPI to 4, fix testing, #422593

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

5 files changed, 60 insertions, 27 deletions

diff --git a/dev-python/mpmath/ChangeLog b/dev-python/mpmath/ChangeLog
index 60deb8970bf1..8432ea3fddc4 100644
--- a/dev-python/mpmath/ChangeLog
+++ b/dev-python/mpmath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/mpmath
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/ChangeLog,v 1.19 2011/05/18 21:04:30 grozin Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/ChangeLog,v 1.20 2012/06/20 21:05:06 jlec Exp $
+
+  20 Jun 2012; Justin Lecher <jlec@gentoo.org> mpmath-0.16.ebuild,
+  mpmath-0.17.ebuild, metadata.xml:
+  Bump EAPI to 4, fix testing, #422593
 
   18 May 2011; Andrey Grozin <grozin@gentoo.org> mpmath-0.17.ebuild:
   Fixing prefix-related bug #367461, thanks to Steven Trogdon
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index 461db591708d..4f633ddbe8be 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX mpmath.patch 434 RMD160 98f7cae5be7ce35de368c75b07f5887825f42add SHA1 e31d384f41d5e6050c18f3134a965892e1d64180 SHA256 e15c6536596321479b5378d5919c9a310d1037c13de8c13c8f0421f95319dd19
 DIST mpmath-0.16.tar.gz 455158 RMD160 3156f0f284f7a03b70bfdbc73083ec5d26483dfe SHA1 95de722d97903911ec1f9cf9592e9e007b3348e4 SHA256 2087f65d99f015a25210a8898d69d0dd433cb6ec1dbd86c32be17c7bad76d590
 DIST mpmath-all-0.17.tar.gz 2085528 RMD160 0a78f7e084c6a6194c567858e1ee620c2b1c0830 SHA1 3b9383498186d657a8cfc636610e5b0ff3f511a3 SHA256 cc33bcfe579139b0c07f3eb3841f1409f36896fe64e9f932f5f9e4915fdeeb88
 DIST mpmath-docsrc-0.16.tar.gz 1627460 RMD160 e7a04a11982db4d15487444b751b55ac0fd8bbf7 SHA1 eea0fbaacf42e62bdc8589c3fd8eb14d03ecdb4d SHA256 87bb3169f65f567cb4229223ecf43cf6a5f7b3fcf6b3c8c83a550ea8a2b3bf8b
-EBUILD mpmath-0.16.ebuild 1593 RMD160 45b30b0b60b5871268858757845fc27e88bd0f73 SHA1 d1b36950bb54f4fd27c2042ad30e0f9df6d57390 SHA256 31c446b20294f8009e55ab0b2543250d009c2f5e7c5b5ac1e228004c8cb00942
-EBUILD mpmath-0.17.ebuild 1889 RMD160 38c7dc7eba0ba90a5c762c93fff5f27aa01b6012 SHA1 efe47db9a8635bf2905b1dcfb93e5f2034f61f28 SHA256 d8c4cd56f7ba0bf4473de5b364f3abd4cedaa6f1af41aea1774f19a4b9fda6c6
-MISC ChangeLog 2907 RMD160 bccfc881ad9f59b32d23baf12fc101dfe7f7837f SHA1 a686a8427ee4ee5b3603e960d87fe242781d6e24 SHA256 9355842bc577fd4645edaffded46056f1acdb9c8b27ebbea69444b727a46d432
-MISC metadata.xml 470 RMD160 b74b5ca58180fd6b6be33b851cd615e07cafbc67 SHA1 a7aa276fb3dbabc6d9fcf40d467a28a121d9fdae SHA256 c466e19e546fb12668ef035ddd0c2f779df1adb6705403631cdad4a63749d192
+EBUILD mpmath-0.16.ebuild 1698 RMD160 380f0ef5e453c67d6592e72e9e407303a7eb94fb SHA1 6e13dd9b00126a76c627bf280852e035d121454b SHA256 13f328dc233ce037218929b71461509b90717a9a6c2c026da11692de2211d952
+EBUILD mpmath-0.17.ebuild 2048 RMD160 fac9d73c8705b68d55e9fde2098a40cd09611d0a SHA1 6fe8689e7727a4f192d6a9218bf6704ff2a76431 SHA256 5e7afdf5bbe05c5f35f74037e246d33afe63bdb17af57380b60b7a944df6d4b3
+MISC ChangeLog 3048 RMD160 bd7a675c0f733d98ead1448e9300f4f203de257f SHA1 6da2ba30d6625533e30cdb6fcd9892df259df365 SHA256 44d3575e3eff8999caa9efa71586c15f8cf0257a238e228510a52f8946f5134f
+MISC metadata.xml 476 RMD160 1f7d15f5b4fe1eebe7bab5a0dbd25fb485185c38 SHA1 4c0c54e61c2b813a8bf4863ff583606d43e8e19e SHA256 a96e0846cffaad67fd8d0f6647fade9ba411dc52e6a186deac5fd7a4c1a697d3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/iOwgACgkQgAnW8HDreRZPqACgpPfGLPw6OgjtUybSOsaMaLP6
+W80An1NnO8p7Oqb2suMb9cK5yOuH8Ida
+=rYmd
+-----END PGP SIGNATURE-----
diff --git a/dev-python/mpmath/metadata.xml b/dev-python/mpmath/metadata.xml
index 38d6f0883ef6..ade8696b3c48 100644
--- a/dev-python/mpmath/metadata.xml
+++ b/dev-python/mpmath/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<maintainer>
-  <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
-</maintainer>
-<longdescription lang='en'>
+	<herd>sci-mathematics</herd>
+	<maintainer>
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<longdescription lang="en">
   A Python library for arbitrary-precision floating-point arithmetic
 </longdescription>
-<use>
-  <flag name='matplotlib'>Add support for <pkg>dev-python/matplotlib</pkg></flag>
-</use>
+	<use>
+		<flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/mpmath/mpmath-0.16.ebuild b/dev-python/mpmath/mpmath-0.16.ebuild
index 12de58afb134..bf20aeff23bc 100644
--- a/dev-python/mpmath/mpmath-0.16.ebuild
+++ b/dev-python/mpmath/mpmath-0.16.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.16.ebuild,v 1.4 2010/11/10 17:56:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.16.ebuild,v 1.5 2012/06/20 21:05:06 jlec Exp $
+
+EAPI=4
 
-EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
@@ -12,7 +13,8 @@ inherit distutils
 
 DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
 HOMEPAGE="http://code.google.com/p/mpmath/ http://pypi.python.org/pypi/mpmath"
-SRC_URI="http://mpmath.googlecode.com/files/${P}.tar.gz
+SRC_URI="
+	http://mpmath.googlecode.com/files/${P}.tar.gz
 	doc? ( http://mpmath.googlecode.com/files/${PN}-docsrc-${PV}.tar.gz )"
 
 LICENSE="BSD"
@@ -20,7 +22,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
 IUSE="doc examples gmp matplotlib"
 
-RDEPEND="gmp? ( dev-python/gmpy )
+RDEPEND="
+	gmp? ( dev-python/gmpy )
 	matplotlib? ( dev-python/matplotlib )"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )"
@@ -46,8 +49,11 @@ src_compile() {
 }
 
 src_test() {
-	cd mpmath/tests
-	distutils_src_test
+	testing() {
+		cd "${S}"/mpmath/tests
+		PYTHONPATH="${S}/build-${PYTHON_ABI}/lib" "$(PYTHON)" runtests.py
+	}
+	python_execute_function testing
 }
 
 src_install() {
diff --git a/dev-python/mpmath/mpmath-0.17.ebuild b/dev-python/mpmath/mpmath-0.17.ebuild
index c290390a53dd..a62110fe3ef3 100644
--- a/dev-python/mpmath/mpmath-0.17.ebuild
+++ b/dev-python/mpmath/mpmath-0.17.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.17.ebuild,v 1.2 2011/05/18 21:04:30 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.17.ebuild,v 1.3 2012/06/20 21:05:06 jlec Exp $
+
+EAPI=4
 
-EAPI="3"
 PYTHON_DEPEND="*:2.5"
 SUPPORT_PYTHON_ABIS="1"
 DISTUTILS_SRC_TEST="py.test"
@@ -11,6 +12,7 @@ inherit distutils eutils
 
 MY_PN=${PN}-all
 MY_P=${MY_PN}-${PV}
+
 DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
 HOMEPAGE="http://code.google.com/p/mpmath/ http://pypi.python.org/pypi/mpmath"
 SRC_URI="http://mpmath.googlecode.com/files/${MY_P}.tar.gz"
@@ -20,14 +22,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
 IUSE="doc examples gmp matplotlib"
 
-RDEPEND="gmp? ( dev-python/gmpy )
+RDEPEND="
+	gmp? ( dev-python/gmpy )
 	matplotlib? ( dev-python/matplotlib )"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )"
 
-DOCS="CHANGES"
 S="${WORKDIR}/${MY_P}"
 
+DOCS="CHANGES"
+
 src_prepare() {
 	distutils_src_prepare
 
@@ -52,6 +56,14 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	testing() {
+		cd "${S}"/mpmath/tests
+		PYTHONPATH="${S}/build-${PYTHON_ABI}/lib" "$(PYTHON)" runtests.py
+	}
+	python_execute_function testing
+}
+
 src_install() {
 	distutils_src_install