Version bump

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 141 insertions, 5 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 860bbe188b32..02e9ae833a20 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.51 2009/01/15 13:15:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.52 2009/01/15 15:04:18 bicatali Exp $
+
+*netcdf-3.6.3 (15 Jan 2009)
+
+  15 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/netcdf-3.6.3-as-needed.patch, +netcdf-3.6.3.ebuild:
+  Version bump
 
   15 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
   files/netcdf-3.6.2-gcc43.patch, -netcdf-3.6.1.ebuild,
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 505b1d5ffcfe..fa977b3fce31 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -6,14 +6,17 @@ AUX fPIC.patch 209 RMD160 f7336b30c070a75335bed8280e5f1505a03ce464 SHA1 c5e87289
 AUX netcdf-3.6.2-as-needed.patch 1535 RMD160 394331f42b20e6fdc510b669390bc697b60cd07d SHA1 8970375441ba026995e1d517c643117919038486 SHA256 23a18d65be6cdc7521e75db8cca3c09e83854343e33f60d214addff836df3b88
 AUX netcdf-3.6.2-gcc43.patch 777 RMD160 b8da3f864204b21fdf38802c7e2c5256e3922916 SHA1 951ae22ac1eec47c0a755c80d6dc99af2512df66 SHA256 6846bcf8cf213218b93c84b52b7aded1c3f01b9f3d5f2bcb48bcb90391fcb9fa
 AUX netcdf-3.6.2-parallel-make.patch 1159 RMD160 bdc0ab52031c4822aeeb1a4ca93da027920c06f9 SHA1 38776793ab83f39762f1556e4932a0580153dcb7 SHA256 44fc5f7fcad525e53f1405e55b9924126f7214931cbd6f545ab9b8c30e2e8a74
+AUX netcdf-3.6.3-as-needed.patch 1794 RMD160 4b81004e09b1d620ad6fe3450ed3906f214cfa32 SHA1 f3c3809227674cdcdd0ec0ea3236c68cda8e9bf7 SHA256 4bd124aac6f9b3aeedf91b89e713cb1dd035423361ef609e784b17b4b08be645
 DIST netcdf-3.6.2.tar.gz 5312882 RMD160 dcf1efa90b7479215ac0a2d8dc231d94dddc73d8 SHA1 32fb81f39ffccab539124cc3d5f619965ce42f36 SHA256 feaa7673f369e5fb57fcc51426e2be694228ddcc141fc3fd20399269fb6b9311
+DIST netcdf-3.6.3.tar.gz 11572512 RMD160 6917caa05adc2fb9dbf2d43354f6dd00914486a2 SHA1 711e5f2a24e1679b17715398ba58127e50cd7fb3 SHA256 afa1a0fa82b9ea33b035257b6e9662b22e135f98b2fd93d5cf030320dfc3ffa1
 EBUILD netcdf-3.6.2.ebuild 2407 RMD160 8851ee9d4251eed868ecf6549a6e9bed0d16304b SHA1 bab5846d04c80aacaf9bbcde0827083eb1fcc2cd SHA256 669f7b5da2eb886fba83585a554f510f31248a746bce7b4c284bf1eeca6fa5d4
-MISC ChangeLog 10478 RMD160 673a7161b38854ee78faeb39373ee86c95bf917e SHA1 697ef591dc83584a2bccd7bdaf34f379bfdd0c13 SHA256 4ddfd0416f68021428a6aaccc2665baf1540206b56e00e184d820df5e960f2b1
+EBUILD netcdf-3.6.3.ebuild 2318 RMD160 9de531596708cd325ecdeb7e71d1e5d0e11445ac SHA1 c6ace357d64e2b6e931cb94d2d67e346fc92f089 SHA256 037bacef2d6ed5d9d6dbe5c930bb265142e795712de9c4bff6f2ac34587f72ea
+MISC ChangeLog 10639 RMD160 8fbefb749b604bd3b58f448256ac048d53d3acc7 SHA1 3a7f58a4e2667b8b8f70d8e01f13714fa18bd284 SHA256 ae15d90a30eeb5a94cf16108302cd51fcee0badb0d95213259c9c5e9126f9bf9
 MISC metadata.xml 575 RMD160 638c53aa85064f37973c46069075a55d1cc02c9b SHA1 1b31b9514dc8f1d56c4c9e0bfe58e0d4f6ce2e9e SHA256 4fc8a40dde64837250400a3468add946b4cc8b29b74b9fc2b7b416534dab04f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklvNwQACgkQ1ycZbhPLE2CF+QCgsGjHBNQ51w11IpvSnNO3Vhk3
-FjYAnRB85n5DA7W8cQxzyeailZtSDbc4
-=SGaf
+iEYEARECAAYFAklvUJAACgkQ1ycZbhPLE2DccwCgilXgcVEOEQxknULkDIl3kfl2
+k/8An0Ll5IbYi0fuGJcDL6DCWIs5S9SO
+=Skxk
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/files/netcdf-3.6.3-as-needed.patch b/sci-libs/netcdf/files/netcdf-3.6.3-as-needed.patch
new file mode 100644
index 000000000000..944600824706
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-3.6.3-as-needed.patch
@@ -0,0 +1,43 @@
+diff -Nur netcdf-3.6.3.orig/cxx/Makefile.am netcdf-3.6.3/cxx/Makefile.am
+--- netcdf-3.6.3.orig/cxx/Makefile.am	2008-04-04 18:05:25.000000000 +0100
++++ netcdf-3.6.3/cxx/Makefile.am	2009-01-15 14:46:15.895277408 +0000
+@@ -105,6 +105,6 @@
+ 
+ # Library source.
+ libnetcdf_c___la_SOURCES = netcdf.cpp ncvalues.cpp
+-
++libnetcdf_c___la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la
+ test: check
+ 
+diff -Nur netcdf-3.6.3.orig/fortran/Makefile.am netcdf-3.6.3/fortran/Makefile.am
+--- netcdf-3.6.3.orig/fortran/Makefile.am	2008-04-22 22:52:04.000000000 +0100
++++ netcdf-3.6.3/fortran/Makefile.am	2009-01-15 14:47:03.426443772 +0000
+@@ -60,6 +60,7 @@
+ # (it's generated by the configure script from nfconfig.in), or if
+ # netcdf.inc has changed.
+ libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc 
++libnetcdff_la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la
+ 
+ # Is the user building netCDF-4?
+ if USE_NETCDF4
+@@ -92,7 +93,7 @@
+ 
+ # If F90 is built, include it's convenience library.
+ if BUILD_F90
+-libnetcdff_la_LIBADD = ../f90/libnetcdff90.la
++libnetcdff_la_LIBADD += ../f90/libnetcdff90.la
+ endif
+ 
+ # If we are building the dll (under MinGW) then set the correct flags.
+diff -Nur netcdf-3.6.3.orig/Makefile.am netcdf-3.6.3/Makefile.am
+--- netcdf-3.6.3.orig/Makefile.am	2008-06-27 14:15:13.000000000 +0100
++++ netcdf-3.6.3/Makefile.am	2009-01-15 14:48:04.594871206 +0000
+@@ -88,7 +88,7 @@
+ # $(DAPDIR) $(NCDAPDIR) $(LIBSRC4_DIR)	\
+ # $(V2_TEST) $(NCGEN) $(NCDUMP) $(F77_TEST) ${CXX_DIR} $(CXX4)	\
+ # $(NC_TEST_DIR) $(NC_TEST4) $(MAN) $(EXAMPLES) win32 
+-SUBDIRS = $(F90_DIR) $(F77_DIR) $(LIBSRC_DIR) $(LIBSRC4_DIR)	\
++SUBDIRS = $(LIBSRC_DIR) $(F90_DIR) $(F77_DIR) $(LIBSRC4_DIR)	\
+ $(V2_TEST) $(NCGEN) $(NCDUMP) $(F77_TEST) ${CXX_DIR} $(CXX4)	\
+ $(NC_TEST_DIR) $(NC_TEST4) $(MAN) $(EXAMPLES) win32
+ 
diff --git a/sci-libs/netcdf/netcdf-3.6.3.ebuild b/sci-libs/netcdf/netcdf-3.6.3.ebuild
new file mode 100644
index 000000000000..9f93d6d4fbda
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-3.6.3.ebuild
@@ -0,0 +1,84 @@
+# 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.1 2009/01/15 15:04:18 bicatali Exp $
+
+EAPI=2
+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_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.6.2-parallel-make.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
+}
+
+src_configure() {
+	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}
+}
+
+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
+}