This revision includes a cleaned up ebuild which now properly builds on amd64 (see bug #179700).

Package-Manager: portage-2.1.2.7

4 files changed, 121 insertions, 5 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index bc9378dee455..6f6e1bd36545 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/Macaulay2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.13 2007/05/25 17:33:43 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.14 2007/05/30 13:25:07 markusle Exp $
+
+*Macaulay2-0.9.95-r2 (30 May 2007)
+
+  30 May 2007; Markus Dittrich <markusle@gentoo.org>
+  +Macaulay2-0.9.95-r2.ebuild:
+  This revision includes a cleaned up ebuild which now properly
+  builds on amd64 (see bug #179700).
 
   25 May 2007; Markus Dittrich <markusle@gentoo.org>
   Macaulay2-0.9.95-r1.ebuild:
diff --git a/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild b/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild
new file mode 100644
index 000000000000..d63768cea7b8
--- /dev/null
+++ b/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r2.ebuild
@@ -0,0 +1,93 @@
+# 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-r2.ebuild,v 1.1 2007/05/30 13:25:07 markusle 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-gentoo.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" econf --with-NOSTREAMIO \
+		--prefix="${WORKDIR}" || die "failed to configure libfac"
+	emake 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"
+	emake -j1 && CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \
+		LDFLAGS="-L${WORKDIR}/$(get_libdir)" \
+		./configure --prefix="${D}/usr" --disable-encap \
+		--with-lapacklibs="-llapack -lblas" || \
+		die "failed to configure Macaulay"
+	# fix install paths
+	emake -j1 || 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/$(get_libdir) || \
+		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/Manifest b/sci-mathematics/Macaulay2/Manifest
index b913c57ba3b6..0cad52bbc09c 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -40,14 +40,18 @@ EBUILD Macaulay2-0.9.95-r1.ebuild 2617 RMD160 9e4d56cd374214f2cd94b5695550a43c17
 MD5 3560aaa4a51808384b87106774721697 Macaulay2-0.9.95-r1.ebuild 2617
 RMD160 9e4d56cd374214f2cd94b5695550a43c17adfa9d Macaulay2-0.9.95-r1.ebuild 2617
 SHA256 ab404a32725e67cf50341bc9b72991e60a28ec22bfec9ce6b2a43a52138d033a Macaulay2-0.9.95-r1.ebuild 2617
+EBUILD Macaulay2-0.9.95-r2.ebuild 2623 RMD160 621cf872d41a7220a8a6614cad4b02ab98d59aed SHA1 d4f1635f615dbc1bd3ee1dda11d3b634c20a8449 SHA256 689b566857c930a1ea09d4c702f27091f48612839966dbb243de1f33963ea283
+MD5 2748242586c580510aee739bdbfe84c5 Macaulay2-0.9.95-r2.ebuild 2623
+RMD160 621cf872d41a7220a8a6614cad4b02ab98d59aed Macaulay2-0.9.95-r2.ebuild 2623
+SHA256 689b566857c930a1ea09d4c702f27091f48612839966dbb243de1f33963ea283 Macaulay2-0.9.95-r2.ebuild 2623
 EBUILD Macaulay2-0.9.95.ebuild 2147 RMD160 ed39d7fca6ecfdccb9d810b3b81a24e17f0752f6 SHA1 b4db99dfd1c098f1132042c99c7c575f1844c0e2 SHA256 9df93e965de641124ad4973003f545f99d6be221b2ff1781a0154acd6c8bbd13
 MD5 7c2cdfaf8b22d7ed13b94f7a84d6a8ec Macaulay2-0.9.95.ebuild 2147
 RMD160 ed39d7fca6ecfdccb9d810b3b81a24e17f0752f6 Macaulay2-0.9.95.ebuild 2147
 SHA256 9df93e965de641124ad4973003f545f99d6be221b2ff1781a0154acd6c8bbd13 Macaulay2-0.9.95.ebuild 2147
-MISC ChangeLog 966 RMD160 a6cbcd646b6c72797743806c0a2ce79523ec740c SHA1 315b0a3564495355212a390c1223f26538745c72 SHA256 6885b96a6ed38a3d5bdb8fb292d18ba2ac9caea993a116bad4953ca55f6a67bf
-MD5 3fdcffd0c91974afcbaee395c7208755 ChangeLog 966
-RMD160 a6cbcd646b6c72797743806c0a2ce79523ec740c ChangeLog 966
-SHA256 6885b96a6ed38a3d5bdb8fb292d18ba2ac9caea993a116bad4953ca55f6a67bf ChangeLog 966
+MISC ChangeLog 1188 RMD160 2bdadeff2bc127cdb10317c51a0aa01f41c0baaa SHA1 99be66596c777204da2eddd2f4f9603cdf53f37a SHA256 4d9364e90e7e7beec655dec18d4eae71b9c121ad0a3a35a3cb5d7d9fa052c568
+MD5 2efdc2ec4ab147ba0b753abe41bee035 ChangeLog 1188
+RMD160 2bdadeff2bc127cdb10317c51a0aa01f41c0baaa ChangeLog 1188
+SHA256 4d9364e90e7e7beec655dec18d4eae71b9c121ad0a3a35a3cb5d7d9fa052c568 ChangeLog 1188
 MISC metadata.xml 467 RMD160 55a9d3716d9efee869202e289dbae72403a6dd1b SHA1 0e5160029c89907b18624b95285472007542f52b SHA256 3f550d75544118b43295756f3246bc13f7f7505ae1c864bbad1eab6c98bc95d4
 MD5 4cee2e2e6dc692ef8144c0d26792fddc metadata.xml 467
 RMD160 55a9d3716d9efee869202e289dbae72403a6dd1b metadata.xml 467
@@ -61,3 +65,6 @@ SHA256 a117e6bf87ddc01227f74d12b4661d317e08a70003fca67e50120b4346c9bea6 files/di
 MD5 cd82649f0bc2d6a6a4fed7e99b4793ea files/digest-Macaulay2-0.9.95-r1 741
 RMD160 3a82694908cc80cbead7ccfd1e469add1481f564 files/digest-Macaulay2-0.9.95-r1 741
 SHA256 a117e6bf87ddc01227f74d12b4661d317e08a70003fca67e50120b4346c9bea6 files/digest-Macaulay2-0.9.95-r1 741
+MD5 cd82649f0bc2d6a6a4fed7e99b4793ea files/digest-Macaulay2-0.9.95-r2 741
+RMD160 3a82694908cc80cbead7ccfd1e469add1481f564 files/digest-Macaulay2-0.9.95-r2 741
+SHA256 a117e6bf87ddc01227f74d12b4661d317e08a70003fca67e50120b4346c9bea6 files/digest-Macaulay2-0.9.95-r2 741
diff --git a/sci-mathematics/Macaulay2/files/digest-Macaulay2-0.9.95-r2 b/sci-mathematics/Macaulay2/files/digest-Macaulay2-0.9.95-r2
new file mode 100644
index 000000000000..0a31d1cb256d
--- /dev/null
+++ b/sci-mathematics/Macaulay2/files/digest-Macaulay2-0.9.95-r2
@@ -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