Version bump. Removed mpi flag, since it was quite buggy on compilation

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

6 files changed, 84 insertions, 100 deletions

diff --git a/sci-misc/nco/ChangeLog b/sci-misc/nco/ChangeLog
index 190ab9320176..be6221ffd4ee 100644
--- a/sci-misc/nco/ChangeLog
+++ b/sci-misc/nco/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-misc/nco
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.18 2011/03/17 08:17:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.19 2011/12/30 04:10:40 bicatali Exp $
+
+*nco-4.0.8 (30 Dec 2011)
+
+  30 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> -nco-2.9.1.ebuild,
+  -nco-3.9.4.ebuild, +nco-4.0.8.ebuild:
+  Version bump. Removed mpi flag, since it was quite buggy on compilation
 
   17 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> nco-3.9.9.ebuild:
   ppc stable wrt #326433
diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest
index aa4fd59bc71e..03395474884e 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1,8 +1,16 @@
-DIST nco-2.9.1.tar.bz2 650696 RMD160 ed2b540221588d1d87b7884eac00230167120f13 SHA1 8d202390403c75900920bad807c297ef14e1edf7 SHA256 259b4dc24d288773fa39fb8f5919031853e558d352704d4dcb5ed26bb0f41e4f
-DIST nco-3.9.4.tar.gz 3236235 RMD160 a0364ba46e717c69480b7f63974f96abfd37841b SHA1 3310e19e4c85c907236352ff175ef35456d550b4 SHA256 0a56840acf57582e85f086bfaf012d8b3aa01d2d86c60d8266fdb15056d75d2a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST nco-3.9.9.tar.gz 4109201 RMD160 e1721bf3f9ad1473dc0120651b6130830cd7c77c SHA1 f8e62993423cdf3c444637a8c280a8a62e725651 SHA256 cdfd7cf47aef49b32e4e581bc7d2d6cdd05312ed88a2a0cfaf83c520e665b142
-EBUILD nco-2.9.1.ebuild 712 RMD160 64043392b928344bb18ad645b474cf3de8bc8418 SHA1 32ad82ea3d15604b42bf64b7da68a6ce412e20a0 SHA256 2beba33e2325f0b366b7fca4ff2bda7a61905ce6b5d76ed7ae49137af0d74a98
-EBUILD nco-3.9.4.ebuild 1509 RMD160 15a9452c5d055b561b8644dd95482dc2caee59ab SHA1 1057b5c5db2e5f32ccbb2b25a58b3a875206965f SHA256 1c049dc359fe24f57c90841706dd77c6e473c5529416bc90b9e5632df2ed45e2
+DIST nco-4.0.8.tar.gz 4874719 RMD160 8788b001021b31d41cf24738d1aa5437bd4493e1 SHA1 98f97fc21bab1190053c08bfae77b61b149bfd50 SHA256 9ca3f7b831a21f9d3e8bc222f8aabee6e690575b55c28c5f8d450ce9a798eb80
 EBUILD nco-3.9.9.ebuild 1711 RMD160 58fa41e7817b3acf1dda7db474ffa713835aaa3a SHA1 6ed7e66751e4b4564f51ec4d98f63f367cec4a43 SHA256 a20750754d0da90bc7ee519c254d50347d367086fee691802c8532eb0a8473c2
-MISC ChangeLog 3403 RMD160 1372497d99531d82d79e1c8c69767d95bd3ee8e1 SHA1 df6acb6e65f1e16333644c0fbcbdc4c9f41ba292 SHA256 2672fe3928d115f885cf53c265d0f72565424becd135b98de3de4dc81b33e5a9
-MISC metadata.xml 866 RMD160 054c53be984a3638a603ddbe88aa24466272664c SHA1 63fd9f687572d71a006cd51deb648e764c52b543 SHA256 804e9546205b2965cda0cd1b81547aeb1b9fdc561526c5078d066af3a79b296f
+EBUILD nco-4.0.8.ebuild 1508 RMD160 3a947f9c5bfd1c007fcf0c796735c03c420c0eac SHA1 adb2c1b862387496feda37313799f32c06825bd3 SHA256 7f9a79a8de16a13d7e1e2f39c0cb9dabde28da2be91c299b7c8e089d9e831175
+MISC ChangeLog 3616 RMD160 ee517117a286718960b2c161f5378c2052b0d73e SHA1 6ee176b4499c00935f1c571ec8a0fdb30f306469 SHA256 484316bac98aaa3ec8d66c265c9317ad7b65dd7b5426c0e4d5dfa01426ee7f41
+MISC metadata.xml 950 RMD160 66c60e5aa75e8c3b7838a06f1bce9251e400a9ea SHA1 3eba5363f9253f0178c4b441c542c1af357e8160 SHA256 9477c5f585e6286ef3fe099053977f6f30d253f3fddc2d559381835cabc5d82a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk79OckACgkQ1ycZbhPLE2CHugCeIRvW5NRb9FK6LPwiJlU++NFa
+d/oAniF/FWmXIZv0jXCc9/tKzq9T7n11
+=aUP1
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/nco/metadata.xml b/sci-misc/nco/metadata.xml
index 5dd3778e42f1..fb593681303a 100644
--- a/sci-misc/nco/metadata.xml
+++ b/sci-misc/nco/metadata.xml
@@ -12,6 +12,7 @@
   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
     (needs <pkg>dev-java/antlr</pkg>)</flag>
   <flag name='udunits'>Add <pkg>sci-libs/udunits</pkg> files support</flag>
diff --git a/sci-misc/nco/nco-2.9.1.ebuild b/sci-misc/nco/nco-2.9.1.ebuild
deleted file mode 100644
index e93da9a57078..000000000000
--- a/sci-misc/nco/nco-2.9.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-2.9.1.ebuild,v 1.6 2009/02/13 20:59:15 phosphan Exp $
-
-IUSE=""
-
-DESCRIPTION="Command line utilities for operating on netCDF files"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://nco.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-DEPEND="sci-libs/netcdf"
-
-src_compile() {
-	econf || die "econf failed"
-	emake
-
-	#need to make info
-	cd doc
-	VARTEXFONTS="${T}/fonts" make
-}
-
-src_install() {
-	DESTDIR=${D} make install
-
-	cd doc
-	dodoc ANNOUNCE ChangeLog MANIFEST NEWS README TAG TODO VERSION *.txt
-	dohtml *.shtml
-	doinfo *.info*
-}
diff --git a/sci-misc/nco/nco-3.9.4.ebuild b/sci-misc/nco/nco-3.9.4.ebuild
deleted file mode 100644
index a2ec1c959da8..000000000000
--- a/sci-misc/nco/nco-3.9.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-3.9.4.ebuild,v 1.3 2009/03/24 19:16:47 betelgeuse Exp $
-
-EAPI="1"
-
-DESCRIPTION="Command line utilities for operating on netCDF files"
-SRC_URI="http://dust.ess.uci.edu/nco/src/${P}.tar.gz"
-HOMEPAGE="http://nco.sourceforge.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-
-IUSE="mpi doc ncap2 udunits"
-
-RDEPEND="sci-libs/netcdf
-	mpi? ( virtual/mpi )
-	udunits? ( sci-libs/udunits )"
-
-DEPEND="${RDEPEND}
-	ncap2? ( !mpi? ( dev-java/antlr:0 ) )
-	doc? ( virtual/latex-base )"
-
-pkg_setup() {
-	if use mpi && use ncap2; then
-		elog
-		elog "mpi and ncap2 are still incompatible flags"
-		elog "nco configure will automatically disables ncap2"
-		elog
-	fi
-}
-
-src_compile() {
-	# let more experimental options enabling via EXTRA_ECONF
-	econf \
-		$(use_enable ncap2 ncoxx) \
-		$(use_enable udunits) \
-		$(use_enable mpi) \
-		|| die "econf failed"
-	emake || die "emake failed"
-	cd doc
-	emake clean info
-	if use doc; then
-		VARTEXFONTS="${T}/fonts" emake html pdf || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd doc
-	dodoc ANNOUNCE ChangeLog MANIFEST NEWS README TAG TODO VERSION *.txt \
-		|| die "dodoc failed"
-	doinfo *.info* || die "doinfo failed"
-	if use doc; then
-		dohtml nco.html/* || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins nco.pdf || die "pdf install failed"
-	fi
-}
diff --git a/sci-misc/nco/nco-4.0.8.ebuild b/sci-misc/nco/nco-4.0.8.ebuild
new file mode 100644
index 000000000000..e6f155cf075b
--- /dev/null
+++ b/sci-misc/nco/nco-4.0.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 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 $
+
+EAPI=4
+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"
+
+IUSE="dap doc gsl ncap2 static-libs udunits"
+
+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 )"
+
+src_configure() {
+	local myconf
+	if has_version '>=sci-libs/netcdf-4[hdf5]'; then
+		myconf="--enable-netcdf4"
+		append-flags -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 gsl) \
+		$(use_enable ncap2) \
+		$(use_enable static-libs static) \
+		$(use_enable udunits udunits2) \
+		${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
+}