Add missing USE-dep, bug #542704

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

5 files changed, 19 insertions, 90 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/Manifest b/sci-misc/nco/Manifest
index c82f9e49b764..bbbf6f94f88d 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1,30 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST nco-3.9.9.tar.gz 4109201 SHA256 cdfd7cf47aef49b32e4e581bc7d2d6cdd05312ed88a2a0cfaf83c520e665b142
-DIST nco-4.3.1.tar.gz 5960090 SHA256 52340ea4e93c12dc897a4ecec8729f898b5b476b0dee3e3f7bdb7ea45e6928c0 SHA512 6ac1aab44f889adacd36b4d94a7357d5373b2b643d2e083f2d04f5cd7b7b3ecc3a9883905be98a38c0f2eb67062bac870d59f47728b780a14ad1171fc42a173a WHIRLPOOL 114621cee3bbe7dee9be2266e3052df98e2fc25fecef56255b98c43b011e2dd27ae0e6a7340f7ff4eacdb795c36ab30c50e9fd3f04d8b3df7d989c99c0ee217d
 DIST nco-4.4.2.tar.gz 7801937 SHA256 6b2f48ac4618ba50306885a6358925956c2b178dee6348ada3195a3fc2a425d8 SHA512 b624174bdb4d10b6f4e05024c0e4f06f642ebeb9bdb291e7dbf07b858522cdb7f2385d63ba70cab36aef40fc42d6d229a1c3bfacd85747f516cbbd45748ae185 WHIRLPOOL ca5d974ac10a0211d5cb4d0daab1501d7e13429530ef480c070af2f70e46630a3b49213b1370b17be0f829b9d73a437a3d44d4bc750b0c54f55a56402b3e7ec7
 EBUILD nco-3.9.9.ebuild 1711 SHA256 a20750754d0da90bc7ee519c254d50347d367086fee691802c8532eb0a8473c2 SHA512 677522e0a3db9386f93da483eda8033dc2e7d506a60101ecf262720b4a1d9f50d8aaa2b00f6ccd05db229f64573113660c305f22dd639d34bb058296dbb6ee81 WHIRLPOOL 1a961e1bf83d5a1b19742eb507d597b2dcb913e0436a95857ff58be937d09aa05131ed453c11ce1fd8779397d8753db8d2e493572a9f52bdc22ab9ed3668a747
-EBUILD nco-4.3.1.ebuild 1262 SHA256 6f71efac80bd20f0a83eb64234260e60e4d61d35e58c924c66d067f013efc112 SHA512 67da19d60e91cbb21c9369703596398b49b7f166511f395eb6822af6f5216c428b929db0a7e7d1f8bb6894f04852cc7392ed1cbfd47674bc20a3bf5ff3557231 WHIRLPOOL 378c52ca226357213b1d588d38ebade37d8cf3a54f48039334969b0da57fad99de24829ae86d2c367e148eef80ffe1bb1050d9a2c765a4b43d1ebf1030f9dc3f
-EBUILD nco-4.4.2.ebuild 1254 SHA256 8aad0149de6437e689df00aee848dae28eb1bbb35a1f39651a1295212ef165ad SHA512 8fb45a1adbcf5bf57d3594b3362222353ab6659c88a3b954b4ab50bb52889fa2ffc92de21dea7325e76669610b508136220f64b9a9ed3c053e12215f1e2890bd WHIRLPOOL 170c797c0af6a967f965c18b2f381f49fd91c64b338a095057e85d42a1921dfa1bef722f35b52dae1824a3c8c04fe498913d3da0fde59eb00c7b86749c5f1d47
-MISC ChangeLog 4221 SHA256 cea35f32a8c49b2e5bc6367fcdc8da9e3b83bb7ca9ee80d241d9153337f58d01 SHA512 becb893ea0827d1a499909400a8a0bdc17575f92faba557054ccf27a5b45faa9e6974aa70469ca301380eee2f9f4db16ce021293da53411ae8a109bc70bf88b7 WHIRLPOOL 59198c23eacf78d20d78ab8f2540b1a77ac0d054a9f63091c0bad0d88e5963d0dff509b0b8dd2b40f70b86d4cde6e651f9931f3780112d6bacacd0eb72bae7fd
-MISC metadata.xml 950 SHA256 9477c5f585e6286ef3fe099053977f6f30d253f3fddc2d559381835cabc5d82a SHA512 589bc7b0624159a5dfdcceea8002ed1ddfd3bec90d088fb54220f051b5469e245ff3993577cf3cda72f97b00680f4e57aec223cfe5abead2de08acc06e301aac WHIRLPOOL a0fef73238e6513dd1acccbd243a8f145e1945fa5f34596b63045236681eece6908be9e7efa0353b538d4f52d2701077edca9450fd4fb6277241a9b877a1507f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJT461pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO66MP/2tBSLu620UL8R9SsMT50zjn
-hEjItt+NEwO8yv4UilI6SUmNOzWlq8BVi0mEI3h3xJPWROA2xA8Au5OfCzNLdir6
-nzouSwwnmJc+R7TrJ28bh59sbjdFr9Y27liqIg5aAGvoONpGYxbRA/1UekzEjtWe
-lopmJs0BQNua1xu9v+uMmxkSbLQD576NnIP37QBRa52+rerz8sU7c3goQP9DXmmB
-eLCV9t5JLn+RX3l3qN3mvNhnouoBV7t3YAmp6t5flRHnbovRfJdzCFmTRqAujf8Z
-jmt7Emg4GawP2TFrnyPe3evSE/EVEjSJ6MSRCUdeyV14a/RxklMYAFjp/Cm/BzMG
-oZo4I1PzjRfJ0XiG7L4X53hrTsuWO+y4Wu3TIAtS4yjs5LeBBH0ubYqn9seHBZhS
-OlSDwZw9QOE/LVsaoT3BmZjsYKxx81obGfyIlnAeWZGHaCw+P4y9xt7KvOHqAXlA
-/AcFf0sE10JxWDxMoi0eHiWH9XXy8NXASTw2FFGdGynboQwvDbO4MdY5kTawEH99
-tsvC3ebg1SOCMwTsEmEwkAN9PvSTwkWl6Ak3bjPl9ZrIdJTZ1pDVNhEjcNVSIIOc
-Z5ofk4pGBPr1yA2kQSEbaEEdxMaKAglDc5ThapisJsQ9P8nq2ApORBxps79vUl7E
-U/AMLNIlCqsUI6WbubHL
-=Rq1l
------END PGP SIGNATURE-----
+EBUILD nco-4.4.2.ebuild 1258 SHA256 0b33e2090a0f884834b1370778359c65cf11f99309304a5e8900ea48adbfb508 SHA512 424b0aaab8c013e3b5e0bfbe4dd1821139a848507d8ddde0ef279f254675c957e661b6b464163f9a6928e95ce75a68c6ec094b3f54a683bf381fa43839a35485 WHIRLPOOL 2123183b82c56c81a720617a2c76e539a5ced87cb8b033699333462c2bbc3419274031f0d75664609067049e7c05248b13c49e0ba6b96c850045c0c507050a73
+MISC ChangeLog 4355 SHA256 b297537068dd91c7a8c01cf5aa3c3f4ee547df472ee3983ba259b7cd7524b5f9 SHA512 d776597f98fe103019ba7eb3ccdbe7911483289155e0431cc2ac29be9ac55b1e1cc91460d5ef8646a22b6b4f874fa3f196e243a6504fab8f7589889046a20887 WHIRLPOOL 7b237bca35e1f5f76a24fd558daaa8c4af7e0c5066dc832ff8f1845e93c28d2c356c600b1ca16acb87813916c1bbbf8ddff7518ed126d58b4ab964b7631433c3
+MISC metadata.xml 964 SHA256 2831762c54c626d863689ab98eac6cf59c8af5d1fb1f6ffc955d00680a4cff3b SHA512 45278f303eb849b0d7597c41ee2bea83033e3fcdd6adf608a8e45f831f3472942cdaab24dc3eab8cb16b9285aa109784a7731a7e5e52563c7710f5d9d66f7f88 WHIRLPOOL c02b76b5c87ecea0eed83fb27363ad5bf8994cae9b50299cc2bf25b2c0f53c390c2b13c9e7f628de70f4c5926e78fc25a27aecb79f7737b0c2ea58170a6c64ed
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 )"