pruned old numpy and added numpy-0.9.6-r1

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@154 32389bae-6d03-0410-99cf-db05cde120eb

6 files changed, 23 insertions, 107 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index abcdf4b75..d07d59611 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,11 +1,27 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.3 2006/04/01 20:23:26 ribosome Exp $
 
-*numpy-0.9.6 (15 Mar 2006)
 
-  15 Mar 2006; Sebastien Fabbro <seb@ist.utl.pt> +numpy-0.9.6.ebuild:
-  Added lapack use flag, a src_test function, and marked ~amd64.
+
+*numpy-0.9.8 (11 Apr 2006)
+
+  11 Apr 2006; Sebastien Fabbro <seb@ist.utl.pt> +numpy-0.9.6-r1.ebuild:
+  Fixed default atlas, and lapack stuff.
+  Note at comment below: bicatali is Sebastien Fabbro!
+
+  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
 
 *numpy-0.9.4 (07 Feb 2006)
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 90bf67839..aa734f4f2 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,5 +1,3 @@
-MD5 3abf235b64d60ff95dec5b02d7840e28 ChangeLog 430
-MD5 5238e63b838e1c26ed682d2c3050cea8 files/digest-numpy-0.9.5 63
-MD5 3d1644c7fef9abd10cb81c674838b436 files/digest-numpy-0.9.6 63
-MD5 04c542ab54b370936205c9a08cab2af7 numpy-0.9.5.ebuild 1096
-MD5 d2d9fcf991f67d76b6257555c8450ec8 numpy-0.9.6.ebuild 1243
+MD5 26db9e168cc8ab64a4fc1322cc7574a9 ChangeLog 960
+MD5 3d1644c7fef9abd10cb81c674838b436 files/digest-numpy-0.9.6-r1 63
+MD5 b92abce8fdd92dcf11a3bf96958718a3 numpy-0.9.6-r1.ebuild 1283
diff --git a/dev-python/numpy/files/digest-numpy-0.9.5 b/dev-python/numpy/files/digest-numpy-0.9.5
deleted file mode 100644
index 907083862..000000000
--- a/dev-python/numpy/files/digest-numpy-0.9.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47fe186078c5e1f68b37e0ffc4994178 numpy-0.9.5.tar.gz 923172
diff --git a/dev-python/numpy/files/digest-numpy-0.9.6 b/dev-python/numpy/files/digest-numpy-0.9.6
deleted file mode 100644
index c1ad4cdc2..000000000
--- a/dev-python/numpy/files/digest-numpy-0.9.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eac9ae05bd7511cecf1ffd12da0e1993 numpy-0.9.6.tar.gz 951680
diff --git a/dev-python/numpy/numpy-0.9.5.ebuild b/dev-python/numpy/numpy-0.9.5.ebuild
deleted file mode 100644
index f141ca9fe..000000000
--- a/dev-python/numpy/numpy-0.9.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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/*
-}
-
-
diff --git a/dev-python/numpy/numpy-0.9.6.ebuild b/dev-python/numpy/numpy-0.9.6.ebuild
deleted file mode 100644
index af5b4605b..000000000
--- a/dev-python/numpy/numpy-0.9.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit distutils
-
-DESCRIPTION="Powerful N-dimensional array object and processing 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}"
-
-	if use lapack; then
-		# only modify [atlas]
-		# the default [blas] and [lapack] are fine
-		# for other implementations
-		echo "[atlas]"  > site.cfg
-		echo "include_dirs = /usr/include/atlas" >> site.cfg
-		echo "atlas_libs = lapack, blas, cblas, atlas" >> site.cfg
-		echo -n "library_dirs = /usr/$(get_libdir)/lapack:" >> site.cfg
-		if [ -d "/usr/$(get_libdir)/blas/threaded-atlas" ]; then
-			echo "/usr/$(get_libdir)/blas/threaded-atlas" >> site.cfg
-		elif [ -d "/usr/$(get_libdir)/blas/atlas" ]; then
-			echo "/usr/$(get_libdir)/blas/atlas" >> site.cfg
-		fi
-		
-	else
-		export ATLAS=None
-		export PTATLAS=None
-		export BLAS=None
-		export LAPACK=None
-		echo "[lapack_opt] =" >> site.cfg
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	dodoc numpy/doc/*
-}