Fixed for gcc-4.3, thanks Martin Väth for his patch (bug #218333)

(Portage version: 2.1.5_rc4)

4 files changed, 29 insertions, 66 deletions

diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index 13c004e660f0..d968db29d053 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/yacas
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.19 2007/12/13 11:31:32 markusle Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.20 2008/04/19 09:49:37 bicatali Exp $
+
+  19 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/yacas-1.2.2-gcc43.patch, yacas-1.2.2.ebuild:
+  Fixed for gcc-4.3, thanks Martin Väth for his patch (bug #218333)
 
   13 Dec 2007; Markus Dittrich <markusle@gentoo.org> yacas-1.0.61.ebuild,
   yacas-1.0.63.ebuild:
diff --git a/sci-mathematics/yacas/files/yacas-1.2.2-gcc43.patch b/sci-mathematics/yacas/files/yacas-1.2.2-gcc43.patch
new file mode 100644
index 000000000000..9e4d04b4647b
--- /dev/null
+++ b/sci-mathematics/yacas/files/yacas-1.2.2-gcc43.patch
@@ -0,0 +1,13 @@
+--- manmake/manripper.cpp
++++ manmake/manripper.cpp
+@@ -1,7 +1,8 @@
+ 
+-#include <stdio.h>
+-#include <ctype.h>
++#include <cstdio>
++#include <cctype>
+ #include <string>
++#include <cstring>
+ #include <map>
+ 
+ using namespace std;
diff --git a/sci-mathematics/yacas/yacas-1.1.0.ebuild b/sci-mathematics/yacas/yacas-1.1.0.ebuild
deleted file mode 100644
index 85c293f45e7a..000000000000
--- a/sci-mathematics/yacas/yacas-1.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.1.0.ebuild,v 1.2 2007/12/13 11:31:32 markusle Exp $
-
-inherit autotools eutils flag-o-matic
-
-IUSE="glut server"
-
-DESCRIPTION="very powerful general purpose computer algebra system"
-HOMEPAGE="http://yacas.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/backups/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	dev-lang/perl
-	glut? ( virtual/glut )
-	www-client/lynx"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use glut; then
-		sed -e 's:opengl::g' -i plugins/Makefile.am || \
-			die "sed (opengl) failed"
-		sed -e 's/\(^PLUGINDOCSCHAPTERS.*\)opengl.chapt\(.*\)/\1 \2/' -i \
-		manmake/Makefile.am || die 'sed (manmake) failed'
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.0.63-as-needed.patch
-	eautoreconf
-}
-
-src_compile() {
-	# Filter -Os due to reported issues with it in bug 126779.
-	replace-flags -Os -O2
-
-	local myconf="--with-numlib=native"
-
-	if use server; then
-		myconf="${myconf} --enable-server"
-	fi
-
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install-strip || die
-
-	dodoc AUTHORS INSTALL NEWS README TODO
-	mv "${D}"/usr/share/${PN}/documentation "${D}"/usr/share/doc/${PF}/html
-	rmdir "${D}"/usr/include/
-	rm "${D}"/usr/share/${PN}/include/win32*
-	sed -e "s|\":FindFile(\"documentation/ref.html\"):\"|localhost/usr/share/doc/${PF}/html/ref.html|" \
-		-e "s|\":FindFile(\"documentation/books.html\"):\"|localhost/usr/share/doc/${PF}/html/books.html|" \
-		-i "${D}"/usr/share/${PN}/yacasinit.ys || die
-}
diff --git a/sci-mathematics/yacas/yacas-1.2.2.ebuild b/sci-mathematics/yacas/yacas-1.2.2.ebuild
index 7d52f1996a0a..bc5e9c3cd9cc 100644
--- a/sci-mathematics/yacas/yacas-1.2.2.ebuild
+++ b/sci-mathematics/yacas/yacas-1.2.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.2.2.ebuild,v 1.1 2007/11/07 23:26:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.2.2.ebuild,v 1.2 2008/04/19 09:49:37 bicatali Exp $
+
+inherit eutils java
 
 DESCRIPTION="Powerful general purpose computer algebra system"
 HOMEPAGE="http://yacas.sourceforge.net/"
@@ -14,6 +16,12 @@ IUSE="doc java server"
 
 DEPEND="java? ( virtual/jdk )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	econf \
 		$(use_enable doc html-doc) \