sci-mathematics/Macaulay2-1.3.1-r1

with doc fixes.
Removed old versions

4 files changed, 9 insertions, 129 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 09d3e3a10..b5dda27f3 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+	20 Nov 2009; Thomas Kahle <tom111@gmx.de>
+	+Macaulay2-1.3.1-r1.ebuild -Macaulay2-1.3.1.ebuild -Macaulay2-1.2-r2.ebuild
+
+	Documentation cache gets installed properly.
+	removed old versions.
+
 	16 Nov 2009; Thomas Kahle <tom111@gmx.de> +Macaulay2-1.3.1.ebuild
 
 	Version bump
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.2-r2.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.2-r2.ebuild
deleted file mode 100644
index 44ccc4c4c..000000000
--- a/sci-mathematics/Macaulay2/Macaulay2-1.2-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit 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, and if possible make
-# separate ebuilds later
-
-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]
-	>=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 )"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/${P}-r8438"
-
-src_compile() {
-	cd "${WORKDIR}/factory"
-	epatch "${FILESDIR}"/patch-3.1.0b
-	econf --enable-NTL --prefix="${WORKDIR}" || \
-		die "failed to configure factory"
-	# -j1 is still necessary
-	emake -j1 || die "failed to build factory"
-	make install || die "failed to install factory"
-
-	cd "${WORKDIR}/libfac"
-	CPPFLAGS="-I${WORKDIR}/include" econf --with-NOSTREAMIO \
-		--prefix="${WORKDIR}" || die "failed to configure libfac"
-	emake || die "failed to build libfac"
-	make install || die "failed to install libfac"
-
-	# Put sourcfile in the right location:
-	mkdir "${S}/BUILD/tarfiles"
-	cp "${DISTDIR}/frobby_vmike3.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-
-	# Workaround for a problem with the doc.
-	# Upstream will fix this in 1.3
-	cd "${S}/Macaulay2/packages/Macaulay2Doc"
-	sed "/^ *SourceCode => applicationDirectory.*$/d" -i doc13.m2
-	cd "${S}"
-
-	if ! use emacs; then
-	tags="ctags"
-	fi
-
-	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
-	append-ldflags "-L${WORKDIR}/$(get_libdir)"
-	emake -j1 && CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \
-		./configure --prefix="${D}/usr" --disable-encap \
-		|| die "failed to configure Macaulay"
-
-	emake -j1 || die "failed to build Macaulay"
-}
-
-src_test() {
-	cd "${S}"
-	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.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r1.ebuild
index 3eb94698d..0c21c8e98 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.3.1.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r1.ebuild
@@ -6,13 +6,7 @@ EAPI="2"
 
 inherit autotools elisp-common eutils flag-o-matic subversion
 
-# For the time being Upstream does not provide source tarballs,
-# but realease branches in their svn
-
-# Todolist:
-# Ebuild for gfan
-# factory, libfac
-# .m2 files patchen
+# Currently upstream has no tarballs, only svn.
 
 ESVN_REPO_URI="svn://macaulay2.math.uiuc.edu/Macaulay2/release-branches/1.3.1"
 
@@ -105,12 +99,6 @@ 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}"
 }
 
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 8a526427e..2ccd6c4e5 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -6,8 +6,7 @@ DIST factory-3-1-0.tar.gz 565374 RMD160 059ed1697f282d309e89d1cc2e0ce8bd94a8b4b3
 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-r2.ebuild 3140 RMD160 4228497ba8c22038b496744c494c6ab0c808d90b SHA1 33ef56c4cbfe449e119d5b7fb1a2801421c5f30a SHA256 bfb59f0a752f4dd90ed87ade901010dc26d2fa6b5c70872638f898399072bb5c
 EBUILD Macaulay2-1.2-r3.ebuild 2974 RMD160 cabf35edad035f139fd3a19ef66162d1791fac78 SHA1 89bf3bf6ec3c756855ee38f7f746aa6bd9dc2a7a SHA256 d9ac5a514993b57af7204319330734d164303bfa0db33bd11cb2fd07e7642bdc
-EBUILD Macaulay2-1.3.1.ebuild 3133 RMD160 792f25c1c259f2c493e5598369f1d3ce9df0a146 SHA1 ea69ff71764e1545e58fb9e2845b4ddfd553cde9 SHA256 97ab0e6b498037d2017761d75c7425f3a8607c37ef7fc5936236e1079af7050a
-MISC ChangeLog 893 RMD160 8ffe81cee10a7ef8641e47aa3a17bedb6972407e SHA1 3bcdf406af5ab3c6d239fb19b08d2c0593ab3210 SHA256 43cba25774ac5c9858af20e45ab4190d144a81d3b422bf07729c00a09b22aebe
+EBUILD Macaulay2-1.3.1-r1.ebuild 2798 RMD160 d5e6392e00427507c2fd62f7365084c493792418 SHA1 c28d0d1951e0e89ea024ced509d88126a350561e SHA256 1055072b9dc8fe5aead10ba7d48c16856e36f2cdf614f8b717930f3e5988b44f
+MISC ChangeLog 1084 RMD160 39c62b2e5682aad57d871c15b753a2ece6db3dab SHA1 951090596478c95b213ab7a08433c449b77e71dd SHA256 498f44dc9592a3151c600c75bbf7de7713521e8305b54f034f764c3318c66808
 MISC metadata.xml 361 RMD160 273db3a009b85938f85e60ea0d34d6fc625f9477 SHA1 7f6e903d81af55b08c7dbb9feb4f7ad39852a23e SHA256 71a0f19b08b1e752e754bbc5faf15880601d00c5b9df2bc5ca5a3b8e93e83b7f