Version bump and cleanup. This new revision fixes the mpi compile problem reported in bug #220211.

(Portage version: 2.1.5_rc6)

4 files changed, 24 insertions, 22 deletions

diff --git a/sci-misc/nco/ChangeLog b/sci-misc/nco/ChangeLog
index 937423fc1bef..77a8c866e4bd 100644
--- a/sci-misc/nco/ChangeLog
+++ b/sci-misc/nco/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-misc/nco
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.10 2007/11/08 09:27:39 bicatali Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.11 2008/05/04 15:41:44 markusle Exp $
+
+*nco-3.9.4 (04 May 2008)
+
+  04 May 2008; Markus Dittrich <markusle@gentoo.org> nco-2.9.1.ebuild,
+  -nco-3.9.1.ebuild, +nco-3.9.4.ebuild:
+  Version bump and cleanup. This new revision fixes the mpi compile problem
+  reported in bug #220211.
 
 *nco-3.9.2 (08 Nov 2007)
 
diff --git a/sci-misc/nco/nco-2.9.1.ebuild b/sci-misc/nco/nco-2.9.1.ebuild
index 7d7223b26348..f873cf2761e4 100644
--- a/sci-misc/nco/nco-2.9.1.ebuild
+++ b/sci-misc/nco/nco-2.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 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.4 2005/06/26 03:11:53 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-2.9.1.ebuild,v 1.5 2008/05/04 15:41:44 markusle Exp $
 
 IUSE=""
 
@@ -27,7 +27,7 @@ src_install() {
 	DESTDIR=${D} make install
 
 	cd doc
-	dodoc ANNOUNCE ChangeLog LICENSE MANIFEST NEWS README TAG TODO VERSION *.txt
+	dodoc ANNOUNCE ChangeLog MANIFEST NEWS README TAG TODO VERSION *.txt
 	dohtml *.shtml
 	doinfo *.info*
 }
diff --git a/sci-misc/nco/nco-3.9.2.ebuild b/sci-misc/nco/nco-3.9.2.ebuild
index e2f7e1a1526e..6dba0bedbefa 100644
--- a/sci-misc/nco/nco-3.9.2.ebuild
+++ b/sci-misc/nco/nco-3.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-3.9.2.ebuild,v 1.1 2007/11/08 09:27:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-3.9.2.ebuild,v 1.2 2008/05/04 15:41:44 markusle Exp $
 
 DESCRIPTION="Command line utilities for operating on netCDF files"
 SRC_URI="http://dust.ess.uci.edu/nco/src/${P}.tar.gz"
diff --git a/sci-misc/nco/nco-3.9.1.ebuild b/sci-misc/nco/nco-3.9.4.ebuild
index 44b6f7645af7..663fe9d8f9d4 100644
--- a/sci-misc/nco/nco-3.9.1.ebuild
+++ b/sci-misc/nco/nco-3.9.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-3.9.1.ebuild,v 1.1 2007/08/20 12:11:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-3.9.4.ebuild,v 1.1 2008/05/04 15:41:44 markusle Exp $
 
 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-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc"
 
@@ -18,7 +18,7 @@ RDEPEND="sci-libs/netcdf
 
 DEPEND="${RDEPEND}
 	ncap2? ( !mpi? ( dev-java/antlr ) )
-	doc? ( virtual/tetex )"
+	doc? ( virtual/latex-base )"
 
 pkg_setup() {
 	if use mpi && use ncap2; then
@@ -30,22 +30,17 @@ pkg_setup() {
 }
 
 src_compile() {
-	 # force disabling experimental and not implemented features
+	# let more experimental options enabling via EXTRA_ECONF
 	econf \
-		--disable-dap \
-		--disable-netcdf4 \
-		--disable-i18n  \
-		--enable-regex \
-		--enable-nco_cplusplus \
 		$(use_enable ncap2 ncoxx) \
 		$(use_enable udunits) \
 		$(use_enable mpi) \
 		|| die "econf failed"
 	emake || die "emake failed"
-	cd "${S}"/doc
-	make clean info
+	cd doc
+	emake clean info
 	if use doc; then
-		make html pdf || die "make doc failed"
+		emake html pdf || die "emake doc failed"
 	fi
 }
 
@@ -56,8 +51,8 @@ src_install() {
 		|| die "dodoc failed"
 	doinfo *.info* || die "doinfo failed"
 	if use doc; then
-		dohtml nco.html/*
+		dohtml nco.html/* || die "dohtml failed"
 		insinto /usr/share/doc/${PF}
-		doins nco.pdf
+		doins nco.pdf || die "pdf install failed"
 	fi
 }