From d9254e93056e974f304bfda19e08e19a8a582c4a Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Mon, 7 Dec 2009 08:59:30 +0000 Subject: Version bump, thanks Kacper Kowalik for his initial work. (Portage version: 2.2_rc55/cvs/Linux x86_64) --- sci-libs/netcdf/ChangeLog | 9 ++- sci-libs/netcdf/files/netcdf-4.0.1-as-needed.patch | 20 +++++ sci-libs/netcdf/netcdf-3.6.2.ebuild | 87 ---------------------- sci-libs/netcdf/netcdf-3.6.3.ebuild | 13 +++- sci-libs/netcdf/netcdf-4.0.1.ebuild | 63 ++++++++++++++++ 5 files changed, 101 insertions(+), 91 deletions(-) create mode 100644 sci-libs/netcdf/files/netcdf-4.0.1-as-needed.patch delete mode 100644 sci-libs/netcdf/netcdf-3.6.2.ebuild create mode 100644 sci-libs/netcdf/netcdf-4.0.1.ebuild (limited to 'sci-libs') diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog index 0f68e0154d9f..ed728d7b0400 100644 --- a/sci-libs/netcdf/ChangeLog +++ b/sci-libs/netcdf/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/netcdf # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.61 2009/11/21 20:48:26 cla Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.62 2009/12/07 08:59:30 bicatali Exp $ + +*netcdf-4.0.1 (07 Dec 2009) + + 07 Dec 2009; Sébastien Fabbro -netcdf-3.6.2.ebuild, + netcdf-3.6.3.ebuild, +netcdf-4.0.1.ebuild, + +files/netcdf-4.0.1-as-needed.patch: + Version bump, thanks Kacper Kowalik for his initial work. 21 Nov 2009; Dawid Węgliński netcdf-3.6.3.ebuild: Stable on amd64 (bug #283715) diff --git a/sci-libs/netcdf/files/netcdf-4.0.1-as-needed.patch b/sci-libs/netcdf/files/netcdf-4.0.1-as-needed.patch new file mode 100644 index 000000000000..b0391c804ec0 --- /dev/null +++ b/sci-libs/netcdf/files/netcdf-4.0.1-as-needed.patch @@ -0,0 +1,20 @@ +--- netcdf-4.0.1.orig/libsrc4/Makefile.am 2009-03-26 21:03:16.000000000 +0100 ++++ netcdf-4.0.1/libsrc4/Makefile.am 2009-09-10 22:34:48.245041376 +0200 +@@ -67,6 +67,7 @@ + libnetcdf_la_SOURCES = nc4attr.c nc4internal.c nc4var.c netcdf3.h \ + nc4dim.c nc4internal.h ncfunc.c nc4file.c netcdf.h error.c error.h \ + nc4grp.c nc4type.c nc4hdf.c ++libnetcdf_la_LIBADD += -lhdf5_hl + + # If we are not building separate fortran libraries, then include + # their functions in the C library. +--- netcdf-4.0.1.orig/cxx4/Makefile.am 2007-08-13 18:05:17.000000000 +0200 ++++ netcdf-4.0.1/cxx4/Makefile.am 2009-09-10 23:45:06.335707145 +0200 +@@ -42,6 +42,7 @@ + # Library source. + libnetcdf_c__4_la_SOURCES = ncatt.cpp ncdim.cpp ncexception.cpp \ + ncfile.cpp ncgroup.cpp ncvar.cpp ncvalues.cpp ncvalues.h ++libnetcdf_c__4_la_LIBADD = $(top_builddir)/libsrc4/libnetcdf.la + + TESTFILES = tst_suiterunner$(EXEEXT) tst_file$(EXEEXT) tst_filerw$(EXEEXT) tst_simple$(EXEEXT) + tst_suiterunner_SOURCES = tst_suite.cpp tst_suiterunner.cpp tst_suite.h diff --git a/sci-libs/netcdf/netcdf-3.6.2.ebuild b/sci-libs/netcdf/netcdf-3.6.2.ebuild deleted file mode 100644 index 15d4d4a091e0..000000000000 --- a/sci-libs/netcdf/netcdf-3.6.2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.2.ebuild,v 1.15 2008/02/13 12:28:37 armin76 Exp $ - -inherit fortran eutils toolchain-funcs flag-o-matic autotools - -DESCRIPTION="Scientific library and interface for array oriented data access" -SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz" -HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/" - -LICENSE="UCAR-Unidata" -SLOT="0" -IUSE="fortran debug doc" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" - -RDEPEND="" -DEPEND="${RDEPEND} - doc? ( virtual/latex-base )" - -pkg_setup() { - if use fortran ; then - FORTRAN="gfortran ifc g77 pgf77 pgf90" - fortran_pkg_setup - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-parallel-make.patch - epatch "${FILESDIR}"/${P}-as-needed.patch - epatch "${FILESDIR}"/${P}-gcc43.patch - eautoreconf -} - -src_compile() { - use debug || append-cppflags -DNDEBUG - local myconf - if use fortran; then - case "${FORTRANC}" in - g77) - myconf="${myconf} --enable-f77 --disable-f90" - myconf="${myconf} F77=g77" - ;; - pgf77) - myconf="${myconf} --enable-f77 --disable-f90" - myconf="${myconf} F77=pgf77" - ;; - pgf90) - myconf="${myconf} --enable-f77 --enable-f90" - myconf="${myconf} FC=pgf90 F90=pgf90 F77=pgf90" - ;; - ifc|ifort) - myconf="${myconf} --enable-f77 --enable-f90" - myconf="${myconf} FC=ifort F90=ifort F77=ifort" - ;; - *) - myconf="${myconf} --enable-f77 --enable-f90" - myconf="${myconf} FC=gfortran F90=gfortran F77=gfortran" - export F90FLAGS="-i4 ${F90FLAGS}" - ;; - esac - # fortran 90 uses FCFLAGS - export FCFLAGS="${FFLAGS:--O2}" - else - myconf="${myconf} --disable-f77 --disable-f90" - fi - econf \ - --enable-shared \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable debug flag-setting ) \ - $(use_enable doc docs-install) \ - ${myconf} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc README RELEASE_NOTES VERSION || die "dodoc failed" - # keep only pdf,txt and html docs, info were already installed - if use doc; then - find "${D}usr/share/doc/${PF}" -name \*.ps -exec rm -f {} \; - find "${D}usr/share/doc/${PF}" -name \*.info -exec rm -f {} \; - find "${D}usr/share/doc/${PF}" -name \*.txt -exec ecompress {} \; - fi -} diff --git a/sci-libs/netcdf/netcdf-3.6.3.ebuild b/sci-libs/netcdf/netcdf-3.6.3.ebuild index 449599777702..c358717a54dd 100644 --- a/sci-libs/netcdf/netcdf-3.6.3.ebuild +++ b/sci-libs/netcdf/netcdf-3.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.3.ebuild,v 1.10 2009/11/21 20:48:26 cla Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.3.ebuild,v 1.11 2009/12/07 08:59:30 bicatali Exp $ EAPI=2 @@ -29,7 +29,6 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-as-needed.patch - #epatch "${FILESDIR}"/${P}-libtool.patch eautoreconf } @@ -65,10 +64,18 @@ src_configure() { else myconf="${myconf} --disable-f77 --disable-f90" fi + + # otherwise fortran/fort-nc4.c is not compiled and package fails + # tests with --as-needed + if use hdf5; then + myconf="${myconf} --with-hdf5=/usr" + fi + econf \ --enable-shared \ --docdir=/usr/share/doc/${PF} \ - $(use_enable debug flag-setting ) \ + $(use_enable fortran separate-fortran ) \ + $(use_enable hdf5 netcdf-4 ) \ $(use_enable doc docs-install) \ ${myconf} } diff --git a/sci-libs/netcdf/netcdf-4.0.1.ebuild b/sci-libs/netcdf/netcdf-4.0.1.ebuild new file mode 100644 index 000000000000..8962aba915de --- /dev/null +++ b/sci-libs/netcdf/netcdf-4.0.1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.0.1.ebuild,v 1.1 2009/12/07 08:59:30 bicatali Exp $ + +EAPI=2 + +inherit eutils autotools + +DESCRIPTION="Scientific library and interface for array oriented data access" +SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz" +HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/" + +LICENSE="UCAR-Unidata" +SLOT="0" +IUSE="doc fortran hdf5 mpi szip" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND="hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,mpi?] )" +DEPEND="${RDEPEND} + >=sys-devel/libtool-2.2 + doc? ( virtual/latex-base ) + fortran? ( dev-lang/cfortran )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-as-needed.patch + rm -f fortran/cfortran.h || die + eautoreconf +} + +src_configure() { + local myconf + if use hdf5; then + myconf="--with-hdf5=/usr --with-zlib=/usr" + use szip && myconf="${myconf} --with-szlib=/usr" + fi + + econf \ + --docdir=/usr/share/doc/${PF} \ + --enable-shared \ + $(use_enable fortran f77) \ + $(use_enable fortran f90) \ + $(use_enable fortran separate-fortran) \ + $(use_enable hdf5 netcdf-4) \ + $(use_enable hdf5 ncgen4) \ + $(use_enable doc docs-install) \ + ${myconf} +} + +src_compile() { + # hack to allow parallel build + if use doc; then + emake pdf || die "emake pdf failed" + cd man4 + emake -j1 || die "emake doc failed" + cd .. + fi + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc README RELEASE_NOTES VERSION +} -- cgit v1.2.3-65-gdbad