Delete older ebuilds.

8 files changed, 20 insertions, 590 deletions

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 985b36e2b1e1..b66fb0e5816a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,25 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
-AUX numpy-1.3.0-alpha.patch 1210 RMD160 d92ca3fa7d671da1ff8e3e2e1a6b64469cf7142b SHA1 0a8740710d7b2e40b1a8899771b641999440558b SHA256 ea0da717e694338a1bca72f1b635309be15af2cdee206b50de4b38ce95701c64
-AUX numpy-1.3.0-arm-sh.patch 2166 RMD160 cc60f574ab7fe29968ebc56f9018c2427f01f6cc SHA1 59b4751c26abf837a69d8bd637bd9abb89344f72 SHA256 9b373c5b8886df971c350c44766ccdf165ffec6c2082f68704121965ad7a2f37
-AUX numpy-1.3.0-darwin-no-arch.patch 3016 RMD160 a35968a68fac400e14d5eeafb44e058825c17ed5 SHA1 35b3fa3b0ed149f2f9f906e7a81d7f3cd0260d58 SHA256 9058cb30c54314e4e8dc5e4c0e4be3178664067d1ae71b0bee9576293f8cd71d
 AUX numpy-1.3.0-fenv-freebsd.patch 1177 RMD160 78a84e18836472bd9c657771c43a44e417ec3e19 SHA1 4dba898255df4784eac9e52633307991c12029de SHA256 2fa3ed9fdeb9dc529d51da4ba8a3a7ea4cc4bb9998fffa66426b1606f2c637b5
-AUX numpy-1.3.0-parisc.patch 474 RMD160 682971d65894aeb2e87de5f8eac717a8f7803318 SHA1 da6067bd782604119111d69fce06b7536d59f6ca SHA256 413af76d3b5518d2f544c4497110a3401d40a7ea713a7449ea8826facddbf225
 AUX numpy-1.4.0-interix.patch 478 RMD160 9a0290253238e09b824069d0026a5d2f00c90a8f SHA1 261e45c3feb068f033eed9b6468f5115ea418ca5 SHA256 4d6adcc1c66aa1399871c37f57e94ae7138c157ee5575945e83224a36c98c142
 AUX numpy-1.5.1-python-3.2.patch 971 RMD160 7e6ba80d2932279a45340a1d74f89051bbef1f0d SHA1 56fd29f930febd7b4339a821d268470fe41b67a1 SHA256 8add395a3f0a7e381fb96691024d7e2e1e062e2f3a1be8ffccbaf0cc060b4735
-DIST numpy-1.3-html.zip 3303495 RMD160 bd35c66c78574e6225de59a47cf161f3623c5119 SHA1 10799530be334cd7b1120a0b46f3c6f5deae5110 SHA256 933724b83300c9fc0779a579dad212ca8dcee230f1d892a56b977f3854d87c7e
-DIST numpy-1.3-ref.pdf 3907485 RMD160 54fe28c711b49ccc160dceed05bafa4e605aec36 SHA1 1edc6a3467bb36c5f395c2ed4dc066394180c6f8 SHA256 c8420df5d25e7fd76e7662477787184d068f43fc340b6975fa1db9ec06c773e7
-DIST numpy-1.3-user.pdf 461480 RMD160 a8aa36e6a0c03784fa3147cc0f0967c7f3c726d6 SHA1 059eee01d65ea401e47f978e2d5ebf5f67973723 SHA256 ab99f999d33eb1d1100ddb5c995ba525edaa64efce51a1f06b65a8285779d636
-DIST numpy-1.3.0.tar.gz 1995868 RMD160 a75155d2014204e16c59857b92356353505c39b9 SHA1 c04998a1fbf7d990c9a2b99a7b62486012c570ac SHA256 7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d
-DIST numpy-1.4.1.tar.gz 2201795 RMD160 a0bbebd1138ffc93517095e3c06459cd9744a9d6 SHA1 ec6078aa09acbcca3d90f9f36353fc83e7e1daa0 SHA256 2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06
 DIST numpy-1.5-html.zip 8545276 RMD160 41636f21c2c82ed1d9f15fe595c9d9303f62a2ee SHA1 c4fb912eec5850e5cf20afd47920a0019bfa5535 SHA256 2b71258bc71b623f682eaa791b81e0f81dce43b69546a1bcd3b1a9de830ce057
 DIST numpy-1.5-ref.pdf 7112007 RMD160 35901204b7e4c0ffc08ebb43a8a4dfa5b5a79bf1 SHA1 5e496e87a4f9873759397cb1cf546f6af0533598 SHA256 9ec75950b46e9d086cfb170f6978ba2b146ed7b1dc103af51e3c81ed5b8b5406
 DIST numpy-1.5-user.pdf 562092 RMD160 20d475d9c5a4abbad0ec5f969fdf9a5eef79c4b3 SHA1 6fafde625a81dd4be22a158cd73c010cb219e855 SHA256 afe77bacce8839460330e0c1c8a01508a03dd4a3010c2b8739ab61956d47f69d
 DIST numpy-1.5.1.tar.gz 2280220 RMD160 6d8f03e4cd2db48a7c9ac39b441d9e0219b15dcf SHA1 423c6bf74f9ac00697db574ba981547991110896 SHA256 c36789ec381fec09f519249744ea36a77e5534b69446a59ee73b06cac29542eb
 DIST numpy-1.6.0b1.tar.gz 2625349 RMD160 89b6577c96f3eba69045c58b581c9022e723bde9 SHA1 67d03f58a5a107ebf8b3506686db0abe69e33365 SHA256 fc21c21a103bae3eca07a55c863dfbe5b6383efd404a1d6aa462a9d090efa80a
-EBUILD numpy-1.3.0-r1.ebuild 4351 RMD160 cb03efd164e532fa8661b3a2126510feb8257531 SHA1 934fefbc6b3a23d6b1094f25107222669c2d4b44 SHA256 7fc8909ae4aebfd2b5c5465b463bd52090d070d36d132f88cbb2412c624c4be2
-EBUILD numpy-1.3.0-r2.ebuild 4880 RMD160 ab964443b724f146201e351fd4f265e340dc5dc5 SHA1 f2bfe5e06dce10b9a0195358b00d6328158c302d SHA256 1f4a29bf3f2a938fa48a76c54b74a68ebc23b564273928c79630cab5478e0aa6
-EBUILD numpy-1.4.1.ebuild 4629 RMD160 20bba506d589ef5703a165253a59e00af802464e SHA1 be71b5be59fb594325927c9d39b8a0162d3c7d69 SHA256 c4a60e6059dfdff138bfeedfa96c350c4ae73b8e7834e7e68abec05b5579ac1d
 EBUILD numpy-1.5.1.ebuild 5134 RMD160 26807c1616834d2c1b3c076c104ce6072f4f6612 SHA1 426ec67907d17faa8074f1305d2ff34723773854 SHA256 80192127e48eb9d9049b6996724261b9c624b29fba35840ad4fcd6c4d9c6f13c
 EBUILD numpy-1.6.0_beta1.ebuild 5203 RMD160 bf21191e6974674c8358799340fce2ba5f239216 SHA1 4fab6477019a434600cea262dd391f2d721a089b SHA256 58011934d8786b411c0163a83b285b11ec2f82b98d2f2cf49f03eb5719bbc811
 MISC ChangeLog 19704 RMD160 f5360e70614da637008160b2a4eac6afab22d66f SHA1 14cd5e3ac5d365dfc5b3169fc4ffd6876454c7d5 SHA256 7eea32e1f2845158d626ef6d5c6bd5a3a39efee28f7cdbe0f1a0f2cb13e32617
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNmGFNAAoJENgZr6v6gHY0Z48P/3BMMrOWMAS2/IQ5Ggd0OG86
+NeZxRI6gO4Gy4QblYHoGvafjZW/JusXME8I0MKFEpDEC26d25Ouqp1vKWM6omr9I
+Do8kBrNcuHYW1Y/aWoCSIRcWhJzmu4jFxWrhwUjmRAKsmJ8AsluDg3TxjPKIujRB
+ffzwsJEv2aBoD3GwnlgQUkcSBO0Aio2hPKxm+buiPcX0cl58iUX/jc9h20/l/fRQ
+vzRoZAIB4+Xoi5CqyOgyX8GP7lwk2owEjsDLYlhT3bW8lao1/OPHJ1Di2nVfoifb
+opmutAkbhqgHm2gVDleNS0BzsI0pXbh7cfEZgZuK0/Pmd3ky5in/pXxITBLiHxbz
+7/xOOAlUcIBHckjNQAuqh8a5ExkM7o3vxehJ9N2DsPNLy2ZBoSrte9Bk2+K/OZvs
+flqVKLCWsSLEO7m44b2Bp0EPQu8pwBFBIE3BpJpb9iYzIYwLwMfUb37k6IBqlnuM
+nXhb280Zptt9VNMLUrDvZdAIsKIdYwCCa1ayNzRg0kCwoh3auIuX9z6kvm+TqOuy
+ucKaM5xv1T4PhG8JBMhQtj6vBMDpP0yVBbHfcOHyrXoHrX8dS2aAvLaga7GM5cnx
+vP4n9k01h1viHrkrUamODE1ehfawlZgUItmBEBPYDDIEuzN3GLjN1hiaXp+DwKuC
+CRCSdUHWn9T9Rj5m5jbC
+=m5Vx
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.3.0-alpha.patch b/dev-python/numpy/files/numpy-1.3.0-alpha.patch
deleted file mode 100644
index 3aa5fe43a6de..000000000000
--- a/dev-python/numpy/files/numpy-1.3.0-alpha.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur numpy-1.3.0.orig/numpy/core/include/numpy/npy_cpu.h numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h
---- numpy-1.3.0.orig/numpy/core/include/numpy/npy_cpu.h	2009-07-22 16:22:51.000000000 +0200
-+++ numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h	2009-07-22 16:23:18.000000000 +0200
-@@ -44,6 +44,8 @@
-     #define NPY_CPU_IA64
- #elif defined(__hppa__)
-     #define NPY_CPU_PARISC
-+#elif defined(__alpha__)
-+    #define NPY_CPU_ALPHA
- #else
-     #error Unknown CPU, please report this to numpy maintainers with \
-     information about your platform (OS, CPU and compiler)
-diff -ur numpy-1.3.0.orig/numpy/core/include/numpy/npy_endian.h numpy-1.3.0/numpy/core/include/numpy/npy_endian.h
---- numpy-1.3.0.orig/numpy/core/include/numpy/npy_endian.h	2009-07-22 16:22:51.000000000 +0200
-+++ numpy-1.3.0/numpy/core/include/numpy/npy_endian.h	2009-07-22 16:23:04.000000000 +0200
-@@ -22,7 +22,7 @@
-     #include "npy_cpu.h"
- 
-     #if defined(NPY_CPU_X86) || defined(NPY_CPU_AMD64)\
--            || defined(NPY_CPU_IA64)
-+            || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)
-         #define NPY_LITTLE_ENDIAN
-         #define NPY_BYTE_ORDER 1234
-     #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_SPARC)\
\ No newline at end of file
diff --git a/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch b/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch
deleted file mode 100644
index 798eebb5aa7a..000000000000
--- a/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -urNp numpy-1.3.0-old/numpy/core/include/numpy/npy_cpu.h numpy-1.3.0-new/numpy/core/include/numpy/npy_cpu.h
---- numpy-1.3.0-old/numpy/core/include/numpy/npy_cpu.h	2009-08-16 17:49:39.000000000 +0530
-+++ numpy-1.3.0-new/numpy/core/include/numpy/npy_cpu.h	2009-08-16 17:49:19.000000000 +0530
-@@ -9,6 +9,10 @@
-  *              NPY_CPU_S390
-  *              NPY_CPU_IA64
-  *              NPY_CPU_PARISC
-+ *              NPY_CPU_ARMEL
-+ *              NPY_CPU_ARMEB
-+ *              NPY_CPU_SH_LE
-+ *              NPY_CPU_SH_BE
-  */
- #ifndef _NPY_CPUARCH_H_
- #define _NPY_CPUARCH_H_
-@@ -46,6 +50,14 @@
-     #define NPY_CPU_PARISC
- #elif defined(__alpha__)
-     #define NPY_CPU_ALPHA
-+#elif defined(__arm__) && defined(__ARMEL__)
-+    #define NPY_CPU_ARMEL
-+#elif defined(__arm__) && defined(__ARMEB__)
-+    #define NPY_CPU_ARMEB
-+#elif defined(__sh__) && defined(__LITTLE_ENDIAN__)
-+    #define NPY_CPU_SH_LE
-+#elif defined(__sh__) && defined(__BIG_ENDIAN__)
-+    #define NPY_CPU_SH_BE
- #else
-     #error Unknown CPU, please report this to numpy maintainers with \
-     information about your platform (OS, CPU and compiler)
-diff -urNp numpy-1.3.0-old/numpy/core/include/numpy/npy_endian.h numpy-1.3.0-new/numpy/core/include/numpy/npy_endian.h
---- numpy-1.3.0-old/numpy/core/include/numpy/npy_endian.h	2009-08-16 17:49:46.000000000 +0530
-+++ numpy-1.3.0-new/numpy/core/include/numpy/npy_endian.h	2009-08-16 17:48:39.000000000 +0530
-@@ -22,11 +22,15 @@
-     #include "npy_cpu.h"
- 
-     #if defined(NPY_CPU_X86) || defined(NPY_CPU_AMD64)\
--            || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)
-+            || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)\
-+            || defined(NPY_CPU_ARMEL)\
-+            || defined(NPY_CPU_SH_LE)
-         #define NPY_LITTLE_ENDIAN
-         #define NPY_BYTE_ORDER 1234
-     #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_SPARC)\
--            || defined(NPY_CPU_S390) || defined(NPY_CPU_PARISC)
-+            || defined(NPY_CPU_S390) || defined(NPY_CPU_PARISC)\
-+            || defined(NPY_CPU_ARMEB)\
-+            || defined(NPY_CPU_SH_BE)
-         #define NPY_BIG_ENDIAN
-         #define NPY_BYTE_ORDER 4321
-     #else
diff --git a/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch b/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch
deleted file mode 100644
index e96611df13ff..000000000000
--- a/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-gfortran -v happily accepts any -arch X argument, but also happily dies
-during compilation that it doesn't understand -arch argument.  Hence,
-testing if -arch is supported like this is kind of not working well.
-
-Since Apple does not officially ship fortran support (any), I wonder how
-universal support could have crept into this piece of code all.  They
-don't even have an Apple GCC compiler with fortran support (like we do
-with Gentoo Prefix).
-
-http://projects.scipy.org/numpy/ticket/1087
-
-
---- numpy/distutils/fcompiler/gnu.py
-+++ numpy/distutils/fcompiler/gnu.py
-@@ -12,13 +12,6 @@
- 
- TARGET_R = re.compile("Target: ([a-zA-Z0-9_\-]*)")
- 
--# XXX: do we really need to check for target ? If the arch is not supported,
--# the return code should be != 0
--_R_ARCHS = {"ppc": r"^Target: (powerpc-.*)$",
--    "i686": r"^Target: (i686-.*)$",
--    "x86_64": r"^Target: (i686-.*)$",
--    "ppc64": r"^Target: (powerpc-.*)$",}
--
- class GnuFCompiler(FCompiler):
-     compiler_type = 'gnu'
-     compiler_aliases = ('g77',)
-@@ -215,6 +208,7 @@
-     # OS X: GNU Fortran 95 (GCC) 4.1.0
-     #       GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
-     #       GNU Fortran (GCC) 4.3.0 20070316 (experimental)
-+    #       GNU Fortran (GCC) 4.2.1 (Apple Inc. build 5574)
- 
-     possible_executables = ['gfortran', 'f95']
-     executables = {
-@@ -241,46 +235,6 @@
- 
-     g2c = 'gfortran'
- 
--    # Note that this is here instead of GnuFCompiler as gcc < 4 uses a
--    # different output format (which isn't as useful) than gcc >= 4,
--    # and we don't have to worry about g77 being universal (as it can't be).
--    def _can_target(self, cmd, arch):
--        """Return true is the compiler support the -arch flag for the given
--        architecture."""
--        newcmd = cmd[:]
--        newcmd.extend(["-arch", arch, "-v"])
--        st, out = exec_command(" ".join(newcmd))
--        if st == 0:
--            for line in out.splitlines():
--                m = re.search(_R_ARCHS[arch], line)
--                if m:
--                    return True
--        return False
--            
--    def _universal_flags(self, cmd):
--        """Return a list of -arch flags for every supported architecture."""
--        if not sys.platform == 'darwin':
--            return []
--        arch_flags = []
--        for arch in ["ppc", "i686"]:
--            if self._can_target(cmd, arch):
--                arch_flags.extend(["-arch", arch])
--        return arch_flags
--
--    def get_flags(self):
--        flags = GnuFCompiler.get_flags(self)
--        arch_flags = self._universal_flags(self.compiler_f90)
--        if arch_flags:
--            flags[:0] = arch_flags
--        return flags
--
--    def get_flags_linker_so(self):
--        flags = GnuFCompiler.get_flags_linker_so(self)
--        arch_flags = self._universal_flags(self.linker_so)
--        if arch_flags:
--            flags[:0] = arch_flags
--        return flags
--
-     def get_library_dirs(self):
-         opt = GnuFCompiler.get_library_dirs(self)
-         if sys.platform == 'win32':
diff --git a/dev-python/numpy/files/numpy-1.3.0-parisc.patch b/dev-python/numpy/files/numpy-1.3.0-parisc.patch
deleted file mode 100644
index fd95f28eaee0..000000000000
--- a/dev-python/numpy/files/numpy-1.3.0-parisc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h.orig	2009-04-05 10:09:20.000000000 +0200
-+++ numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h	2009-07-15 17:13:35.000000000 +0200
-@@ -42,8 +42,7 @@
-     #define NPY_CPU_S390
- #elif defined(__ia64)
-     #define NPY_CPU_IA64
--#elif defined(__parisc__)
--    /* XXX: Not sure about this one... */
-+#elif defined(__hppa__)
-     #define NPY_CPU_PARISC
- #else
-     #error Unknown CPU, please report this to numpy maintainers with \
diff --git a/dev-python/numpy/numpy-1.3.0-r1.ebuild b/dev-python/numpy/numpy-1.3.0-r1.ebuild
deleted file mode 100644
index 640e048b6e35..000000000000
--- a/dev-python/numpy/numpy-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.3.0-r1.ebuild,v 1.12 2010/12/19 16:41:54 arfrever Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast array and numerical python library"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
-HOMEPAGE="http://numpy.scipy.org/"
-
-RDEPEND="dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	lapack? ( dev-util/pkgconfig )
-	test? ( >=dev-python/nose-0.10 )"
-
-IUSE="lapack test"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-LICENSE="BSD"
-
-pkg_setup() {
-	# whatever LDFLAGS set will break linking
-	# see progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		if [[ -n "${LDFLAGS}" ]]; then
-			append-ldflags -shared
-		else
-			LDFLAGS="-shared"
-		fi
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	use lapack || return
-	[[ -z ${FC} ]] && FC=$(tc-getFC)
-	# when fortran flags are set, pic is removed.
-	FFLAGS="${FFLAGS} -fPIC"
-	export NUMPY_FCONFIG="config_fc --noopt --noarch"
-}
-
-src_prepare() {
-	# Fix some paths and docs in f2py
-	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
-
-	epatch "${FILESDIR}/${P}-parisc.patch" # bug 277438
-	epatch "${FILESDIR}/${P}-alpha.patch" # bug 277438
-	epatch "${FILESDIR}/${P}-arm-sh.patch"
-
-	epatch "${FILESDIR}"/${P}-fenv-freebsd.patch # bug 279487
-
-	# Gentoo patch for ATLAS library names
-	sed -i \
-		-e "s:'f77blas':'blas':g" \
-		-e "s:'ptf77blas':'blas':g" \
-		-e "s:'ptcblas':'cblas':g" \
-		-e "s:'lapack_atlas':'lapack':g" \
-		numpy/distutils/system_info.py \
-		|| die "sed system_info.py failed"
-
-	if use lapack; then
-		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[atlas]
-			include_dirs = $(pkg-config --cflags-only-I \
-				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas lapack | sed -e \
-				's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):"${EPREFIX}"/usr/$(get_libdir)
-			atlas_libs = $(pkg-config --libs-only-l \
-				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			lapack_libs = $(pkg-config --libs-only-l \
-				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			[blas_opt]
-			include_dirs = $(pkg-config --cflags-only-I \
-				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
-				-e 's/ //g'):"${EPREFIX}"/usr/$(get_libdir)
-			libraries = $(pkg-config --libs-only-l \
-				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			[lapack_opt]
-			library_dirs = $(pkg-config --libs-only-L \
-				lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
-				-e 's/ //g'):"${EPREFIX}"/usr/$(get_libdir)
-			libraries = $(pkg-config --libs-only-l \
-				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-}
-
-src_compile() {
-	distutils_src_compile ${NUMPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py ${NUMPY_FCONFIG} build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile || die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
-		PYTHONPATH=python "$(PYTHON)" -c "import numpy; numpy.test()" 2>&1 | tee test.log
-		grep -q '^ERROR' test.log && die "test failed"
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED=${D}
-	distutils_src_install ${NUMPY_FCONFIG}
-	dodoc THANKS.txt DEV_README.txt COMPATIBILITY
-	rm -f "${ED}"/usr/lib/python*/site-packages/numpy/*.txt || die
-	docinto f2py
-	dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
-	doman numpy/f2py/f2py.1 || die "doman failed"
-}
diff --git a/dev-python/numpy/numpy-1.3.0-r2.ebuild b/dev-python/numpy/numpy-1.3.0-r2.ebuild
deleted file mode 100644
index 6f16a6445126..000000000000
--- a/dev-python/numpy/numpy-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.3.0-r2.ebuild,v 1.5 2010/12/19 16:41:54 arfrever Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils flag-o-matic toolchain-funcs versionator
-
-NP="${PN}-$(get_version_component_range 1-2)"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/ http://pypi.python.org/pypi/numpy"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${NP}.x/numpy-html.zip -> ${NP}-html.zip
-		http://docs.scipy.org/doc/${NP}.x/numpy-ref.pdf -> ${NP}-ref.pdf
-		http://docs.scipy.org/doc/${NP}.x/numpy-user.pdf -> ${NP}-user.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	lapack? ( dev-util/pkgconfig )
-	test? ( >=dev-python/nose-0.10 )
-	doc? ( app-arch/unzip )"
-
-pkg_setup() {
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	use lapack || return
-	[[ -z ${FC} ]] && FC=$(tc-getFC)
-	# when fortran flags are set, pic is removed.
-	FFLAGS="${FFLAGS} -fPIC"
-	export NUMPY_FCONFIG="config_fc --noopt --noarch"
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${NP}-html.zip -d html || die
-	fi
-}
-
-src_prepare() {
-	# Fix some paths and docs in f2py
-	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
-
-	epatch "${FILESDIR}/${P}-parisc.patch" # bug 277438
-	epatch "${FILESDIR}/${P}-alpha.patch" # bug 277438
-	epatch "${FILESDIR}/${P}-arm-sh.patch"
-
-	epatch "${FILESDIR}"/${P}-fenv-freebsd.patch # bug 279487
-	epatch "${FILESDIR}"/${P}-darwin-no-arch.patch
-
-	# Gentoo patch for ATLAS library names
-	sed -i \
-		-e "s:'f77blas':'blas':g" \
-		-e "s:'ptf77blas':'blas':g" \
-		-e "s:'ptcblas':'cblas':g" \
-		-e "s:'lapack_atlas':'lapack':g" \
-		numpy/distutils/system_info.py \
-		|| die "sed system_info.py failed"
-
-	if use lapack; then
-		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[atlas]
-			include_dirs = $(pkg-config --cflags-only-I \
-				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas lapack | sed -e \
-				's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):"${EPREFIX}"/usr/$(get_libdir)
-			atlas_libs = $(pkg-config --libs-only-l \
-				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			lapack_libs = $(pkg-config --libs-only-l \
-				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			[blas_opt]
-			include_dirs = $(pkg-config --cflags-only-I \
-				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
-				-e 's/ //g'):"${EPREFIX}"/usr/$(get_libdir)
-			libraries = $(pkg-config --libs-only-l \
-				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			[lapack_opt]
-			library_dirs = $(pkg-config --libs-only-L \
-				lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
-				-e 's/ //g'):"${EPREFIX}"/usr/$(get_libdir)
-			libraries = $(pkg-config --libs-only-l \
-				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-}
-
-src_compile() {
-	distutils_src_compile ${NUMPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py ${NUMPY_FCONFIG} build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile || die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
-		PYTHONPATH=python "$(PYTHON)" -c "import numpy; numpy.test()" 2>&1 | tee test.log
-		grep -q '^ERROR' test.log && die "test failed"
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED=${D}
-	distutils_src_install ${NUMPY_FCONFIG}
-	dodoc THANKS.txt DEV_README.txt COMPATIBILITY
-	rm -f "${ED}"/usr/lib/python*/site-packages/numpy/*.txt || die
-	docinto f2py
-	dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
-	doman numpy/f2py/f2py.1 || die "doman failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/html || die
-		doins  "${DISTDIR}"/${NP}*pdf || die
-	fi
-}
diff --git a/dev-python/numpy/numpy-1.4.1.ebuild b/dev-python/numpy/numpy-1.4.1.ebuild
deleted file mode 100644
index c8d0e44f32f0..000000000000
--- a/dev-python/numpy/numpy-1.4.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.4.1.ebuild,v 1.8 2010/12/19 16:41:54 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils flag-o-matic toolchain-funcs versionator
-
-NP="${PN}-1.3"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/ http://pypi.python.org/pypi/numpy"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${NP}.x/numpy-html.zip -> ${NP}-html.zip
-		http://docs.scipy.org/doc/${NP}.x/numpy-ref.pdf -> ${NP}-ref.pdf
-		http://docs.scipy.org/doc/${NP}.x/numpy-user.pdf -> ${NP}-user.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 -ppc -ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	lapack? ( dev-util/pkgconfig )
-	test? ( >=dev-python/nose-0.10 )
-	doc? ( app-arch/unzip )"
-
-pkg_setup() {
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	use lapack || return
-	[[ -z ${FC} ]] && FC=$(tc-getFC)
-	# when fortran flags are set, pic is removed.
-	FFLAGS="${FFLAGS} -fPIC"
-	export NUMPY_FCONFIG="config_fc --noopt --noarch"
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${NP}-html.zip -d html || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
-	epatch "${FILESDIR}"/${PN}-1.3.0-fenv-freebsd.patch # bug 279487
-
-	# Gentoo patch for ATLAS library names
-	sed -i \
-		-e "s:'f77blas':'blas':g" \
-		-e "s:'ptf77blas':'blas':g" \
-		-e "s:'ptcblas':'cblas':g" \
-		-e "s:'lapack_atlas':'lapack':g" \
-		numpy/distutils/system_info.py \
-		|| die "sed system_info.py failed"
-
-	if use lapack; then
-		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF
-			[atlas]
-			include_dirs = $(pkg-config --cflags-only-I \
-				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-			atlas_libs = $(pkg-config --libs-only-l \
-				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			lapack_libs = $(pkg-config --libs-only-l \
-				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			[blas_opt]
-			include_dirs = $(pkg-config --cflags-only-I \
-				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-			libraries = $(pkg-config --libs-only-l \
-				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-			[lapack_opt]
-			library_dirs = $(pkg-config --libs-only-L \
-				lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-			libraries = $(pkg-config --libs-only-l \
-				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.4.0-interix.patch
-}
-
-src_compile() {
-	distutils_src_compile ${NUMPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py ${NUMPY_FCONFIG} build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile || die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
-		PYTHONPATH=python "$(PYTHON)" -c "import numpy; numpy.test()" 2>&1 | tee test.log
-		grep -q '^ERROR' test.log && die "test failed"
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED=${D}
-	distutils_src_install ${NUMPY_FCONFIG}
-	dodoc THANKS.txt DEV_README.txt COMPATIBILITY
-	rm -f "${ED}"/usr/lib/python*/site-packages/numpy/*.txt || die
-	docinto f2py
-	dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
-	doman numpy/f2py/f2py.1 || die "doman failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/html || die
-		doins  "${DISTDIR}"/${NP}*pdf || die
-	fi
-}