making ready for gcc 3.4

4 files changed, 64 insertions, 8 deletions

diff --git a/app-sci/Macaulay2/ChangeLog b/app-sci/Macaulay2/ChangeLog
index 6690ced3ae8f..a824abcb942b 100644
--- a/app-sci/Macaulay2/ChangeLog
+++ b/app-sci/Macaulay2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-sci/Macaulay2
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/Macaulay2/ChangeLog,v 1.2 2004/06/24 22:09:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/Macaulay2/ChangeLog,v 1.3 2004/12/13 12:55:25 phosphan Exp $
+
+  13 Dec 2004; Patrick Kursawe <phosphan@gentoo.org>
+  files/gentoo-Macaulay2-0.9.2.diff, files/gentoo-factory-1.3b.diff,
+  Macaulay2-0.9.2.ebuild:
+  Extending patches to get the program through gcc 3.4
 
 *Macaulay2-0.9.2 (19 May 2004)
 
diff --git a/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild b/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild
index 8a8e64c176cd..a7aae7d0ea56 100644
--- a/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild
+++ b/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild,v 1.2 2004/06/24 22:09:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild,v 1.3 2004/12/13 12:55:25 phosphan Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 IUSE=""
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 RDEPEND="sys-libs/gdbm
 	dev-libs/gmp
@@ -26,26 +26,29 @@ DEPEND="${RDEPEND}
 	dev-util/yacc"
 
 src_compile() {
+	if [ "$(gcc-version)" = "3.4" ]; then
+		append-flags "-fno-unit-at-a-time" # gcc 3.4 bug #15114, phosphan
+	fi
 	cd ${WORKDIR}/factory
-	patch -p1 < ${FILESDIR}/gentoo-factory-1.3b.diff || die
+	epatch ${FILESDIR}/gentoo-factory-1.3b.diff
 	./configure --disable-streamio --prefix=${WORKDIR} || die
 	make || die
 	make install || die
 
 	cd ${WORKDIR}/libfac
-	patch -p1 < ../Macaulay2-0.9.2/INSTALL.libfac-0.3.2-diffs || die
+	epatch ../Macaulay2-0.9.2/INSTALL.libfac-0.3.2-diffs
 	./configure --prefix=${WORKDIR} || die
 	make DEFS=-DHAVE_SINGULAR_ERROR || die
 	make prefix=${WORKDIR} install || die
 
 	cd ${WORKDIR}/include
-	patch -p1 < ${FILESDIR}/gentoo-libfac-0.3.2.include.diff || die
+	epatch ${FILESDIR}/gentoo-libfac-0.3.2.include.diff
 
 	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 	filter-flags "-fomit-frame-pointer"
 
 	cd ${WORKDIR}/Macaulay2-0.9.2
-	patch -p1 < ${FILESDIR}/gentoo-Macaulay2-0.9.2.diff || die
+	epatch ${FILESDIR}/gentoo-Macaulay2-0.9.2.diff
 	CPPFLAGS='-I/usr/include/gc -I${WORKDIR}/include' LDFLAGS=-L${WORKDIR}/lib \
 	./configure --prefix=${D}/usr || die
 	make || die
diff --git a/app-sci/Macaulay2/files/gentoo-Macaulay2-0.9.2.diff b/app-sci/Macaulay2/files/gentoo-Macaulay2-0.9.2.diff
index d50c8d06a9f9..358705c770ec 100644
--- a/app-sci/Macaulay2/files/gentoo-Macaulay2-0.9.2.diff
+++ b/app-sci/Macaulay2/files/gentoo-Macaulay2-0.9.2.diff
@@ -206,3 +206,40 @@ diff -U 3 -dHrN -- Macaulay2-0.9.2-orig/include/config.Makefile.in Macaulay2-0.9
  bindir = $(target)/bin
  
  RANLIB = @RANLIB@
+--- Macaulay2-0.9.2/Macaulay2/e/EGB1.hpp	1999-09-09 23:47:12.000000000 +0200
++++ Macaulay2-0.9.2/Macaulay2/e/EGB1.hpp.new	2004-12-13 11:48:17.208554431 +0100
+@@ -104,8 +104,6 @@
+ };
+ class EGB1 : public EGroebnerComputation
+ {
+-  class iterator;
+-  friend class iterator;
+ private:
+   // Ring information
+   const EInterface I;
+@@ -255,6 +253,9 @@
+ 
+   virtual int new_calc(const EStopConditions &stop);
+ 
++  class iterator;
++  friend class iterator;
++
+   class iterator {
+     const EGB1 *comp;
+     int i;
+--- Macaulay2-0.9.2/include/config.Makefile.in	2004-12-13 12:29:02.776249827 +0100
++++ Macaulay2-0.9.2/include/config.Makefile.in.new	2004-12-13 12:47:35.221607868 +0100
+@@ -110,13 +110,6 @@
+ ifeq "$(GCC)" "yes"
+ CFLAGS   += -Wall -Wshadow -Wcast-qual
+ CXXFLAGS += -Wall -Wshadow -Wcast-qual
+-ifeq "$(OPTIMIZE)" "yes"
+-CFLAGS   += -O3 -fexpensive-optimizations
+-CXXFLAGS += -O3 -fexpensive-optimizations
+-else
+-CFLAGS   += -O0
+-CXXFLAGS += -O0
+-endif
+ endif
+ 
+ ifeq "$(STRIP)" "no"
diff --git a/app-sci/Macaulay2/files/gentoo-factory-1.3b.diff b/app-sci/Macaulay2/files/gentoo-factory-1.3b.diff
index b7d82502f1b2..d600ce003f54 100644
--- a/app-sci/Macaulay2/files/gentoo-factory-1.3b.diff
+++ b/app-sci/Macaulay2/files/gentoo-factory-1.3b.diff
@@ -11,3 +11,14 @@ diff -U 4 -H -d -r -N -- factory-org/cf_gmp.h factory/cf_gmp.h
 -}
  
  #endif /* ! INCL_CF_GMP_H */
+--- factory/cf_random.h	2001-06-25 09:51:46.000000000 +0200
++++ factory.new/cf_random.h	2004-12-13 11:25:04.000000000 +0100
+@@ -62,6 +62,8 @@
+     ~AlgExtRandomF();
+     CanonicalForm generate() const;
+     CFRandom * clone() const;
++    
++    friend CFFList FpFactorizeUnivariateCZ(const CanonicalForm&, bool, int, Variable, Variable);
+ };
+ 
+ class CFRandomFactory {