New version

(Portage version: 2.0.54)

6 files changed, 62 insertions, 52 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index de849a879c28..dc5c5c3a571b 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.2 2006/04/01 15:10:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.3 2006/04/01 20:23:26 ribosome Exp $
+
+  01 Apr 2006; Olivier Fisette <ribosome@gentoo.org> -numpy-0.9.4.ebuild,
+  +numpy-0.9.6.ebuild:
+  Removed old version.
+
+*numpy-0.9.6 (01 Apr 2006)
+
+  01 Apr 2006; Olivier Fisette <ribosome@gentoo.org> +numpy-0.9.6.ebuild:
+  New version. Thanks to bicatali and Sebastien Fabbro <seb@ist.utl.pt> for
+  their work.
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org> numpy-0.9.4.ebuild:
   Mark 0.9.4 ~ia64
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 4840ed2fbb1f..55da2cc5e92b 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,22 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7309be617ba18ae1695f86a2fd73d3d6 ChangeLog 446
-RMD160 36a1be25173e21e6a250a0fd067a3295d3fd8044 ChangeLog 446
-SHA256 fe374f39f2b5e27335a0e3047c5716bf27941146bd3dcce8a8ff1ef999f31b23 ChangeLog 446
 MD5 22d45be0cf5e365559a44bf0d4f5d512 files/digest-numpy-0.9.4 63
-RMD160 f40eb40e20de9d020f55416172d453dbf7190a50 files/digest-numpy-0.9.4 63
-SHA256 00f23ecc779610abdd46c8acd08b1c0d884d52840899acb000c8f7b7874d7735 files/digest-numpy-0.9.4 63
+MD5 3d1644c7fef9abd10cb81c674838b436 files/digest-numpy-0.9.6 63
 MD5 485ea1fb2083d4705baa1e4efb747e95 metadata.xml 600
-RMD160 4ef3f91f075252029a2b70934ed3ccb871d8d5be metadata.xml 600
-SHA256 180aedfa033a20855f09b016cfb9e9cb577c8bfd284108005bff35006458dc08 metadata.xml 600
 MD5 d6e285c5b7792aded9ae7edf8ee02f79 numpy-0.9.4.ebuild 724
-RMD160 c7282bee315bdfe895109a6c2f5681ed200eef73 numpy-0.9.4.ebuild 724
-SHA256 760332d0198aef4d795e757a1b0a184a6cb9798a637a29a5d72b7302df50923d numpy-0.9.4.ebuild 724
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFELpgLJrHF4yAQTrARAiEmAJ9J5m7qgwS1QDpFfwv0jPk9PYHEbwCfbhPB
-mlfhhIGHYeAEhU7ZVZiq5Cc=
-=7lKo
------END PGP SIGNATURE-----
+MD5 04c542ab54b370936205c9a08cab2af7 numpy-0.9.6.ebuild 1096
diff --git a/dev-python/numpy/files/digest-numpy-0.9.4 b/dev-python/numpy/files/digest-numpy-0.9.4
deleted file mode 100644
index d61e93e87426..000000000000
--- a/dev-python/numpy/files/digest-numpy-0.9.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 104ef1beb4b0182be52e2c0849305427 numpy-0.9.4.tar.gz 908192
diff --git a/dev-python/numpy/files/digest-numpy-0.9.6 b/dev-python/numpy/files/digest-numpy-0.9.6
new file mode 100644
index 000000000000..c1ad4cdc2d01
--- /dev/null
+++ b/dev-python/numpy/files/digest-numpy-0.9.6
@@ -0,0 +1 @@
+MD5 eac9ae05bd7511cecf1ffd12da0e1993 numpy-0.9.6.tar.gz 951680
diff --git a/dev-python/numpy/numpy-0.9.4.ebuild b/dev-python/numpy/numpy-0.9.4.ebuild
deleted file mode 100644
index 004762b252fe..000000000000
--- a/dev-python/numpy/numpy-0.9.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-0.9.4.ebuild,v 1.3 2006/04/01 15:10:57 agriffis Exp $
-
-inherit distutils
-
-DESCRIPTION="Numpy contains a powerful N-dimensional array object for Python."
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
-HOMEPAGE="http://numeric.scipy.org/"
-DEPEND=">=dev-lang/python-2.3
-	virtual/lapack
-	virtual/blas"
-IUSE=""
-SLOT="0"
-KEYWORDS="~ia64 ~x86"
-LICENSE="BSD"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s: f77blas: blas:g" \
-		-e "s:'f77blas':'blas':g" \
-		numpy/distutils/system_info.py
-}
-
-src_install() {
-	distutils_src_install
-	dodoc numpy/doc/*
-}
-
diff --git a/dev-python/numpy/numpy-0.9.6.ebuild b/dev-python/numpy/numpy-0.9.6.ebuild
new file mode 100644
index 000000000000..96f6fa57b442
--- /dev/null
+++ b/dev-python/numpy/numpy-0.9.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-0.9.6.ebuild,v 1.1 2006/04/01 20:23:26 ribosome Exp $
+
+inherit distutils
+
+DESCRIPTION="Numpy contains a powerful N-dimensional array object for Python."
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
+HOMEPAGE="http://numeric.scipy.org/"
+DEPEND=">=dev-lang/python-2.3
+	lapack? ( virtual/blas )
+	lapack? ( virtual/lapack )"
+IUSE="lapack"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# note the default are fine to use with
+	# blas/lapack reference and mkl.
+	if use lapack; then
+		echo "[atlas]"  > site.cfg
+		echo "atlas_libs = lapack, blas, cblas, atlas" >> site.cfg
+	else
+		echo "[DEFAULT]" > site.cfg
+		echo "library_dirs =" >> site.cfg
+		echo "include_dirs =" >> site.cfg
+		echo "src_dirs =" >> site.cfg
+		echo "[blas_opt] =" >> site.cfg
+		echo "[lapack_opt] =" >> site.cfg
+	fi
+}
+
+# he test only works after install
+# to be worked out.
+#src_test() {
+#	python -c "import numpy; numpy.test()" || \
+#		die "test failed!"
+#}
+
+src_install() {
+	distutils_src_install
+	dodoc numpy/doc/*
+}
+
+