revision bump, enabling emacs when requested; added some quotes

(Portage version: 2.1.2-r9)

4 files changed, 110 insertions, 43 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 5a82e6975a95..634b6c97b6b9 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,47 +1,10 @@
 # ChangeLog for sci-mathematics/Macaulay2
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.8 2007/03/02 23:14:11 markusle Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.9 2007/03/06 08:30:15 opfer Exp $
 
-  02 Mar 2007; Markus Dittrich <markusle@gentoo.org>
-  +files/Macaulay2-0.9.95-cpp-fix.patch,
-  +files/Macaulay2-0.9.95-test-fix.patch, Macaulay2-0.9.95.ebuild:
-  Fixed multiple compile issues and testing should now work.
+*Macaulay2-0.9.95-r1 (06 Mar 2007)
 
-  22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
-  Redigest for Manifest2
+  06 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/70Macaulay2-gentoo.el, +Macaulay2-0.9.95-r1.ebuild:
+  revision bump, enabling emacs when requested; added some quotes
 
-*Macaulay2-0.9.95 (12 Nov 2006)
-
-  12 Nov 2006; Markus Dittrich <markusle@gentoo.org>
-  +files/Macaulay2-0.9.95-etags-gentoo.patch, +Macaulay2-0.9.95.ebuild:
-  Version bump (see bug #128066).
-
-  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> Macaulay2-0.9.2.ebuild:
-  change dep from net-www/mozilla to www-client/mozilla
-
-  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> :
-  change dep from net-www/epiphany to www-client/epiphany
-
-  18 Mar 2005; Seemant Kulleen <seemant@gentoo.org> Macaulay2-0.9.2.ebuild:
-  epiphany and firefox are in www-client
-
-*Macaulay2-0.9.2 (28 Dec 2004)
-
-  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> +metadata.xml,
-  +files/gentoo-Macaulay2-0.9.2.diff, +files/gentoo-factory-1.3b.diff,
-  +files/gentoo-libfac-0.3.2.include.diff, +Macaulay2-0.9.2.ebuild:
-  Moved from app-sci/Macaulay2 to sci-mathematics/Macaulay2.
-
-  13 Dec 2004; Patrick Kursawe <phosphan@gentoo.org>
-  files/gentoo-Macaulay2-0.9.2.diff, files/gentoo-factory-1.3b.diff,
-  Macaulay2-0.9.2.ebuild:
-  Extending patches to get the program through gcc 3.4
-
-*Macaulay2-0.9.2 (19 May 2004)
-
-  19 May 2004; Thomas Veith <xtv@gentoo.org> Macaulay2-0.9.2.ebuild,
-metadata.xml, Manifest, files/{gentoo-factory-1.3b.diff, 
-gentoo-libfac-0.3.2.include.diff, gentoo-Macaulay2-0.9.2.diff,
-digest-Macaulay2-0.9.2} :
-  Initial import.
-  research tool for commutative algebra and algebraic geometry
diff --git a/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild b/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild
new file mode 100644
index 000000000000..f630305690b2
--- /dev/null
+++ b/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild,v 1.1 2007/03/06 08:30:15 opfer Exp $
+
+inherit elisp-common eutils flag-o-matic toolchain-funcs autotools
+
+IUSE="emacs"
+
+DESCRIPTION="research tool for commutative algebra and algebraic geometry"
+SRC_URI="http://www.math.uiuc.edu/Macaulay2/Downloads/${P}-src.tar.gz
+	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-3-0-2.tar.gz \
+	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-0-2.tar.gz"
+
+HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND="sys-libs/gdbm
+	dev-libs/gmp
+	dev-libs/ntl
+	dev-libs/boehm-gc
+	virtual/blas
+	virtual/lapack
+	dev-util/ctags
+	sys-libs/ncurses
+	emacs? ( virtual/emacs )"
+
+SITEFILE=70Macaulay2.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-etags-gentoo.patch
+	epatch "${FILESDIR}"/${P}-cpp-fix.patch
+	epatch "${FILESDIR}"/${P}-test-fix.patch
+}
+
+src_compile() {
+	cd "${WORKDIR}/factory"
+	econf --enable-NTL --prefix="${WORKDIR}" || \
+		die "failed to configure factory"
+	emake || die "failed to build factory"
+	make install || die "failed to install factory"
+
+	cd "${WORKDIR}/libfac"
+	CPPFLAGS="-I${WORKDIR}/include" ./configure --with-NOSTREAMIO \
+		--prefix="${WORKDIR}" || die "failed to configure libfac"
+	make DEFS=-DHAVE_SINGULAR_ERROR || die "failed to build libfac"
+	make install || die "failed to install libfac"
+
+	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+	cd "${S}"
+	sed -e "/^docm2RelDir/s:Macaulay2:${P}:" \
+		-i include/config.Makefile.in || \
+		die "failed to fix makefile"
+	make && CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \
+		LDFLAGS="-L${WORKDIR}/lib" \
+		./configure --prefix="${D}/usr" --disable-encap \
+		--with-lapacklibs="-llapack -lblas" || \
+		die "failed to configure Macaulay"
+	# fix install paths
+	make || die "failed to build Macaulay"
+}
+
+src_test() {
+	cd "${S}"
+	make check || die "tests failed"
+}
+
+src_install () {
+	cd "${S}"
+	make install || die "install failed"
+
+	# nothing in here, get rid of it
+	rm -fr "${D}"/usr/lib || die "failed to remove empty /usr/lib"
+
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
+
+pkg_postinstall() {
+	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
+}
\ No newline at end of file
diff --git a/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el b/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el
new file mode 100644
index 000000000000..84c0a8c8c3d0
--- /dev/null
+++ b/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el
@@ -0,0 +1,3 @@
+;; sci-mathematics/Macaulay2 init file
+
+(load "M2-init")
diff --git a/sci-mathematics/Macaulay2/files/digest-Macaulay2-0.9.95-r1 b/sci-mathematics/Macaulay2/files/digest-Macaulay2-0.9.95-r1
new file mode 100644
index 000000000000..0a31d1cb256d
--- /dev/null
+++ b/sci-mathematics/Macaulay2/files/digest-Macaulay2-0.9.95-r1
@@ -0,0 +1,9 @@
+MD5 83a7a7fbfa0bc016cc2525cc0f221694 Macaulay2-0.9.95-src.tar.gz 2875836
+RMD160 f3c5ad889e89d238ca3ede40e692bc42744861a8 Macaulay2-0.9.95-src.tar.gz 2875836
+SHA256 3fd4698d82de76a8356d24dfdba2775794231b5723ee3fda232ce2f0d1e6360a Macaulay2-0.9.95-src.tar.gz 2875836
+MD5 9b1fac924bc754339989d617946ea8c4 factory-3-0-2.tar.gz 503712
+RMD160 3cfaa7e438af75fb1c00501099c0d6c88fbfdd8b factory-3-0-2.tar.gz 503712
+SHA256 463a29232f9e187014bd53bb726cf1628f929ee830fa63d445dcc9a45403d8ed factory-3-0-2.tar.gz 503712
+MD5 d94415a24186bfd4bdb6df491a58d173 libfac-3-0-2.tar.gz 87369
+RMD160 847103ae3fcc870188630028965086c3933a2009 libfac-3-0-2.tar.gz 87369
+SHA256 3fae688d7471e137834e9f89e5677e2ded4d578942b54ce7efa536817799fa74 libfac-3-0-2.tar.gz 87369