Fixed some examples for gcc-4.3, thanks to anomen

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

5 files changed, 39 insertions, 153 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index e0d199f91e32..860bbe188b32 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/netcdf
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.50 2008/02/13 12:28:37 armin76 Exp $
+# 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 $
+
+  15 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  files/netcdf-3.6.2-gcc43.patch, -netcdf-3.6.1.ebuild,
+  -netcdf-3.6.1-r1.ebuild:
+  Fixed some examples for gcc-4.3, thanks to anomen
 
   13 Feb 2008; Raúl Porcel <armin76@gentoo.org> netcdf-3.6.2.ebuild:
   alpha stable wrt #201477
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 12ee9a025392..505b1d5ffcfe 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fPIC.1.patch 816 RMD160 4640831dac116428fc1b7bb80a27a0c3ad59cc15 SHA1 3ed50725c51c66cdbf769b2214d0e2be9d4aa850 SHA256 d5f9431b102815c5000fb2a97536d5a74aa1c83acbc1df11e5ad9716f9623501
 AUX fPIC.patch 209 RMD160 f7336b30c070a75335bed8280e5f1505a03ce464 SHA1 c5e8728952dc9eace71417936e93b7ee5c415e98 SHA256 7c24234fdc8b9f4031989949398aa203aafd492d367d71c02e1ce41b5b39d68c
 AUX netcdf-3.6.2-as-needed.patch 1535 RMD160 394331f42b20e6fdc510b669390bc697b60cd07d SHA1 8970375441ba026995e1d517c643117919038486 SHA256 23a18d65be6cdc7521e75db8cca3c09e83854343e33f60d214addff836df3b88
-AUX netcdf-3.6.2-gcc43.patch 245 RMD160 91a45f85b858a5bb6c320a5413c6244ca2351ffe SHA1 0001c2614ed275c3ccb348984ca9fde8d0941d42 SHA256 8f6d39b916fd3f9bd3f039cee4ce27ce9f8d106181b0925bf810ad0af5adec7b
+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
-DIST netcdf-3.6.1.tar.gz 883888 RMD160 f46c3f65645169db60c8523eb28d498dfb6f7760 SHA1 42dfacab24f2af5fbc16a75769c7295d0b228542 SHA256 15c42a2c698c4e42ee17720701168711d86e97e97311223015d07853fb09249f
 DIST netcdf-3.6.2.tar.gz 5312882 RMD160 dcf1efa90b7479215ac0a2d8dc231d94dddc73d8 SHA1 32fb81f39ffccab539124cc3d5f619965ce42f36 SHA256 feaa7673f369e5fb57fcc51426e2be694228ddcc141fc3fd20399269fb6b9311
-EBUILD netcdf-3.6.1-r1.ebuild 1945 RMD160 f7f64c53b4814478df6409bd2f0dbef3d15b9a3f SHA1 71c62bad1d6e56fbcd7f543c45b78ffec8b6b0a9 SHA256 29e3d8c216b6b0efc47874e08447b05e809ea83812aaa94181e345579484b62c
-EBUILD netcdf-3.6.1.ebuild 1932 RMD160 281ab589d135ac62c4881c4f4ea7f39c39828a47 SHA1 95a1519ed350d9dc7924a6043f4ffd03c885db7f SHA256 22d73c9434ed09b0a060767bcd42097cc568fbcb4809d57defc37d98711a84a8
 EBUILD netcdf-3.6.2.ebuild 2407 RMD160 8851ee9d4251eed868ecf6549a6e9bed0d16304b SHA1 bab5846d04c80aacaf9bbcde0827083eb1fcc2cd SHA256 669f7b5da2eb886fba83585a554f510f31248a746bce7b4c284bf1eeca6fa5d4
-MISC ChangeLog 10286 RMD160 2675e3bce8c351ad9966a08b58cf2a7fa1989a6a SHA1 a9e95a79c67985e0a7e4b2a9b8d0de60daa0df13 SHA256 ec7e460d9e294904880b80ff92494aadecc72440da0938237226a5af72d2b2b4
+MISC ChangeLog 10478 RMD160 673a7161b38854ee78faeb39373ee86c95bf917e SHA1 697ef591dc83584a2bccd7bdaf34f379bfdd0c13 SHA256 4ddfd0416f68021428a6aaccc2665baf1540206b56e00e184d820df5e960f2b1
 MISC metadata.xml 575 RMD160 638c53aa85064f37973c46069075a55d1cc02c9b SHA1 1b31b9514dc8f1d56c4c9e0bfe58e0d4f6ce2e9e SHA256 4fc8a40dde64837250400a3468add946b4cc8b29b74b9fc2b7b416534dab04f6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklvNwQACgkQ1ycZbhPLE2CF+QCgsGjHBNQ51w11IpvSnNO3Vhk3
+FjYAnRB85n5DA7W8cQxzyeailZtSDbc4
+=SGaf
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/files/netcdf-3.6.2-gcc43.patch b/sci-libs/netcdf/files/netcdf-3.6.2-gcc43.patch
index 2c4c0f749746..60fd5b895292 100644
--- a/sci-libs/netcdf/files/netcdf-3.6.2-gcc43.patch
+++ b/sci-libs/netcdf/files/netcdf-3.6.2-gcc43.patch
@@ -9,3 +9,23 @@
  
  #include "ncvalues.h"
  
+--- examples/CXX/sfc_pres_temp_rd.cpp.orig	2009-01-15 13:10:38.866169747 +0000
++++ examples/CXX/sfc_pres_temp_rd.cpp	2009-01-15 13:11:21.301635873 +0000
+@@ -17,6 +17,7 @@
+ */
+ 
+ #include <iostream>
++#include <cstring>
+ #include <netcdfcpp.h>
+ 
+ using namespace std;
+--- examples/CXX/sfc_pres_temp_wr.cpp.orig	2009-01-15 13:10:28.031052831 +0000
++++ examples/CXX/sfc_pres_temp_wr.cpp	2009-01-15 13:11:07.535199220 +0000
+@@ -17,6 +17,7 @@
+ */
+ 
+ #include <iostream>
++#include <cstring>
+ #include <netcdfcpp.h>
+ 
+ using namespace std;
diff --git a/sci-libs/netcdf/netcdf-3.6.1-r1.ebuild b/sci-libs/netcdf/netcdf-3.6.1-r1.ebuild
deleted file mode 100644
index 25c8a956b46e..000000000000
--- a/sci-libs/netcdf/netcdf-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.1-r1.ebuild,v 1.3 2007/10/15 14:48:39 corsair Exp $
-
-inherit fortran eutils toolchain-funcs
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
-HOMEPAGE="http://my.unidata.ucar.edu/content/software/netcdf/index.html"
-
-LICENSE="UCAR-Unidata"
-SLOT="0"
-IUSE="fortran"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86"
-
-S="${WORKDIR}/${P}/src"
-
-pkg_setup() {
-	if use fortran ; then
-	    need_fortran "gfortran ifc g77"
-#	    fortran_pkg_setup
-	else
-	    FORTRAN=""
-	fi
-}
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/fPIC.1.patch || die "fPIC patch failed"
-}
-
-src_compile() {
-	local myconf
-
-	if use fortran ; then
-	    if [ ${FORTRANC} == gfortran ] ; then
-		myconf="${myconf} CPPFLAGS=-DpgiFortran"
-	    else
-		myconf="${myconf} CPPFLAGS=-Df2cFortran"
-	    fi
-	fi
-
-	econf ${myconf} || die "econf failed"
-
-	make || die "make failed"
-}
-
-src_test() {
-	make test || die "make test failed"
-}
-
-src_install() {
-	dodir /usr/{lib,share} /usr/share/man/man3
-
-	einstall MANDIR=${D}usr/share/man || die "einstall failed"
-
-	if test -f ${D}usr/share/man/man3/netcdf.3f ; then
-	    dodir /usr/share/man/man3f
-	    mv ${D}usr/share/man/man3/netcdf.3f ${D}usr/share/man/man3f/ \
-		|| die "Failed to move f77 man page"
-	    dosed "s:NETCDF 3:NETCDF 3F:g" /usr/share/man/man3f/netcdf.3f \
-		|| die "dosed failed"
-	    if test -f ${D}usr/share/man/man3/netcdf.3f90 ; then
-		dodir /usr/share/man/man3f90
-		mv ${D}usr/share/man/man3/netcdf.3f90 ${D}usr/share/man/man3f90/ \
-		    || die "Failed to move f90 man page"
-	    fi
-	    dodoc fortran/cfortran.doc || die "Failed to install fortran docs"
-	fi
-
-	dodoc COPYRIGHT README RELEASE_NOTES VERSION \
-		|| die "Failed to install docs"
-}
diff --git a/sci-libs/netcdf/netcdf-3.6.1.ebuild b/sci-libs/netcdf/netcdf-3.6.1.ebuild
deleted file mode 100644
index ffa02c576a74..000000000000
--- a/sci-libs/netcdf/netcdf-3.6.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.1.ebuild,v 1.14 2006/09/08 17:57:43 tcort Exp $
-
-inherit fortran eutils toolchain-funcs
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
-HOMEPAGE="http://my.unidata.ucar.edu/content/software/netcdf/index.html"
-
-LICENSE="UCAR-Unidata"
-SLOT="0"
-IUSE="fortran"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-
-S="${WORKDIR}/${P}/src"
-
-pkg_setup() {
-	if use fortran ; then
-	    need_fortran "gfortran ifc g77"
-#	    fortran_pkg_setup
-	else
-	    FORTRAN=""
-	fi
-}
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/fPIC.patch || die "fPIC patch failed"
-}
-
-src_compile() {
-	local myconf
-
-	if use fortran ; then
-	    if [ ${FORTRANC} == gfortran ] ; then
-		myconf="${myconf} CPPFLAGS=-DpgiFortran"
-	    else
-		myconf="${myconf} CPPFLAGS=-Df2cFortran"
-	    fi
-	fi
-
-	econf ${myconf} || die "econf failed"
-
-	make || die "make failed"
-}
-
-src_test() {
-	make test || die "make test failed"
-}
-
-src_install() {
-	dodir /usr/{lib,share} /usr/share/man/man3
-
-	einstall MANDIR=${D}usr/share/man || die "einstall failed"
-
-	if test -f ${D}usr/share/man/man3/netcdf.3f ; then
-	    dodir /usr/share/man/man3f
-	    mv ${D}usr/share/man/man3/netcdf.3f ${D}usr/share/man/man3f/ \
-		|| die "Failed to move f77 man page"
-	    dosed "s:NETCDF 3:NETCDF 3F:g" /usr/share/man/man3f/netcdf.3f \
-		|| die "dosed failed"
-	    if test -f ${D}usr/share/man/man3/netcdf.3f90 ; then
-		dodir /usr/share/man/man3f90
-		mv ${D}usr/share/man/man3/netcdf.3f90 ${D}usr/share/man/man3f90/ \
-		    || die "Failed to move f90 man page"
-	    fi
-	    dodoc fortran/cfortran.doc || die "Failed to install fortran docs"
-	fi
-
-	dodoc COPYRIGHT README RELEASE_NOTES VERSION \
-		|| die "Failed to install docs"
-}