5 files changed, 13 insertions, 87 deletions
diff --git a/sci-mathematics/ginac/ChangeLog b/sci-mathematics/ginac/ChangeLog
index 899a1d3f1328..0bf771108c9a 100644
--- a/sci-mathematics/ginac/ChangeLog
+++ b/sci-mathematics/ginac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/ginac
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.42 2010/01/31 17:59:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.43 2010/02/01 20:19:13 bicatali Exp $
+
+*ginac-1.5.6 (01 Feb 2010)
+
+  01 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> -ginac-1.5.1.ebuild,
+  -files/ginac-1.5.1-lexer_cpp.patch, -ginac-1.5.3.ebuild,
+  -files/ginac-1.5.3-parser.patch, +ginac-1.5.6.ebuild:
+  Version bump
 
   31 Jan 2010; Raúl Porcel <armin76@gentoo.org> ginac-1.5.5.ebuild:
   sparc stable wrt #300557
diff --git a/sci-mathematics/ginac/files/ginac-1.5.1-lexer_cpp.patch b/sci-mathematics/ginac/files/ginac-1.5.1-lexer_cpp.patch
deleted file mode 100644
index 1da24a5d5238..000000000000
--- a/sci-mathematics/ginac/files/ginac-1.5.1-lexer_cpp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ginac-1.5.1.org/ginac/parser/lexer.cpp	2009-03-16 22:04:09.000000000 +0530
-+++ ginac-1.5.1/ginac/parser/lexer.cpp	2009-03-16 22:04:30.000000000 +0530
-@@ -23,6 +23,7 @@
- #include "lexer.h"
- #include "compiler.h"
- 
-+#include <cstdio>
- #include <iostream>
- #include <sstream>
- #include <string>
diff --git a/sci-mathematics/ginac/files/ginac-1.5.3-parser.patch b/sci-mathematics/ginac/files/ginac-1.5.3-parser.patch
deleted file mode 100644
index 29dc1b8c4bcd..000000000000
--- a/sci-mathematics/ginac/files/ginac-1.5.3-parser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ginac/parser/parser.cpp.orig	2009-08-07 18:46:20.000000000 +0100
-+++ ginac/parser/parser.cpp	2009-08-07 18:46:41.000000000 +0100
-@@ -66,7 +66,7 @@
- 		Parse_error_("no function \"" << name << "\" with " <<
- 			     args.size() << " arguments");
- 	}
--	ex ret = GiNaC::function((unsigned)reader->second, args);
-+	ex ret = GiNaC::function((size_t)reader->second, args);
- 	return ret;
- }
- 
diff --git a/sci-mathematics/ginac/ginac-1.5.1.ebuild b/sci-mathematics/ginac/ginac-1.5.1.ebuild
deleted file mode 100644
index 6eb4585b4fa8..000000000000
--- a/sci-mathematics/ginac/ginac-1.5.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.5.1.ebuild,v 1.7 2009/10/10 18:11:09 armin76 Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="C++ library and tools for symbolic calculations"
-SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/${P}.tar.bz2"
-HOMEPAGE="http://www.ginac.de/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="doc"
-
-RDEPEND=">=sci-libs/cln-1.2.2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen
-		   media-gfx/transfig
-		   || ( dev-texlive/texlive-fontsrecommended
-				app-text/ptex ) )"
-
-src_prepare() {
-	# 2 harmless patches from fedora
-	epatch "${FILESDIR}"/${P}-lexer_cpp.patch
-	epatch "${FILESDIR}"/${P}-pkgconfig.patch
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd "${S}/doc/reference"
-		#pdf generation for reference failed (1.5.1), bug #264774
-		#emake html pdf || die "emake doc reference failed"
-		emake html || die "emake ref failed"
-		cd "${S}/doc/tutorial"
-		emake ginac.pdf ginac.html || die "emake doc tutorial failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README NEWS AUTHORS || die
-
-	if use doc; then
-		cd doc
-		insinto /usr/share/doc/${PF}
-		newins tutorial/ginac.pdf tutorial.pdf || die "tutorial install failed"
-		#newins reference/ginac.pdf reference.pdf || die "ref install failed"
-		insinto /usr/share/doc/${PF}/html/reference
-		doins -r reference/html_files/* || die
-		insinto /usr/share/doc/${PF}/html
-		newins tutorial/ginac.html tutorial.html
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.cpp examples/ginac-examples.txt
-	fi
-}
diff --git a/sci-mathematics/ginac/ginac-1.5.3.ebuild b/sci-mathematics/ginac/ginac-1.5.6.ebuild
index 2d0256843208..6f1092ddd748 100644
--- a/sci-mathematics/ginac/ginac-1.5.3.ebuild
+++ b/sci-mathematics/ginac/ginac-1.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.5.3.ebuild,v 1.3 2009/12/26 15:34:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.5.6.ebuild,v 1.1 2010/02/01 20:19:13 bicatali Exp $
 
 EAPI=2
 inherit eutils
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ginac.de/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND=">=sci-libs/cln-1.2.2"
@@ -23,20 +23,19 @@ DEPEND="${RDEPEND}
 				app-text/ptex ) )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.1-lexer_cpp.patch
 	epatch "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch
-	epatch "${FILESDIR}"/${PN}-1.5.3-parser.patch
 }
 
 src_compile() {
 	emake || die "emake failed"
 	if use doc; then
+		export VARTEXFONTS="${T}"/fonts
 		cd "${S}/doc/reference"
 		#pdf generation for reference failed (1.5.1), bug #264774
 		#emake html pdf || die "emake doc reference failed"
 		emake html || die "emake ref failed"
 		cd "${S}/doc/tutorial"
-		emake ginac.pdf ginac.html || die "emake doc tutorial failed"
+	   emake ginac.pdf ginac.html || die "emake doc tutorial failed"
 	fi
 }