10 files changed, 16 insertions, 148 deletions
diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog
index 9539d41273a6..80450920692b 100644
--- a/dev-python/numeric/ChangeLog
+++ b/dev-python/numeric/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/numeric
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.14 2005/04/25 17:15:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.15 2005/04/25 17:20:49 carlo Exp $
+
+*numeric-23.8 (25 Apr 2005)
+
+  25 Apr 2005; Carsten Lohrke <carlo@gentoo.org> -files/numeric-23.3.patch,
+  -numeric-23.0.ebuild, -numeric-23.3.ebuild, -numeric-23.6.ebuild,
+  +numeric-23.8.ebuild:
+  version bump, clean up
 
   25 Apr 2005; Carsten Lohrke <carlo@gentoo.org> numeric-23.7.ebuild:
   stable on x86
diff --git a/dev-python/numeric/Manifest b/dev-python/numeric/Manifest
index 07cc05fb0e9c..555a15d61ec8 100644
--- a/dev-python/numeric/Manifest
+++ b/dev-python/numeric/Manifest
@@ -1,16 +1,11 @@
-MD5 d1b82077ebc1facaf1a4bf85ab5d5231 numeric-23.0.ebuild 816
 MD5 9172669cf69c37d6245191f3ea3d78f2 numeric-23.7.ebuild 891
-MD5 9c68825522f6cb8708df23f5089e4dea numeric-23.6.ebuild 913
 MD5 2ffcf0a55ea7cf8a52d71f0c72c753a8 numeric-23.1.ebuild 797
-MD5 3eb6cb5f48c7d44f54cd7ecff5ef66e9 ChangeLog 2767
+MD5 573e2b55be94de74d9e9472561136f3e ChangeLog 2990
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 867d2f4c5aee28005b82f5a94052c151 numeric-22.0.ebuild 812
-MD5 9cef432939085074afadf2ad7a9ab28b numeric-23.3.ebuild 905
-MD5 c687dac0db35f8cf31d423d46dd0ced5 files/numeric-23.3.patch 2390
+MD5 0f94a7648198403dccefe64e24fbceef numeric-23.8.ebuild 758
 MD5 b962c2f9fe39159f4c6025bb24cdf701 files/numeric-23.7.patch 2311
 MD5 543b62c79215183872d1f43ee1033c0b files/digest-numeric-22.0 64
-MD5 1bbfd6024c1a372499b3774b2b91b5ab files/digest-numeric-23.0 64
 MD5 a52c0be4669341bbf82129377ca75f2e files/digest-numeric-23.1 64
-MD5 5d2d3eb0342d757082bce1599b6838de files/digest-numeric-23.3 64
-MD5 3589c8d3f9d19b0b8d7bca9bc2dae572 files/digest-numeric-23.6 64
 MD5 f7fae5c73c85e5d2038f4b1c7d634d7b files/digest-numeric-23.7 64
+MD5 6c2043e258fdbea77284f56bae42b32a files/digest-numeric-23.8 64
diff --git a/dev-python/numeric/files/digest-numeric-23.0 b/dev-python/numeric/files/digest-numeric-23.0
deleted file mode 100644
index cc2aa609b30d..000000000000
--- a/dev-python/numeric/files/digest-numeric-23.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f8c3c5d0703ce12f55f04f43d1a9ab3 Numeric-23.0.tar.gz 723250
diff --git a/dev-python/numeric/files/digest-numeric-23.3 b/dev-python/numeric/files/digest-numeric-23.3
deleted file mode 100644
index 12c3008d83c9..000000000000
--- a/dev-python/numeric/files/digest-numeric-23.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cb350a3764e6d1b009d598e4581dede Numeric-23.3.tar.gz 724568
diff --git a/dev-python/numeric/files/digest-numeric-23.6 b/dev-python/numeric/files/digest-numeric-23.6
deleted file mode 100644
index 31628fe67edf..000000000000
--- a/dev-python/numeric/files/digest-numeric-23.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 89da82dd9dd7fc331f5752a68dc79dba Numeric-23.6.tar.gz 725093
diff --git a/dev-python/numeric/files/digest-numeric-23.8 b/dev-python/numeric/files/digest-numeric-23.8
new file mode 100644
index 000000000000..d703c8f50a3f
--- /dev/null
+++ b/dev-python/numeric/files/digest-numeric-23.8
@@ -0,0 +1 @@
+MD5 0b3aa8453d4912368b980ddcff19f6d1 Numeric-23.8.tar.gz 725817
diff --git a/dev-python/numeric/files/numeric-23.3.patch b/dev-python/numeric/files/numeric-23.3.patch
deleted file mode 100644
index ab152b26ad74..000000000000
--- a/dev-python/numeric/files/numeric-23.3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- setup.py	2004-08-12 22:15:54.134168680 +0300
-+++ setup.py	2004-08-12 22:18:16.398541208 +0300
-@@ -33,20 +33,20 @@
- 
- # delete all but the first one in this list if using your own LAPACK/BLAS
- sourcelist = [os.path.join('Src', 'lapack_litemodule.c'),
--#              os.path.join('Src', 'blas_lite.c'), 
--#              os.path.join('Src', 'f2c_lite.c'), 
--#              os.path.join('Src', 'zlapack_lite.c'),
--#              os.path.join('Src', 'dlapack_lite.c')
-+              os.path.join('Src', 'blas_lite.c'), 
-+              os.path.join('Src', 'f2c_lite.c'), 
-+              os.path.join('Src', 'zlapack_lite.c'),
-+              os.path.join('Src', 'dlapack_lite.c')
-              ]
- # set these to use your own BLAS;
- 
--library_dirs_list = ['/usr/lib/atlas']
--libraries_list = ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c'] 
-+#library_dirs_list = ['/usr/lib/atlas']
-+#libraries_list = ['lapack_lite', 'cblas', 'f77blas', 'atlas', 'g2c'] 
-                    # if you also set `use_dotblas` (see below), you'll need:
-                    # ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c']
- 
- # set to true (1), if you also want BLAS optimized matrixmultiply/dot/innerproduct
--use_dotblas = 1
-+use_dotblas = 0
- include_dirs = ['/usr/include/atlas']  # You may need to set this to find cblas.h
-                    #  e.g. on UNIX using ATLAS this should be ['/usr/include/atlas'] 
- 
-@@ -80,8 +80,8 @@
-                os.path.join('Src', 'linpack.c')],
-               extra_compile_args = extra_compile_args),
-     Extension('lapack_lite', sourcelist,
--              library_dirs = library_dirs_list,
--              libraries = libraries_list,
-+#              library_dirs = library_dirs_list,
-+#              libraries = libraries_list,
-               extra_compile_args = extra_compile_args) 
-     ]
- 
-@@ -113,8 +113,8 @@
-     package_dir['dotblas'] = os.path.join('Packages', 'dotblas', 'dotblas')
-     ext_modules.append(Extension('_dotblas',
-                                  [os.path.join('Packages', 'dotblas', 'dotblas', '_dotblas.c')],
--                                 library_dirs = library_dirs_list,
--                                 libraries = libraries_list,
-+#                                 library_dirs = library_dirs_list,
-+#                                 libraries = libraries_list,
-                                  extra_compile_args=extra_compile_args))
- 
- 
diff --git a/dev-python/numeric/numeric-23.3.ebuild b/dev-python/numeric/numeric-23.3.ebuild
deleted file mode 100644
index 398e95219211..000000000000
--- a/dev-python/numeric/numeric-23.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-23.3.ebuild,v 1.2 2005/01/21 16:49:57 carlo Exp $
-
-inherit distutils eutils
-
-MY_P=${P/n/N}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Numerical Python adds a fast, compact, multidimensional array language facility to Python."
-SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pfdubois.com/numpy/"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-LICENSE="as-is"
-
-# 2.1 gave sandbox violations see #21
-DEPEND=">=dev-lang/python-2.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
-}
-
-src_install() {
-
-	distutils_src_install
-	distutils_python_version
-
-	#Numerical Tutorial is nice for testing and learning
-	insinto /usr/lib/python${PYVER}/site-packages/NumTut
-	doins Demo/NumTut/*
-
-}
diff --git a/dev-python/numeric/numeric-23.6.ebuild b/dev-python/numeric/numeric-23.6.ebuild
deleted file mode 100644
index 5bb72be513e6..000000000000
--- a/dev-python/numeric/numeric-23.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-23.6.ebuild,v 1.2 2005/01/21 16:49:57 carlo Exp $
-
-inherit distutils eutils
-
-MY_P=${P/n/N}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Numerical Python adds a fast, compact, multidimensional array language facility to Python."
-SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pfdubois.com/numpy/"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-LICENSE="as-is"
-
-# 2.1 gave sandbox violations see #21
-DEPEND=">=dev-lang/python-2.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P/\.6/\.3}.patch
-}
-
-src_install() {
-
-	distutils_src_install
-	distutils_python_version
-
-	#Numerical Tutorial is nice for testing and learning
-	insinto /usr/lib/python${PYVER}/site-packages/NumTut
-	doins Demo/NumTut/*
-
-}
diff --git a/dev-python/numeric/numeric-23.0.ebuild b/dev-python/numeric/numeric-23.8.ebuild
index daccc8b1d2a6..3599f763b837 100644
--- a/dev-python/numeric/numeric-23.0.ebuild
+++ b/dev-python/numeric/numeric-23.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-23.0.ebuild,v 1.5 2005/01/21 16:49:57 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-23.8.ebuild,v 1.1 2005/04/25 17:20:49 carlo Exp $
 
-inherit distutils
+inherit distutils eutils
 
-MY_P=${P/n/N}
+MY_P=Numeric-${PV}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Numerical Python adds a fast, compact, multidimensional array language facility to Python."
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pfdubois.com/numpy/"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 LICENSE="as-is"
 
 # 2.1 gave sandbox violations see #21
@@ -29,7 +29,3 @@ src_install() {
 	doins Demo/NumTut/*
 
 }
-
-
-
-