Fix building with GCC 4.4+ wrt #277422.

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

4 files changed, 47 insertions, 8 deletions

diff --git a/dev-lisp/xlispstat/ChangeLog b/dev-lisp/xlispstat/ChangeLog
index 5ed7398111b5..9c50221868aa 100644
--- a/dev-lisp/xlispstat/ChangeLog
+++ b/dev-lisp/xlispstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/xlispstat
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/xlispstat/ChangeLog,v 1.4 2007/07/22 08:00:34 graaff Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/xlispstat/ChangeLog,v 1.5 2009/08/10 16:36:11 ssuominen Exp $
+
+  10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xlispstat-3.52.20.ebuild, +files/xlispstat-3.52.20-fmax.patch:
+  Fix building with GCC 4.4+ wrt #277422.
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> xlispstat-3.52.20.ebuild:
   Drop virtual/x11 references.
diff --git a/dev-lisp/xlispstat/Manifest b/dev-lisp/xlispstat/Manifest
index cbe44a27475e..9da83d528cb5 100644
--- a/dev-lisp/xlispstat/Manifest
+++ b/dev-lisp/xlispstat/Manifest
@@ -1,4 +1,5 @@
+AUX xlispstat-3.52.20-fmax.patch 1041 RMD160 a16d781b1cdb8bee41742decfa3954008a0cb352 SHA1 acfbdbc4287feea8f58c4b35102850c4a979cab2 SHA256 fa6e1f4bb4f576cbb26e20f6452b79ce62f5a795472b5ba5fb00a68984788112
 DIST xlispstat-3-52-20.tar.gz 1527951 RMD160 834442693df99692c80efd6149315639329379c4 SHA1 a62c353ce136ba7111536457272fa20f82ae23e0 SHA256 977d3e984cbe881244b0f15d1b8a78f4660ac2b7cbc53cc857606d75ecd0b71a
-EBUILD xlispstat-3.52.20.ebuild 1047 RMD160 7200481d3b9af9f54e0d97cb454b2bd3c9b27f95 SHA1 33a20ce3ea73e03e46ebb57c24a00fd3050050d2 SHA256 4823d377da4ddf37b50867b03be6a1295d2ca8313ccf71315fd70ce848e747ad
-MISC ChangeLog 616 RMD160 7cd8bb64101034769187a40832433862a6a391d1 SHA1 454999e3d144389d4d881d7a6c0a6fa5779033a7 SHA256 4c40f5afd9c6ea2d488b74c8b0df885befec606b1f5be97fd2e5ec32be97005d
+EBUILD xlispstat-3.52.20.ebuild 1176 RMD160 80bf18896b2bc0ad03f20e4c5dc0e6efee121df8 SHA1 ad0b87a29b6acd9f9f7ef63eb3cf33cd79f66171 SHA256 09348f12f468b0f17e299b9719e3db4fad413ff97368134ebedf28c8b1ca2e87
+MISC ChangeLog 781 RMD160 c6d8b5271df76ae67cc44657bbb4667bbc5b86cb SHA1 b758e4aaf449afccaf4624ab9741d4bb044d23ee SHA256 e8476141a8395ed5f6d8fd76d914ad0fc57d0e31f5bcca42d4f125b24558bc1c
 MISC metadata.xml 164 RMD160 5edb79931b874dc3a72128f0742b9d4c4eb3c8c1 SHA1 2f781e1fca36d790a027079805d56cf397e6a6f8 SHA256 f8efc9385015233c71f279f85bd0a327525b7136cf8714cc04449d8bea4ce22f
diff --git a/dev-lisp/xlispstat/files/xlispstat-3.52.20-fmax.patch b/dev-lisp/xlispstat/files/xlispstat-3.52.20-fmax.patch
new file mode 100644
index 000000000000..50ff409b663e
--- /dev/null
+++ b/dev-lisp/xlispstat/files/xlispstat-3.52.20-fmax.patch
@@ -0,0 +1,23 @@
+Source: DragonFlyBSD
+
+diff -ur xlispstat-3-52-20.orig/lowess.c xlispstat-3-52-20/lowess.c
+--- xlispstat-3-52-20.orig/lowess.c	2000-11-25 01:17:38.000000000 +0200
++++ xlispstat-3-52-20/lowess.c	2009-08-10 19:34:54.000000000 +0300
+@@ -12,7 +12,7 @@
+ /* forward declarations */
+ static double pow2 P1H(double);
+ static double pow3 P1H(double x);
+-static double fmax P2H(double, double);
++/* static double fmax P2H(double, double); */
+ static VOID sort P2H(double *, int);
+ static VOID lowest P11H(double *, double *, int, double, double *,
+                         int, int, double *, int, double *, int *);
+@@ -20,7 +20,7 @@
+ 
+ static double pow2 P1C(double, x) { return(x * x); }
+ static double pow3 P1C(double, x) { return(x * x * x); }
+-static double fmax P2C(double, x, double, y) { return (x > y ? x : y); }
++/* static double fmax P2C(double, x, double, y) { return (x > y ? x : y); } */
+ 
+ int lowess P9C(double *, x, double *, y, int, n, double, f, int, nsteps, double, delta,
+                double *, ys, double *, rw, double *, res)
diff --git a/dev-lisp/xlispstat/xlispstat-3.52.20.ebuild b/dev-lisp/xlispstat/xlispstat-3.52.20.ebuild
index d1a4bee82aa4..15081bca4a5a 100644
--- a/dev-lisp/xlispstat/xlispstat-3.52.20.ebuild
+++ b/dev-lisp/xlispstat/xlispstat-3.52.20.ebuild
@@ -1,18 +1,29 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/xlispstat/xlispstat-3.52.20.ebuild,v 1.4 2007/07/22 08:00:34 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/xlispstat/xlispstat-3.52.20.ebuild,v 1.5 2009/08/10 16:36:11 ssuominen Exp $
+
+inherit eutils
 
 DESCRIPTION="XLISP-STAT is a statistical environment based on a dialect of the Lisp language called XLISP."
 HOMEPAGE="http://www.stat.uiowa.edu/~luke/xls/xlsinfo/xlsinfo.html"
 SRC_URI="ftp://ftp.stat.umn.edu/pub/xlispstat/current/xlispstat-${PV//./-}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
-DEPEND="X? ( x11-libs/libX11 )"
+
+RDEPEND="X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P//./-}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fmax.patch
+}
+
 src_compile() {
 	local opts=''
 	use X && opts='--with-x' || opts='--without-x'