stable bump for x86, add block on dev-python/f2py because it provides the same package.

(Portage version: 2.1-r1)
 (Signed Manifest commit)

5 files changed, 18 insertions, 126 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index a9da7b8b94c9..a7b67c864e42 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,35 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.9.6-recognize-more-gfortran-versions.patch 828 RMD160 7b281fbc21c762b2739d68b85d8e19f3cf0159dc SHA1 4df7c54f8ac37a4e72db63cf2960d0897c06576e SHA256 e922584a37011f12f4236b805071a7787bdf812e638819735155b8a9d16c82df
 MD5 55e142d9ed082ef48eafdf63a45e84a6 files/0.9.6-recognize-more-gfortran-versions.patch 828
 RMD160 7b281fbc21c762b2739d68b85d8e19f3cf0159dc files/0.9.6-recognize-more-gfortran-versions.patch 828
 SHA256 e922584a37011f12f4236b805071a7787bdf812e638819735155b8a9d16c82df files/0.9.6-recognize-more-gfortran-versions.patch 828
-DIST numpy-0.9.6.tar.gz 951680 RMD160 17182408135857b2ada0db7579e2c81d2baf9eb6 SHA1 f7ac718abd1cd8397e36acc58b8ce49a261dfbbb SHA256 8527a12c5e4399e476fab497cf76729519e14be818ccc7479af3087facb06f58
 DIST numpy-0.9.8.tar.gz 985088 RMD160 6059d103ae0c89f946da906f0cddcb9cd1f6b59b SHA1 d468f66849f8672a611004a64726fc6ea7195c83 SHA256 1cac3bb08d5a64b9877eb458b7235bf33bdb591136cb08e4561b6210756750c1
-EBUILD numpy-0.9.6-r1.ebuild 1267 RMD160 b4aea8471d7b497afbd5cd0b186b697496b4a34c SHA1 1cce2ec2c370e0a686141faa7e7e10dc1ca880b2 SHA256 3ca9e07aa6bf1d76c5a625c962cabb23ce426766a6398afe2c8d7ed091e57630
-MD5 bc3202348f01bf7a2a2ac46bb4eb3c01 numpy-0.9.6-r1.ebuild 1267
-RMD160 b4aea8471d7b497afbd5cd0b186b697496b4a34c numpy-0.9.6-r1.ebuild 1267
-SHA256 3ca9e07aa6bf1d76c5a625c962cabb23ce426766a6398afe2c8d7ed091e57630 numpy-0.9.6-r1.ebuild 1267
-EBUILD numpy-0.9.6.ebuild 1195 RMD160 8c64a30a3934acef7ed1ffad8a85f0c35b8de2b6 SHA1 b26da341ba14d8b880a39b9d0dab1d472dab2a24 SHA256 30500957357f83211fee74c82b87f6d87c1721f48eb122fb4cf85dcd888d5351
-MD5 a44faddee7f73fd65138dda8ae3ebda8 numpy-0.9.6.ebuild 1195
-RMD160 8c64a30a3934acef7ed1ffad8a85f0c35b8de2b6 numpy-0.9.6.ebuild 1195
-SHA256 30500957357f83211fee74c82b87f6d87c1721f48eb122fb4cf85dcd888d5351 numpy-0.9.6.ebuild 1195
-EBUILD numpy-0.9.8.ebuild 1356 RMD160 64266c97715a362ea032836b424dfb975ca32061 SHA1 c2db7f9e1f48818400766a8a97946ab3c4f89670 SHA256 0fe2919e36cca121492aa06ede848d3c8793b29ebcdbffb7aa2665d0b452cce8
-MD5 4f194ad5b915c6306529c693b21dbeff numpy-0.9.8.ebuild 1356
-RMD160 64266c97715a362ea032836b424dfb975ca32061 numpy-0.9.8.ebuild 1356
-SHA256 0fe2919e36cca121492aa06ede848d3c8793b29ebcdbffb7aa2665d0b452cce8 numpy-0.9.8.ebuild 1356
-MISC ChangeLog 1478 RMD160 f4d6319c7c477ecab100fe49dadc8541f030d410 SHA1 61c81b74666cd6012d9cb769edea619c6e3eed13 SHA256 a2399a2a4d0f5d03481a462de33857e2f6b004b4f470a2ac83194248c333cef6
-MD5 029773af7cc7945701c66478c9028e05 ChangeLog 1478
-RMD160 f4d6319c7c477ecab100fe49dadc8541f030d410 ChangeLog 1478
-SHA256 a2399a2a4d0f5d03481a462de33857e2f6b004b4f470a2ac83194248c333cef6 ChangeLog 1478
+EBUILD numpy-0.9.8.ebuild 1426 RMD160 84db5497023a5076b1598e31ea99d60c5f0c9d12 SHA1 b9d719cdf6de378cdd7ba49c9d5da6cf04875d5f SHA256 dbe86ce46e458900d1d16671f9937f1698381c026fa0d8e721301a95c18dad00
+MD5 bb8d125c7eb7d6ba8ae7bac5f432d8d3 numpy-0.9.8.ebuild 1426
+RMD160 84db5497023a5076b1598e31ea99d60c5f0c9d12 numpy-0.9.8.ebuild 1426
+SHA256 dbe86ce46e458900d1d16671f9937f1698381c026fa0d8e721301a95c18dad00 numpy-0.9.8.ebuild 1426
+MISC ChangeLog 1691 RMD160 61e4289abb4acda876782565e50cba51de1d2a1b SHA1 d878da82762d2be74504ab5f1a22f10f7a1d68db SHA256 4c6c0977fb83d2d5f1c75c855f3982157cd306b7fa05d90b6eda61381e7ac30d
+MD5 3b528505ad62b873848d1e76cdd6828d ChangeLog 1691
+RMD160 61e4289abb4acda876782565e50cba51de1d2a1b ChangeLog 1691
+SHA256 4c6c0977fb83d2d5f1c75c855f3982157cd306b7fa05d90b6eda61381e7ac30d ChangeLog 1691
 MISC metadata.xml 617 RMD160 fcb64d876af5dffc1a1cc308f6e76a3ff3525244 SHA1 5e056fcc834226a96a9a7197ba2f2c0c076634d5 SHA256 eda38840db709ec1460753d542150351bcd8eaf235fcd58252e45712d64cad6a
 MD5 9251edbaa605d72f2c04cc0a5b4f9a84 metadata.xml 617
 RMD160 fcb64d876af5dffc1a1cc308f6e76a3ff3525244 metadata.xml 617
 SHA256 eda38840db709ec1460753d542150351bcd8eaf235fcd58252e45712d64cad6a metadata.xml 617
-MD5 70ac490e7058e3c3596587b79f44fd88 files/digest-numpy-0.9.6 235
-RMD160 4ab24c9d8157ced0d63a8cce1d43ea5fb8da017c files/digest-numpy-0.9.6 235
-SHA256 0ff9626194e8eb34606c98b6e783ddc5b6ceea5769a202e84a8d269afb38b3fd files/digest-numpy-0.9.6 235
-MD5 70ac490e7058e3c3596587b79f44fd88 files/digest-numpy-0.9.6-r1 235
-RMD160 4ab24c9d8157ced0d63a8cce1d43ea5fb8da017c files/digest-numpy-0.9.6-r1 235
-SHA256 0ff9626194e8eb34606c98b6e783ddc5b6ceea5769a202e84a8d269afb38b3fd files/digest-numpy-0.9.6-r1 235
 MD5 a69679bccfb83100a3547c07b19bd72d files/digest-numpy-0.9.8 235
 RMD160 8a348d126eee1dffdfcda72fe0e898faeb633801 files/digest-numpy-0.9.8 235
 SHA256 5b8e9c649439c0084103ace433c75d26c1e2aa05fefddc972d8716240db48da3 files/digest-numpy-0.9.8 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEu7nfuB6ZT1m7QRERAoUxAJ4sYLFeuCW0r0Q7Hh0CppOseGxR3QCggURK
+/BOx/xckh5Mw8OJoIVCbwzE=
+=mYJt
+-----END PGP SIGNATURE-----
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 b694261d8023..000000000000
--- a/dev-python/numpy/files/digest-numpy-0.9.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eac9ae05bd7511cecf1ffd12da0e1993 numpy-0.9.6.tar.gz 951680
-RMD160 17182408135857b2ada0db7579e2c81d2baf9eb6 numpy-0.9.6.tar.gz 951680
-SHA256 8527a12c5e4399e476fab497cf76729519e14be818ccc7479af3087facb06f58 numpy-0.9.6.tar.gz 951680
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 b694261d8023..000000000000
--- a/dev-python/numpy/files/digest-numpy-0.9.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eac9ae05bd7511cecf1ffd12da0e1993 numpy-0.9.6.tar.gz 951680
-RMD160 17182408135857b2ada0db7579e2c81d2baf9eb6 numpy-0.9.6.tar.gz 951680
-SHA256 8527a12c5e4399e476fab497cf76729519e14be818ccc7479af3087facb06f58 numpy-0.9.6.tar.gz 951680
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 48adcd6c29fa..000000000000
--- a/dev-python/numpy/numpy-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,49 +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.6-r1.ebuild,v 1.3 2006/06/13 23:32:54 spyderous Exp $
-
-inherit eutils 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
-		virtual/lapack )"
-IUSE="lapack"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="BSD"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PV}-recognize-more-gfortran-versions.patch
-	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 96f6fa57b442..000000000000
--- 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: /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/*
-}
-
-