Version bump

Package-Manager: portage-2.2.01.21938-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 26 insertions, 31 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/Manifest b/sci-misc/nco/Manifest
index 59b5b6cc77ad..0f0ef27a5a64 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST nco-3.9.9.tar.gz 4109201 SHA256 cdfd7cf47aef49b32e4e581bc7d2d6cdd05312ed88a2a0cfaf83c520e665b142
-DIST nco-4.0.8.tar.gz 4874719 SHA256 9ca3f7b831a21f9d3e8bc222f8aabee6e690575b55c28c5f8d450ce9a798eb80
 DIST nco-4.2.3.tar.gz 5361500 SHA256 155d8f39cbdd765eafc2cb0ca6dc6e7c13012933d61b9cfd62b72a874dbdae17 SHA512 6ac4fb8e8e2088a0bac7da69c171f1151e0e0725c90168cbd0b88f06caf9176fad5edcfcf87f87a3e2921d60b5cd4e5b7935975190a87ee65f390ffd0ae2b3e8 WHIRLPOOL dc2526dd476c7216be487f33cc495aa4e083ba8567ff2a9a6f3984df0eec65e1f7f06e7bfb194f8f6b859e2c5fe2075236dcd81a0d8611012f6379b702952ec6
+DIST nco-4.3.1.tar.gz 5960090 SHA256 52340ea4e93c12dc897a4ecec8729f898b5b476b0dee3e3f7bdb7ea45e6928c0 SHA512 6ac1aab44f889adacd36b4d94a7357d5373b2b643d2e083f2d04f5cd7b7b3ecc3a9883905be98a38c0f2eb67062bac870d59f47728b780a14ad1171fc42a173a WHIRLPOOL 114621cee3bbe7dee9be2266e3052df98e2fc25fecef56255b98c43b011e2dd27ae0e6a7340f7ff4eacdb795c36ab30c50e9fd3f04d8b3df7d989c99c0ee217d
 EBUILD nco-3.9.9.ebuild 1711 SHA256 a20750754d0da90bc7ee519c254d50347d367086fee691802c8532eb0a8473c2 SHA512 677522e0a3db9386f93da483eda8033dc2e7d506a60101ecf262720b4a1d9f50d8aaa2b00f6ccd05db229f64573113660c305f22dd639d34bb058296dbb6ee81 WHIRLPOOL 1a961e1bf83d5a1b19742eb507d597b2dcb913e0436a95857ff58be937d09aa05131ed453c11ce1fd8779397d8753db8d2e493572a9f52bdc22ab9ed3668a747
-EBUILD nco-4.0.8.ebuild 1508 SHA256 7f9a79a8de16a13d7e1e2f39c0cb9dabde28da2be91c299b7c8e089d9e831175 SHA512 91e7867463f660cbfd2c7ab7f85d169c9456399d33a638b41c884a103fb65d3e903afa01d16920b3dd10ac3f7b145bea71bf16fc3c15a60bc53bf66161319438 WHIRLPOOL 5e4b369a2328aa2f547430d32dc7bca1c2e9a7a5794a417433e69b65a22c652c60a432c8f6641a1f540b2d2a769827cd39e17cc446e72b43a1539cd57b262164
 EBUILD nco-4.2.3.ebuild 1262 SHA256 37206db943a1beb58a70d249ed6260f090e0ef2aa4f48e2af79ba16447573b4f SHA512 ce920a8bd43702d1aefcbcf45b2a0f11fb4a6bb9c2caf0e8e5fd5a45f987e334bfc0a1d8fb34e52b7a30d894e731d8762ade903e705ba1d5364fc45cd6ad22e1 WHIRLPOOL cd6be4fc8c255ac1625213606f8b6f4432fdaa5202cff2b7390c010e1ff6dd3bf8788e8fc5ee65827510bfd4ef45769a79ba6eb921ae820db470b92b136591e0
-MISC ChangeLog 3732 SHA256 397c5b9641a2ab5023edf247be2c988f033ea02e249d5af4ce396622597e6137 SHA512 0eef259ea339770ae1c8e44a0305ce0b010a8728f1e3b5d27a0ebaabc7a6c85ff4017b56897467043fde3a8f39c8503d1ea5f503f170d8c111e3f4219316d6e2 WHIRLPOOL d97cc044231d41ac95a7116f38f65251aff0c78ed56894cab307e7b5a3659238bbbe6201a028207a4076fde743a4700f7bc863d904fb51fd4a3a7eb02655915d
+EBUILD nco-4.3.1.ebuild 1262 SHA256 6f71efac80bd20f0a83eb64234260e60e4d61d35e58c924c66d067f013efc112 SHA512 67da19d60e91cbb21c9369703596398b49b7f166511f395eb6822af6f5216c428b929db0a7e7d1f8bb6894f04852cc7392ed1cbfd47674bc20a3bf5ff3557231 WHIRLPOOL 378c52ca226357213b1d588d38ebade37d8cf3a54f48039334969b0da57fad99de24829ae86d2c367e148eef80ffe1bb1050d9a2c765a4b43d1ebf1030f9dc3f
+MISC ChangeLog 3869 SHA256 7b42db83b70266e4215d586c6373ed2f72d7d36c7e42b46e9929a17aa6a9e9db SHA512 e50d87dda7edb640915bc27605b1fd8e064283c1862b54eb0246187c88c9616adf16a658388558c0ca2161ab62577cb94c0be6ba80f4520fa8e012ac90523019 WHIRLPOOL dbf799a4909ecdf8f4d25b8f85690104b55c41ea5bb01f0bfeb9027694b7d5749d1c80ebc5c153ee53962538071c60aeeaf03f0191283589526b44b1614a60ac
 MISC metadata.xml 950 SHA256 9477c5f585e6286ef3fe099053977f6f30d253f3fddc2d559381835cabc5d82a SHA512 589bc7b0624159a5dfdcceea8002ed1ddfd3bec90d088fb54220f051b5469e245ff3993577cf3cda72f97b00680f4e57aec223cfe5abead2de08acc06e301aac WHIRLPOOL a0fef73238e6513dd1acccbd243a8f145e1945fa5f34596b63045236681eece6908be9e7efa0353b538d4f52d2701077edca9450fd4fb6277241a9b877a1507f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlC1Q+QACgkQ1ycZbhPLE2ATKQCfbwr0uf/dWe6Fm/9JLBlXZbJ7
-MfoAn24k/kR35f6kzeZ7GuV9SOhL5yEa
-=YQVM
+iEYEAREIAAYFAlGjmLEACgkQ1ycZbhPLE2AU+QCeL5kBw7yMyMHhqkx5ZqgSas0y
+oMoAoI/AGRDWHRRSMJGa7ayUQg3g0ypU
+=bltS
 -----END PGP SIGNATURE-----
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
 }