From a3bbf05165e268675f2e2de982e4aaa4666c5cac Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 4 Dec 2013 14:14:18 +0100 Subject: sci-geosciences/cdat-lite: Bump to distutils-r1 eclass Package-Manager: portage-2.2.7 --- sci-geosciences/cdat-lite/ChangeLog | 6 +++- sci-geosciences/cdat-lite/Manifest | 2 +- sci-geosciences/cdat-lite/cdat-lite-5.2.ebuild | 38 +++++++++++----------- sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild | 31 ++++++++---------- sci-geosciences/cdat-lite/metadata.xml | 12 +++---- 5 files changed, 45 insertions(+), 44 deletions(-) (limited to 'sci-geosciences') diff --git a/sci-geosciences/cdat-lite/ChangeLog b/sci-geosciences/cdat-lite/ChangeLog index 51a2e6218..242e26723 100644 --- a/sci-geosciences/cdat-lite/ChangeLog +++ b/sci-geosciences/cdat-lite/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-geosciences/cdat-lite -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Dec 2013; Justin Lecher cdat-lite-5.2.ebuild, + cdat-lite-6.0_rc2.ebuild, metadata.xml: + Bump to distutils-r1 eclass + *cdat-lite-6.0_rc2 (16 Jul 2011) 16 Jul 2011; Tim Cera +cdat-lite-6.0_rc2.ebuild: diff --git a/sci-geosciences/cdat-lite/Manifest b/sci-geosciences/cdat-lite/Manifest index 410f7df59..a8e187dde 100644 --- a/sci-geosciences/cdat-lite/Manifest +++ b/sci-geosciences/cdat-lite/Manifest @@ -1,2 +1,2 @@ -DIST cdat_lite-5.2.tar.gz 3454154 SHA256 72e851d61d9f8be5d744b346ccbb16a757809f723e332ed09703bfaeb8c84bd7 +DIST cdat_lite-5.2.tar.gz 3454154 SHA256 72e851d61d9f8be5d744b346ccbb16a757809f723e332ed09703bfaeb8c84bd7 SHA512 84ddd0f75bda999cea15c1dfa25c11e1cc1f94b163821e43ffdf18a0cf58e7561a7d771180dd32a01a5e70cfb4e8db25b12252f9b50276a6bb54602366efe758 WHIRLPOOL c52e908a14296ef519713976336d5bd402848e06f6f333288e862811133d91fd01be0096e413236d192efd7aa8804640ecf4782c3f3d9d408003e6645e396f14 DIST cdat_lite-6.0rc2.tar.gz 3563402 SHA256 6cbfdf9b47fdbc189ca7d2819dafb6cf958116e0f6077b325c375a0ddfab2a95 diff --git a/sci-geosciences/cdat-lite/cdat-lite-5.2.ebuild b/sci-geosciences/cdat-lite/cdat-lite-5.2.ebuild index 0390f8271..4f544cd64 100644 --- a/sci-geosciences/cdat-lite/cdat-lite-5.2.ebuild +++ b/sci-geosciences/cdat-lite/cdat-lite-5.2.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI=5 -PYTHON_DEPEND="2:2.5" -SUPPORT_PYTHON_ABIS="1" +PYTHON_COMPAT=( python{2_6,2_7} ) -inherit distutils eutils toolchain-funcs +inherit distutils-r1 toolchain-funcs MY_P=${P/-/_} DESCRIPTION="Large suite of open source tools for the management and analysis of climate data" -HOMEPAGE="http://proj.badc.rl.ac.uk/ndg/wiki/CdatLite" +HOMEPAGE="http://proj.badc.rl.ac.uk/cedaservices/wiki/CdatLite" SRC_URI="http://ndg.nerc.ac.uk/dist/${MY_P}.tar.gz" LICENSE="BSD" @@ -20,25 +19,26 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -COMMON_DEPEND=">=sci-libs/netcdf-4.0.1 +COMMON_DEPEND=" + >=sci-libs/netcdf-4.0.1 >=sci-libs/hdf5-1.6.4" DEPEND="${COMMON_DEPEND} - dev-python/setuptools" + dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="${COMMON_DEPEND} !sci-biology/ncbi-tools" -RESTRICT_PYTHON_ABIS="3.*" +S="${WORKDIR}"/${MY_P} -S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PV}-shared-lib.patch + "${FILESDIR}"/${PV}-impl-dec.patch + ) -src_prepare() { - epatch "${FILESDIR}"/${PV}-shared-lib.patch - epatch "${FILESDIR}"/${PV}-impl-dec.patch +python_prepare_all() { find "${S}" -type l -exec rm '{}' \; - distutils_src_prepare -} - -src_compile()( tc-export CC - distutils_src_compile -) + sed \ + -e 's:libhdf5.a:libhdf5.so:g' \ + -i setup_util.py || die + distutils-r1_python_prepare_all +} diff --git a/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild b/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild index 34d713c71..4016346a6 100644 --- a/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild +++ b/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI=5 -PYTHON_DEPEND="2:2.5" -SUPPORT_PYTHON_ABIS="1" +PYTHON_COMPAT=( python{2_6,2_7} ) -inherit distutils eutils toolchain-funcs +inherit distutils-r1 toolchain-funcs MY_P=${P/-/_} MY_P=${MY_P/_rc/rc} DESCRIPTION="Large suite of open source tools for the management and analysis of climate data" -HOMEPAGE="http://proj.badc.rl.ac.uk/ndg/wiki/CdatLite" +HOMEPAGE="http://proj.badc.rl.ac.uk/cedaservices/wiki/CdatLite" SRC_URI="http://ndg.nerc.ac.uk/dist/${MY_P}.tar.gz" LICENSE="BSD" @@ -21,23 +20,21 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -COMMON_DEPEND=">=sci-libs/netcdf-4.0.1 +COMMON_DEPEND=" + >=sci-libs/netcdf-4.0.1 >=sci-libs/hdf5-1.6.4" DEPEND="${COMMON_DEPEND} - dev-python/setuptools" + dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="${COMMON_DEPEND} !sci-biology/ncbi-tools" -RESTRICT_PYTHON_ABIS="3.*" - S="${WORKDIR}/${MY_P}" -src_prepare() { +python_prepare_all() { find "${S}" -type l -exec rm '{}' \; - distutils_src_prepare -} - -src_compile()( tc-export CC - distutils_src_compile -) + sed \ + -e 's:libhdf5.a:libhdf5.so:g' \ + -i setup_util.py || die + distutils-r1_python_prepare_all +} diff --git a/sci-geosciences/cdat-lite/metadata.xml b/sci-geosciences/cdat-lite/metadata.xml index 91bea767c..50f2b52a9 100644 --- a/sci-geosciences/cdat-lite/metadata.xml +++ b/sci-geosciences/cdat-lite/metadata.xml @@ -1,12 +1,12 @@ -sci-geosciences - -tim@cerazone.net -Tim Cera - - + sci-geosciences + + tim@cerazone.net + Tim Cera + + CDAT-Lite is a large suite of open source tools for the management and analysis of climate data. -- cgit v1.2.3-65-gdbad