Version bump. Switched to EAPI4. Added static-libs flag

Package-Manager: portage-2.1.10.2/cvs/Linux x86_64

4 files changed, 29 insertions, 48 deletions

diff --git a/sci-mathematics/ginac/ChangeLog b/sci-mathematics/ginac/ChangeLog
index 229394d05a52..e643bcbb6ea5 100644
--- a/sci-mathematics/ginac/ChangeLog
+++ b/sci-mathematics/ginac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/ginac
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.50 2011/04/26 08:46:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.51 2011/06/13 21:54:19 bicatali Exp $
+
+*ginac-1.6.0 (13 Jun 2011)
+
+  13 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> -ginac-1.5.7.ebuild,
+  -files/ginac-1.5.7-gcc45.patch, +ginac-1.6.0.ebuild:
+  Version bump. Switched to EAPI4. Added static-libs flag
 
   26 Apr 2011; Markos Chandras <hwoarang@gentoo.org> ginac-1.5.8.ebuild:
   Stable on amd64 wrt bug #360605
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 2fad4bb2ee5f..f1394312d659 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,30 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX ginac-1.5.1-pkgconfig.patch 340 RMD160 afa493de555a86c2aa2eff7251b8da272ed58c22 SHA1 f1418d8f2551d94140e86864b8fa45fb51b2d21e SHA256 bd1a63b67f1c1786e537992b50b9bb376a14be54971bd0ac8912a584f7f802d8
-AUX ginac-1.5.7-gcc45.patch 571 RMD160 81a4fe06629c827941c0cfc41eb71f25cf58bada SHA1 9361d1cfe823435072fab62a10fd5de8a79438cb SHA256 4f20fda304f7f06a9f745329112721531d4d5fdce0586dd3304404a983c90057
 DIST ginac-1.5.5.tar.bz2 997969 RMD160 99d96d49b42a425f90b8db4e9b76d0d38d190ea9 SHA1 cf3b18dc7f8a787821b80ab0411314c015bff84f SHA256 6e0c8d20a76316b8f9b1bb015babdfa0b4fe401a190a9d501fc0702647750956
-DIST ginac-1.5.7.tar.bz2 998446 RMD160 bb826bcc0da06435ce4f1f287ba3729663e770b7 SHA1 defc247327017d43dc457f2c4490551186cc8a9a SHA256 cf59e63cb6e4db52c944b2d008056b93b05bdd09c04860c4ead2e9603602c7dd
 DIST ginac-1.5.8.tar.bz2 1003965 RMD160 9005c8625fdad753aee54846db74ea47b8124ad7 SHA1 42e77ab5f9c7f8fab4adaeb4f2c9a93f618bf66a SHA256 8ce72e70f7539e9a2b32539e13eb651fd688d1423dd90bcf0b9c37b592cfc2dd
+DIST ginac-1.6.0.tar.bz2 972922 RMD160 a3dcc1ee9ce83fc3631002fea763257f860ca2ca SHA1 4d8d5fbc9cb07994ed45e8bc11ae210939641040 SHA256 6a482f15bfb89f1a350e06ac7d55f173976d873bcc4900bcb52a37627da066f8
 EBUILD ginac-1.5.5.ebuild 1681 RMD160 23bece5871dfec25ce3f97e5090f09c119d29f3a SHA1 721d4dc94ff78e154139f43fd9cc0ade4377a37b SHA256 67098efe288382a721045f00101764a2f455c68aae6f221fc32514ef55c2e076
-EBUILD ginac-1.5.7.ebuild 1745 RMD160 91493814129b8a5aedc104ab13cda7cb88a89c88 SHA1 d59361ac53cc7781a878d197691abe624e6fdf35 SHA256 1dce2b7962d08e00a4d63ec21590123da3140523e52b85724b69f09faaa7e6ea
 EBUILD ginac-1.5.8.ebuild 1705 RMD160 b76b04c45920365356ad3873b20617168189644d SHA1 977f62cd675df4f1b92057d3e68872e32640846a SHA256 0d3cc92db5f15ddf4152cce5a7ec99b9063bbf40eaf592d259c5dc55e8d7b9ff
-MISC ChangeLog 7953 RMD160 1909396366a12ce13d5bc2e7c6acd68bb407333b SHA1 6c6e0b766b50c2e623f905b1d97cda6fd7f9acf3 SHA256 f2dc0746a298fb8b846ef5da289f1c42bc32f3764ed092890a1136934bfda3a7
+EBUILD ginac-1.6.0.ebuild 1521 RMD160 8e197c79490e035ac0eec868868f616bf3200da1 SHA1 ea76f976bd4e532df9890b0cae6f2ac58128d39f SHA256 53a7f568e98291069801acf0c5c6da3ccd4c7fd69a2b5cf399c4d52998f817e8
+MISC ChangeLog 8171 RMD160 a83744d80a085897729caba1f48b328f34ec98b6 SHA1 b2b90684138b4dedd047a295c9863f1b8a1ac3a5 SHA256 99b1744acacce3eba6c971131c9410f920e17ebb1e14a5b250aedc93285df80d
 MISC metadata.xml 582 RMD160 0f0b60e373c8fee0efbebb7b7fd2420e2052082e SHA1 7e2a04c2da42292f37e33d06fc2e15305687bcdf SHA256 a68adc59dd6641c75f663a7be278804746fc15f64707b2570ed88918c6f9ff33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNtoZ/AAoJEPqDWhW0r/LC3aMP/iE1fwr6z/9JMspJcFNG2fPl
-is8sFvDv7d16GeeAj3LC/3FaDH8TzhTocAJglH2PreQkziqFY+tdJ6YBpO+GD4jy
-E00Q2JnEMBgljGTFAQatKe+fWQjGcPTp4nCAdSf9Uuu0135Dteel7axt3KeM/MA7
-cXNf3PwHW05Y7ND8Znw6L0NCL+3yE8tt1QIyuy7W8QsaT5SkkLFZ4Rw0HqezE1wa
-DAk0DGpbSL6Zhfw0v1ptCO2uicC0vhUkVQlJoSsuARFD4N0bG/pToVfFm9DoOP+C
-QF5tH/6Dmfxx1s8a/Qh2TFkIuosaOpuo78NSn4XzxdT0dgUHspnh8f4jAhT0iy7H
-+ZJj70R/GJzlGWe/IkBRSUuWNUVgNoXQe1GLNS+jGbT1SuljyIbkIBB4cPcpMHHc
-v6g7aTsfCnRFBctfQXRq1MeM7vOqS5XzsDvw8AgG0le3Z3SiZD/orKJKaQQQmtQ1
-O1cdiZvP25vEgOck4Mncw6FYoZpnepIq0auUk2XQwtB8JbEi+DOpzz9E8jyTPdzk
-FnJfpLYk60Mfz4rx8KgOr+dMsvnQuKiI/Tk+6slXjADYh7WPFA7LWOoDWZhSJItb
-PXpCN7/gzaD6pSSUeTMyNlHedUTu6AmljFRkoWLjyXjAH3GJH5wNPAuGGWVaHY/Q
-OR9UG9uidp6Mk10VvrtY
-=1xYx
+iEYEARECAAYFAk32hxUACgkQ1ycZbhPLE2DGEQCePDFdShVBQo8UE2KS+wWQiYd8
+FmkAn1NYyqxwcFXio4h6HERSrfos4gUw
+=ndnV
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/ginac/files/ginac-1.5.7-gcc45.patch b/sci-mathematics/ginac/files/ginac-1.5.7-gcc45.patch
deleted file mode 100644
index df0a61d79f3c..000000000000
--- a/sci-mathematics/ginac/files/ginac-1.5.7-gcc45.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixing build with gcc 4.5. 
-Upstream fix e22d2ed95925d870876c4fcd922ea2a9cfdbdab1
-
-http://bugs.gentoo.org/show_bug.cgi?id=321411
-
---- ginac/function.pl
-+++ ginac/function.pl
-@@ -1314,7 +1314,7 @@
- 	
- 	// No derivative defined? Then return abstract derivative object
- 	if (opt.power_f == NULL)
--		return (new power::power(*this, power_param))->setflag(status_flags::dynallocated |
-+		return (new GiNaC::power(*this, power_param))->setflag(status_flags::dynallocated |
- 	                                               status_flags::evaluated);
- 
- 	current_serial = serial;
diff --git a/sci-mathematics/ginac/ginac-1.5.7.ebuild b/sci-mathematics/ginac/ginac-1.6.0.ebuild
index ca1753c17972..8c75df3b261d 100644
--- a/sci-mathematics/ginac/ginac-1.5.7.ebuild
+++ b/sci-mathematics/ginac/ginac-1.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.5.7.ebuild,v 1.3 2011/04/25 15:05:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.6.0.ebuild,v 1.1 2011/06/13 21:54:19 bicatali Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils
 
 DESCRIPTION="C++ library and tools for symbolic calculations"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.ginac.de/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
+IUSE="doc static-libs"
 
 RDEPEND=">=sci-libs/cln-1.2.2"
 DEPEND="${RDEPEND}
@@ -25,33 +25,35 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch
-	epatch "${FILESDIR}"/${P}-gcc45.patch
+}
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		$(use_enable static-libs static)
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 	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"
+		emake html
 		cd "${S}/doc/tutorial"
-	   emake ginac.pdf ginac.html || die "emake doc tutorial failed"
+		emake ginac.pdf ginac.html
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README NEWS AUTHORS || die
-
+	default
 	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"
+		newins tutorial/ginac.pdf tutorial.pdf
 		insinto /usr/share/doc/${PF}/html/reference
-		doins -r reference/html_files/* || die
+		doins -r reference/html_files/*
 		insinto /usr/share/doc/${PF}/html
 		newins tutorial/ginac.html tutorial.html
 		insinto /usr/share/doc/${PF}/examples