Delete older ebuild.

Package-Manager: portage-2.2.0_alpha15_p10/cvs/Linux x86_64

7 files changed, 8 insertions, 269 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 41499ea59776..3f05128ad501 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.61 2011/01/16 09:25:31 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.62 2011/01/16 15:31:31 arfrever Exp $
+
+  16 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/scipy-0.7.0_beta1-implicit.patch, -files/scipy-0.7.1-weave.patch,
+  -scipy-0.7.2-r1.ebuild, -files/scipy-0.7.2-optimize.patch,
+  -files/scipy-0.7.2-python2.7.patch:
+  Delete.
 
   16 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> scipy-0.8.0.ebuild:
   x86 stable wrt bug #351488
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index af323f7d2ec5..b2030dd6e76d 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,16 +1,8 @@
 AUX scipy-0.6.0-stsci.patch 2209 RMD160 c7c21a23aef7fff9318f224ef2383f7970c1caf9 SHA1 4b86ad61346660959a61dce24b2b9f20595ea473 SHA256 69cec7cfedbc39a30f54ec12852a84017b5a256e966e60a64b4e891b497fd1be
-AUX scipy-0.7.0_beta1-implicit.patch 905 RMD160 a22d5b5c7a67b3a806b63d7708654562fc241300 SHA1 40239fd3a77dc6f8cf9914a266953fd7b4ef41fe SHA256 cbde48ba3e22ef994b4ae0744c6186ef6d3ec608a74b3d0082f22d0be9591b96
-AUX scipy-0.7.1-weave.patch 413 RMD160 ef71432902d2ae914a9c5fbccf23ee4bb5f77802 SHA1 1f0d07591984be705ec9fb71c9d776e2a4eae25b SHA256 8f9d18c5dbf9cae951ae6d64530650e88f0109fa98d8d2e9e896e0c856a9eaa5
-AUX scipy-0.7.2-optimize.patch 1878 RMD160 59e8da9aa98c803683dd61889c9c93d5a8eaac13 SHA1 33bb4b2df3b21a8ad7211ae6de7f4224264c162e SHA256 8ea93099edd954625a272dd216cd462f5281f9b93ccfa89ec97720ee7b08ce12
-AUX scipy-0.7.2-python2.7.patch 792 RMD160 453dab01a79a3163f348750bade6537862a62339 SHA1 148e6ffda6b3eee61c574b6c99db625ae7eaa82e SHA256 286058b4c798ccad499ebdeaddef70467f0b00af12810bf9ee96e30b0f1f2cb1
 AUX scipy-0.8.0-python2.7.patch 826 RMD160 9c4cf8bb36e22dd1602fb14b4af5731692b43f9f SHA1 5b7f8a55c67d28448480a211d62379368c029df4 SHA256 cebe98b2a0f755516a154f43f99297a2a654b06b976d97db877b609d0ff0a346
-DIST scipy-0.7-html.zip 5723344 RMD160 2629be4420fcad20bd7d9f080e01e4dcf7639c10 SHA1 3db044ef8603578e15754ae890a6e2fddcdadae9 SHA256 35e2e4e4a7aaba8c348175366c120b1a802951abe50af10458c532631e0133bb
-DIST scipy-0.7-ref.pdf 3380649 RMD160 88bda2a06bc20627afbb0354fbe57c1b82dda7eb SHA1 091e1df2d28ee85428c50ee268db56146be96746 SHA256 4acbd75979fabfea9ff9d0cf60e06520c1f4d372f5369add8294f72303d3d0e0
-DIST scipy-0.7.2.tar.gz 4557178 RMD160 456e4ab9d69f9d4056bca6b52474b72bea37b122 SHA1 c3223df023008ee339cf1d3fad74d4566af69c8a SHA256 cae80f12e8b8e72fb2ca2007077e3948af9abc6f2011fe01a68137aea0ef46be
 DIST scipy-0.8-html.zip 6570421 RMD160 718a919f095e619a3669c30b3b77816500687daa SHA1 4d9e8e3bc04a3d5aec54b77c4acf36be46af342a SHA256 fd4f0a268cb0c4ca7f1b03da0036e342c06cb2dacf3eda3b893cb759e6655f7e
 DIST scipy-0.8-ref.pdf 4561020 RMD160 e748733add18a452753d2a6ec1a1084024e87756 SHA1 0ccd530749b05f56ee1372e9461ebe99810d1472 SHA256 0715c01702ac7302487544600e16870ef12027c121af336c3ae9bae03e9fd41b
 DIST scipy-0.8.0.tar.gz 5560625 RMD160 cce915a5760f9bcf4cc39381cb01d1a5726a57f3 SHA1 d7a84e5dc440d05e4d198411a2e0c6b8ec9adfc5 SHA256 b12937bd3a71ace8d7d6b7e19f8f220630969c2822e6248fc0bbc8f2cc18d825
-EBUILD scipy-0.7.2-r1.ebuild 4285 RMD160 d8eb110a2086eef9e39b79f242a898c1bacb92b8 SHA1 d0158270b6f63ea95d128d95b75ff1ecb1d49867 SHA256 3377b43d087ded50c9e5b7732d5af3dd66e6093ddd5edcd72f12019c0fc025ca
 EBUILD scipy-0.8.0.ebuild 4143 RMD160 7d6afc17ba7b181982153d199ce9748314ba6580 SHA1 302eb76603763ad450dcbeeb50e00e2430784318 SHA256 312108aa975f4deb336863d5ae1c38cfb84c03b74b2abc4bf0a1055bca19eba3
-MISC ChangeLog 12371 RMD160 56ca6debfb5e4effcd67e2ddecae4260b7269d12 SHA1 c38f8b65cea8d502e0c57dfee57ac65e7f62e0ed SHA256 733d6e32cc9f6997930d17ff4b8689824cd93ea989ebc3e41d02d707c8a74db5
+MISC ChangeLog 12627 RMD160 3d0dabd5be70bd0380e60cb9db5f4fc600218047 SHA1 acabd0d0ad8f36c6d0963ed3cebc4bb418b21474 SHA256 281334d3700fa1d93f9062e0e052f14b6777e15b646f61fbde1808045818f39b
 MISC metadata.xml 697 RMD160 05eb973594c8fe27be71e813f2a2294cf9e3f46e SHA1 1dbbb06751c0fc5760618d8998f9d169b3f774ae SHA256 1bfca083b6aa7c4fbd95b638daa2158b2eaa5cb93fe7a99abe9a2bc08b21e48e
diff --git a/sci-libs/scipy/files/scipy-0.7.0_beta1-implicit.patch b/sci-libs/scipy/files/scipy-0.7.0_beta1-implicit.patch
deleted file mode 100644
index dee015244db3..000000000000
--- a/sci-libs/scipy/files/scipy-0.7.0_beta1-implicit.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- scipy/sparse/linalg/dsolve/SuperLU/SRC/dcomplex.c	2007-09-22 03:55:18.000000000 -0400
-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/dcomplex.c	2008-07-03 08:04:15.000000000 -0400
-@@ -11,6 +11,7 @@
-  */
- #include <math.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include "dcomplex.h"
- 
- 
---- scipy/sparse/linalg/dsolve/SuperLU/SRC/scomplex.c	2007-09-22 03:55:18.000000000 -0400
-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/scomplex.c	2008-07-03 08:04:34.000000000 -0400
-@@ -11,6 +11,7 @@
-  */
- #include <math.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include "scomplex.h"
- 
- 
---- scipy/sparse/linalg/dsolve/SuperLU/SRC/xerbla.c	2007-09-22 03:55:18.000000000 -0400
-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/xerbla.c	2008-07-03 08:05:27.000000000 -0400
-@@ -1,3 +1,5 @@
-+#include <stdio.h>
-+
- /* Subroutine */ int xerbla_(char *srname, int *info)
- {
- /*  -- LAPACK auxiliary routine (version 2.0) --   
diff --git a/sci-libs/scipy/files/scipy-0.7.1-weave.patch b/sci-libs/scipy/files/scipy-0.7.1-weave.patch
deleted file mode 100644
index 56d29f2addac..000000000000
--- a/sci-libs/scipy/files/scipy-0.7.1-weave.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: /trunk/scipy/io/dumbdbm_patched.py

-===================================================================

---- /trunk/scipy/io/dumbdbm_patched.py (revision 3521)

-+++ /trunk/scipy/io/dumbdbm_patched.py (revision 5967)

-@@ -78,4 +78,7 @@

-         return dat

- 

-+    def __contains__(self, key):

-+        return key in self._index

-+

-     def _addval(self, val):

-         f = _open(self._datfile, 'rb+')

diff --git a/sci-libs/scipy/files/scipy-0.7.2-optimize.patch b/sci-libs/scipy/files/scipy-0.7.2-optimize.patch
deleted file mode 100644
index 4a3bb74012bd..000000000000
--- a/sci-libs/scipy/files/scipy-0.7.2-optimize.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- scipy/optimize/optimize.py.orig	2009-07-11 17:56:37.000000000 +1200
-+++ scipy/optimize/optimize.py	2010-05-17 21:36:07.605336495 +1200
-@@ -41,6 +41,12 @@
-     m = asarray(m)
-     return numpy.minimum.reduce(m,axis)
- 
-+def is_array_scalar(x):
-+    """Test whether `x` is either a scalar or an array scalar.
-+
-+    """
-+    return len(atleast_1d(x) == 1)
-+
- abs = absolute
- import __builtin__
- pymin = __builtin__.min
-@@ -1177,13 +1183,12 @@
- 
-     """
-     # Test bounds are of correct form
--    x1 = atleast_1d(x1)
--    x2 = atleast_1d(x2)
--    if len(x1) != 1 or len(x2) != 1:
--        raise ValueError, "Optimisation bounds must be scalars" \
--                " or length 1 arrays"
-+
-+    if not (is_array_scalar(x1) and is_array_scalar(x2)):
-+        raise ValueError("Optimisation bounds must be scalars"
-+                         " or array scalars.")
-     if x1 > x2:
--        raise ValueError, "The lower bound exceeds the upper bound."
-+        raise ValueError("The lower bound exceeds the upper bound.")
- 
-     flag = 0
-     header = ' Func-count     x          f(x)          Procedure'
---- scipy/optimize/tests/test_optimize.py.orig	2009-07-11 17:56:37.000000000 +1200
-+++ scipy/optimize/tests/test_optimize.py	2010-05-18 21:31:39.000000000 +1200
-@@ -159,10 +160,17 @@
-         assert abs(x - 1.5) < 1e-6
-         assert_raises(ValueError,
-                 optimize.fminbound, lambda x: (x - 1.5)**2 - 0.8, 5, 1)
-+
-+    def test_fminbound_scalar(self):
-         assert_raises(ValueError,
--                optimize.fminbound, lambda x: (x - 1.5)**2 - 0.8,
-+                      optimize.fminbound, lambda x: (x - 1.5)**2 - 0.8,
-                       np.zeros(2), 1)
- 
-+        assert_almost_equal(
-+            optimize.fminbound(lambda x: (x - 1.5)**2 - 0.8, 1, np.array(5)),
-+            1.5)
-+
-+
- class TestTnc(TestCase):
-     """TNC non-linear optimization.
diff --git a/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch b/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch
deleted file mode 100644
index 13dbd4caaef3..000000000000
--- a/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://projects.scipy.org/scipy/changeset/6645
-
---- scipy/sparse/sparsetools/setup.py
-+++ scipy/sparse/sparsetools/setup.py
-@@ -8,7 +8,10 @@
- 
-     for fmt in ['csr','csc','coo','bsr','dia']:
-         sources = [ fmt + '_wrap.cxx' ]
--        config.add_extension('_' + fmt, sources=sources)
-+        depends = [ fmt + '.h' ]
-+        config.add_extension('_' + fmt, sources=sources,
-+		define_macros=[('__STDC_FORMAT_MACROS', 1)],
-+		depends=depends)
- 
-     return config
- 
---- scipy/sparse/sparsetools/SConscript
-+++ scipy/sparse/sparsetools/SConscript
-@@ -3,6 +3,7 @@
- from numscons import GetNumpyEnvironment
- 
- env = GetNumpyEnvironment(ARGUMENTS)
-+env.PrependUnique(CPPDEFINES = '__STDC_FORMAT_MACROS')
- 
- for fmt in ['csr','csc','coo','bsr','dia']:
-     sources = [ fmt + '_wrap.cxx' ]
diff --git a/sci-libs/scipy/scipy-0.7.2-r1.ebuild b/sci-libs/scipy/scipy-0.7.2-r1.ebuild
deleted file mode 100644
index 8e4e1d637791..000000000000
--- a/sci-libs/scipy/scipy-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild,v 1.7 2010/08/03 13:40:45 xarthisius Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils distutils flag-o-matic toolchain-funcs versionator
-
-SP="${PN}-$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${SP}.x/${PN}-html.zip -> ${SP}-html.zip
-		http://docs.scipy.org/doc/${SP}.x/${PN}-ref.pdf -> ${SP}-ref.pdf
-	)"
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/ http://pypi.python.org/pypi/scipy"
-
-LICENSE="BSD"
-
-SLOT="0"
-IUSE="doc umfpack"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND=">=dev-python/numpy-1.2
-	virtual/cblas
-	virtual/lapack
-	umfpack? ( sci-libs/umfpack )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	umfpack? ( dev-lang/swig )
-	doc? ( app-arch/unzip )"
-#	test? ( dev-python/nose )
-
-RDEPEND="${CDEPEND}
-	dev-python/imaging"
-
-# buggy tests
-RESTRICT="test"
-
-DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
-
-pkg_setup() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use umfpack && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${SP}-html.zip -d html || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.0_beta1-implicit.patch
-	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
-	epatch "${FILESDIR}"/${PN}-0.7.1-weave.patch
-	epatch "${FILESDIR}"/${PN}-0.7.2-optimize.patch \
-		"${FILESDIR}"/${P}-python2.7.patch
-	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
-}
-
-src_compile() {
-	[[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
-	distutils_src_compile ${SCIPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile ${SCIPY_FCONFIG} || die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib*/python > /dev/null
-		PYTHONPATH=. "$(PYTHON)" -c "import scipy; scipy.test('full')" 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() {
-	distutils_src_install ${SCIPY_FCONFIG}
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/html || die
-		doins  "${DISTDIR}"/${SP}*pdf || die
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer if you don't like the default one. Ex:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}