Add missing USE-dep, bug #542704

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

4 files changed, 16 insertions, 63 deletions

diff --git a/sci-misc/nco/ChangeLog b/sci-misc/nco/ChangeLog
index 66c00cbaf69f..0be47e28b519 100644
--- a/sci-misc/nco/ChangeLog
+++ b/sci-misc/nco/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/nco
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.24 2014/08/07 16:45:53 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.25 2015/07/31 07:45:44 jlec Exp $
+
+  31 Jul 2015; Justin Lecher <jlec@gentoo.org> -nco-4.3.1.ebuild, metadata.xml,
+  nco-4.4.2.ebuild:
+  Add missing USE-dep, bug #542704
 
   07 Aug 2014; Michał Górny <mgorny@gentoo.org> nco-4.4.2.ebuild:
   Fix myconfargs typo, bug #519288.
diff --git a/sci-misc/nco/metadata.xml b/sci-misc/nco/metadata.xml
index fb593681303a..4f8a54def83b 100644
--- a/sci-misc/nco/metadata.xml
+++ b/sci-misc/nco/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   Command-line operators to analyze netCDF files
   NetCDF Operator is a suite of programs known as operators. The
   operators are stand-alone, command-line programs executable in a POSIX
@@ -11,10 +11,10 @@
   output file. NCO was originally designed to manipulate and analyze
   climate data, though it works on any netCDF format datasets.
 </longdescription>
-<use>
-  <flag name="dap">Support for remote data access with the NETCDF DAP client</flag>
-  <flag name='ncap2'>Build next generation netcdf arithmetic processor
+  <use>
+    <flag name="dap">Support for remote data access with the NETCDF DAP client</flag>
+    <flag name="ncap2">Build next generation netcdf arithmetic processor
     (needs <pkg>dev-java/antlr</pkg>)</flag>
-  <flag name='udunits'>Add <pkg>sci-libs/udunits</pkg> files support</flag>
-</use>
+    <flag name="udunits">Add <pkg>sci-libs/udunits</pkg> files support</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-misc/nco/nco-4.3.1.ebuild b/sci-misc/nco/nco-4.3.1.ebuild
deleted file mode 100644
index 82b79e0e3f9b..000000000000
--- a/sci-misc/nco/nco-4.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.3.1.ebuild,v 1.1 2013/05/27 17:28:55 bicatali Exp $
-
-EAPI=5
-inherit 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"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="dap doc gsl ncap2 static-libs test udunits"
-
-RDEPEND="
-	>=sci-libs/netcdf-4[dap=]
-	gsl? ( sci-libs/gsl )
-	udunits? ( >=sci-libs/udunits-2 )"
-
-DEPEND="${RDEPEND}
-	ncap2? ( dev-java/antlr:0 )
-	test? ( >=sci-libs/netcdf-4[tools] )"
-
-src_configure() {
-	local myconf
-	if has_version '>=sci-libs/netcdf-4[hdf5]'; then
-		myconf="--enable-netcdf4"
-		append-cppflags -DHAVE_NETCDF4_H
-	else
-		myconf="--disable-netcdf4"
-	fi
-	econf \
-		--disable-udunits \
-		$(use_enable dap dap-netcdf) \
-		$(use_enable gsl) \
-		$(use_enable ncap2) \
-		$(use_enable static-libs static) \
-		$(use_enable udunits udunits2) \
-		${myconf}
-}
-
-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
-}
diff --git a/sci-misc/nco/nco-4.4.2.ebuild b/sci-misc/nco/nco-4.4.2.ebuild
index 4f4300cc97ef..50365a8eb078 100644
--- a/sci-misc/nco/nco-4.4.2.ebuild
+++ b/sci-misc/nco/nco-4.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-4.4.2.ebuild,v 1.3 2014/08/07 16:45:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-4.4.2.ebuild,v 1.4 2015/07/31 07:45:44 jlec Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="dap doc gsl ncap2 static-libs test udunits"
 
 RDEPEND="
-	>=sci-libs/netcdf-4:=[dap=]
+	>=sci-libs/netcdf-4:=[dap=,tools]
 	gsl? ( sci-libs/gsl:= )
 	udunits? ( >=sci-libs/udunits-2 )"