Version bump, as-needed bug #248371 fixed upstream

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 16 insertions, 60 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/Manifest b/sci-mathematics/mathomatic/Manifest
index 7da60f15713b..5f705f7ef54d 100644
--- a/sci-mathematics/mathomatic/Manifest
+++ b/sci-mathematics/mathomatic/Manifest
@@ -3,20 +3,18 @@ Hash: SHA1
 
 DIST mathomatic-12.8.8.tar.bz2 138604 RMD160 e180a32feeab61a0bee5aee70afcb9d6bf0f2e56 SHA1 4d4b7b8bc066522a4aefbb810989a57b017d99d1 SHA256 16ac8b1f2561c8e869e5042f2f317ac347e86a190e4c424b5bb8980921412a89
 DIST mathomatic-12.9.1.tar.bz2 139522 RMD160 27c6ef08eadc9b51d21eb6353e9b91c8d1f5cc8a SHA1 3afb2e1c7d00b8299f76cd553d24608dc660354f SHA256 f567771148dce6afacaed99efa3a57ccc138df7f8f57c22f8915791c36974d1d
-DIST mathomatic-14.1.6.tar.bz2 147624 RMD160 d9eef0431222c340317c27cf7cecf86c4584a0f7 SHA1 4b3ec1e73ddb3997a709eefd73fcc1e02d951dea SHA256 fe32e412ef88da6e82ddf2ee8f4fa68a240aa1ec2ffdf71a4d909bce61d43b78
-DIST mathomatic-14.2.1.tar.bz2 149403 RMD160 11b8f3d2a0f94c60da7f62ce2b200f5f79d32c07 SHA1 4edf482bad2d66d3f7954444f4897696dd9b18a2 SHA256 916f0a7ecf77ac86147bbee3a7e993d9845354b51d63fbff822c9261965123ab
 DIST mathomatic-14.2.4.tar.bz2 153070 RMD160 ac6107d406cf013b591b4d504f4a314cd5335038 SHA1 dbf1a32417dd0af6c8d7456eabc8679e5777dc58 SHA256 f53382cc27d58e4c4f2ccf74b277a2be509062f5fdf3ada33c7ed7616f7e6849
+DIST mathomatic-14.2.5.tar.bz2 153722 RMD160 1385619547b4fc00c92aca843fe98d6f758c9574 SHA1 d7aabc8363c01be412110eae07a64f82eeebb415 SHA256 8e468c64050af3cf6e15b66b3c85a83d63ec494f22a80967bdf52b0892d489a2
 EBUILD mathomatic-12.8.8.ebuild 1316 RMD160 ae88231b4910aa1575225327ad2c4fa1ae586a04 SHA1 7b9e50e6f84842c5ef5e0244ad96f05ad392d913 SHA256 ce8924ceb37a1cb1754a8a43fbbd6e583bbac4e45ba78987eec2726adc93f760
 EBUILD mathomatic-12.9.1.ebuild 1315 RMD160 f6c9fdc8f4ffdaa8d59c1f6e17721a48f43875d5 SHA1 c4418082cb25f07e6826f577295fa30b32db85f1 SHA256 27831b5dadbbdb3011b418066fbfb309682f4b14689ae1fd1fa9b689212c6cba
-EBUILD mathomatic-14.1.6.ebuild 1318 RMD160 fc6af177424b16c0f2064adec78861efc594f04a SHA1 65f2ca88607cc39d1430092711b2ed67589fe8de SHA256 197672ccff96574f40672b879152a7a6f04efc16cc39c809de516a54f845e2bd
-EBUILD mathomatic-14.2.1.ebuild 1330 RMD160 4b8056b53068fd470470ecc563c506861ceb59ef SHA1 437329be8e756d1b98fe85000107f46a86688f62 SHA256 4d8d79455c240ca57cbd66989607e156feff294d11daf79ddd1571c0aee75946
 EBUILD mathomatic-14.2.4.ebuild 1332 RMD160 1289b72fa8d14c97c5431ab78cbf5183807aa8d9 SHA1 ef823f28e2a5334d843b98c1f97ce823c297c678 SHA256 d472e447b6b1738d37fc6b20f85020bec5d344ef41b755cea40cbe33a891cfea
-MISC ChangeLog 6611 RMD160 85123c52f545aad1f80685be54daa751953323df SHA1 8a0dde48dbcff224d5a61f141afd205d8478b49f SHA256 77f89280cf50f9e211f6d436469344e02f8474c3acb7ab1850d02c7404593ba4
+EBUILD mathomatic-14.2.5.ebuild 1263 RMD160 6e5b9daa39f8f167ac2468b34e4a2ac295373205 SHA1 3f053b7ce56f00643f6206b702ef7e3e04e45dff SHA256 4afaac1310fbbb4941ea03de8eaeb89c3141600d05377daa10f5d753abb665fb
+MISC ChangeLog 6839 RMD160 2bb00d435faf61c94b4db54f8a9d38f60cfe7e26 SHA1 4247958a3d08f6b172cf8d220e563e91f642b370 SHA256 bf3925588d44212852133637dc9ebea4c5bd37f463eff969a31cc533c1ffd45f
 MISC metadata.xml 491 RMD160 ec2b8093f050b587650b1d5a30d8455d3c540274 SHA1 dbce211957fb4b6905bd39e34303843544db686f SHA256 79040f6ae769065819cb71990ab9461739ffc13f22df7af67b6b545cc59cdcf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk2eyYACgkQ1ycZbhPLE2AjigCgp4pjVpNZHy/7AYns9nX+5KnH
-fhkAn0ozeNQ1KGWqy4pk3LlWm6BnPXKp
-=2HlG
+iEYEARECAAYFAkk7n5YACgkQ1ycZbhPLE2ARlQCdE2vKyya5J7miE1VCkG1lA+zv
+yEkAnj9NyXnNpuDr9pLPvBvWB1sTTkcn
+=hWIx
 -----END PGP SIGNATURE-----
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"