Version bump. Removed time in test (bug #362041)

(Portage version: 2.1.9.45/cvs/Linux x86_64)

4 files changed, 26 insertions, 102 deletions

diff --git a/sci-mathematics/mathomatic/ChangeLog b/sci-mathematics/mathomatic/ChangeLog
index 2b7ff66392c0..d1fd64565e5c 100644
--- a/sci-mathematics/mathomatic/ChangeLog
+++ b/sci-mathematics/mathomatic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/mathomatic
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/ChangeLog,v 1.54 2011/02/23 20:37:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/ChangeLog,v 1.55 2011/04/08 03:47:54 bicatali Exp $
+
+*mathomatic-15.5.2 (08 Apr 2011)
+
+  08 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -mathomatic-15.3.4.ebuild, -mathomatic-15.3.6.ebuild,
+  -mathomatic-15.4.4.ebuild, +mathomatic-15.5.2.ebuild:
+  Version bump. Removed time in test (bug #362041)
 
 *mathomatic-15.4.4 (23 Feb 2011)
 
diff --git a/sci-mathematics/mathomatic/mathomatic-15.3.4.ebuild b/sci-mathematics/mathomatic/mathomatic-15.3.4.ebuild
deleted file mode 100644
index e963711ee481..000000000000
--- a/sci-mathematics/mathomatic/mathomatic-15.3.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-15.3.4.ebuild,v 1.1 2010/11/19 04:22:50 bicatali Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Automatic algebraic manipulator"
-HOMEPAGE="http://www.mathomatic.org/"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gnuplot"
-
-DEPEND="sys-libs/readline
-	sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	gnuplot? ( sci-visualization/gnuplot )"
-
-src_compile() {
-	emake READLINE=1 OPTFLAGS="" CC=$(tc-getCC) || die "emake failed"
-	emake OPTFLAGS="" CC=$(tc-getCC) -C primes || die "emake in primes failed"
-}
-
-src_test() {
-	emake test || die "emake test failed"
-	emake -C primes test || die "emake test in primes failed"
-}
-
-src_install() {
-	dobin mathomatic || die
-	dobin primes/matho-{mult,primes,pascal,sumsq} primes/primorial || die
-	dodoc changes.txt README.txt AUTHORS
-	doman mathomatic.1 primes/*.1 || die
-	doicon icons/mathomatic.png || die
-	domenu icons/mathomatic.desktop || die
-	newdoc primes/README.txt README-primes.txt || die
-	if use doc; then
-		dohtml doc/* || die
-		insinto /usr/share/doc/${PF}
-		doins -r tests factorial m4 || die
-	fi
-}
diff --git a/sci-mathematics/mathomatic/mathomatic-15.3.6.ebuild b/sci-mathematics/mathomatic/mathomatic-15.3.6.ebuild
deleted file mode 100644
index bae13f09c2e2..000000000000
--- a/sci-mathematics/mathomatic/mathomatic-15.3.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-15.3.6.ebuild,v 1.1 2010/12/22 06:03:45 bicatali Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Automatic algebraic manipulator"
-HOMEPAGE="http://www.mathomatic.org/"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gnuplot"
-
-DEPEND="sys-libs/readline
-	sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	gnuplot? ( sci-visualization/gnuplot )"
-
-src_compile() {
-	emake READLINE=1 OPTFLAGS="" CC=$(tc-getCC) || die "emake failed"
-	emake OPTFLAGS="" CC=$(tc-getCC) -C primes || die "emake in primes failed"
-}
-
-src_test() {
-	emake test || die "emake test failed"
-	emake -C primes test || die "emake test in primes failed"
-}
-
-src_install() {
-	dobin mathomatic || die
-	dobin primes/matho-{mult,primes,pascal,sumsq} primes/primorial || die
-	dodoc changes.txt README.txt AUTHORS
-	doman mathomatic.1 primes/*.1 || die
-	doicon icons/mathomatic.png || die
-	domenu icons/mathomatic.desktop || die
-	newdoc primes/README.txt README-primes.txt || die
-	if use doc; then
-		dohtml doc/* || die
-		insinto /usr/share/doc/${PF}
-		doins -r tests factorial m4 || die
-	fi
-}
diff --git a/sci-mathematics/mathomatic/mathomatic-15.4.4.ebuild b/sci-mathematics/mathomatic/mathomatic-15.5.2.ebuild
index 5676e1239047..9b6e97a19b5c 100644
--- a/sci-mathematics/mathomatic/mathomatic-15.4.4.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-15.5.2.ebuild
@@ -1,7 +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/mathomatic/mathomatic-15.4.4.ebuild,v 1.1 2011/02/23 20:37:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-15.5.2.ebuild,v 1.1 2011/04/08 03:47:54 bicatali Exp $
 
+EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Automatic algebraic manipulator"
@@ -18,27 +19,31 @@ DEPEND="sys-libs/readline
 RDEPEND="${DEPEND}
 	gnuplot? ( sci-visualization/gnuplot )"
 
+src_prepare() {
+	sed -i -e 's/time -p//g' makefile primes/makefile || die
+}
+
 src_compile() {
-	emake READLINE=1 CC=$(tc-getCC) || die "emake failed"
-	emake CC=$(tc-getCC) -C primes || die "emake in primes failed"
+	emake READLINE=1 CC=$(tc-getCC)
+	emake CC=$(tc-getCC) -C primes
 }
 
 src_test() {
-	emake test || die "emake test failed"
-	emake -C primes test || die "emake test in primes failed"
+	emake test
+	emake -C primes test
 }
 
 src_install() {
-	dobin mathomatic || die
-	dobin primes/matho-{mult,primes,pascal,sumsq} primes/primorial || die
+	dobin mathomatic
+	dobin primes/matho-{mult,primes,pascal,sumsq} primes/primorial
 	dodoc changes.txt README.txt AUTHORS
-	doman mathomatic.1 primes/*.1 || die
-	doicon icons/mathomatic.png || die
-	domenu icons/mathomatic.desktop || die
-	newdoc primes/README.txt README-primes.txt || die
+	doman mathomatic.1 primes/*.1
+	doicon icons/mathomatic.png
+	domenu icons/mathomatic.desktop
+	newdoc primes/README.txt README-primes.txt
 	if use doc; then
-		dohtml doc/* || die
+		dohtml doc/*
 		insinto /usr/share/doc/${PF}
-		doins -r tests factorial m4 || die
+		doins -r tests factorial m4
 	fi
 }