Fixed netcdf support (bug #228943)

Package-Manager: portage-2.1.4.4

5 files changed, 29 insertions, 33 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/Manifest b/sci-visualization/grace/Manifest
index 24822f69b13f..d837c1e06c63 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX grace-5.1.21-fortran.patch 650 RMD160 1eb2b9cb37cad4b103f5fe4749e65403a1dffab5 SHA1 50b5a5af6ab802936fcb227ebba46bb69e37bd7b SHA256 5001b3eb4ceb4b408b01a92651162bdf6f3ce1823199ae8f0a62c32a816a5c1e
-AUX grace-5.1.21-m4-netcdf.patch 427 RMD160 7c681749c86a3b9650ca7f07787d0099755c39fd SHA1 821e18f472ec621ae44aa20ba6b36d4e86cfbfa9 SHA256 17ebe8dd0a74b0e5edda5e5b124ecce9dae49e5402509a6006bc32247c4117a4
+AUX grace-5.1.21-netcdf.patch 413 RMD160 dab48c7889042ebe741293da0184c36c00034e32 SHA1 750efdb37af1f1c1eab0f8c28f52df4621964c44 SHA256 57c36bfd320d2a3a61c2f7628ede67f96c4c165969f7162b4d3dbf07d23d5adb
 AUX grace-5.1.21-stdc99.patch 458 RMD160 79f98076d98c90bb9dde7edf76797790d53f4eba SHA1 1f5267b3fbc757704042b5d5a5c25465bb0bd8b9 SHA256 8fb25ffd450c65871d4c418a3c8a42e4e33545723c2ce6e854c534d60e035f3e
 AUX grace-helpviewer-gentoo.diff 384 RMD160 c9c0ff6d9ff270cfb94ec2d91a19a1eee64e76be SHA1 949d2728e0857fb955538757b72852643a1e2b2c SHA256 d17e81fa31c1647c9b7a8dbff5a8aa75faf6d4d293ad2738de93acbdf754e206
 AUX grace.desktop 262 RMD160 5a10a1cf6f5e79aff53eb62fffb24067afcab37e SHA1 11e2ecbf7862f3e810c32ca5398da11ea182ebd8 SHA256 25b51b4216d35b44ae0d6a5d930d82fab76b5cd799898dd0797d23eec8bfdc3e
@@ -10,16 +10,15 @@ AUX grace.png 498 RMD160 01c0e1841ca819eafd6c49933e8bcf656ba664d6 SHA1 32d698b82
 AUX xmgrace.sh 100 RMD160 ca883727fa2ea3555238dde62d97ea52d4c57633 SHA1 8c2deb5cce72d100fcd0b926ef8b1aa7a27f7800 SHA256 5349f556ce95b419d4678ac10b090c7fde91d78c345495aab7acf2aaaa4a1b05
 DIST grace-5.1.20.tar.gz 2458543 RMD160 2c8ed6d71ccea028a8798b3c08feccbdac62348d SHA1 40679a554c94b44aa378d1af9b19fc8c4662b8e5 SHA256 8524d54505bf634b038c054850ff71eed119dc96f3d5e3706b4e4ff4b07d4b13
 DIST grace-5.1.21.tar.gz 2474115 RMD160 d2818d1a50945ef84aa2ddd6046e5bfbf6c9459b SHA1 23edbb8f713fe3895a58c7ed9892875ee3d819fa SHA256 30e4b5d86f4b966428aac5d8c5d0468bcf28226eea9e00d9eb4886f4ab094b00
-DIST grace_5.1.21-2.diff.gz 23517 RMD160 e027372cbe6bd51543ca00888da987055895eecc SHA1 5507eeb8100d750690b203db9e628d83d77d3830 SHA256 d04252fbfc1fde51e05df3f36d34dcfe88fb53a330f92e189eb6af6a459e1b23
 EBUILD grace-5.1.20.ebuild 3347 RMD160 b1e8dfd1274e0e0cf7ac11346b18069787beef70 SHA1 e35e1fec434966fc02ef43d78e6ed7717490e2c8 SHA256 673f199a41056d4b25caef84b2034d1a55c011fca01dd3a9cc478087ecc5badb
-EBUILD grace-5.1.21-r1.ebuild 3100 RMD160 aa645f2f16ff0b279b4395c549f69da043d2990f SHA1 0852814a4759841e198c69b4ad0592fee9fc0e91 SHA256 911a5f2eb751c27d8dd0e3c5dec8899aa3fc6cc4406b253439ffa4405d16f404
+EBUILD grace-5.1.21-r1.ebuild 2940 RMD160 0e3022d54dde683698d5bdb2b67ceaa4a8326e06 SHA1 aca31af8b1a51decfcf0536bc1558b12c647cd62 SHA256 e83ec852ddd6a19b3612354b89d83dbccdf28daf9b7bdedd093f53b5116cb39a
 EBUILD grace-5.1.21.ebuild 3527 RMD160 e0ea9109183cd82510b17ce7f331b6e994580da0 SHA1 3b68ebc45a12f7bca099996c58560cdc7d5c4351 SHA256 ceeb5cdb4b5a85be2fcd13adca17e5c1dee5208caa0ae2ce28928354f7e9eb1d
-MISC ChangeLog 11088 RMD160 df14e4a43324289f61ae1fbcb6305f8cd40ccd04 SHA1 5a930a90a135c10a8dcc41a912f0632b0d0a7c69 SHA256 0cda6e86298b31c01b334454049f4c10eb9748f57e69b0ea13e3821fcd8e89e2
+MISC ChangeLog 11284 RMD160 5a13c82117b25a825711c523763d10754d279710 SHA1 f5ad030039c2f9596ec222a8c4ebef20aeee6e80 SHA256 3ad7ceeb30e71c0109005ee5cb79c2b27873713abe556c0c5870ac5103dfa0b3
 MISC metadata.xml 645 RMD160 78fdc207c55c585d82c8282ddedf554da9ebbeaf SHA1 f905e31a079fe543bc3f81d0305c11ea3529c605 SHA256 97aa6dae00402081c1d846ef26f8a5283b5bbe62c414bb66febee13bf2d92bfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgbzbAACgkQfNMcoUhJ7GwbdgCeJvzMyoaWgIeJzhRS/meeERaF
-AEYAnjWo7wzlFupgO6lcexT4S5K+epTJ
-=m93r
+iEYEARECAAYFAkhfXhoACgkQ1ycZbhPLE2BiFQCfXkOZgy+dGZpnqo4mpUR6FQ+B
+XuUAn1ukIFR+UA81Nwt0NJ++dMe3BpZY
+=qHik
 -----END PGP SIGNATURE-----
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() {