From 632d426b187566345c80409164b9162223dbeb39 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 2 Jan 2016 19:20:59 +0000 Subject: sci-misc/nco: antlr-cpp should be in RDEPEND I commented that antlr should have been in RDEPEND before and forgot to put antlr-cpp there myself. D'oh! Package-Manager: portage-2.2.26 --- sci-misc/nco/nco-4.5.1-r1.ebuild | 50 ---------------------------------------- sci-misc/nco/nco-4.5.1-r2.ebuild | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 sci-misc/nco/nco-4.5.1-r1.ebuild create mode 100644 sci-misc/nco/nco-4.5.1-r2.ebuild (limited to 'sci-misc/nco') diff --git a/sci-misc/nco/nco-4.5.1-r1.ebuild b/sci-misc/nco/nco-4.5.1-r1.ebuild deleted file mode 100644 index 32a8c255c770..000000000000 --- a/sci-misc/nco/nco-4.5.1-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_IN_SOURCE_BUILD=1 -inherit autotools-utils eutils flag-o-matic - -DESCRIPTION="Command line utilities for operating on netCDF files" -HOMEPAGE="http://nco.sourceforge.net/" -SRC_URI="http://nco.sf.net/src/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="dap doc gsl ncap2 openmp static-libs test udunits" - -RDEPEND=" - >=sci-libs/netcdf-4:=[dap=,tools] - gsl? ( sci-libs/gsl:= ) - udunits? ( >=sci-libs/udunits-2 )" - -DEPEND="${RDEPEND} - ncap2? ( dev-cpp/antlr-cpp:2= ) - test? ( >=sci-libs/netcdf-4[tools] )" - -src_configure() { - local myeconfargs=( - --disable-udunits - $(use_enable dap dap-netcdf) - $(use_enable gsl) - $(use_enable ncap2) - $(use_enable openmp) - $(use_enable udunits udunits2) - ) - if has_version '>=sci-libs/netcdf-4[hdf5]'; then - myeconfargs+=( --enable-netcdf4 ) - append-cppflags -DHAVE_NETCDF4_H - else - myeconfargs+=( --disable-netcdf4 ) - fi - autotools-utils_src_configure -} - -src_install() { - use doc && DOCS=( doc/nco.pdf ) && HTML_DOCS=( doc/nco.html ) - autotools-utils_src_install - doinfo doc/*.info* -} diff --git a/sci-misc/nco/nco-4.5.1-r2.ebuild b/sci-misc/nco/nco-4.5.1-r2.ebuild new file mode 100644 index 000000000000..a8db552ea7fc --- /dev/null +++ b/sci-misc/nco/nco-4.5.1-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_IN_SOURCE_BUILD=1 +inherit autotools-utils eutils flag-o-matic + +DESCRIPTION="Command line utilities for operating on netCDF files" +HOMEPAGE="http://nco.sourceforge.net/" +SRC_URI="http://nco.sf.net/src/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="dap doc gsl ncap2 openmp static-libs test udunits" + +RDEPEND=" + >=sci-libs/netcdf-4:=[dap=,tools] + gsl? ( sci-libs/gsl:= ) + ncap2? ( dev-cpp/antlr-cpp:2= ) + udunits? ( >=sci-libs/udunits-2 )" + +DEPEND="${RDEPEND} + test? ( >=sci-libs/netcdf-4[tools] )" + +src_configure() { + local myeconfargs=( + --disable-udunits + $(use_enable dap dap-netcdf) + $(use_enable gsl) + $(use_enable ncap2) + $(use_enable openmp) + $(use_enable udunits udunits2) + ) + if has_version '>=sci-libs/netcdf-4[hdf5]'; then + myeconfargs+=( --enable-netcdf4 ) + append-cppflags -DHAVE_NETCDF4_H + else + myeconfargs+=( --disable-netcdf4 ) + fi + autotools-utils_src_configure +} + +src_install() { + use doc && DOCS=( doc/nco.pdf ) && HTML_DOCS=( doc/nco.html ) + autotools-utils_src_install + doinfo doc/*.info* +} -- cgit v1.2.3-65-gdbad