From ca4225c8a1722630517b342b7bf3aa6ee06737b9 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 11 Jun 2010 22:58:00 +0000 Subject: [PATCH] Delete call to deprecated distutils_python_version(). Package-Manager: portage-HEAD/cvs/Linux x86_64 --- dev-python/numarray/ChangeLog | 6 +++++- dev-python/numarray/Manifest | 4 ++-- dev-python/numarray/numarray-1.5.2-r1.ebuild | 9 ++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dev-python/numarray/ChangeLog b/dev-python/numarray/ChangeLog index 64c034936fae..935b08bfeaad 100644 --- a/dev-python/numarray/ChangeLog +++ b/dev-python/numarray/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/numarray # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/ChangeLog,v 1.34 2010/02/07 20:43:52 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/ChangeLog,v 1.35 2010/06/11 22:58:00 arfrever Exp $ + + 11 Jun 2010; Arfrever Frehtes Taifersar Arahesis + numarray-1.5.2-r1.ebuild: + Delete call to deprecated distutils_python_version(). 07 Feb 2010; Peter Volkov numarray-1.5.2-r1.ebuild: Add inherit eutils: epatch is defined there. diff --git a/dev-python/numarray/Manifest b/dev-python/numarray/Manifest index bf48bb5bfa43..c242e2945bfa 100644 --- a/dev-python/numarray/Manifest +++ b/dev-python/numarray/Manifest @@ -8,6 +8,6 @@ DIST numarray-1.5.2.tar.gz 1196014 RMD160 51cc7681958cada32c515872e8def6fc0ff296 DIST numarray-1.5.html.tar.gz 203409 RMD160 361850242a04efea59befe7e05dd9cb6fa1cb457 SHA1 dd88e63e19d51dcc4ff092dff47048bf37bf674c SHA256 55d6322e83d78d6f0961ae563bf81602214fb44d47929a212f0342fb579346a6 EBUILD numarray-1.3.1.ebuild 739 RMD160 03864a573b7c4aeb891f2213ca9bc164af4cd76f SHA1 4019c88fc59d6024516ee1ea883cf1be123ae8d6 SHA256 fb9dfc56bd1f054405f9c6629c374f2f6d803749c11c069ed1a660e388a98fd8 EBUILD numarray-1.5.1.ebuild 743 RMD160 a811282e45cc70c1f50e0d584b5a0af22f0eaebe SHA1 3526f46803c63c5213d1f675773707b0efc77459 SHA256 d4616f0eff2db1d0081d9bb321e6557bc858527a7bea931ed73ad66d7bc44c1e -EBUILD numarray-1.5.2-r1.ebuild 2883 RMD160 a97c9f9cd7c5ffbd918a56c3735396a8171b776c SHA1 c70d158dc35c0df4aaf346cd57aaa7ef7c66e07c SHA256 de182c63f6dcd41f84cb0439d822701a5f630e25a447f346f96b57e9bfa1d559 -MISC ChangeLog 5107 RMD160 8a6a1d07b37becd1bd80016716a81fa81a9fa875 SHA1 8c52ce42d2c861cfa67cda4b1e3dcfc45283b217 SHA256 02503180df5db84511112cd3bdf7352563bdad75d69f4836a9fac638570e82cc +EBUILD numarray-1.5.2-r1.ebuild 2875 RMD160 dbc4540adfdd7493f35f5e92f646e69fc3ffd33a SHA1 8df18e5e2e68a24b2fae3bad05f7d5886357eb78 SHA256 92424c83772193d1a080026edf3ff1e25952fb4d2e998e5fba632d40bda5af04 +MISC ChangeLog 5270 RMD160 11b1462a10972f0df978b761216a87fcb684f6c9 SHA1 72fe0a3fa00395c58dd54d1bb433ae6c3ec2563a SHA256 3d77f26c395241527e885f7e1924b5ac154be799eda2eabfef889703509aa52b MISC metadata.xml 950 RMD160 678f238a25e95981f6668360be4f564a84eafba8 SHA1 5b2721eab57bd7bb4946400354edd4d162930fc3 SHA256 1e4851dd9530a0ee08781b710b138653904b195fdb4d2e62152ad4f2534acaf8 diff --git a/dev-python/numarray/numarray-1.5.2-r1.ebuild b/dev-python/numarray/numarray-1.5.2-r1.ebuild index 53038b53f37e..7c15c9be1cfe 100644 --- a/dev-python/numarray/numarray-1.5.2-r1.ebuild +++ b/dev-python/numarray/numarray-1.5.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/numarray-1.5.2-r1.ebuild,v 1.13 2010/02/07 20:43:52 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/numarray-1.5.2-r1.ebuild,v 1.14 2010/06/11 22:58:00 arfrever Exp $ NEED_PYTHON=2.3 @@ -53,8 +53,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-freebsd.patch # fix only for python-2.5 (fix still uncomplete, see bug #191240) - distutils_python_version - [[ "${PYVER}" == 2.5 ]] && epatch "${FILESDIR}"/${P}-python25.patch + [[ "$(python_get_version)" == 2.5 ]] && epatch "${FILESDIR}"/${P}-python25.patch # array_protocol tests are buggy with various numeric/numpy versions sed -i \ @@ -71,13 +70,13 @@ src_unpack() { cfg_packages.py || die "sed for lapack failed" fi - "${python}" setup.py config --gencode || die "API code generation failed" + "$(PYTHON)" setup.py config --gencode || die "API code generation failed" } src_test() { cd build/lib* cp "${S}"/Lib/testdata.fits numarray - PYTHONPATH=. "${python}" -c \ + PYTHONPATH=. "$(PYTHON)" -c \ "from numarray.testall import test;import sys;sys.exit(test())" 2>&1 \ | tee test.log grep -q -i failed test.log && die "failed tests in ${PWD}/test.log" -- 2.26.2