From c99da0b6083aefeb53ed8098ced8802a41d8bc72 Mon Sep 17 00:00:00 2001 From: Markus Dittrich Date: Sun, 4 May 2008 15:41:44 +0000 Subject: Version bump and cleanup. This new revision fixes the mpi compile problem reported in bug #220211. (Portage version: 2.1.5_rc6) --- sci-misc/nco/ChangeLog | 11 ++++++-- sci-misc/nco/nco-2.9.1.ebuild | 6 ++--- sci-misc/nco/nco-3.9.1.ebuild | 63 ------------------------------------------- sci-misc/nco/nco-3.9.2.ebuild | 4 +-- sci-misc/nco/nco-3.9.4.ebuild | 58 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 70 deletions(-) delete mode 100644 sci-misc/nco/nco-3.9.1.ebuild create mode 100644 sci-misc/nco/nco-3.9.4.ebuild (limited to 'sci-misc/nco') 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 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.1.ebuild b/sci-misc/nco/nco-3.9.1.ebuild deleted file mode 100644 index 44b6f7645af7..000000000000 --- a/sci-misc/nco/nco-3.9.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2007 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 $ - -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" -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/tetex )" - -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() { - # force disabling experimental and not implemented features - 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 - if use doc; then - make html pdf || die "make 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/* - insinto /usr/share/doc/${PF} - doins nco.pdf - fi -} 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.4.ebuild b/sci-misc/nco/nco-3.9.4.ebuild new file mode 100644 index 000000000000..663fe9d8f9d4 --- /dev/null +++ b/sci-misc/nco/nco-3.9.4.ebuild @@ -0,0 +1,58 @@ +# 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.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-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 +} -- cgit v1.2.3-65-gdbad