Fixed tests (bug #361583)

(Portage version: 2.1.10.7/cvs/Linux x86_64)

3 files changed, 43 insertions, 5 deletions

diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index 883a67e7ee9e..771beb6581b6 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/yacas
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.29 2011/07/28 20:18:54 bicatali Exp $
+
+  28 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> yacas-1.2.2-r1.ebuild,
+  +files/yacas-1.2.2-tests.patch:
+  Fixed tests (bug #361583)
 
 *yacas-1.2.2-r1 (17 Apr 2011)
 
diff --git a/sci-mathematics/yacas/files/yacas-1.2.2-tests.patch b/sci-mathematics/yacas/files/yacas-1.2.2-tests.patch
new file mode 100644
index 000000000000..3d5f6dc65c3f
--- /dev/null
+++ b/sci-mathematics/yacas/files/yacas-1.2.2-tests.patch
@@ -0,0 +1,31 @@
+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/yacas-1.2.2-r1.ebuild b/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild
index ba93411effc2..cf8fa19daad6 100644
--- a/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild
+++ b/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild
@@ -1,12 +1,12 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.2.2-r1.ebuild,v 1.2 2011/07/28 20:18:54 bicatali Exp $
 
 EAPI="4"
 
-inherit eutils java-pkg-opt-2
+inherit eutils java-pkg-opt-2 autotools
 
-DESCRIPTION="Powerful general purpose computer algebra system"
+DESCRIPTION="General purpose computer algebra system"
 HOMEPAGE="http://yacas.sourceforge.net/"
 SRC_URI="http://${PN}.sourceforge.net/backups/${P}.tar.gz"
 
@@ -23,7 +23,10 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-makefixes.patch
+		"${FILESDIR}"/${P}-makefixes.patch \
+		"${FILESDIR}"/${P}-tests.patch
+	# needs to rebuild because tests include file modify Makefile.am
+	eautoreconf
 }
 
 src_configure() {