Bump to 2.9, remove old

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 18 insertions, 51 deletions

diff --git a/dev-python/scientificpython/ChangeLog b/dev-python/scientificpython/ChangeLog
index e80b4a9c6ab9..0b408390704a 100644
--- a/dev-python/scientificpython/ChangeLog
+++ b/dev-python/scientificpython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/scientificpython
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.20 2009/08/14 14:59:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.21 2009/09/04 17:04:51 patrick Exp $
+
+*scientificpython-2.9 (04 Sep 2009)
+
+  04 Sep 2009; Patrick Lauer <patrick@gentoo.org>
+  -scientificpython-2.4.9.ebuild, -scientificpython-2.6.1.ebuild,
+  +scientificpython-2.9.ebuild:
+  Bump to 2.9, remove old
 
   14 Aug 2009; Raúl Porcel <armin76@gentoo.org>
   scientificpython-2.8.ebuild:
diff --git a/dev-python/scientificpython/Manifest b/dev-python/scientificpython/Manifest
index 38db74ec8894..dcffff290273 100644
--- a/dev-python/scientificpython/Manifest
+++ b/dev-python/scientificpython/Manifest
@@ -1,10 +1,8 @@
 AUX scientificpython-2.8-mpi.patch 530 RMD160 9ce4b864391bae5ec5365af17b8199899191625d SHA1 f1f40e2f354ea2210d6070abba5fd38168712be3 SHA256 fc327506ebdfd5e3a7e5e1351b6575039748ff9d1650b0e64a9efa57b799dacc
 AUX scientificpython-mpi.patch 403 RMD160 fcb18d760d73bd5d250c597b344ec33c665aab90 SHA1 93b9b6ac9588c7c332f422a8a520ced116f94881 SHA256 a36550c0c01ecb3c7eced75be15c343ef65bf3fefc9cada1d2cbb3521ede50af
-DIST ScientificPython-2.4.9.tar.gz 491370 RMD160 70bc5a918bf7fc368ba88306078b66931b8b3436 SHA1 077b6347940617999c23103bac9542d926ed7f69 SHA256 139bca0eed3e307d4e5d6b45b4111d2de8964c7ede657c7ea8ce7f7d218097d7
-DIST ScientificPython-2.6.1.tar.gz 514044 RMD160 5c9e8cba2373d722854cfe57e270803d7ed2bf2a SHA1 db5b0d369e8254130312553a13a70888537e637e SHA256 cfa06b0e5bdadfdc79328bfd01843f9e7b0a08f7c19d1f32a7ecec498be72cc0
 DIST ScientificPython-2.8.tar.gz 559613 RMD160 0501829586253fe3986458529c436b6d93e6667f SHA1 c0847eac6359d70b0e4687c5c65af49b3986e55b SHA256 4de6c8d1b28526d0f2db02f30e99a28a8340ee4cc06fa0a5c0d4b20096806908
-EBUILD scientificpython-2.4.9.ebuild 858 RMD160 b38feba4386bf24e900bf5853464abf5f099e7e5 SHA1 1b9a189f6028224f56bdde5ee3ee7186bf00fcef SHA256 04ff82fa82c715800246f89bbb13e699ca70c5e7ae7b77b85c65dd0b289dfb46
-EBUILD scientificpython-2.6.1.ebuild 1562 RMD160 87a859d0fec9d0c9c657501edc572c9d2b942c70 SHA1 69f3dc8ae5122bc0ca7a35d19ab46018fc99dbb1 SHA256 0698ae3b1123eda683223f74f299a30dc8f716a4339b9234dfbe11c3f595ade5
+DIST ScientificPython-2.9.tar.gz 593720 RMD160 2533879b64fcb17027b11784fc0cff4351284c98 SHA1 60fb1ec7c31c86b7e7a068ccda780197e1e95ad8 SHA256 4ffc33f211b9dc811af0aa82b74453f73c7f415c04352ac1cef92b95b12b74be
 EBUILD scientificpython-2.8.ebuild 1584 RMD160 3c5248b8107fe26bbfcc8cd7306cd029b54aa4d3 SHA1 062066b26506f263c485f9f1f1fe2fbc5883740c SHA256 a1b3c0d7cd5e0cbb53617c066b4efc431f4c12ed980cb3489a9b4fa2b7c35afd
-MISC ChangeLog 5356 RMD160 9db0b6e68937bf9d2ae7b65e2a7348f0f5ca065b SHA1 8bf9cfbcef2a87eafef1134eb0f184ca9e87d010 SHA256 7bdc5d0bf916dcc522d12ea12634950cd613b3a24c83a3d51797c5f26e25cfca
+EBUILD scientificpython-2.9.ebuild 1511 RMD160 f820ed65084a8024b84f56a490f8f061727bac63 SHA1 37744b63f82aa88ccf5bbdc6b70baa5cfa6029b8 SHA256 826a26f39b15d1dde80f78b62704d7c7190c39c758cc6c7f23761ad783f37a7a
+MISC ChangeLog 5568 RMD160 b86a7ff42acbea1fb6834eb6e6535d234e35e5e0 SHA1 2f8b4d2008bf4a565aa03c948a86ce1a21cf85cc SHA256 59e4fe2ff3d20efa4809cf4bd614fc522905faeadc7800cb36f90147edec5eb1
 MISC metadata.xml 734 RMD160 47baa4ca9756eff5e19c8f7b18f18054d5c3e1aa SHA1 aa3adb4221bc8997d68d01afa2ca8528ab579baf SHA256 6749ecfd7ae3f2ed8e9da27ad372d9f35023cdf3ea7ab0976b829460b1d03b2f
diff --git a/dev-python/scientificpython/scientificpython-2.4.9.ebuild b/dev-python/scientificpython/scientificpython-2.4.9.ebuild
deleted file mode 100644
index 749901382c27..000000000000
--- a/dev-python/scientificpython/scientificpython-2.4.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.4.9.ebuild,v 1.5 2009/07/29 20:28:07 vostorga Exp $
-
-MY_P=${P/scientificpython/ScientificPython}
-S=${WORKDIR}/${MY_P}
-
-inherit distutils
-
-IUSE=""
-DESCRIPTION="Scientific Module for Python"
-SRC_URI="http://starship.python.net/~hinsen/ScientificPython/${MY_P}.tar.gz"
-HOMEPAGE="http://sourcesup.cru.fr/projects/scientific-py/"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="alpha ~amd64 ia64 ~ppc sparc x86"
-
-DEPEND="virtual/python
-	>=dev-python/numeric-19.0
-	>=sci-libs/netcdf-3.0"
-
-src_install() {
-	distutils_src_install
-
-	dodoc MANIFEST.in COPYRIGHT README*
-	cd Doc
-	dodoc CHANGELOG
-	dohtml HTML/*
-
-	dodir /usr/share/doc/${PF}/pdf
-	insinto /usr/share/doc/${PF}/pdf
-	doins PDF/*
-}
diff --git a/dev-python/scientificpython/scientificpython-2.6.1.ebuild b/dev-python/scientificpython/scientificpython-2.9.ebuild
index 2a1585b342d3..6199554ed64f 100644
--- a/dev-python/scientificpython/scientificpython-2.6.1.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.6.1.ebuild,v 1.2 2009/07/29 20:28:07 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.ebuild,v 1.1 2009/09/04 17:04:51 patrick Exp $
 
 MY_PN=ScientificPython
-DV=1034 # hardcoded download version
+DV=2372 # hardcoded download version
 
 inherit eutils distutils
 
@@ -16,23 +16,18 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 IUSE="mpi doc"
 
-DEPEND=">=dev-python/numeric-23.8
-	>=sci-libs/netcdf-3.0
+DEPEND="dev-python/numpy
+	sci-libs/netcdf
 	mpi? ( virtual/mpi )"
 
-S="${WORKDIR}/${MY_PN}-2.6"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-mpi.patch
-}
+S="${WORKDIR}/${MY_PN}-${PV}.0"
 
 src_compile() {
 	distutils_src_compile
 	if use mpi; then
 		cd Src/MPI
-		"${python}" compile.py || die "compile mpi failed"
+		PYTHONPATH=$(ls -d "${S}"/build/lib*) \
+			"${python}" compile.py || die "compile mpi failed"
 	fi
 }