Version bump

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

6 files changed, 26 insertions, 94 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/Manifest b/sci-mathematics/ginac/Manifest
index 7f0cae2db811..447fa54ad399 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,11 +1,17 @@
-AUX ginac-1.5.1-lexer_cpp.patch 296 RMD160 c88f10c77c71913ad328c970806b5c0e3b6da508 SHA1 bf6bafc173f05909dff47d8a9f2776b96cc7769f SHA256 6e8f336c2b00309d8772dfdcc640fba546432c615e0cc2048d63624c364a7784
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ginac-1.5.1-pkgconfig.patch 340 RMD160 afa493de555a86c2aa2eff7251b8da272ed58c22 SHA1 f1418d8f2551d94140e86864b8fa45fb51b2d21e SHA256 bd1a63b67f1c1786e537992b50b9bb376a14be54971bd0ac8912a584f7f802d8
-AUX ginac-1.5.3-parser.patch 389 RMD160 3f061e05cd80e45c8040af373ecc50b9e3177cf7 SHA1 f49ea5bb5622c77b507096a5c9c77730c0471e55 SHA256 0bb747336e54ffda89527e4afc1e63942080db26d8f91486985884d953ae4aeb
-DIST ginac-1.5.1.tar.bz2 989950 RMD160 4a9aeb83045a1970baced1ae08f60d6f6c6bc8ce SHA1 d9b818197979200ea3d7c1bfba26d4a3980b819f SHA256 ed4404c44fdcc82468162d18cfb43bdc61a59c31b1e2da08fdcbce898955ce08
-DIST ginac-1.5.3.tar.bz2 996505 RMD160 0fc37e79d86b852b843689fbdf8ef00a6d539c5b SHA1 a2dc144729d4e57ee40bf0ea4ffde8c2e0d7f5f9 SHA256 06620b448cb8a6be78f4035b6f94b2394a41485dc374e0b76e15475173b65469
 DIST ginac-1.5.5.tar.bz2 997969 RMD160 99d96d49b42a425f90b8db4e9b76d0d38d190ea9 SHA1 cf3b18dc7f8a787821b80ab0411314c015bff84f SHA256 6e0c8d20a76316b8f9b1bb015babdfa0b4fe401a190a9d501fc0702647750956
-EBUILD ginac-1.5.1.ebuild 1721 RMD160 5fcec77baf739dd8bfd8c5690ce2d2f84e8c1521 SHA1 9eaf418ef5f8940e66e64f79c275e3f5704469ed SHA256 86610f9f141be2760814dad351d441a0841b540349bba7bd7238f84e0595dedc
-EBUILD ginac-1.5.3.ebuild 1749 RMD160 a613808c440456b12ca01ab9c645b878ec70255f SHA1 7833508c0ab8dcfc758368ffd202b60548690c17 SHA256 88d3d0716d679a2326866fed2394a4a0ecfb2155e3186b7160caabaa7eca4a56
+DIST ginac-1.5.6.tar.bz2 998303 RMD160 da872208a576b4c1a35cbf0c4d65b36e9a946e3d SHA1 2f65eae2cdda3fad6aa9ed8f1b54444e443ee5a0 SHA256 f06175f32e758279e963910087890c7109222975a7f7fcfe90fd4fec22d20e24
 EBUILD ginac-1.5.5.ebuild 1687 RMD160 86fbb7702b5262bc27fe78c5fb9a8f2b82489a26 SHA1 531206f28ec6e9063c80ea8d426a4efceae1c00a SHA256 8202c03e50ae8b895e73124341ed1289f87e9fd5ec7baedaa8c0b08b4a004ca3
-MISC ChangeLog 6831 RMD160 d09191cba3bad7ad0b1f792bbc2883db61183690 SHA1 82c5b2d6bc0624d29fcb055689c9ea2c223fd6da SHA256 c7441fe3edca3ff2239e2ccf91515c7f549a07806a250d5826b1eda159275e11
+EBUILD ginac-1.5.6.ebuild 1692 RMD160 f3887c34e27c290dffa78218884cbe53bad7611c SHA1 f40cd72cac7eb4002672b41ca8056d0abb276eee SHA256 d13a4884794d87ac43fd925f6cd64916649ec4007fc01d7d57818a916ee39c9f
+MISC ChangeLog 7067 RMD160 b51c837043a3eb86c671481023ab8f1929280252 SHA1 dae0a7d14c8199da864c0d63f83e8204f0002ed8 SHA256 1b4ae919a8d84e9895fb26ed9473fdea8cf7ed3787c9475c15ed0f950529955e
 MISC metadata.xml 582 RMD160 0f0b60e373c8fee0efbebb7b7fd2420e2052082e SHA1 7e2a04c2da42292f37e33d06fc2e15305687bcdf SHA256 a68adc59dd6641c75f663a7be278804746fc15f64707b2570ed88918c6f9ff33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktnN0sACgkQ1ycZbhPLE2DsQwCfc7mGfU36MaqgnKkcQLSMNvGv
+CzsAn2LrdHhKWOk2wT8S7qOV7PxLRLHs
+=czk+
+-----END PGP SIGNATURE-----
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
 }