added numpy-1.0_beta5, removed old versions

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

7 files changed, 76 insertions, 92 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 87d97c7e8..501e4efcc 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -2,21 +2,44 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  06 Jun 2006; Sebastien Fabbro <seb@ist.utl.pt> numpy-0.9.8.ebuild:
-  Blocks f2py (closes bug #131833). Tested with gcc-4.1, works. 
-  Does not compile with as-needed. Fixed home page and cleaning.
-		
-*numpy-0.9.8 (30 May 2006)
-
-  30 May 2006; Sebastien Fabbro <seb@ist.utl.pt> +numpy-0.9.8.ebuild:
-  Version bump. Changed homepage. Blocks f2py (closes bug #131833)
-  Tested with gcc-4.1, works. Does not compile with as-needed.
-	
-*numpy-0.9.6-r1 (11 Apr 2006)
-
-  11 Apr 2006; Sebastien Fabbro <seb@ist.utl.pt> +numpy-0.9.6-r1.ebuild:
-  Fixed default atlas, and lapack stuff. Changed homepage.
-  Note at comment below: bicatali and Sebastien Fabbro are the same.
+*numpy-1.0_beta5 (05 Sep 2006)
+
+  05 Sep 2006; Sebastien Fabbro <seb@ist.utl.pt> +numpy-1.0_beta5.ebuild:
+  Version bump. Filter --as-needed ldflags, but still buggy. 
+  Removed obsolete versions in overlay.
+
+*numpy-1.0_beta2 (16 Aug 2006)
+
+  16 Aug 2006; Alastair Tse <liquidx@gentoo.org> +numpy-1.0_beta2.ebuild:
+  version bump (#143964). restricted test because it does not work in sandbox.
+
+  17 Jul 2006; Alastair Tse <liquidx@gentoo.org> -numpy-0.9.6.ebuild,
+  -numpy-0.9.6-r1.ebuild, numpy-0.9.8.ebuild:
+  Stable bump for x86. Block on !dev-python/f2py because numpy provides
+  this package. (#131833)
+
+*numpy-0.9.8 (14 Jun 2006)
+
+  14 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; +numpy-0.9.8.ebuild:
+  Bump. Incorporates many changes from the science overlay, mainly from bicatali.
+
+  13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Add sci herd as co-maintainer.
+
+  13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  numpy-0.9.6-r1.ebuild:
+  Keyword ~ppc.
+
+  13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  numpy-0.9.6-r1.ebuild:
+  Fix up weird dep syntax.
+
+*numpy-0.9.6-r1 (13 Jun 2006)
+
+  13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/0.9.6-recognize-more-gfortran-versions.patch,
+  +numpy-0.9.6-r1.ebuild:
+  Patch to recognize Gentoo gfortran version strings.
 
   01 Apr 2006; Olivier Fisette <ribosome@gentoo.org> -numpy-0.9.4.ebuild,
   +numpy-0.9.6.ebuild:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 97a04e409..e8b88c85a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,5 +1,16 @@
-MD5 a9db9e9e6c486d789a347cd0493a12e9 ChangeLog 1335
-MD5 3d1644c7fef9abd10cb81c674838b436 files/digest-numpy-0.9.6-r1 63
-MD5 8f0b986d41688c7bf8b416bc3d1844e9 files/digest-numpy-0.9.8 63
-MD5 9185a676f9b9d796c4d7aaf5c91b9895 numpy-0.9.6-r1.ebuild 1281
-MD5 12ab1bc78a49fa6c69f031b2e31f741a numpy-0.9.8.ebuild 1309
+DIST numpy-1.0b5.tar.gz 1112924 RMD160 994baabc9df870dcdf5fbf62b1789e0d5fcb417b SHA1 001797105ba9924f50dc1115b5d5eaf1673e4d30 SHA256 6c275c479aeca7ed17524b923179c95e90fb3f8f10be762841c9198ad392e465
+EBUILD numpy-1.0_beta5.ebuild 1533 RMD160 4376348efd4f1f418aaccfc133e7d59f9425038c SHA1 e3a977b9b1f69673c2fb07c2e9a13f34ccf322a0 SHA256 0a7ee28dd21459eda0d2abd95c998d2a555d1693706f093b9d8bb6f851d18b1d
+MD5 7bb6ce8bce118e6998b66d931946eee1 numpy-1.0_beta5.ebuild 1533
+RMD160 4376348efd4f1f418aaccfc133e7d59f9425038c numpy-1.0_beta5.ebuild 1533
+SHA256 0a7ee28dd21459eda0d2abd95c998d2a555d1693706f093b9d8bb6f851d18b1d numpy-1.0_beta5.ebuild 1533
+MISC ChangeLog 1997 RMD160 16bc3704881e3d6270e8ece0894f8e812f1a8a39 SHA1 451e3a9ec78b3d594ec0a8551913a8966b573303 SHA256 852b91f701787e5fc7ee5e018b14f9c0613486b8d95039e6e637bf231aa1433a
+MD5 842dd8aa84aa2ee5aec1bd5f15525e82 ChangeLog 1997
+RMD160 16bc3704881e3d6270e8ece0894f8e812f1a8a39 ChangeLog 1997
+SHA256 852b91f701787e5fc7ee5e018b14f9c0613486b8d95039e6e637bf231aa1433a ChangeLog 1997
+MISC numpy-1.0_beta5.ebuild~ 1243 RMD160 7e578720cbf22c9e72744cb47b48b0859e6cdb4b SHA1 30155510f5ddf5b36612d93c111d06191b80b1b9 SHA256 8d59eebfae88d9d1b92d29bc8e277b932d1f7b1af38c60d9fed0a778fc5959ff
+MD5 9a1225d19b4ce1fb4692a3b4cd383ca5 numpy-1.0_beta5.ebuild~ 1243
+RMD160 7e578720cbf22c9e72744cb47b48b0859e6cdb4b numpy-1.0_beta5.ebuild~ 1243
+SHA256 8d59eebfae88d9d1b92d29bc8e277b932d1f7b1af38c60d9fed0a778fc5959ff numpy-1.0_beta5.ebuild~ 1243
+MD5 c8015059f7dfe664d4c4d801366fdfd1 files/digest-numpy-1.0_beta5 238
+RMD160 cac7746da7f215771286caad38a87fe63f27c4bf files/digest-numpy-1.0_beta5 238
+SHA256 3b9e3d704cf2d4de6b4e328e8fa268481ff4f8a687740dc6c7b8a69a3f081f86 files/digest-numpy-1.0_beta5 238
diff --git a/dev-python/numpy/files/digest-numpy-0.9.6-r1 b/dev-python/numpy/files/digest-numpy-0.9.6-r1
deleted file mode 100644
index c1ad4cdc2..000000000
--- a/dev-python/numpy/files/digest-numpy-0.9.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eac9ae05bd7511cecf1ffd12da0e1993 numpy-0.9.6.tar.gz 951680
diff --git a/dev-python/numpy/files/digest-numpy-0.9.8 b/dev-python/numpy/files/digest-numpy-0.9.8
deleted file mode 100644
index 4deecfde0..000000000
--- a/dev-python/numpy/files/digest-numpy-0.9.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca528d2b460a6567d70bb6bdf0dc1805 numpy-0.9.8.tar.gz 985088
diff --git a/dev-python/numpy/files/digest-numpy-1.0_beta5 b/dev-python/numpy/files/digest-numpy-1.0_beta5
new file mode 100644
index 000000000..ca7b62efe
--- /dev/null
+++ b/dev-python/numpy/files/digest-numpy-1.0_beta5
@@ -0,0 +1,3 @@
+MD5 2451bc1751a9bc1c22452cd71f846982 numpy-1.0b5.tar.gz 1112924
+RMD160 994baabc9df870dcdf5fbf62b1789e0d5fcb417b numpy-1.0b5.tar.gz 1112924
+SHA256 6c275c479aeca7ed17524b923179c95e90fb3f8f10be762841c9198ad392e465 numpy-1.0b5.tar.gz 1112924
diff --git a/dev-python/numpy/numpy-0.9.6-r1.ebuild b/dev-python/numpy/numpy-0.9.6-r1.ebuild
deleted file mode 100644
index 0a9f98525..000000000
--- a/dev-python/numpy/numpy-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,53 +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/"
-# temp fix force atlas, while eselect gets ready.
-DEPEND=">=dev-lang/python-2.3
-	lapack? ( sci-libs/blas-atlas )
-	lapack? ( sci-libs/lapack-atlas )"
-IUSE="lapack"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# sed to patch ATLAS libraries names
-	sed -i \
-		-e "s:f77blas: blas:g" \
-		-e "s:'f77blas':'blas':g" \
-		numpy/distutils/system_info.py
-
-	#
-	export MKL=None
-	export BLAS=None
-	export LAPACK=None
-	export PTATLAS=None
-
-	if use lapack; then
-		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
-		else
-			echo "/usr/$(get_libdir)/blas/atlas" >> site.cfg
-		fi
-	else
-		export ATLAS=None
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	dodoc numpy/doc/*
-}
diff --git a/dev-python/numpy/numpy-0.9.8.ebuild b/dev-python/numpy/numpy-1.0_beta5.ebuild
index 77fcd6910..f0b322c88 100644
--- a/dev-python/numpy/numpy-0.9.8.ebuild
+++ b/dev-python/numpy/numpy-1.0_beta5.ebuild
@@ -2,37 +2,32 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit distutils
+inherit distutils flag-o-matic
 
+MY_P=${P/_beta/b}
 DESCRIPTION="Multi-dimensional array object and processing for Python."
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
-HOMEPAGE="http://www.scipy.org/numpy"
-IUSE="lapack"
-
-# force atlas, while eselect blas/lapack gets more usable
+SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
+HOMEPAGE="http://numpy.scipy.org/"
+# numpy provides the latest version of dev-python/f2py
 DEPEND=">=dev-lang/python-2.3
 	!dev-python/f2py
-	lapack? ( sci-libs/blas-atlas sci-libs/lapack-atlas )"
+	lapack? ( virtual/blas
+		virtual/lapack )"
+IUSE="lapack"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="BSD"
+RESTRICT="test"
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	# sed to patch ATLAS libraries names (gentoo specific)
 	sed -i \
-		-e "s:f77blas: blas:g" \
-		-e "s:'f77blas':'blas':g" \
+		-e "s:f77blas:blas:g" \
 		numpy/distutils/system_info.py
 
-	#
-	export MKL=None
-	export BLAS=None
-	export LAPACK=None
-	export PTATLAS=None
-
 	if use lapack; then
 		echo "[atlas]"  > site.cfg
 		echo "include_dirs = /usr/include/atlas" >> site.cfg
@@ -46,8 +41,15 @@ src_unpack() {
 	else
 		export ATLAS=None
 	fi
+
+	# could not make it work with as-needed stuff
+	# it looks like you need to remove the ldflags in the make.conf
+	# and run env-update to really remove the as-needed. The filter does not seem to 
+	# do anything. Anyone has a clue?
+	#filter-ldflags -Wl,--as-needed --as-needed
 }
 
+
 src_install() {
 	distutils_src_install
 	dodoc numpy/doc/*