Removed old version and fixed deps of live version

(Portage version: 2.1.10.4/git/Linux i686, signed Manifest commit with key 0x914769A1)

6 files changed, 14 insertions, 223 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 1b3395e7c..80813e5bf 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jul 2011; Thomas Kahle <tomka@gentoo.org>
+  -files/1.4-paths-of-external-programs.patch, -Macaulay2-1.3.1-r4.ebuild,
+  Macaulay2-9999.ebuild, -files/respect-CFLAGS.patch:
+  Removed old, fixed deps of live version
+
   07 Mar 2011; Justin Lecher <jlec@gentoo.org> Macaulay2-1.3.1-r4.ebuild,
   Macaulay2-9999.ebuild:
   Correct Slots for gtk 3 introduction to tree
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild
deleted file mode 100644
index 6df19f4b8..000000000
--- a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools elisp-common eutils
-
-MY_REV="r10737"
-
-DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
-SRC_URI="
-	${SRC_BASE}/SourceCode/Macaulay2-${PV}-${MY_REV}.bz2 -> ${P}.tar.bz2
-	${SRC_BASE}/OtherSourceCode/1.3/factory-3-1-0.tar.gz
-	${SRC_BASE}/OtherSourceCode/1.3/libfac-3-1-0.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs optimization"
-
-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:2
-	sci-mathematics/frobby
-	sci-mathematics/4ti2
-	<sci-mathematics/normaliz-2.5
-	sci-mathematics/gfan
-	>=dev-libs/mpfr-2.4.1
-	>=sci-libs/mpir-1.3.1[cxx]
-	virtual/blas
-	virtual/lapack
-	dev-util/ctags
-	sys-libs/ncurses
-	sys-process/time
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/${PN}-${PV}-${MY_REV}"
-
-RESTRICT="mirror"
-
-pkg_setup () {
-		tc-export CC CPP CXX
-}
-
-src_prepare() {
-	# Patching .m2 files to look for external programs in
-	# /usr/bin
-	epatch "${FILESDIR}"/paths-of-dependencies.patch
-
-	if ! use optimization ; then
-		epatch "${FILESDIR}"/respect-CFLAGS.patch
-	fi
-
-	# Fixing make warnings about unavailable jobserver:
-	sed -i "s/\$(MAKE)/+ \$(MAKE)/g" "${S}"/distributions/Makefile.in
-
-	# Factory and libfac are statically linked libraries which (in this flavor)
-	# are not used by any other program. We build them internally and don't install them
-	# Permission was granted to tomka by bicatali on IRC.
-	mkdir "${S}/BUILD/tarfiles" || die "Creation of directory 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"
-
-	eautoreconf
-}
-
-src_configure (){
-
-	# Recommended in bug #268064 Possibly unecessary
-	# but should not hurt anybody.
-	if ! use emacs; then
-		tags="ctags"
-	fi
-
-	CPPFLAGS="-I/usr/include/frobby" \
-		./configure --prefix="${D}/usr" \
-		--disable-encap \
-		--disable-strip \
-		--enable-build-libraries="factory libfac" \
-		--with-unbuilt-programs="4ti2 gfan normaliz" \
-		|| die "failed to configure Macaulay"
-}
-
-src_compile() {
-	# Parallel build not supported yet
-	emake -j1 || die "failed to build Macaulay"
-
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs"
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_test() {
-	emake check || die "tests failed"
-}
-
-src_install () {
-	# Parallel install not supported yet
-	emake -j1 install || die "install failed"
-
-	# Remove emacs files and install them in the
-	# correct place if use emacs
-
-	rm -rf "${D}"/usr/share/emacs/site-lisp
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs"
-		elisp-install ${PN} *.elc *.el || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-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-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index fd77a717d..67c914a54 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	sci-mathematics/frobby
 	sci-mathematics/4ti2
 	sci-mathematics/nauty
-	>=sci-mathematics/normaliz-2.5
+	>=sci-mathematics/normaliz-2.7
 	sci-mathematics/gfan
 	>=dev-libs/mpfr-3.0.0
 	>=sci-libs/mpir-2.1.1[cxx]
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 5ea94246a..eb19de9b5 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,25 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 1.4-paths-of-external-programs.patch 3175 RMD160 ad0f634b52b3fe883e49a53815481ca5b73d93c3 SHA1 4644c4b8c64678ca8205515436666651f467ee58 SHA256 162823069e075d7b7712db841d8c7bb8e1f03f2c33d4ade18e0b7a20543f5230
 AUX 70Macaulay2-gentoo.el 597 RMD160 bdf3a30bb4d15a77e0dff86c866134d06c443fa0 SHA1 d4a4036042ab13bc20d8be90b559e9168bfc0ef5 SHA256 e5583d11e6ab662261abb32e90fcf31ccf6bd56f2b23b691b9255d1b8d8acb2f
 AUX 9999-paths-of-external-programs.patch 3175 RMD160 ad0f634b52b3fe883e49a53815481ca5b73d93c3 SHA1 4644c4b8c64678ca8205515436666651f467ee58 SHA256 162823069e075d7b7712db841d8c7bb8e1f03f2c33d4ade18e0b7a20543f5230
 AUX paths-of-dependencies.patch 2437 RMD160 9b63baeee97428406bed8bfbf67cf6fead95974a SHA1 cf245ad8bcdbe119e127242119b2b96342100035 SHA256 bffbaaf077f99f1e135fe0eff61be702c6eb138f4b4ae715cec8c5be62ee8046
-AUX respect-CFLAGS.patch 410 RMD160 9236f3e777d4b2d9510fa83ba71e8c4f4e114539 SHA1 adce86b7605e1aff654532968f8be7a199d2081e SHA256 13ba84357f79b7a779d3bbabdb4c367beeb08f7878ab8f4ca6d30ba219126349
-DIST Macaulay2-1.3.1.tar.bz2 3737431 RMD160 ce29e95d5b1b5409e368054f2edf0e5bd04d0dd3 SHA1 5a0f6b830b7a3a7cf045ac10e64ca2e3cb199600 SHA256 c07104d3a0edb70d61d3a221f7c8b0d23e0cca2d30b27127fe8ec7f763a2b4b1
-DIST factory-3-1-0.tar.gz 565374 RMD160 059ed1697f282d309e89d1cc2e0ce8bd94a8b4b3 SHA1 c41ab3cdc6ea51332169645e35c35c3fd6c4d94b SHA256 cb1768ccaaa71557ace880be0e88100bcfd420d3094ffac59d229cd852edc0ff
 DIST factory-3-1-1.tar.gz 540431 RMD160 63b5d71c93b1c0f628d758959822f61b0a9c702c SHA1 2b0e087de5ff4d4b63c003e1b6f9926577f17264 SHA256 1f86833248ef2bb5fd7820201d08df864bda2d8be58bc69255ecdca6fdf12c1b
 DIST gc-7.2alpha5-2010-09-03.tar.gz 1257818 RMD160 58954216c702add21e24eecb2225274e760faf49 SHA1 1686ccc823376e7e693cae3b3c387c2aa052154b SHA256 adba7f6663d911d4031a1a6a87de6f75d5d8f7870ad362e16f5395449911c1fa
-DIST libfac-3-1-0.tar.gz 91544 RMD160 2500d402328ad532756c677015c1d01f8594e394 SHA1 d005ddd58a180b8a91fe5728b96bde515c5d9cc5 SHA256 fc3dda08f7ec039635f8d7f1629546f4ac7620a69cf9332ca39e29dd822aee7d
 DIST libfac-3-1-1.tar.gz 90104 RMD160 8ca086ad2dc1dfbf3d8824e244f0b1af087eef62 SHA1 3753363a6f56cfeb0d0be3bdf471d6bd55c14ede SHA256 4c463af2d22375aa62be4fb1f9a32cada6723ca5e3ddbd8a4f5cab72b675e33a
-EBUILD Macaulay2-1.3.1-r4.ebuild 3324 RMD160 88b825be9a028b9c234db27f6efad59b1519998d SHA1 3a5c23abc6a87c32481b4044f0ae9078342231af SHA256 95fb8b6dd9d0a53f510379a266310d30f66a84f45983ae3ebf9428c5b2c0d377
-EBUILD Macaulay2-9999.ebuild 3762 RMD160 77bbad2d6573bd3419aef87886805c179b0f8283 SHA1 536f962e9190730e987e68ebaeb15f172817ff7e SHA256 f90a35f2f0224ee0b4f4e2fcc8d0d539f9fe0700e3ccd56de8848933a3f74cb5
-MISC ChangeLog 4161 RMD160 c8abe1e3d16ea007f8728904bcd4e68fb966e79e SHA1 c01917c957fd5d331a2cea696c257c9d1e8d3878 SHA256 21a9f09b09f9cab59369fd984f57c928beaa2faaa75f3504c8a158eb90312460
+EBUILD Macaulay2-9999.ebuild 3762 RMD160 87098eaed32eeeb5b75cd11bc7ef5668038e07c7 SHA1 15ca80b1a7942b6588f1264293f73cca7b4786d9 SHA256 5c7d3ceb12da58d7d37a98e0dc9452c9b4929ff635e1b540e1b6fd6301f39913
+MISC ChangeLog 4380 RMD160 ff5c441eb702a8b05f85b3489d925815d737a756 SHA1 2d05dd08c80f902f713262792e581548a512fd5e SHA256 8ec0b885c26c7c213ed25cbb7af479884bfd02f20db7b739f8ebccbd9b4e083f
 MISC metadata.xml 486 RMD160 0e913360cd4f3dd6b814bf44341c83005739a22b SHA1 83fb4a5ca743b184562281c8f1a5b8f722528514 SHA256 5937610a5ea0ddb9d15953121aa4f512f6ba8c2bcd35882a2dfe401f1dbddaa7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk10wcIACgkQgAnW8HDreRZGVgCeP2sFRiv+rowawlP6opysBLFt
-vHcAoLRaQhc2m3S+pZ7xKxXwg+ASUu3c
-=uaCb
+iJwEAQEIAAYFAk4W5zgACgkQQYXt1pFHaaGodwP/ayJiZ3bkjDNWIHI25i32q3ch
+NjolUy16AKwAeiNP6VsN8DjMyNar8N+oqOUnVBnC2qt/IQyUfSffUdQo+Jc+KY/z
+P9SkJC6fHBbm9yHMLKiq3VADYq9at8JBCWNJ7MKdYrXbEO/Jrli26oDhp/iwMMwO
+GRO+weeXKeDgn8pDQY0=
+=rmQB
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/Macaulay2/files/1.4-paths-of-external-programs.patch b/sci-mathematics/Macaulay2/files/1.4-paths-of-external-programs.patch
deleted file mode 100644
index 9b16e5a51..000000000
--- a/sci-mathematics/Macaulay2/files/1.4-paths-of-external-programs.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/FourTiTwo.m2 M2source.patches/Macaulay2/packages/FourTiTwo.m2
---- M2source.orig/Macaulay2/packages/FourTiTwo.m2	2010-09-19 02:32:45.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/FourTiTwo.m2	2010-09-19 02:37:25.000000000 +0200
-@@ -47,7 +47,7 @@
- 
- path'4ti2 = (options FourTiTwo).Configuration#"path"
- -- NOTE: the absolute path should be put into the .init file for 4ti2 inside the .Macaulay2 directory.
--if path'4ti2 == "" then path'4ti2 = prefixDirectory | currentLayout#"programs"
-+if path'4ti2 == "" then path'4ti2 = "/usr/bin/"
- 
- getFilename = () -> (
-      filename := temporaryFileName();
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/gfanInterface.m2 M2source.patches/Macaulay2/packages/gfanInterface.m2
---- M2source.orig/Macaulay2/packages/gfanInterface.m2	2010-09-19 02:32:45.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/gfanInterface.m2	2010-09-19 02:38:08.000000000 +0200
-@@ -26,7 +26,7 @@
-      }
- 
- gfan'path = gfanInterface#Options#Configuration#"path"
--if gfan'path == "" then gfan'path = prefixDirectory | currentLayout#"programs"
-+if gfan'path == "" then gfan'path = "/usr/bin/"
- if instance(gfan'path, String) then gfan'path = {gfan'path}
- if not instance(gfan'path,List) then error "expected configuration option gfan'path to be a list of strings or a string"
- gfan'path = join(
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Nauty.m2 M2source.patches/Macaulay2/packages/Nauty.m2
---- M2source.orig/Macaulay2/packages/Nauty.m2	2010-09-19 02:33:04.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/Nauty.m2	2010-09-19 02:40:46.000000000 +0200
-@@ -27,7 +27,8 @@
- -- Check the ~/.Macaulay2/init-Nauty.m2 file for the absolute path.
- -- If it's not there, then use the M2-Programs directory.
- nauty'path = (options Nauty).Configuration#"path";
--if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
-+if nauty'path == "" then nauty'path = "/usr/bin/";
-+
- 
- -------------------
- -- Exports
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Normaliz.m2 M2source.patches/Macaulay2/packages/Normaliz.m2
---- M2source.orig/Macaulay2/packages/Normaliz.m2	2010-09-19 02:33:04.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/Normaliz.m2	2010-09-19 02:39:12.000000000 +0200
-@@ -156,7 +156,7 @@
-         nmzExec="norm64";
-     );
- --    return nmzExec;
--    return prefixDirectory | currentLayout#"programs" | nmzExec;
-+    return "/usr/bin/" | nmzExec;
- );
- 
- 
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/StatePolytope.m2 M2source.patches/Macaulay2/packages/StatePolytope.m2
---- M2source.orig/Macaulay2/packages/StatePolytope.m2	2010-09-19 02:32:46.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/StatePolytope.m2	2010-09-19 02:38:39.000000000 +0200
-@@ -31,7 +31,7 @@
- 
- 
- gfanCommand = (options StatePolytope)#Configuration#"gfan command"
--if gfanCommand === "gfan" then gfanCommand = prefixDirectory | currentLayout#"programs" | gfanCommand
-+if gfanCommand === "gfan" then gfanCommand = "/usr/bin/" | gfanCommand
- gfanCommand = "!" | gfanCommand
- 
- --The next two functions print out the ring and the ideal in the format required by gfan
diff --git a/sci-mathematics/Macaulay2/files/respect-CFLAGS.patch b/sci-mathematics/Macaulay2/files/respect-CFLAGS.patch
deleted file mode 100644
index f774f6024..000000000
--- a/sci-mathematics/Macaulay2/files/respect-CFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.orig	2010-07-12 20:13:09.000000000 +0200
-+++ configure.ac	2010-07-12 20:13:20.000000000 +0200
-@@ -193,11 +193,6 @@
- else M2_CPPFLAGS="$M2_CPPFLAGS -DNDEBUG"
- fi
- 
--if test "$OPTIMIZE" = yes
--then CFLAGS="$CFLAGS -O3"
--     CXXFLAGS="$CFLAGS -O3"
--fi
--
- AC_PROG_CC() 			# set CFLAGS before this
- AC_SUBST(GCC)			# gets set to yes or no by AC_PROG_CC
- AC_PROG_CXX()			# set CXXFLAGS before this