Fix building with GCC 4.4+ wrt #274281. Keyword -amd64 because the code is not 64bit safe and Portage aborts on install.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 84 insertions, 19 deletions

diff --git a/sci-geosciences/vis5d+/ChangeLog b/sci-geosciences/vis5d+/ChangeLog
index 449e5e69e816..230f7ab54a36 100644
--- a/sci-geosciences/vis5d+/ChangeLog
+++ b/sci-geosciences/vis5d+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/vis5d+
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/vis5d+/ChangeLog,v 1.4 2007/02/22 01:22:17 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/vis5d+/ChangeLog,v 1.5 2009/08/12 14:10:16 ssuominen Exp $
+
+  12 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> vis5d+-1.2.1.ebuild,
+  +files/vis5d+-1.2.1-round.patch:
+  Fix building with GCC 4.4+ wrt #274281. Keyword -amd64 because the code is
+  not 64bit safe and Portage aborts on install.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-geosciences/vis5d+/Manifest b/sci-geosciences/vis5d+/Manifest
index 23c1124122c4..9b47a1317895 100644
--- a/sci-geosciences/vis5d+/Manifest
+++ b/sci-geosciences/vis5d+/Manifest
@@ -1,4 +1,5 @@
+AUX vis5d+-1.2.1-round.patch 2176 RMD160 183d5be1ec2d9736eadcd2d34a9e2aeafb917e7f SHA1 81d6bd914bb203c964585828ebbd26e8d65e287e SHA256 15cfdc63eea30093321a01688479faf552e7814e0a195d41d5986d8df013ab1a
 DIST vis5d+-1.2.1.tar.gz 2278840 RMD160 b9eda9ab8a754a968c03ce54622b0c4fe918937d SHA1 d99ec14fd8e6e482ab360abbd00adf36e7fd541b SHA256 4fae83d9ea515e3ce9e89af7aeb7c51158dde6533ad94d28352df60ca8214776
-EBUILD vis5d+-1.2.1.ebuild 819 RMD160 016358accee8c4512e69b15e36d83661ef26cce3 SHA1 a2d8d032a4c4383df42a18005610a00d62abb90c SHA256 1f75d02349013ee1dd5d6b0e841999614bc7881fbf4a1f4d5e22a06d9863b157
-MISC ChangeLog 1065 RMD160 e7bb1ba710d6354587d8b59f57d212793a25af45 SHA1 3c87b9d4694b099b8d6818b79f36cd806cd2fb40 SHA256 36fe35ceab29cfd3b8ffdbe347a79492ae6201b92dd82a56ab4c1dd4aa9b3595
+EBUILD vis5d+-1.2.1.ebuild 844 RMD160 3587798da299a5451269c12e67fcf2b113fb1d13 SHA1 ae34b7e91bd183555f273d95a7ea187343c34bfd SHA256 4415a938f2aab3c4470893876fa6eb75a29c5bb7045afd7cb53a16e6c9da97a3
+MISC ChangeLog 1305 RMD160 3d06972cf3f0868d710d0d06e32894b2990f9123 SHA1 f9c1c459d6ac1769789addb733db7c8626779d75 SHA256 7c4c06813e8df842336d91c524669de0bf78d77b79320dae867bba24cc7c1c3a
 MISC metadata.xml 168 RMD160 156c29f9b364fbbaf0028d17736a01112e5d8cab SHA1 1221e73982792f6e23f10d95e878e86e8f62fe35 SHA256 2fc15316b226307080574c36b3761f27a23a642e89c60f02feabdc64049a188d
diff --git a/sci-geosciences/vis5d+/files/vis5d+-1.2.1-round.patch b/sci-geosciences/vis5d+/files/vis5d+-1.2.1-round.patch
new file mode 100644
index 000000000000..76001d83afdc
--- /dev/null
+++ b/sci-geosciences/vis5d+/files/vis5d+-1.2.1-round.patch
@@ -0,0 +1,58 @@
+diff -ur vis5d+-1.2.1.orig/src/misc.c vis5d+-1.2.1/src/misc.c
+--- vis5d+-1.2.1.orig/src/misc.c	2001-11-07 13:53:12.000000000 +0200
++++ vis5d+-1.2.1/src/misc.c	2009-08-12 17:01:17.000000000 +0300
+@@ -144,10 +144,10 @@
+ 
+ 
+ 
+-/*** round ************************************************************
++/*** Round ************************************************************
+    Round off x to a 'nice' value.
+ **********************************************************************/
+-float round( float x )
++float Round( float x )
+ {
+    float base, fudge;
+    int temp;
+@@ -273,7 +273,7 @@
+       ctx->Variable[var]->HSliceRequest->Interval = 0.0;
+    }
+    else {
+-      ctx->Variable[var]->HSliceRequest->Interval = round( (ctx->Variable[var]->MaxVal - ctx->Variable[var]->MinVal)
++      ctx->Variable[var]->HSliceRequest->Interval = Round( (ctx->Variable[var]->MaxVal - ctx->Variable[var]->MinVal)
+                                         / 10.0 );
+    }
+ 
+@@ -309,7 +309,7 @@
+       ctx->Variable[var]->VSliceRequest->Interval = 0.0;
+    }
+    else {
+-      ctx->Variable[var]->VSliceRequest->Interval = round( (ctx->Variable[var]->MaxVal - ctx->Variable[var]->MinVal)
++      ctx->Variable[var]->VSliceRequest->Interval = Round( (ctx->Variable[var]->MaxVal - ctx->Variable[var]->MinVal)
+                                         / 10.0 );
+    }
+ 
+diff -ur vis5d+-1.2.1.orig/src/misc.h vis5d+-1.2.1/src/misc.h
+--- vis5d+-1.2.1.orig/src/misc.h	2001-11-07 13:53:12.000000000 +0200
++++ vis5d+-1.2.1/src/misc.h	2009-08-12 16:59:45.000000000 +0300
+@@ -37,7 +37,7 @@
+ 
+ extern void die( char *msg );
+ 
+-extern float round( float x );
++extern float Round( float x );
+ 
+ extern int which( char *file, char *fullpath );
+ 
+diff -ur vis5d+-1.2.1.orig/src/work.c vis5d+-1.2.1/src/work.c
+--- vis5d+-1.2.1.orig/src/work.c	2001-11-07 13:53:30.000000000 +0200
++++ vis5d+-1.2.1/src/work.c	2009-08-12 17:01:46.000000000 +0300
+@@ -6791,7 +6791,7 @@
+ 		  request->HighLimit = floor(request->HighLimit*factor)/(float) factor;
+ 		}
+ 	 }
+-	 request->Interval = round((request->HighLimit - request->LowLimit)/5.0);
++	 request->Interval = Round((request->HighLimit - request->LowLimit)/5.0);
+ 	 
+   }
+ }
diff --git a/sci-geosciences/vis5d+/vis5d+-1.2.1.ebuild b/sci-geosciences/vis5d+/vis5d+-1.2.1.ebuild
index e169f8f70364..c836b7c993fa 100644
--- a/sci-geosciences/vis5d+/vis5d+-1.2.1.ebuild
+++ b/sci-geosciences/vis5d+/vis5d+-1.2.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/vis5d+/vis5d+-1.2.1.ebuild,v 1.2 2005/11/10 19:00:48 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/vis5d+/vis5d+-1.2.1.ebuild,v 1.3 2009/08/12 14:10:16 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="3dimensional weather modeling software"
@@ -10,24 +11,24 @@ SRC_URI="mirror://sourceforge/vis5d/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+# amd64: Function `vis5d_get_dtx' implicitly converted to pointer at graphics.ogl.c:1355
+KEYWORDS="-amd64 x86"
 IUSE=""
 
-DEPEND=">=sci-libs/netcdf-3.5.0"
+RDEPEND=">=sci-libs/netcdf-3.5"
+DEPEND="${RDEPEND}"
 
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--without-mixkit \
-		--enable-threads || die "./configure failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-round.patch
+}
 
-	emake || die "emake failed"
+src_configure() {
+	econf \
+		--without-mixkit \
+		--enable-threads
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc README NEWS INSTALL ChangeLog PORTING AUTHORS ABOUT-NLS
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README NEWS ChangeLog PORTING AUTHORS
 }