[gentoo-commits] proj/sci:master commit in: sci-geosciences/cdat-lite/

[Justin Lecher]

commit:     a3bbf05165e268675f2e2de982e4aaa4666c5cac
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 13:14:18 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec  4 13:14:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a3bbf051

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/cdat-lite-5.2.ebuild     | 38 +++++++++++-----------
 sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild | 31 ++++++++----------
 sci-geosciences/cdat-lite/metadata.xml             | 12 +++----
 4 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/sci-geosciences/cdat-lite/ChangeLog b/sci-geosciences/cdat-lite/ChangeLog
index 51a2e62..242e267 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 <jlec@g.o> 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 <tim@××××××××.net> +cdat-lite-6.0_rc2.ebuild:

diff --git a/sci-geosciences/cdat-lite/cdat-lite-5.2.ebuild b/sci-geosciences/cdat-lite/cdat-lite-5.2.ebuild
index 0390f82..4f544cd 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 34d713c..4016346 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 91bea76..50f2b52 100644
--- a/sci-geosciences/cdat-lite/metadata.xml
+++ b/sci-geosciences/cdat-lite/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<maintainer>
-<email>tim@××××××××.net</email>
-<name>Tim Cera</name>
-</maintainer>
-<longdescription lang="en">
+  <herd>sci-geosciences</herd>
+  <maintainer>
+    <email>tim@××××××××.net</email>
+    <name>Tim Cera</name>
+  </maintainer>
+  <longdescription lang="en">
 CDAT-Lite is a large suite of open source tools for the management and analysis of climate data.
 </longdescription>
 </pkgmetadata>