Added patch to fix compilation under gcc-4.x and to force configure to honor user provided CFLAGS.

(Portage version: 2.1_pre4-r1)

6 files changed, 78 insertions, 11 deletions

diff --git a/sci-mathematics/euler/ChangeLog b/sci-mathematics/euler/ChangeLog
index 7f8f2535d294..525cdb430320 100644
--- a/sci-mathematics/euler/ChangeLog
+++ b/sci-mathematics/euler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/euler
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/ChangeLog,v 1.7 2006/02/12 12:50:14 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/ChangeLog,v 1.8 2006/02/12 15:45:26 markusle Exp $
+
+  12 Feb 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/command-gcc4-gentoo.patch, +files/configure-gentoo.patch,
+  euler-1.61.0.ebuild:
+  Added patch to fix compilation under gcc-4.x and to force configure
+  to honor user provided CFLAGS.
 
   12 Feb 2006; Markus Dittrich <markusle@gentoo.org> euler-1.60.6-r1.ebuild:
   Removed dependency on virtual-x11 since this gets pulled in by gtk.
diff --git a/sci-mathematics/euler/Manifest b/sci-mathematics/euler/Manifest
index 7f79ceafd4b1..6b5a62661250 100644
--- a/sci-mathematics/euler/Manifest
+++ b/sci-mathematics/euler/Manifest
@@ -1,18 +1,24 @@
-MD5 72d4c2d8aa3dbd3d16dffa7423912b9b ChangeLog 3364
-RMD160 77696f2c1f3ed05f4e80293acc76d7994dcdcd57 ChangeLog 3364
-SHA256 71f95d8e963305c4d50ed83406e5cde0844934c30a8e946297f45a6b645bd6a6 ChangeLog 3364
+MD5 a193b9ea996872258c6ac77bf635c033 ChangeLog 3611
+RMD160 f29d3fea49cdab069fcf8e042487f5fcd4a46e6b ChangeLog 3611
+SHA256 c515a20de1e479d397b3fb0abb8ad194b12bfd3d757403f59d25c4acfb2746ed ChangeLog 3611
 MD5 77bc9428f3b0dc76eadfb2451861ccca euler-1.60.6-r1.ebuild 1244
 RMD160 ba552220df6d1c7105fc4e62f899fbf991d3aada euler-1.60.6-r1.ebuild 1244
 SHA256 2e1f6688e785a3f52c04235d1b71b4e92574522c6b7c2bcea109320b8a71162e euler-1.60.6-r1.ebuild 1244
-MD5 b9abd5656b1fb6107e894d96cb481461 euler-1.61.0.ebuild 532
-RMD160 147aa73fae081c23d28b730a591ae6eebc635050 euler-1.61.0.ebuild 532
-SHA256 a63ceb8b9de95057a830ba34427412b45842d5315db16d24308e7c389aefdb53 euler-1.61.0.ebuild 532
+MD5 515ef625719249c4add61a7889f76d77 euler-1.61.0.ebuild 794
+RMD160 7fa55008f506c07e3bfeaff3911140f723d7c4be euler-1.61.0.ebuild 794
+SHA256 3ce5f7f0fa408942f30a9952f1941f74e4e234acd25ceea4101b3b596cbcc99a euler-1.61.0.ebuild 794
+MD5 2c3ee647a9bb675678ac382dc4d4369c files/command-gcc4-gentoo.patch 341
+RMD160 433a86213f049d3ffb9ec3023419c2faf0f4b87c files/command-gcc4-gentoo.patch 341
+SHA256 9871a61e1a04efc3780c0a140eb86b055c6d2637e75a4316b3988580e93c0787 files/command-gcc4-gentoo.patch 341
+MD5 3d1bda1a40fe747d668e24ea872de525 files/configure-gentoo.patch 677
+RMD160 c2c4775ee65c3f49a8d33919caa8e6aaa847285b files/configure-gentoo.patch 677
+SHA256 c3245551597dce86a51e57b7a2e73bd3d842cc68cf9a7de79c865ebddc289415 files/configure-gentoo.patch 677
 MD5 354fd5b92c4ea7033c2874f87f3b16dc files/digest-euler-1.60.6-r1 238
 RMD160 28b375a86d308ef5a9240c689b25032dbe626b8e files/digest-euler-1.60.6-r1 238
 SHA256 8b85af8d16093d72179fb059dba1ba719d45716ab20ca636bf7f1a23783aee2b files/digest-euler-1.60.6-r1 238
-MD5 71890d35a59781a66942023798d56344 files/digest-euler-1.61.0 62
-RMD160 a9197af5c481fc383baa371532eeea7ab9ad0c49 files/digest-euler-1.61.0 62
-SHA256 510e778100fe0259f03d958943a62b13072d5b5b79b7a3735ae77d1efcd6d81d files/digest-euler-1.61.0 62
+MD5 e695eadddeb53eadf9a80df723941a04 files/digest-euler-1.61.0 232
+RMD160 0a14649ebd0c0523b655b652bd11a826cb756d87 files/digest-euler-1.61.0 232
+SHA256 f719d3ffda7cb0df5d15f9224a094efbfe5e4f1fb1c69b3c1fa98672ae860395 files/digest-euler-1.61.0 232
 MD5 9efb40aa017b65e543bc280229e78da6 files/euler-1.60-compound_statements.patch 851
 RMD160 a0180345999e8ab187081308e1d597fe152378a7 files/euler-1.60-compound_statements.patch 851
 SHA256 c41b4464dc48f87e335d1e8d40b6f928c0c7cfe6e6850879a0511ce8b931ab1d files/euler-1.60-compound_statements.patch 851
diff --git a/sci-mathematics/euler/euler-1.61.0.ebuild b/sci-mathematics/euler/euler-1.61.0.ebuild
index d6adb53984cf..6faab42c9607 100644
--- a/sci-mathematics/euler/euler-1.61.0.ebuild
+++ b/sci-mathematics/euler/euler-1.61.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/euler-1.61.0.ebuild,v 1.1 2006/01/18 08:14:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/euler-1.61.0.ebuild,v 1.2 2006/02/12 15:45:26 markusle Exp $
+
+inherit autotools eutils
 
 DESCRIPTION="Mathematical programming environment"
 HOMEPAGE="http://euler.sourceforge.net/"
@@ -11,6 +13,19 @@ KEYWORDS="~x86 ~ppc -sparc ~amd64"
 IUSE=""
 DEPEND=">=x11-libs/gtk+-2"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/configure-gentoo.patch
+	epatch "${FILESDIR}"/command-gcc4-gentoo.patch
+	eautoreconf
+
+	sed -e 's:g77:g77 gfortran:g' -i ./configure || \
+		die "Failed to patch configure"
+}
+
+
 src_install() {
 	make DESTDIR="${D}" install || die "install failed"
 }
diff --git a/sci-mathematics/euler/files/command-gcc4-gentoo.patch b/sci-mathematics/euler/files/command-gcc4-gentoo.patch
new file mode 100644
index 000000000000..c405d65bd76e
--- /dev/null
+++ b/sci-mathematics/euler/files/command-gcc4-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Naur euler-1.61.0/src/command.c euler-1.61.0-new/src/command.c
+--- euler-1.61.0/src/command.c	2005-10-24 00:38:24.000000000 +0000
++++ euler-1.61.0-new/src/command.c	2006-02-08 23:30:43.000000000 +0000
+@@ -732,7 +732,7 @@
+ }
+ 
+ 
+-static int command_count;
++int command_count;
+ 
+ commandtyp command_list[] = {
+ 	{"quit",c_quit,do_quit},
diff --git a/sci-mathematics/euler/files/configure-gentoo.patch b/sci-mathematics/euler/files/configure-gentoo.patch
new file mode 100644
index 000000000000..fd83d1ab8291
--- /dev/null
+++ b/sci-mathematics/euler/files/configure-gentoo.patch
@@ -0,0 +1,26 @@
+diff -Naur euler-1.61.0/configure.in euler-1.61.0-new/configure.in
+--- euler-1.61.0/configure.in	2005-10-30 16:40:27.000000000 +0000
++++ euler-1.61.0-new/configure.in	2006-02-08 23:38:54.000000000 +0000
+@@ -8,8 +8,6 @@
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_ISC_POSIX
+-CFLAGS=""
+-AC_SUBST(CFLAGS)
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+diff -Naur euler-1.61.0/src/Makefile.am euler-1.61.0-new/src/Makefile.am
+--- euler-1.61.0/src/Makefile.am	2005-10-30 22:48:35.000000000 +0000
++++ euler-1.61.0-new/src/Makefile.am	2006-02-08 23:41:32.000000000 +0000
+@@ -7,10 +7,6 @@
+ INCLUDES = \
+ 	$(GTK_CFLAGS)
+ 
+-AM_CFLAGS =\
+-	 -Wall\
+-	 -O3
+-
+ bin_PROGRAMS = euler
+ 
+ euler_SOURCES = \
diff --git a/sci-mathematics/euler/files/digest-euler-1.61.0 b/sci-mathematics/euler/files/digest-euler-1.61.0
index bbaf896a764e..ae0ecef7153a 100644
--- a/sci-mathematics/euler/files/digest-euler-1.61.0
+++ b/sci-mathematics/euler/files/digest-euler-1.61.0
@@ -1 +1,3 @@
 MD5 4a45d7aaba2b73c7978e6d5623141103 euler-1.61.0.tgz 1202485
+RMD160 d015f1eaf1192508ddfe20ea9aba033bcc1d140d euler-1.61.0.tgz 1202485
+SHA256 1350a3ded26fa8bab2580a1dc3a689aabbb100b872df62819327282773e02d95 euler-1.61.0.tgz 1202485