Removed old versions of Macaulay2 and updated deps

6 files changed, 8 insertions, 256 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 0a5505d20..9473af3e0 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -20,6 +20,11 @@
 
 	Version bump
 
+  19 Feb 2010; Thomas Kahle <tom111@gmx.de> -Macaulay2-1.2-r3.ebuild,
+  -Macaulay2-1.3.1-r1.ebuild, Macaulay2-1.3.1-r2.ebuild,
+  -files/patch-3.1.0b:
+  Removed old versions, dependency on sci-libs/mpir updated
+
   19 Feb 2010; François Bissey <f.r.bissey@massey.ac.nz>
   Macaulay2-1.3.1-r1.ebuild, Macaulay2-1.3.1-r2.ebuild:
   change the dependencies from dev-libs/mpir to sci-libs/mpir as agreed.
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.2-r3.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.2-r3.ebuild
deleted file mode 100644
index dba76f391..000000000
--- a/sci-mathematics/Macaulay2/Macaulay2-1.2-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools elisp-common eutils flag-o-matic
-
-IUSE="emacs"
-
-DESCRIPTION="research tool for commutative algebra and algebraic geometry"
-SRC_URI=" http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/${P}-r8438-src.tar.bz2
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-3-1-0.tar.gz \
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-1-0.tar.gz \
-	http://www.math.uiuc.edu/Macaulay2/Extra/frobby_vmike3.tar.gz"
-#	mirror://gentoo/${P}-src.tar.bz2
-
-# We should keep frobby, factory and libfac in sync!
-
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-# The ntl version is a due to factory
-# If <boehm-gc-7.0 is installed M2 download and install it internally
-# sys-process/time is needed to run the checks
-DEPEND="sys-libs/gdbm
-	dev-libs/gmp
-	|| ( >=dev-libs/ntl-5.4.1[gmp,-gf2x]
-		 >=dev-libs/ntl-5.4.2 )
-	>=dev-libs/boehm-gc-7.0
-	>=sci-mathematics/pari-2.3.4[gmp]
-	virtual/blas
-	virtual/lapack
-	dev-util/ctags
-	sys-libs/ncurses
-	sys-process/time
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/${P}-r8438"
-
-src_unpack() {
-	unpack "${P}-r8438-src.tar.bz2"
-	mkdir "${S}/BUILD/tarfiles"
-	# Put sourcfile in the right location:
-	cp "${DISTDIR}/frobby_vmike3.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	cp "${DISTDIR}/factory-3-1-0.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	cp "${DISTDIR}/libfac-3-1-0.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-}
-
-src_prepare () {
-	# Fixes an issue with Doc. Probably gone in 1.3
-	cd "${S}/Macaulay2/packages/Macaulay2Doc"
-	sed "/^ *SourceCode => applicationDirectory.*$/d" -i doc13.m2
-
-	cd "${S}"
-	eautoreconf
-}
-
-src_configure (){
-
-	# Recommended in bug #268064 Possibly unecessary since
-	# its a local problem of original reporter.
-	if ! use emacs; then
-		tags="ctags"
-	fi
-
-	append-ldflags "-L${WORKDIR}/$(get_libdir)"
-	CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \
-		./configure --prefix="${D}/usr" --disable-encap \
-		|| die "failed to configure Macaulay"
-}
-
-src_compile() {
-	# Parallel build ?
-	emake -j1 || die "failed to build Macaulay"
-}
-
-src_test() {
-	make check || die "tests failed"
-}
-
-src_install () {
-
-	make install || die "install failed"
-
-	# nothing useful in here, get rid of it
-	# NOTE: Macaulay installs into lib even on amd64 hence don't
-	# replace lib with $(get_libdir) below!
-	rm -fr "${D}"/usr/lib \
-		|| die "failed to remove empty /usr/lib"
-
-	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "If you want to set a hot key for Macaulay2 in Emacs add a line similar to"
-		elog "(global-set-key [ f12 ] 'M2)"
-		elog "in order to set it to F12 (or choose a different one)."
-	fi
-}
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r1.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r1.ebuild
deleted file mode 100644
index 0320cea5d..000000000
--- a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools elisp-common eutils flag-o-matic subversion
-
-# Currently upstream has no tarballs, only svn.
-
-ESVN_REPO_URI="svn://macaulay2.math.uiuc.edu/Macaulay2/release-branches/1.3.1"
-
-IUSE="emacs"
-
-PACKURL="http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/1.3/"
-DESCRIPTION="research tool for commutative algebra and algebraic geometry"
-SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-3-1-0.tar.gz \
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-1-0.tar.gz \
-	${PACKURL}/frobby_v0.8.2.tar.gz"
-#	mirror://gentoo/${P}-src.tar.bz2
-
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-# mpir 1.3.0_rc3 does not work!
-DEPEND="sys-libs/gdbm
-	>=dev-libs/ntl-5.5.2
-	>=dev-libs/boehm-gc-7.1
-	>=sci-mathematics/pari-2.3.4[gmp]
-	>=sys-libs/readline-6.0
-	dev-libs/libxml2
-	>=sci-mathematics/4ti2-1.3.2
-	>=sci-mathematics/normaliz-2.2
-	sci-mathematics/gfan
-	>=dev-libs/mpfr-2.4.1
-	<sci-libs/mpir-1.3[-nocxx]
-	sys-libs/gdbm
-	virtual/blas
-	virtual/lapack
-	dev-util/ctags
-	sys-libs/ncurses
-	sys-process/time
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/1.3.1"
-
-src_unpack() {
-	subversion_src_unpack
-	# Patching .m2 files to look for external programs in
-	# /usr/bin
-	cd "${S}"
-	mkdir "${S}/BUILD/tarfiles"
-	# Put sourcfile in the right location:
-	cp "${DISTDIR}/frobby_v0.8.2.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	cp "${DISTDIR}/factory-3-1-0.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	cp "${DISTDIR}/libfac-3-1-0.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-}
-
-src_prepare() {
-	# Remove the external programs from built list,
-	# configure does not check for them
-	cd "${S}"
-	epatch "${FILESDIR}/paths-of-dependencies.patch"
-
-	sed "s/4ti2 gfan normaliz//" -i configure.ac
-	eautoreconf
-
-}
-
-src_configure (){
-
-	# Recommended in bug #268064 Possibly unecessary
-	# but should not hurt anybody.
-	if ! use emacs; then
-		tags="ctags"
-	fi
-
-	./configure --prefix="${D}/usr" --disable-encap \
-		|| die "failed to configure Macaulay"
-}
-
-src_compile() {
-	# Parallel build not yet supported
-	emake -j1 || die "failed to build Macaulay"
-}
-
-src_test() {
-	make check || die "tests failed"
-}
-
-src_install () {
-
-	make install || die "install failed"
-
-	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "If you want to set a hot key for Macaulay2 in Emacs add a line similar to"
-		elog "(global-set-key [ f12 ] 'M2)"
-		elog "in order to set it to F12 (or choose a different one)."
-	fi
-}
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r2.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r2.ebuild
index 9d2fb90a3..503182317 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r2.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r2.ebuild
@@ -19,7 +19,6 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 
-# mpir 1.3.0_rc3 does not work!
 DEPEND="sys-libs/gdbm
 	>=dev-libs/ntl-5.5.2
 	>=dev-libs/boehm-gc-7.1
@@ -33,8 +32,7 @@ DEPEND="sys-libs/gdbm
 	sci-mathematics/normaliz
 	sci-mathematics/gfan
 	>=dev-libs/mpfr-2.4.1
-	>=sci-libs/mpir-1.2.1[-nocxx]
-	<sci-libs/mpir-1.3[-nocxx]
+	>=sci-libs/mpir-1.3.1[cxx]
 	sys-libs/gdbm
 	virtual/blas
 	virtual/lapack
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 8d5b698e4..5aaf342f0 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,14 +1,6 @@
 AUX 70Macaulay2-gentoo.el 57 RMD160 07b266ed45b28e5ebe7ee8e46ea73571a401dea3 SHA1 877ac4fd55e2b42922212bce587c2aa68e010bf2 SHA256 427d14300a958b0970837191006641f5e1c9952cf3492c640bc1e8c223b221f5
-AUX patch-3.1.0b 399 RMD160 1f28f88c7e84ff2d6de35cc600ca03681db53436 SHA1 e5f27b2f2da9ad3c3f5456d9c625761ee6287ae6 SHA256 9cc468162ae6d94e5eab71ef77dd289c733ff575bc98cb5677f6eb8c89cd7e40
 AUX paths-of-dependencies.patch 2437 RMD160 9b63baeee97428406bed8bfbf67cf6fead95974a SHA1 cf245ad8bcdbe119e127242119b2b96342100035 SHA256 bffbaaf077f99f1e135fe0eff61be702c6eb138f4b4ae715cec8c5be62ee8046
-DIST Macaulay2-1.2-r8438-src.tar.bz2 3198159 RMD160 bfd5fc5498e0ca7507277e9b2997d3b429a372df SHA1 c02b943a1cf43e74e566afa6a89c01e2f9f2e01c SHA256 ad28262a007afc6fa96afae2d3f294548d0376f39d4db0d2fb17cc43f23fc317
 DIST Macaulay2-1.3.1-r9872-src.tar.bz2 3757093 RMD160 f6c25009932d8f551f99d9faca697e8612b69712 SHA1 bb512164cf6ef252babfe896f1b6a6515608f7ef SHA256 7c1de3d18422b0c3505b0939e0dd6b7d4d1065e5d32e4897b7d895a1ab8eabcd
-DIST factory-3-1-0.tar.gz 565374 RMD160 059ed1697f282d309e89d1cc2e0ce8bd94a8b4b3 SHA1 c41ab3cdc6ea51332169645e35c35c3fd6c4d94b SHA256 cb1768ccaaa71557ace880be0e88100bcfd420d3094ffac59d229cd852edc0ff
-DIST frobby_v0.8.2.tar.gz 746484 RMD160 3644813d14feea3e361c1669c3f5460e1fa0974e SHA1 0e75a0b78eeef43df491393a5c1fd1421b9e47d8 SHA256 aa6c686b00375283d125d6d5c2f4af40947a4ea2977c95e488c2339ab640353e
-DIST frobby_vmike3.tar.gz 235794 RMD160 d9bf705895f4ccb8a1db9fd3909d4ae53fb05b08 SHA1 e478c0d0ac66f4d315ab246a1b2e0cb563991367 SHA256 98c58c0bb99f81344d1a647840f32e062923f2a45bf4cbafbf03ad1160e0a673
-DIST libfac-3-1-0.tar.gz 91544 RMD160 2500d402328ad532756c677015c1d01f8594e394 SHA1 d005ddd58a180b8a91fe5728b96bde515c5d9cc5 SHA256 fc3dda08f7ec039635f8d7f1629546f4ac7620a69cf9332ca39e29dd822aee7d
-EBUILD Macaulay2-1.2-r3.ebuild 2974 RMD160 cabf35edad035f139fd3a19ef66162d1791fac78 SHA1 89bf3bf6ec3c756855ee38f7f746aa6bd9dc2a7a SHA256 d9ac5a514993b57af7204319330734d164303bfa0db33bd11cb2fd07e7642bdc
-EBUILD Macaulay2-1.3.1-r1.ebuild 2814 RMD160 03301e80777cf872ae355f813a58bcf252910dd2 SHA1 1af86722381bf522ff5394182938c182e4fad30c SHA256 e9a55f0e276f31818a405a3ddff4afe258d6397091650cd97e57b4616c636a64
-EBUILD Macaulay2-1.3.1-r2.ebuild 2202 RMD160 735198b2a0132d85d93013e4262b141f3708aad8 SHA1 8ec9c887e4f3f7dc6044637463ba4976d28319cb SHA256 1f2e81580655afbe8ab27d41c13ef863bb1a0675bd5d7381a42a510481507ad6
-MISC ChangeLog 1463 RMD160 72c75042c5e4ca2bda3921295d6db79d0562aa47 SHA1 f5e8b9c28d290d7629eac0c86778e59867d00b0d SHA256 25e7e2593372f7fba925e47bd449cfe60e222f05cbe927dd48f71d93d65cd941
+EBUILD Macaulay2-1.3.1-r2.ebuild 2139 RMD160 21640ace109bf9bfb7e0ba328d3a37b8ebd23d9d SHA1 5cb74777f3beac20bd2d605ee9d2d0f26275be2e SHA256 862e0323c305241d2b8c14d2535ce42500d674959a62addf240bca434ef12348
+MISC ChangeLog 1674 RMD160 06662b409e4bc50ec87df519e3d5ac40da14fc45 SHA1 de4d5c285d92ce804a2cb763e452e90f2628c13a SHA256 df153161d16016e6009614462b094a120259b4cea3c92e99e055f6612c061128
 MISC metadata.xml 361 RMD160 273db3a009b85938f85e60ea0d34d6fc625f9477 SHA1 7f6e903d81af55b08c7dbb9feb4f7ad39852a23e SHA256 71a0f19b08b1e752e754bbc5faf15880601d00c5b9df2bc5ca5a3b8e93e83b7f
diff --git a/sci-mathematics/Macaulay2/files/patch-3.1.0b b/sci-mathematics/Macaulay2/files/patch-3.1.0b
deleted file mode 100644
index ec3efaad6..000000000
--- a/sci-mathematics/Macaulay2/files/patch-3.1.0b
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur --exclude=configure tmp/factory/newdelete.cc factory/newdelete.cc
---- tmp/factory/newdelete.cc	2008-10-28 04:16:24.000000000 -0500
-+++ factory/newdelete.cc	2008-10-30 13:28:52.000000000 -0500
-@@ -1,6 +1,8 @@
- /* emacs edit mode for this file is -*- C++ -*- */
- /* $Id: newdelete.cc,v 1.3 2008/10/25 11:04:06 Singular Exp $ */
- 
-+#include <new>
-+
- #include <config.h>
- 
- #include "assert.h"