Setting VARTEXFONTS (see bug #223077) and removing unnecessary version.

(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r4 i686)

4 files changed, 12 insertions, 66 deletions

diff --git a/sci-misc/nco/ChangeLog b/sci-misc/nco/ChangeLog
index 893b89807a22..af44c44c0153 100644
--- a/sci-misc/nco/ChangeLog
+++ b/sci-misc/nco/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/nco
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.12 2008/08/06 18:28:07 ulm Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/ChangeLog,v 1.13 2009/02/13 20:59:15 phosphan Exp $
+
+  13 Feb 2009; Patrick Kursawe <phosphan@gentoo.org> nco-2.9.1.ebuild,
+  -nco-3.9.2.ebuild, nco-3.9.4.ebuild:
+  Setting VARTEXFONTS (see bug #223077) and removing unnecessary version.
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-misc/nco/nco-2.9.1.ebuild b/sci-misc/nco/nco-2.9.1.ebuild
index f873cf2761e4..e93da9a57078 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-2008 Gentoo Foundation
+# 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.5 2008/05/04 15:41:44 markusle Exp $
+# $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=""
 
@@ -20,7 +20,7 @@ src_compile() {
 
 	#need to make info
 	cd doc
-	make
+	VARTEXFONTS="${T}/fonts" make
 }
 
 src_install() {
diff --git a/sci-misc/nco/nco-3.9.2.ebuild b/sci-misc/nco/nco-3.9.2.ebuild
deleted file mode 100644
index 6dba0bedbefa..000000000000
--- a/sci-misc/nco/nco-3.9.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.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"
-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 ) )
-	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
-		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-3.9.4.ebuild b/sci-misc/nco/nco-3.9.4.ebuild
index 663fe9d8f9d4..ae354608e820 100644
--- a/sci-misc/nco/nco-3.9.4.ebuild
+++ b/sci-misc/nco/nco-3.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1 2008/05/04 15:41:44 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/nco/nco-3.9.4.ebuild,v 1.2 2009/02/13 20:59:15 phosphan Exp $
 
 DESCRIPTION="Command line utilities for operating on netCDF files"
 SRC_URI="http://dust.ess.uci.edu/nco/src/${P}.tar.gz"
@@ -40,7 +40,7 @@ src_compile() {
 	cd doc
 	emake clean info
 	if use doc; then
-		emake html pdf || die "emake doc failed"
+		VARTEXFONTS="${T}/fonts" emake html pdf || die "emake doc failed"
 	fi
 }