Fixing bug #41638, adding usage of CFLAGS in -r1

6 files changed, 75 insertions, 9 deletions

diff --git a/app-sci/euler/ChangeLog b/app-sci/euler/ChangeLog
index de9eab71aff1..d7abda298c34 100644
--- a/app-sci/euler/ChangeLog
+++ b/app-sci/euler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-sci/euler
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/ChangeLog,v 1.5 2003/02/12 05:15:49 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/ChangeLog,v 1.6 2004/03/15 14:26:26 phosphan Exp $
+
+*euler-1.60.6-r1 (15 Mar 2004)
+
+  15 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> euler-1.60.6-r1.ebuild,
+  euler-1.60.6.ebuild, files/euler-1.60.6.patch:
+  Fixing bug #41638, adding usage of CFLAGS in -r1
 
 *euler-1.60.6 (14 Dec 2002)
   
diff --git a/app-sci/euler/Manifest b/app-sci/euler/Manifest
index 766f5b7904b2..db32daec1a7d 100644
--- a/app-sci/euler/Manifest
+++ b/app-sci/euler/Manifest
@@ -1,6 +1,9 @@
-MD5 3a936a4181c2ec0c1e386ebee7c744af ChangeLog 1288
 MD5 6753ae6b664971739a1c916998a142d2 euler-1.59.1.ebuild 1042
-MD5 f8f14e005c6b3c4f4f5b6338f9c3a8e5 euler-1.60.6.ebuild 1138
+MD5 2b548d18122d2e1e9912af6129382de3 euler-1.60.6.ebuild 1128
+MD5 6ad5198b73f8cad4e22d12e8f0d46d5f euler-1.60.6-r1.ebuild 1175
+MD5 f069e375d08f47c2c988344a51681e47 ChangeLog 1500
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 026d72827b7dc7ecc8a31b474ce6ed5f files/digest-euler-1.59.1 64
 MD5 25c07f2cd7585d6b674ba310cf33fafa files/digest-euler-1.60.6 64
+MD5 797a67ee56e452b239fbadb6a9a8c319 files/euler-1.60.6.patch 284
+MD5 25c07f2cd7585d6b674ba310cf33fafa files/digest-euler-1.60.6-r1 64
diff --git a/app-sci/euler/euler-1.60.6-r1.ebuild b/app-sci/euler/euler-1.60.6-r1.ebuild
new file mode 100644
index 000000000000..6bdd92954294
--- /dev/null
+++ b/app-sci/euler/euler-1.60.6-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/euler-1.60.6-r1.ebuild,v 1.1 2004/03/15 14:26:26 phosphan Exp $
+
+#euler only uses two major numners internally, need to do some mangling
+MajVer="$(echo ${PV}|cut -d '.' -f 1,2)"
+S=${WORKDIR}/${PN}-${MajVer}
+
+DESCRIPTION="Mathematical programming environment"
+HOMEPAGE="http://euler.sourceforge.net/"
+SRC_URI="mirror://sourceforge/euler/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="virtual/glibc
+	virtual/x11
+	=x11-libs/gtk+-1.2*"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${S}/source
+	epatch ${FILESDIR}/${P}.patch
+	sed -e "s:share/euler/docs/index.html:share/doc/${P}/html/index.html:" \
+		-i main.c
+	sed -e "s:-O2:\$(CFLAGS):" -i makefile	
+}
+
+src_compile() {
+	cd ${S}/source
+	emake INSTALL_DIR=/usr || die
+}
+
+src_install() {
+	cd ${S}/source
+	dodir usr usr/share usr/bin
+	make INSTALL_DIR=${D}/usr install || die
+
+	cd ${S}
+	dodir usr/share/doc/${P}/html
+	mv ${D}/usr/share/doc/${PN}/* ${D}/usr/share/doc/${PF}/html
+	rm -rf ${D}/usr/share/doc/${PN}
+	dodoc ChangeLog README TODO
+}
diff --git a/app-sci/euler/euler-1.60.6.ebuild b/app-sci/euler/euler-1.60.6.ebuild
index 7b0888799681..ebf2abdd97a3 100644
--- a/app-sci/euler/euler-1.60.6.ebuild
+++ b/app-sci/euler/euler-1.60.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/euler-1.60.6.ebuild,v 1.5 2003/08/05 18:32:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/euler-1.60.6.ebuild,v 1.6 2004/03/15 14:26:26 phosphan Exp $
 
 #euler only uses two major numners internally, need to do some mangling
 MajVer="$(echo ${PV}|cut -d '.' -f 1,2)"
@@ -22,10 +22,9 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd ${S}/source
-	mv main.c main.c.orig
-	cat main.c.orig | \
+	epatch ${FILESDIR}/${P}.patch
 	sed -e "s:share/euler/docs/index.html:share/doc/${P}/html/index.html:" \
-		> main.c
+		-i main.c
 }
 
 src_compile() {
diff --git a/app-sci/euler/files/digest-euler-1.60.6-r1 b/app-sci/euler/files/digest-euler-1.60.6-r1
new file mode 100644
index 000000000000..969cfd5375a3
--- /dev/null
+++ b/app-sci/euler/files/digest-euler-1.60.6-r1
@@ -0,0 +1 @@
+MD5 e56a0f41c184fc2f416457f0c5ece78f euler-1.60.6.tar.gz 769602
diff --git a/app-sci/euler/files/euler-1.60.6.patch b/app-sci/euler/files/euler-1.60.6.patch
new file mode 100644
index 000000000000..c06c8ff04cd3
--- /dev/null
+++ b/app-sci/euler/files/euler-1.60.6.patch
@@ -0,0 +1,11 @@
+--- metaps.c	2002-05-25 16:15:52.000000000 +0200
++++ metaps.c.new	2004-03-15 15:18:25.423631080 +0100
+@@ -209,7 +209,7 @@
+ //	rectangle clipping
+ //	x1 y1 x2 y2 setclip
+ static char setclipmacro[]= "/setclip {\n\
+-gsave
++gsave\n\
+ 	/y2 exch def\n\
+ 	/x2 exch def\n\
+ 	/y1 exch def\n\