Fix for compilation with gcc4.6, #362377

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 84 insertions, 7 deletions

diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index 89bd44a5fd3c..883a67e7ee9e 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/yacas
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.27 2009/01/15 17:40:12 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.28 2011/04/17 09:58:34 jlec Exp $
+
+*yacas-1.2.2-r1 (17 Apr 2011)
+
+  17 Apr 2011; Justin Lecher <jlec@gentoo.org> +yacas-1.2.2-r1.ebuild,
+  +files/yacas-1.2.2-gcc46.patch:
+  Fix for compilation with gcc4.6, #362377
 
   15 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
   -files/yacas-1.0.63-as-needed.patch, -yacas-1.0.63.ebuild:
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index 8e2033f74650..520f0f26aa87 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 AUX yacas-1.2.2-gcc43.patch 227 RMD160 52ca83c63ce7b5955c9db176b8f07c223277e5a6 SHA1 af732b5ccf9d69dbcfd51247181b9636c3d029c8 SHA256 0d4db004fcffb34d78229672f0adf68d3ecac64d1fd5d9355dc3b85feb3991ef
+AUX yacas-1.2.2-gcc46.patch 399 RMD160 ee69384f5fbe7a931d85a0cfd6c0d8372328a609 SHA1 5d05f2def1a82ea5f17fb600ffe202a1a8415660 SHA256 07dfa80723186c920d7218929e5d7e9dfe3ce75cbe78c128187d382b8e3dce71
 AUX yacas-1.2.2-makefixes.patch 675 RMD160 c2e9c7d4a598565e18a87e7b8ac7417a0b475236 SHA1 f817d589aa542cd83dd06e5e1a0ab86ad3125d3d SHA256 fa2fc79e5a8daeae4380d25c9c6885d626d7bd4cf2a19516f09f6c85b6e18046
 DIST yacas-1.2.2.tar.gz 1203303 RMD160 6c49ca60e4f1f92e7d30e8d91b6126e55d77321b SHA1 8e753c22c207a5aa5e9fd2a9d519605d5b73d5b9 SHA256 e8345de267ed41790128649e3ff5ab7be7d0a2fa6e721b82e0a552c04775aab6
+EBUILD yacas-1.2.2-r1.ebuild 1224 RMD160 f721785c8a5f606fd56115c2ccc1625dd5b33747 SHA1 a79db8e84a66ff05544b6e7119f841b427d4108d SHA256 006da62b72c06ecb1578f6a6d80b76a7afd39354a702fd3e3f2b00949347567c
 EBUILD yacas-1.2.2.ebuild 1391 RMD160 786a4b50642c0114ee2ebf1845070c0a8aa61040 SHA1 3e3f60d654f1b448772f61aea72ed69a5bf30762 SHA256 c6d866572473b0782e5608e7110f11e90218a672dc073766d68da7c3fad6f67e
-MISC ChangeLog 5891 RMD160 c8d0d223830be71f57ab72a8955b3e3d772d129b SHA1 dd7dfe45e09095bba514e3824fcdef6cdbe25813 SHA256 a43dca2acfae3feb0f8e3465a366572ff4eb5443e986656be1c798daa08708e6
+MISC ChangeLog 6067 RMD160 d7d5da9faebc62696a7a4500f3f306fea256a776 SHA1 dc7b4faee9f7d5da9af73562aba6166c445e03c0 SHA256 d1a861d0284c5a59ae3b349670d87b36d576d589339592babfee9c376387914b
 MISC metadata.xml 652 RMD160 271e435f003d4c7587aeabae1a79db2f6941dae3 SHA1 7f0d2103397e65a72c70c3c32ac05a363ff31e83 SHA256 1a7b21bc7f24f77ac3c15e96bdf2f96390aca1ab85387bedcd4caaa7b61017a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAklvdQQACgkQ1ycZbhPLE2CPwgCfbyljfoQsoXIYv5fswEi5WscN
-OEkAoJQbSmsAe+1Q4dgGKNs7BZ69m58+
-=alLm
+iEYEARECAAYFAk2quc8ACgkQgAnW8HDreRbsUQCeMz9JTY9aYuaHG2WkNFVsuWRa
+au4AoMdd5pPSnC/+qvlWawnNQ05RjanL
+=VGbh
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/yacas/files/yacas-1.2.2-gcc46.patch b/sci-mathematics/yacas/files/yacas-1.2.2-gcc46.patch
new file mode 100644
index 000000000000..646de9091d11
--- /dev/null
+++ b/sci-mathematics/yacas/files/yacas-1.2.2-gcc46.patch
@@ -0,0 +1,15 @@
+ src/grower.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/grower.h b/src/grower.h
+index 9c91e58..34ea786 100644
+--- a/src/grower.h
++++ b/src/grower.h
+@@ -92,6 +92,7 @@ class ArrOpsDeletingPtr : public ArrOpsCustomPtr<T>
+ {
+   typedef T* TY;
+ public:
++  ArrOpsDeletingPtr() {}
+   inline void destruct(void * obj) const
+   { delete *static_cast<const TY*>(obj); }
+ };
diff --git a/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild b/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..ba93411effc2
--- /dev/null
+++ b/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/04/17 09:58:33 jlec Exp $
+
+EAPI="4"
+
+inherit eutils java-pkg-opt-2
+
+DESCRIPTION="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"
+
+IUSE="doc java server"
+
+DEPEND="java? ( >=virtual/jdk-1.6 )"
+RDEPEND="java? ( >=virtual/jre-1.6 )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-makefixes.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc html-doc) \
+		$(use_enable server) \
+		--with-html-dir="/usr/share/doc/${PF}/html"
+}
+
+src_compile() {
+	default
+	if use java; then
+		cd JavaYacas || die
+		# -j1 because of file generation dependence
+		emake -j1 -f makefile.yacas
+	fi
+}
+
+src_install() {
+	default
+	if use java; then
+		cd JavaYacas || die
+		java-pkg_dojar yacas.jar
+		java-pkg_dolauncher jyacas --main net.sf.yacas.YacasConsole
+		insinto /usr/share/${PN}
+		doins hints.txt yacasconsole.html
+	fi
+}