summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-05-27 17:28:55 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-05-27 17:28:55 +0000
commitf7bba46ec044877a1ae48020a849143c32e4a478 (patch)
tree4f1bd259965afdf7c46550f7b9160a328392e8d8 /sci-misc
parentFix up build under latest mdds. (diff)
downloadgentoo-2-f7bba46ec044877a1ae48020a849143c32e4a478.tar.gz
gentoo-2-f7bba46ec044877a1ae48020a849143c32e4a478.tar.bz2
gentoo-2-f7bba46ec044877a1ae48020a849143c32e4a478.zip
Version bump
(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/nco/ChangeLog10
-rw-r--r--sci-misc/nco/nco-4.3.1.ebuild (renamed from sci-misc/nco/nco-4.0.8.ebuild)33
2 files changed, 19 insertions, 24 deletions
diff --git a/sci-misc/nco/ChangeLog b/sci-misc/nco/ChangeLog
index 2422ce0d9956..bff76c973584 100644
--- a/sci-misc/nco/ChangeLog
+++ b/sci-misc/nco/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-misc/nco
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.20 2012/11/27 22:51:10 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.21 2013/05/27 17:28:55 bicatali Exp $
+
+*nco-4.3.1 (27 May 2013)
+
+ 27 May 2013; Sébastien Fabbro <bicatali@gentoo.org> +nco-4.3.1.ebuild,
+ -nco-4.0.8.ebuild:
+ Version bump
*nco-4.2.3 (27 Nov 2012)
diff --git a/sci-misc/nco/nco-4.0.8.ebuild b/sci-misc/nco/nco-4.3.1.ebuild
index e6f155cf075b..82b79e0e3f9b 100644
--- a/sci-misc/nco/nco-4.0.8.ebuild
+++ b/sci-misc/nco/nco-4.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-4.0.8.ebuild,v 1.1 2011/12/30 04:10:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-4.3.1.ebuild,v 1.1 2013/05/27 17:28:55 bicatali Exp $
-EAPI=4
+EAPI=5
inherit eutils flag-o-matic
DESCRIPTION="Command line utilities for operating on netCDF files"
@@ -11,33 +11,30 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dap doc gsl ncap2 static-libs udunits"
+IUSE="dap doc gsl ncap2 static-libs test udunits"
-RDEPEND=">=sci-libs/netcdf-4[dap=]
+RDEPEND="
+ >=sci-libs/netcdf-4[dap=]
gsl? ( sci-libs/gsl )
udunits? ( >=sci-libs/udunits-2 )"
DEPEND="${RDEPEND}
ncap2? ( dev-java/antlr:0 )
- doc? ( virtual/latex-base )"
+ test? ( >=sci-libs/netcdf-4[tools] )"
src_configure() {
local myconf
if has_version '>=sci-libs/netcdf-4[hdf5]'; then
myconf="--enable-netcdf4"
- append-flags -DHAVE_NETCDF4_H
+ append-cppflags -DHAVE_NETCDF4_H
else
myconf="--disable-netcdf4"
fi
- if use dap; then
- myconf="${myconf} --enable-dap-netcdf --disable-dap-opendap"
- else
- myconf="${myconf} --disable-dap-netcdf --disable-dap-opendap"
- fi
econf \
--disable-udunits \
+ $(use_enable dap dap-netcdf) \
$(use_enable gsl) \
$(use_enable ncap2) \
$(use_enable static-libs static) \
@@ -45,18 +42,10 @@ src_configure() {
${myconf}
}
-src_compile() {
- # TODO: workout -j1 to make sure lex generation is done
- emake -j1
- cd doc
- emake clean info
- use doc && VARTEXFONTS="${T}/fonts" emake html pdf
-}
-
src_install() {
default
cd doc
dodoc ANNOUNCE ChangeLog MANIFEST NEWS README TAG TODO VERSION *.txt
doinfo *.info*
- use doc && dohtml nco.html/* && dodoc nco.pdf
+ use doc && dohtml nco.html && dodoc nco.pdf
}