Fixing bug #54931, removing old version

7 files changed, 54 insertions, 53 deletions

diff --git a/app-sci/euler/ChangeLog b/app-sci/euler/ChangeLog
index 7545d3a580c8..dcd661126c96 100644
--- a/app-sci/euler/ChangeLog
+++ b/app-sci/euler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-sci/euler
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/ChangeLog,v 1.13 2004/07/01 19:38:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/ChangeLog,v 1.14 2004/07/02 19:52:13 phosphan Exp $
+
+  02 Jul 2004; Patrick Kursawe <phosphan@gentoo.org> euler-1.59.1.ebuild,
+  euler-1.60.6-r1.ebuild, euler-1.60.6.ebuild,
+  files/euler-1.60-compound_statements.patch:
+  Adding patch for bug #54931, removing old version.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> euler-1.59.1.ebuild,
   euler-1.60.6-r1.ebuild, euler-1.60.6.ebuild:
diff --git a/app-sci/euler/Manifest b/app-sci/euler/Manifest
index 8931581f0293..f9054e85061a 100644
--- a/app-sci/euler/Manifest
+++ b/app-sci/euler/Manifest
@@ -1,9 +1,8 @@
-MD5 8e2c13bb6cbfea89b233b4844fa5f0e6 ChangeLog 2113
-MD5 f87b4ab8b93e34055cf8217a7d45f7a6 euler-1.59.1.ebuild 1009
-MD5 b423c23625a48aceb731158966bd715a euler-1.60.6-r1.ebuild 1196
-MD5 9db255f438f6ff0ef52b7c5ce2b66914 euler-1.60.6.ebuild 1145
+MD5 a8593fa356b51fe6d542bbc2efbe530b euler-1.60.6.ebuild 1200
+MD5 fd05faa510d169c7909c2558607bd723 euler-1.60.6-r1.ebuild 1251
+MD5 13e6e49ca435775318a56574ee784187 ChangeLog 2332
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 026d72827b7dc7ecc8a31b474ce6ed5f files/digest-euler-1.59.1 64
 MD5 25c07f2cd7585d6b674ba310cf33fafa files/digest-euler-1.60.6 64
-MD5 25c07f2cd7585d6b674ba310cf33fafa files/digest-euler-1.60.6-r1 64
 MD5 797a67ee56e452b239fbadb6a9a8c319 files/euler-1.60.6.patch 284
+MD5 25c07f2cd7585d6b674ba310cf33fafa files/digest-euler-1.60.6-r1 64
+MD5 9efb40aa017b65e543bc280229e78da6 files/euler-1.60-compound_statements.patch 851
diff --git a/app-sci/euler/euler-1.59.1.ebuild b/app-sci/euler/euler-1.59.1.ebuild
deleted file mode 100644
index ecf5e950b8f7..000000000000
--- a/app-sci/euler/euler-1.59.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/euler-1.59.1.ebuild,v 1.16 2004/07/01 11:51:23 eradicator Exp $
-
-DESCRIPTION="Mathematical programming environment"
-HOMEPAGE="http://euler.sourceforge.net/"
-SRC_URI="mirror://sourceforge/euler/euler-1.59.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/libc
-	virtual/x11
-	=x11-libs/gtk+-1.2*"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	mv euler-1.59 ${P}
-
-	cd ${S}/source
-	mv main.c main.c.orig
-	cat main.c.orig | \
-	sed -e "s:share/euler/docs/index.html:share/doc/${P}/html/index.html:" \
-	> main.c
-}
-
-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/euler/docs/* ${D}/usr/share/doc/${PF}/html
-	rm -rf ${D}/usr/share/euler/docs
-	dodoc ChangeLog README TODO
-}
diff --git a/app-sci/euler/euler-1.60.6-r1.ebuild b/app-sci/euler/euler-1.60.6-r1.ebuild
index f76ccfa9f8a9..9261fcfc0095 100644
--- a/app-sci/euler/euler-1.60.6-r1.ebuild
+++ b/app-sci/euler/euler-1.60.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.7 2004/07/01 11:51:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/euler-1.60.6-r1.ebuild,v 1.8 2004/07/02 19:52:13 phosphan Exp $
 
 inherit eutils
 IUSE=""
@@ -26,6 +26,7 @@ src_unpack() {
 
 	cd ${S}/source
 	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/euler-1.60-compound_statements.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
diff --git a/app-sci/euler/euler-1.60.6.ebuild b/app-sci/euler/euler-1.60.6.ebuild
index 5686b891efa4..1a49fbd231e8 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-2004 Gentoo Foundation
 # 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.10 2004/07/01 11:51:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/euler/euler-1.60.6.ebuild,v 1.11 2004/07/02 19:52:13 phosphan Exp $
 
 inherit eutils
 IUSE=""
@@ -26,6 +26,7 @@ src_unpack() {
 
 	cd ${S}/source
 	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/euler-1.60-compound_statements.patch
 	sed -e "s:share/euler/docs/index.html:share/doc/${P}/html/index.html:" \
 		-i main.c
 }
diff --git a/app-sci/euler/files/digest-euler-1.59.1 b/app-sci/euler/files/digest-euler-1.59.1
deleted file mode 100644
index 4bb30e8ecd38..000000000000
--- a/app-sci/euler/files/digest-euler-1.59.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b71759991443c550dcc3dcffc3f62f8 euler-1.59.1.tar.gz 609491
diff --git a/app-sci/euler/files/euler-1.60-compound_statements.patch b/app-sci/euler/files/euler-1.60-compound_statements.patch
new file mode 100644
index 000000000000..98a38c5b4758
--- /dev/null
+++ b/app-sci/euler/files/euler-1.60-compound_statements.patch
@@ -0,0 +1,39 @@
+diff -ru euler-1.60.orig/source/term.c euler-1.60/source/term.c
+--- euler-1.60.orig/source/term.c	2002-06-02 15:40:30.000000000 +0200
++++ euler-1.60/source/term.c	2004-06-23 22:59:05.172479232 +0200
+@@ -2163,7 +2163,7 @@
+ 								case 'U':
+ 									ch = 'Û';
+ 									break;
+-								default:
++								default:;
+ 							}
+ 							deadkey=0;
+ 							break;
+@@ -2206,7 +2206,7 @@
+ 								case 'U':
+ 									ch = 'Ü';
+ 									break;
+-								default:
++								default:;
+ 							}
+ 							deadkey=0;
+ 							break;
+@@ -2586,7 +2586,7 @@
+ 									case 'U':
+ 										ch = 'Û';
+ 										break;
+-									default:
++									default:;
+ 								}
+ 								deadkey=0;
+ 								break;
+@@ -2629,7 +2629,7 @@
+ 									case 'U':
+ 										ch = 'Ü';
+ 										break;
+-									default:
++									default:;
+ 								}
+ 								deadkey=0;
+ 								break;