Version bump. Removed unused function and patch

Package-Manager: portage-2.2.01.21418-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

6 files changed, 68 insertions, 62 deletions

diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index 6929c4b314a2..0d0ceb2f33e0 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/yacas
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.34 2012/06/16 07:34:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.35 2012/12/11 18:52:52 bicatali Exp $
+
+*yacas-1.3.3 (11 Dec 2012)
+
+  11 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +yacas-1.3.3.ebuild,
+  -files/yacas-1.2.2-tests.patch, metadata.xml, yacas-1.3.2.ebuild:
+  Version bump. Removed unused function and patch
 
   16 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org>
   -files/yacas-1.2.2-gcc43.patch, -files/yacas-1.2.2-gcc46.patch,
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index f09936a17f7c..af3dc9242c5b 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -1,25 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX yacas-1.2.2-tests.patch 1699 RMD160 aac824d8424d50c42937befbf21b24a797a6591a SHA1 43fcc49c11c015eeb21ac9caeb61b0ca0bd6851e SHA256 1f273d8f1b4485289b0165e62c4746f80a2a23df1a9f07762d44e2dc74963a24
-DIST yacas-1.3.2.tar.gz 1292706 RMD160 a57b877036b107310200058842ed7d17d531e438 SHA1 f8c81923b55f2b37ce9b42ec02600f331a6435f6 SHA256 82c7dc0de492b4290633e6abf18d35a2ec03117e6ea3e0f9418e6e85372c030e
-EBUILD yacas-1.3.2.ebuild 1231 RMD160 387e644e74ac53944b6bba658b689ee3a29ff964 SHA1 e7f15ccbfda95e9f783f606d9cd037feeb29ffbf SHA256 7282a88c907df7f6363f8f088f49b2d0445bdea0b8074837313df967e80485b3
-MISC ChangeLog 6893 RMD160 065e04150db8186d4b850ef8317477660dff167a SHA1 5fbdde39a4166788c5a5b3bded56df4aefbea11e SHA256 d54b46018cb894b2fd951db712f3364c958e426778da21ea3b00ba9110701f27
-MISC metadata.xml 656 RMD160 b5348c41efac252539003a3b9d0b147eb45dcf3a SHA1 f7952024415014fc8f4a804ca782586593a01540 SHA256 729ce44f7a3d9678ac82c4365e70f40d526d4249fcdc129fb985f5d7e8769787
+DIST yacas-1.3.2.tar.gz 1292706 SHA256 82c7dc0de492b4290633e6abf18d35a2ec03117e6ea3e0f9418e6e85372c030e
+DIST yacas-1.3.3.tar.gz 1296777 SHA256 6c73c653c5e13567510888800a68c14d231b1ef4f2b33193a158b8caec142141 SHA512 a0c60f78a0d3f19d5fa820bdf62b2ae25ece00f985422a17a56f091ff240b74811af1c1480c24eff5dcb5cb021aa9709664e929913a33f411e6d2b64f37d3c70 WHIRLPOOL f1334fd7cd191b1e9448efaed0542f338f35cf769ef2c6e8ca43ab0a75994aa09286fb6e5688b78927980ba4967093f971be33785f4a3d92a377532dd5e09a34
+EBUILD yacas-1.3.2.ebuild 1084 SHA256 21219c42d57e22b77e0671297b7744f0d85ea6fd73a0e1b73210cc292a49f1d3 SHA512 1a731af459e98d5826c72dd41fd06279a5d55e153346b4843ec1e2b3a5bee94447859561f9dc097fb94cf77aa2a90d7531047287bedba381bc40f53f075a1c5f WHIRLPOOL e0ccef258fea8fdf52fa36581282fddf89bd98adf75d027fea85639c1e13966ff10cf4f4baac1ed34a30d2cf45ef090e544ca9a174e96cc2da48f2c6244777bc
+EBUILD yacas-1.3.3.ebuild 1111 SHA256 1355f96a8144426048d9c5cb7820338efdfeead284dbc20f621bb64a9d6f8355 SHA512 03e8e2fa4f36e2ba74910e10b4e068f015bc42ba952f87e9003d782d037df975c0c389f9544dadb09ac469b6c7a6f64199bbe215aa0c991474e8c6bcbd1e2e1f WHIRLPOOL fe476442b5016d5bad1114ac8a14058e2d5b82ba1de6db9cb9746e8743f0169762e88c13da7cca82e1af5455a495e9c10874ac537098b108965f44c5327ebddd
+MISC ChangeLog 7114 SHA256 93de68c461339be0123858633bceb90a2b40c0cd11d6b1ee3356d0b7d7ae007b SHA512 c8609e8907f955458021a49d4e1eb74366eed55f359babb788dc75fe9c8f78daf10baefa2ce27caeadadd89f56a0f44b9870028f0e7da00d1c480e30c5ee532f WHIRLPOOL 3b7c89019de9e44a5738410b9c442b1d6f50a5bd7b42308d274218e85965ddb19b8293cd38c8427775b485d2c2c3d06e8cdeb57b6798f388ed137cc97d816c7a
+MISC metadata.xml 652 SHA256 b3e57d8bd4cdd080f456ae8ce7991972cc20937bbf588fc937d3213f23686c60 SHA512 9eaac4be51d0ab535c830d0b4197f24844cfcf14a941f877e7b43191e0f8dc6c5395a43c9bb735f0c41ec9264572675139a702db2f294e8c663c4b3baae96328 WHIRLPOOL f722a4463cc9bd73b2205c5cae44230078d6d796ea5d727d683add6580be82e200377e856667e074f4c11239bb6f1d384c5c1ae2b8386a2eecfc2a2676ce04a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP3DcrAAoJEF0huFKJUZL5AvAP/1WNmTeM1OiidJzz97sT3oYn
-7A6T65noA4/5hZmHAPl5YCRubJ9e1RtK4oDJX5/ftZWJ933qKuc+BROd778vZ21x
-EvcPDKXk/7r8voXh+D5Z0QZtZ7jR4f+/7hmjr9ZrOQzemRZgMlJKaKnNYBctdid2
-Mlv2SH1Jhqg31yuo437Nf4URtu0O81o/TV6S1CZJGagI9v19bNfWZz51GWPUvowe
-bM2ykH6FL7wuEmVUbVOUPk5LuH6jXvXKE9n/Cs1VuOn7RF+acpjBlL96eilsdabV
-hmzBnmqPyA7avKk7SgMjURQ+pheI205yiDBZ11e6TdKD/XHLwpabOTNiCONWIdND
-PbkLDZB+B+wQSewIzaGjG19JJQYrYNJ+1Fbx1IFKdzaJ/1yO+CxsYsXaMZBCAgVM
-oKmtsrS6n1uoCpZMc4BTkjhRqhpyg9oEnXZxTaYZa5gnvA5cjMlOkrZdB6gblX+7
-S9/g3PD2kCpPlaCw8liQLeBCkZ8pR06qHQt6ZyDspO/5N8cq3rHkCWb0mKosXZH/
-fqWXcPfeuqWMxeXpRKxio/iZYiDqMEenflQlE8OCvCE7RLYI1G0o1XrfvI2DD8Or
-YjSAZ3taWQoMO655fuQ2mh06rw184Q9PnWtfr/KU5C94WMkmqYsCwENLSXeDyL4U
-NsDvA+PCmMinFCM22gId
-=eCsU
+iEYEAREIAAYFAlDHgQUACgkQ1ycZbhPLE2BUAwCeIYGSYWPWl0aV+Fjc9JDQajDy
+hkAAoJxHJo4M40vShRC3aVGmWKMGeRd6
+=r1oE
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/yacas/files/yacas-1.2.2-tests.patch b/sci-mathematics/yacas/files/yacas-1.2.2-tests.patch
deleted file mode 100644
index 3d5f6dc65c3f..000000000000
--- a/sci-mathematics/yacas/files/yacas-1.2.2-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nur yacas-1.2.2.orig/tests/includetestfiles yacas-1.2.2/tests/includetestfiles
---- yacas-1.2.2.orig/tests/includetestfiles	2011-07-28 20:44:18.000000000 +0100
-+++ yacas-1.2.2/tests/includetestfiles	2011-07-28 20:59:03.000000000 +0100
-@@ -1,11 +1,11 @@
--
-+FAILURES_TESTFILES = calculus.yts complex.yts regress.yts
- NORMAL_TESTFILES = \
--	openmath.yts macro.yts arithmetic.yts c_tex_form.yts calculus.yts canprove.yts \
--	comments.yts complex.yts deriv.yts dimensions.yts dot.yts journal.yts \
-+	openmath.yts macro.yts arithmetic.yts c_tex_form.yts canprove.yts \
-+	comments.yts deriv.yts dimensions.yts dot.yts journal.yts \
- 	integrate.yts lists.yts logic_simplify_test.yts matrixpower.yts \
- 	nthroot.yts outer.yts predicates.yts ode.yts \
- 	tensors.yts trace.yts tr.yts multivar.yts numbers.yts io.yts \
--	programming.yts regress.yts simplify.yts solve.yts sums.yts \
-+	programming.yts simplify.yts solve.yts sums.yts \
- 	transforms.yts radsimp.yts linalg.yts orthopoly.yts poly.yts numerics.yts \
- 	scopestack.yts plots.yts GaussianIntegers.yts nummethods.yts sturm.yts \
-         cyclotomic.yts binaryfactors.yts 
-diff -Nur yacas-1.2.2.orig/tests/test-yacas yacas-1.2.2/tests/test-yacas
---- yacas-1.2.2.orig/tests/test-yacas	2011-07-28 20:44:18.000000000 +0100
-+++ yacas-1.2.2/tests/test-yacas	2011-07-28 20:44:47.000000000 +0100
-@@ -69,7 +69,7 @@
- #		fi
-     echo "Running $scr"
- 	if [ -f $TESTFILE ]; then rm $TESTFILE ; fi
--    /bin/sh -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \
-+    /bin/sh -c "time -p $($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \
- 		2> $TIMEFILE \
- 		|| (echo "Error -- User interrupt" > $TESTFILE)
- #	cat $TIMEFILE
diff --git a/sci-mathematics/yacas/metadata.xml b/sci-mathematics/yacas/metadata.xml
index 2add54fa6f82..e992686a974a 100644
--- a/sci-mathematics/yacas/metadata.xml
+++ b/sci-mathematics/yacas/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
-	<longdescription lang="en">
+<herd>sci-mathematics</herd>
+<longdescription lang="en">
   Yacas (Yet Another Computer Algebra System) is a small and highly
   flexible general-purpose computer algebra language. The syntax uses a
   infix-operator grammar parser. The distribution contains a small
@@ -10,7 +10,7 @@
   language in which you can easily write your own symbolic manipulation
   algorithms.
 </longdescription>
-	<use>
-		<flag name="server">Build the network server version</flag>
-	</use>
+<use>
+  <flag name="server">Build the network server version</flag>
+</use>
 </pkgmetadata>
diff --git a/sci-mathematics/yacas/yacas-1.3.2.ebuild b/sci-mathematics/yacas/yacas-1.3.2.ebuild
index b9bbbad06c5b..c26082ccf27b 100644
--- a/sci-mathematics/yacas/yacas-1.3.2.ebuild
+++ b/sci-mathematics/yacas/yacas-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.2.ebuild,v 1.5 2012/06/16 07:34:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.2.ebuild,v 1.6 2012/12/11 18:52:52 bicatali Exp $
 
 EAPI=4
 
@@ -18,12 +18,6 @@ IUSE="doc java server"
 DEPEND="java? ( >=virtual/jdk-1.6 )"
 RDEPEND="java? ( >=virtual/jre-1.6 )"
 
-psrc_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.2-tests.patch
-	# needs to rebuild because tests include file modify Makefile.am
-	eautoreconf
-}
-
 src_configure() {
 	econf \
 		$(use_enable doc html-doc) \
diff --git a/sci-mathematics/yacas/yacas-1.3.3.ebuild b/sci-mathematics/yacas/yacas-1.3.3.ebuild
new file mode 100644
index 000000000000..5d7c22529591
--- /dev/null
+++ b/sci-mathematics/yacas/yacas-1.3.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.3.ebuild,v 1.1 2012/12/11 18:52:51 bicatali Exp $
+
+EAPI=4
+
+inherit autotools eutils java-pkg-opt-2
+
+DESCRIPTION="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 ~amd64-linux ~x86-linux"
+IUSE="doc java server"
+
+DEPEND="java? ( >=virtual/jdk-1.6 )"
+RDEPEND="java? ( >=virtual/jre-1.6 )"
+
+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
+}