Add a src_test, fix mpi (bug #192443), longdescription, update numeric dep, and cleanup

Package-Manager: portage-2.1.2.12

5 files changed, 88 insertions, 27 deletions

diff --git a/dev-python/scientificpython/ChangeLog b/dev-python/scientificpython/ChangeLog
index 939dc36ac3d3..f4d17b7f4a9f 100644
--- a/dev-python/scientificpython/ChangeLog
+++ b/dev-python/scientificpython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/scientificpython
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.13 2007/02/22 00:51:13 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.14 2007/09/15 10:48:01 bicatali Exp $
+
+  15 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/scientificpython-mpi.patch, metadata.xml,
+  scientificpython-2.6.ebuild:
+  Add a src_test, fix mpi (bug #192443, thanks JTRiley
+  <justin.t.riley@gmail.com>), adde longdescription, updated numeric
+  dependency, and cleanup.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-python/scientificpython/Manifest b/dev-python/scientificpython/Manifest
index 203f429e78f9..6e7e9b25c345 100644
--- a/dev-python/scientificpython/Manifest
+++ b/dev-python/scientificpython/Manifest
@@ -1,24 +1,38 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX scientificpython-mpi.patch 403 RMD160 fcb18d760d73bd5d250c597b344ec33c665aab90 SHA1 93b9b6ac9588c7c332f422a8a520ced116f94881 SHA256 a36550c0c01ecb3c7eced75be15c343ef65bf3fefc9cada1d2cbb3521ede50af
+MD5 b6cfc0f117955ecd215a1d7353b03570 files/scientificpython-mpi.patch 403
+RMD160 fcb18d760d73bd5d250c597b344ec33c665aab90 files/scientificpython-mpi.patch 403
+SHA256 a36550c0c01ecb3c7eced75be15c343ef65bf3fefc9cada1d2cbb3521ede50af files/scientificpython-mpi.patch 403
 DIST ScientificPython-2.4.9.tar.gz 491370 RMD160 70bc5a918bf7fc368ba88306078b66931b8b3436 SHA1 077b6347940617999c23103bac9542d926ed7f69 SHA256 139bca0eed3e307d4e5d6b45b4111d2de8964c7ede657c7ea8ce7f7d218097d7
 DIST ScientificPython-2.6.tar.gz 514044 RMD160 5c9e8cba2373d722854cfe57e270803d7ed2bf2a SHA1 db5b0d369e8254130312553a13a70888537e637e SHA256 cfa06b0e5bdadfdc79328bfd01843f9e7b0a08f7c19d1f32a7ecec498be72cc0
 EBUILD scientificpython-2.4.9.ebuild 862 RMD160 a829d26897748138ed5f9683e580107e3724e810 SHA1 456e3e7a7707d400063486372c04f2be07ca990c SHA256 16819705dc363c429aab3e713ee47091f7ac5e2e2a63cfbc9c31541e79e96568
 MD5 9e972d386cb029fdc1c0407d1a51890b scientificpython-2.4.9.ebuild 862
 RMD160 a829d26897748138ed5f9683e580107e3724e810 scientificpython-2.4.9.ebuild 862
 SHA256 16819705dc363c429aab3e713ee47091f7ac5e2e2a63cfbc9c31541e79e96568 scientificpython-2.4.9.ebuild 862
-EBUILD scientificpython-2.6.ebuild 1058 RMD160 2310389f01cf84aa92bd3534f89bea38d0a607fa SHA1 c5c2a891055e6b178f381d30d3323c24f9aa558c SHA256 707c08b8f72b3875f959a84b1d494d4ace09c644f3967117423a15145bce696f
-MD5 1c3c538f10778314b8131ca7296e7660 scientificpython-2.6.ebuild 1058
-RMD160 2310389f01cf84aa92bd3534f89bea38d0a607fa scientificpython-2.6.ebuild 1058
-SHA256 707c08b8f72b3875f959a84b1d494d4ace09c644f3967117423a15145bce696f scientificpython-2.6.ebuild 1058
-MISC ChangeLog 4199 RMD160 5c54afb54c19920273ff529c0057e24745e091f7 SHA1 d8ecca8f32a33b3cfe00b8e0bb5e06795290b748 SHA256 f7e3a37e2562853fd12927af88efc678d8b2a34809303027c066f96f3085cfbd
-MD5 36eb37c9423f5547dba50f405962d8a4 ChangeLog 4199
-RMD160 5c54afb54c19920273ff529c0057e24745e091f7 ChangeLog 4199
-SHA256 f7e3a37e2562853fd12927af88efc678d8b2a34809303027c066f96f3085cfbd ChangeLog 4199
-MISC metadata.xml 176 RMD160 be161ab43aa0cbb1c5c585fd9b8ff535eea919de SHA1 f9fd4782b684fb34e2440e13f5d27976340bf8ec SHA256 00113e658cc98dad3d4f0ecf4bdce6a609fba11d41c73fd9c958eaba6f77f4f6
-MD5 010cb2cd5ae1e8e35bdbcd11610bad18 metadata.xml 176
-RMD160 be161ab43aa0cbb1c5c585fd9b8ff535eea919de metadata.xml 176
-SHA256 00113e658cc98dad3d4f0ecf4bdce6a609fba11d41c73fd9c958eaba6f77f4f6 metadata.xml 176
+EBUILD scientificpython-2.6.ebuild 1566 RMD160 82e5dd56c366af6b4a2c5c966bcd051f6eddee98 SHA1 9b74c900175893fa5311a98b159dd3acefad72a3 SHA256 63453b7231d961f18cbcb1f6c03069c540cfc73e3dd91c9402ac79f8eeaf5563
+MD5 7259160190754f867c8e016c24b4f1b1 scientificpython-2.6.ebuild 1566
+RMD160 82e5dd56c366af6b4a2c5c966bcd051f6eddee98 scientificpython-2.6.ebuild 1566
+SHA256 63453b7231d961f18cbcb1f6c03069c540cfc73e3dd91c9402ac79f8eeaf5563 scientificpython-2.6.ebuild 1566
+MISC ChangeLog 4491 RMD160 35ece96766b130a0a68f01c52d062f3021680a32 SHA1 048a3da1598669cb6daec30ce77ae002434b80bb SHA256 fbc82c9e253114151177258e508defb2994f035d3bfc05d75ad32512ff1ea184
+MD5 d1b674a5ac6e41229707f7e2e0a4d825 ChangeLog 4491
+RMD160 35ece96766b130a0a68f01c52d062f3021680a32 ChangeLog 4491
+SHA256 fbc82c9e253114151177258e508defb2994f035d3bfc05d75ad32512ff1ea184 ChangeLog 4491
+MISC metadata.xml 718 RMD160 94b835d89f4db13e4f46f31569c6ed681bf36a8b SHA1 7ee5cdd9b9cfec5f6e4b87e80e80ae66c9bb3bbf SHA256 4a897b19224d4777793df3ef707377a7d1deb46e632b850c327424219687d47c
+MD5 ca1057346f9882a59cdfe30a04c8e207 metadata.xml 718
+RMD160 94b835d89f4db13e4f46f31569c6ed681bf36a8b metadata.xml 718
+SHA256 4a897b19224d4777793df3ef707377a7d1deb46e632b850c327424219687d47c metadata.xml 718
 MD5 10d7bd846085adde582b9d014f28d4eb files/digest-scientificpython-2.4.9 268
 RMD160 ef7f06464725144a82c5a1c97adcede4000841c1 files/digest-scientificpython-2.4.9 268
 SHA256 8df02b79174bb7b1e05447422a458ff75c90ada6814c2fc6149e8a47694344c5 files/digest-scientificpython-2.4.9 268
 MD5 3aa27b7727f4fdd4fe85d08d398c18e5 files/digest-scientificpython-2.6 262
 RMD160 1a3dd17ce3dca0b2ae3efb9731f5c81ae598be79 files/digest-scientificpython-2.6 262
 SHA256 a7969a320c2a88d774c4e43e5bb74d2ef8167d0a3d4503c2cf3939291c2e9501 files/digest-scientificpython-2.6 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFG67ho1ycZbhPLE2ARAmRKAJ953+RAW8VlG6+qjEXBAB5Tlar5nQCfT85V
+VxWOjpYhiCoKcTDodMyLuIU=
+=J5Iu
+-----END PGP SIGNATURE-----
diff --git a/dev-python/scientificpython/files/scientificpython-mpi.patch b/dev-python/scientificpython/files/scientificpython-mpi.patch
new file mode 100644
index 000000000000..ee2e972f8f5d
--- /dev/null
+++ b/dev-python/scientificpython/files/scientificpython-mpi.patch
@@ -0,0 +1,11 @@
+--- Src/MPI/compile.py.orig	2007-09-15 11:11:53.739580548 +0100
++++ Src/MPI/compile.py	2007-09-15 11:12:49.798775179 +0100
+@@ -13,7 +13,7 @@
+ sources='mpipython.c Scientific_mpi.c'
+ 
+ 
+-cmd = '%s %s -o mpipython -I%s %s -L%s -lpython%s %s %s' % \
++cmd = '%s %s -o mpipython -I%s -I../../Include %s -L%s -lpython%s %s %s' % \
+     (mpicompiler, 
+     cfgDict['LINKFORSHARED'],
+     cfgDict['INCLUDEPY'],
diff --git a/dev-python/scientificpython/metadata.xml b/dev-python/scientificpython/metadata.xml
index 4e87bf14976c..a531d91d7247 100644
--- a/dev-python/scientificpython/metadata.xml
+++ b/dev-python/scientificpython/metadata.xml
@@ -3,4 +3,14 @@
 <pkgmetadata>
 <herd>python</herd>
 <herd>sci</herd>
+<longdescription lang="en">
+ScientificPython is a collection of Python modules that are useful for
+scientific computing. In this collection you will find modules that
+cover basic geometry (vectors, tensors, transformations, vector and
+tensor fields), quaternions, automatic derivatives, linear
+interpolation, polynomials, elementary statistics, nonlinear
+least-squares fits, unit calculations, Fortran-compatible text
+formatting, 3D visualization via VRML, and two Tk widgets for simple
+line plots and 3D wireframe models.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/scientificpython/scientificpython-2.6.ebuild b/dev-python/scientificpython/scientificpython-2.6.ebuild
index 9d13d3a4b64f..21158f67eadf 100644
--- a/dev-python/scientificpython/scientificpython-2.6.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.6.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.6.ebuild,v 1.2 2006/10/17 04:14:04 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.6.ebuild,v 1.3 2007/09/15 10:48:01 bicatali Exp $
 
 MY_P=${P/scientificpython/ScientificPython}
-S=${WORKDIR}/${MY_P}
 DV=1034 # hardcoded download version
 
-inherit distutils
+inherit eutils distutils
 
-IUSE="mpi"
 DESCRIPTION="Scientific Module for Python"
 SRC_URI="http://sourcesup.cru.fr/frs/download.php/${DV}/${MY_P}.tar.gz"
 HOMEPAGE="http://dirac.cnrs-orleans.fr/ScientificPython/"
@@ -16,25 +14,46 @@ SLOT="0"
 LICENSE="CeCILL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
-DEPEND="virtual/python
-	>=dev-python/numeric-23.0
+IUSE="mpi doc"
+
+DEPEND=">=dev-python/numeric-23.8
 	>=sci-libs/netcdf-3.0
 	mpi? ( virtual/mpi )"
 
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-mpi.patch
+}
+
 src_compile() {
 	distutils_src_compile
 	if use mpi; then
 		cd Src/MPI
-		${python} compile.py
-		dobin mpipython || die "dobin failed"
+		"${python}" compile.py || die "compile mpi failed"
 	fi
 }
 
+src_test() {
+	cd "${S}"/build/lib*
+	for t in "${S}"/Tests/*tests.py; do
+		PYTHONPATH=. "${python}" ${t} || die "test $(basename ${t}) failed"
+	done
+}
+
 src_install() {
 	distutils_src_install
-
-	dodoc MANIFEST.in README* Doc/CHANGELOG Doc/*.pdf
-	dohtml Doc/Reference/*
-	docinto Examples; dodoc Examples/*
-	docinto Examples/BSP; dodoc Examples/BSP/*
+	# do not install bsp related stuff, since we don't compile the interface
+	dodoc README README.MPI Doc/CHANGELOG || die "dodoc failed"
+	insinto /usr/share/doc/${PF}
+	doins Examples/{demomodule.c,netcdf_demo.py} || die "doins examples failed"
+	if use mpi; then
+		dobin Src/MPI/mpipython || die "dobin failed"
+		doins Examples/mpi.py || die "doins mpi example failed failed"
+	fi
+	if use doc; then
+		dohtml Doc/Reference/* || die "dohtml failed"
+	fi
 }