Version bump, as-needed bug #248371 fixed upstream

(Portage version: 2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64)

3 files changed, 10 insertions, 52 deletions

diff --git a/sci-mathematics/mathomatic/ChangeLog b/sci-mathematics/mathomatic/ChangeLog
index ce9ad9a54078..1ea18f883c66 100644
--- a/sci-mathematics/mathomatic/ChangeLog
+++ b/sci-mathematics/mathomatic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/mathomatic
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/ChangeLog,v 1.36 2008/12/03 12:27:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/ChangeLog,v 1.37 2008/12/07 10:03:58 bicatali Exp $
+
+*mathomatic-14.2.5 (07 Dec 2008)
+
+  07 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -mathomatic-14.1.6.ebuild, -mathomatic-14.2.1.ebuild,
+  +mathomatic-14.2.5.ebuild:
+  Version bump, as-needed bug #248371 fixed upstream
 
 *mathomatic-14.2.4 (03 Dec 2008)
 
diff --git a/sci-mathematics/mathomatic/mathomatic-14.1.6.ebuild b/sci-mathematics/mathomatic/mathomatic-14.1.6.ebuild
deleted file mode 100644
index 7322a38200fa..000000000000
--- a/sci-mathematics/mathomatic/mathomatic-14.1.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-14.1.6.ebuild,v 1.1 2008/09/23 13:21:13 bicatali Exp $
-
-inherit eutils
-
-DESCRIPTION="Automatic algebraic manipulator"
-HOMEPAGE="http://www.mathomatic.com/"
-SRC_URI="http://www.panix.com/~gesslein/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND="sys-libs/readline
-	sys-libs/ncurses"
-
-src_compile() {
-	# respect user flags
-	sed -i \
-		-e '/^CFLAGS/ s/-O.//' \
-		-e '/^LDFLAGS/s/+= -lm/:= -lm $(LDFLAGS)/' \
-		makefile primes/makefile || die "sed failed"
-	emake READLINE=1 || die "emake failed"
-	emake -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() {
-	# It was easier just to install the files manually
-	dobin mathomatic primes/matho-{primes,pascal,sumsq} || die
-	dodoc changes.txt README.txt AUTHORS || die
-	doman mathomatic.1 primes/*.1 || die
-	doicon mathomatic.png || die
-	domenu 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-14.2.1.ebuild b/sci-mathematics/mathomatic/mathomatic-14.2.5.ebuild
index 8cfe859e1584..fed286053f94 100644
--- a/sci-mathematics/mathomatic/mathomatic-14.2.1.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-14.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-14.2.1.ebuild,v 1.1 2008/10/21 14:39:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-14.2.5.ebuild,v 1.1 2008/12/07 10:03:58 bicatali Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Automatic algebraic manipulator"
 HOMEPAGE="http://www.mathomatic.com/"
 SRC_URI="http://www.panix.com/~gesslein/${P}.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
@@ -17,10 +17,8 @@ DEPEND="sys-libs/readline
 	sys-libs/ncurses"
 
 src_compile() {
-	# respect user flags
 	sed -i \
 		-e '/^CFLAGS/ s/-O.//' \
-		-e '/^LDFLAGS/s/+= -lm/:= -lm $(LDFLAGS)/' \
 		makefile primes/makefile || die "sed failed"
 	emake READLINE=1 || die "emake failed"
 	emake -C primes || die "emake in primes failed"