Fixed netcdf support (bug #228943)

(Portage version: 2.1.4.4)

4 files changed, 23 insertions, 26 deletions

diff --git a/sci-visualization/grace/ChangeLog b/sci-visualization/grace/ChangeLog
index 0aeabd631325..1abcf0464473 100644
--- a/sci-visualization/grace/ChangeLog
+++ b/sci-visualization/grace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/grace
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.30 2008/05/03 02:28:12 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.31 2008/06/23 08:25:53 bicatali Exp $
+
+  22 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/grace-5.1.21-m4-netcdf.patch, +files/grace-5.1.21-netcdf.patch,
+  grace-5.1.21-r1.ebuild:
+  Fixed netcdf support (bug #228943)
 
   03 May 2008; Matti Bickel <mabi@gentoo.org> grace-5.1.21-r1.ebuild:
   ~ppc added (bug #212198)
diff --git a/sci-visualization/grace/files/grace-5.1.21-m4-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-m4-netcdf.patch
deleted file mode 100644
index 94df301daf90..000000000000
--- a/sci-visualization/grace/files/grace-5.1.21-m4-netcdf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ac-tools/aclocal.m4.orig	2008-03-03 11:17:50.000000000 +0000
-+++ ac-tools/aclocal.m4	2008-03-03 11:20:45.000000000 +0000
-@@ -662,7 +662,7 @@
-       int main(void) {
-         char *vlib;
-         vlib = nc_inq_libvers();
--        if (strcmp(vlib, "[$1]") < 0) {
-+        if ((vlib[0] == '"') && (strcmp(vlib, "[$1]") < 0) || ((vlib[0] != '"') && (strcmp(vlib,"[$1]") < 0))){
-           exit(1);
-         }
-         exit(0);
diff --git a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch
new file mode 100644
index 000000000000..eabb27434e17
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2007-02-16 22:44:49.000000000 +0000
++++ configure	2007-09-28 23:03:29.000000000 +0100
+@@ -15181,7 +15181,7 @@
+       int main(void) {
+         char *vlib;
+         vlib = nc_inq_libvers();
+-        if (strcmp(vlib, "3.0") < 0) {
++        if (((vlib[0] == '"') && (strcmp(vlib, "\"3.0") < 0)) || ((vlib[0] != '"') && (strcmp(vlib, "3.0") < 0))){
+           exit(1);
+         }
+         exit(0);
diff --git a/sci-visualization/grace/grace-5.1.21-r1.ebuild b/sci-visualization/grace/grace-5.1.21-r1.ebuild
index 3d6502478ae8..e22c4034d0eb 100644
--- a/sci-visualization/grace/grace-5.1.21-r1.ebuild
+++ b/sci-visualization/grace/grace-5.1.21-r1.ebuild
@@ -1,17 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.21-r1.ebuild,v 1.3 2008/05/03 02:28:12 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.21-r1.ebuild,v 1.4 2008/06/23 08:25:53 bicatali Exp $
 
 EAPI="1"
-
-inherit eutils fortran autotools
-
-DEB_PR=2
+inherit eutils fortran
 
 DESCRIPTION="Motif based XY-plotting tool"
 HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
-SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.diff.gz"
+SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
@@ -41,13 +37,11 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	epatch ${PN}_${PV}-${DEB_PR}.diff
 	cd "${S}"
 
-	epatch debian/patches/tmpnam_to_mkstemp.diff
-
-	# fix for netcdf versioning in aclocal.m4
-	epatch "${FILESDIR}"/${P}-m4-netcdf.patch
+	epatch "${FILESDIR}"/${P}-mkstemp.diff
+	# fix configure instead of aclocal.m4
+	epatch "${FILESDIR}"/${P}-netcdf.patch
 	# fix for missing defines when fortran is disabled
 	epatch "${FILESDIR}"/${P}-fortran.patch
 	# fix for glibc-2.7 (bug #)
@@ -74,8 +68,6 @@ src_unpack() {
 	# and a config.h
 
 	cp ac-tools/configure.in .
-	eautoconf
-	eaclocal
 }
 
 src_compile() {