diff options
author | Thomas Kahle <tom111@gmx.de> | 2010-09-19 03:18:28 +0200 |
---|---|---|
committer | Thomas Kahle <tom111@gmx.de> | 2010-09-19 03:19:00 +0200 |
commit | 3d74bc4f2f5af6a3f8e9fd2e11d53b37d58f6e3c (patch) | |
tree | a4ff5ffdcf6fd41ff2cb8a0a1b0466d9ffe436d2 /sci-mathematics/Macaulay2 | |
parent | One more parallel make fix for singular. Hopefully the last one. (diff) | |
download | sci-3d74bc4f2f5af6a3f8e9fd2e11d53b37d58f6e3c.tar.gz sci-3d74bc4f2f5af6a3f8e9fd2e11d53b37d58f6e3c.tar.bz2 sci-3d74bc4f2f5af6a3f8e9fd2e11d53b37d58f6e3c.zip |
sci-math/Macaulay2 live ebuild
Diffstat (limited to 'sci-mathematics/Macaulay2')
-rw-r--r-- | sci-mathematics/Macaulay2/ChangeLog | 6 | ||||
-rw-r--r-- | sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 144 | ||||
-rw-r--r-- | sci-mathematics/Macaulay2/Manifest | 8 | ||||
-rw-r--r-- | sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch | 61 |
4 files changed, 218 insertions, 1 deletions
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog index a61965017..7d512316e 100644 --- a/sci-mathematics/Macaulay2/ChangeLog +++ b/sci-mathematics/Macaulay2/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*Macaulay2-9999 (19 Sep 2010) + + 19 Sep 2010; Thomas Kahle <tom111@gmx.de> + +files/9999-paths-of-external-programs.patch, +Macaulay2-9999.ebuild: + live ebuild added + 16 Sep 2010; Thomas Kahle <tom111@gmx.de> Macaulay2-1.3.1-r4.ebuild: Dep of normalized adjusted, won't work with latest version. diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild new file mode 100644 index 000000000..271395f8f --- /dev/null +++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit autotools elisp-common eutils subversion + +IUSE="emacs optimization" + +ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2" + +DESCRIPTION="research tool for commutative algebra and algebraic geometry" +SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/" +SRC_URI="${SRC_BASE}/OtherSourceCode/1.3/factory-3-1-1.tar.gz + ${SRC_BASE}/OtherSourceCode/1.3/libfac-3-1-1.tar.gz + http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha5-2010-09-03.tar.gz + ${SRC_BASE}/OtherSourceCode/1.4/lrslib-042c.tar.gz" + +HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="" + +DEPEND="sys-libs/gdbm + >=dev-libs/ntl-5.5.2 + >=sci-mathematics/pari-2.3.4[gmp] + >=sys-libs/readline-6.1 + dev-libs/libxml2 + sci-mathematics/frobby + sci-mathematics/4ti2 + sci-mathematics/nauty + >=sci-mathematics/normaliz-2.5 + sci-mathematics/gfan + >=dev-libs/mpfr-3.0.0 + >=sci-libs/mpir-2.1.1[cxx] + sci-libs/cddlib + 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}"/${PV}-paths-of-external-programs.patch + + # This is now a configure option: +# 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-1.tar.gz" "${S}/BUILD/tarfiles/" \ + || die "copy failed" + cp "${DISTDIR}/libfac-3-1-1.tar.gz" "${S}/BUILD/tarfiles/" \ + || die "copy failed" + cp "${DISTDIR}/gc-7.2alpha5-2010-09-03.tar.gz" "${S}/BUILD/tarfiles/" \ + || die "copy failed" + cp "${DISTDIR}/lrslib-042c.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 \ + $(use_enable optimization optimize) \ + --enable-build-libraries="factory libfac" \ + --with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus" \ + || 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/Manifest b/sci-mathematics/Macaulay2/Manifest index 73ea5d3e5..71637eef3 100644 --- a/sci-mathematics/Macaulay2/Manifest +++ b/sci-mathematics/Macaulay2/Manifest @@ -1,10 +1,16 @@ AUX 70Macaulay2-gentoo.el 597 RMD160 bdf3a30bb4d15a77e0dff86c866134d06c443fa0 SHA1 d4a4036042ab13bc20d8be90b559e9168bfc0ef5 SHA256 e5583d11e6ab662261abb32e90fcf31ccf6bd56f2b23b691b9255d1b8d8acb2f +AUX 9999-paths-of-external-programs.patch 3170 RMD160 8ad9f330e761b3b13aa4b5864fc22938967f9775 SHA1 a515a63de6fd26553e04c669a634917a2c236ecd SHA256 1c42e806965d8ebd7e3196e2bb8750ea0bd492797e07450fb43cf45acb92c45b 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 +DIST lrslib-042c.tar.gz 168765 RMD160 ada5b8b74808edb78c250d62147489381babdf49 SHA1 5614ea18725aa6a00f3deeb61d096f9e3564d753 SHA256 53f99b5271397bb5f317c96fa365edc1ac71fa7cba0295c8bd79e0882f5c3a4a EBUILD Macaulay2-1.3.1-r3.ebuild 2651 RMD160 ca4332c7ccbffd35ea516f968a77dfbc01e9c8eb SHA1 0551b9803cff0ff7993e4ca90d70b12eec628f6c SHA256 6f957b390ffadf97dce4c91ba30376cca016be8c3d93dedc83e4be23a2a96e92 EBUILD Macaulay2-1.3.1-r4.ebuild 3323 RMD160 685a9e92768a913984f4b75e47bebac2c988d9ac SHA1 0247845b210eeb7b4f2e92764a99ca88b570e16e SHA256 07baf8dfcdc3ed2cf92db4f0a2530a3f63269452eab42c7d128f13c23ecf5d04 -MISC ChangeLog 2574 RMD160 2189b96353977d78cf047b6a50753ebd56e13f81 SHA1 66d6477484aa62268966fb42cdc898c8f070c21b SHA256 be3d2d2692bf92b05138792b7784edd3da27e567dd7c666d176002164f94ade4 +EBUILD Macaulay2-9999.ebuild 3727 RMD160 ab596ff5a440d21c9e64acab075606e0f1da0d9f SHA1 2b4b3ad3877134f2c64df82d981b132ebbd1c472 SHA256 6a74b4026079f160323618d335c04baa2e339c41834b819d2b64c89d9af649c5 +MISC ChangeLog 2742 RMD160 3117d6906fa0d56978486b381811f7c07b36d782 SHA1 19849820f8087fe00cf3f35e35e18c48a15aa30c SHA256 3a69fb094718d3df2578f5409187d6cf97bd32940c7c514d39f1bec23ff303e8 MISC metadata.xml 486 RMD160 0e913360cd4f3dd6b814bf44341c83005739a22b SHA1 83fb4a5ca743b184562281c8f1a5b8f722528514 SHA256 5937610a5ea0ddb9d15953121aa4f512f6ba8c2bcd35882a2dfe401f1dbddaa7 diff --git a/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch b/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch new file mode 100644 index 000000000..34376c19b --- /dev/null +++ b/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch @@ -0,0 +1,61 @@ +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 |