* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2011-02-26 6:51 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2011-02-26 6:51 UTC (permalink / raw
To: gentoo-commits
commit: f25808fc0d5097d0181544289eb38af6d00447a3
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 06:52:13 2011 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Sat Feb 26 06:52:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f25808fc
Live ebuild updated
(Portage version: 2.1.9.41/git/Linux i686, signed Manifest commit with key 0x914769A1)
---
sci-mathematics/Macaulay2/ChangeLog | 5 ++-
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 36 +++++++---------------
2 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 107a4ca..1e0b146 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-mathematics/Macaulay2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 26 Feb 2011; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Live ebuild updated
+
12 Nov 2010; Thomas Kahle <tomka@gentoo.org>
-files/1.4_pre-paths-of-external-programs.patch,
-Macaulay2-1.3.1-r3.ebuild, -Macaulay2-1.4_pre.ebuild,
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 80ce6b0..3798d86 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
-inherit autotools elisp-common eutils subversion
+inherit autotools elisp-common eutils flag-o-matic subversion
IUSE="emacs optimization"
@@ -53,6 +53,7 @@ RESTRICT="mirror"
pkg_setup () {
tc-export CC CPP CXX
+ append-cppflags "-I/usr/include/frobby"
}
src_prepare() {
@@ -60,31 +61,19 @@ src_prepare() {
# /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
-
-## fixed in trunk as of 09/28/10
-# # The Posets-Package refers to a non-existent Graphs package.
-# # We dump it for now.
-# rm "${S}"/Macaulay2/packages/Posets.m2
-# sed -i "/ Posets/d" "${S}"/configure.ac
-# sed -i "/Posets/d" "${S}"/Macaulay2/packages/Macaulay2Doc/changes.m2
-
# 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.
- # Macaulay 2 in this version insists on a snapshot of boehm-gc that is not available elsewhere
- # We will let it build its internal version for now.
+ # 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
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"
+ # Macaulay 2 in this version insists on a snapshot of boehm-gc that is not available elsewhere
+ # We will let it build its internal version until >=boehm-gc-7.2_alpha5 is in in tree. Note:
+ # The resulting QA warning is known.
cp "${DISTDIR}/gc-7.2alpha5-2010-09-03.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
@@ -92,19 +81,18 @@ src_prepare() {
}
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" \
+ # configure instead of econf to enable install with --prefix
+ ./configure --prefix="${D}/usr" \
--disable-encap \
--disable-strip \
$(use_enable optimization optimize) \
- --enable-build-libraries="factory libfac" \
+ --enable-build-libraries="factory gc libfac" \
--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
|| die "failed to configure Macaulay"
}
@@ -129,7 +117,6 @@ src_install () {
# 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"
@@ -146,6 +133,7 @@ pkg_postinst() {
elog "in order to set it to F12 (or choose a different one)."
fi
}
+
pkg_postrm() {
use emacs && elisp-site-regen
}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2011-03-07 12:01 Justin Lecher
0 siblings, 0 replies; 28+ messages in thread
From: Justin Lecher @ 2011-03-07 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 1b69819f76376d794d9908ceafb10f65a8fa9290
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 7 11:30:10 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 11:30:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1b69819f
Correct Slots for gtk 3 introduction to tree
(Portage version: 2.2.0_alpha26/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
sci-mathematics/Macaulay2/ChangeLog | 4 +++
.../Macaulay2/Macaulay2-1.3.1-r4.ebuild | 21 ++++++++++---------
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 10 ++++----
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 1e0b146..1b3395e 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 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
+
26 Feb 2011; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Live ebuild updated
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild
index e8fe720..6df19f4 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,27 +6,28 @@ EAPI="2"
inherit autotools elisp-common eutils
-IUSE="emacs optimization"
-
MY_REV="r10737"
-DESCRIPTION="research tool for commutative algebra and algebraic geometry"
-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"
+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
+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
+ dev-libs/libxml2:2
sci-mathematics/frobby
sci-mathematics/4ti2
<sci-mathematics/normaliz-2.5
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 3798d86..fd77a71 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -10,23 +10,23 @@ IUSE="emacs optimization"
ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
-DESCRIPTION="research tool for commutative algebra and algebraic geometry"
+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}/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"
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-
SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""
-DEPEND="sys-libs/gdbm
+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
+ dev-libs/libxml2:2
sci-mathematics/frobby
sci-mathematics/4ti2
sci-mathematics/nauty
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2011-08-09 11:46 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2011-08-09 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 4548831f683bef8d9da94113f8a39c4fddbb371a
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 9 11:46:16 2011 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Tue Aug 9 11:46:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4548831f
adjusting boehm-gc source file
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 80813e5..e3e7937 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 09 Aug 2011; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ adjusting boehm-gc source file
+
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:
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 67c914a..1ea1cde 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
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"
+ http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha7-2011-07-25.tar.gz"
SLOT="0"
LICENSE="GPL-2"
@@ -71,10 +71,10 @@ src_prepare() {
|| die "copy failed"
cp "${DISTDIR}/libfac-3-1-1.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
- # Macaulay 2 in this version insists on a snapshot of boehm-gc that is not available elsewhere
- # We will let it build its internal version until >=boehm-gc-7.2_alpha5 is in in tree. Note:
+ # Macaulay 2 insists on a snapshot of boehm-gc that is not available elsewhere
+ # We will let it build its internal version for now. Note:
# The resulting QA warning is known.
- cp "${DISTDIR}/gc-7.2alpha5-2010-09-03.tar.gz" "${S}/BUILD/tarfiles/" \
+ cp "${DISTDIR}/gc-7.2alpha7-2011-07-25.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
eautoreconf
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2011-09-25 7:27 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2011-09-25 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 8b299782687f610304db15758edd2638d6e58813
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 18:30:38 2011 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Sun Sep 25 07:27:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8b299782
Fix tests better
---
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 1ea1cde..e4aa03c 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -108,7 +108,9 @@ src_compile() {
}
src_test() {
- emake check || die "tests failed"
+ # No parallel tests yet & Need to increase the time
+ # limit for long running tests in Schubert2 to pass
+ emake TLIMIT=550 -j1 check || die "tests failed"
}
src_install () {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-03-01 16:33 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-03-01 16:33 UTC (permalink / raw
To: gentoo-commits
commit: ec4d0cbf48fd6686e20d99708da842f1b9148935
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 1 16:32:43 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Thu Mar 1 16:33:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ec4d0cbf
Update deps in M2 live ebuild
---
sci-mathematics/Macaulay2/ChangeLog | 5 ++++-
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 21 ++++++++++++++-------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index ab9d8e8..069f906 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-mathematics/Macaulay2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 01 Mar 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Update deps in M2-live ebuild
+
25 Sep 2011; Thomas Kahle <tomka@gentoo.org>
files/9999-paths-of-external-programs.patch, Macaulay2-9999.ebuild:
Fix live ebuild
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index e313f60..6839fc3 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -10,12 +10,17 @@ IUSE="emacs optimization"
ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
+BOEHM_GC="gc-7.3alpha1.2012.01.23"
+FACTORY="factory-3-1-4"
+LIBFAC="libfac-3-1-4"
+
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="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-1-3.tar.gz
- ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-3-1-3.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha7-2011-07-25.tar.gz"
+SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${FACTORY}.tar.gz
+ ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
+ ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${LIBFAC}.tar.gz
+ http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
@@ -67,14 +72,16 @@ src_prepare() {
# 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
mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed"
- cp "${DISTDIR}/factory-3-1-3.tar.gz" "${S}/BUILD/tarfiles/" \
+ cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
+ || die "copy failed"
+ cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
- cp "${DISTDIR}/libfac-3-1-3.tar.gz" "${S}/BUILD/tarfiles/" \
+ cp "${DISTDIR}/${LIBFAC}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
# Macaulay 2 insists on a snapshot of boehm-gc that is not available elsewhere
# We will let it build its internal version for now. Note:
# The resulting QA warning is known.
- cp "${DISTDIR}/gc-7.2alpha7-2011-07-25.tar.gz" "${S}/BUILD/tarfiles/" \
+ cp "${DISTDIR}/${BOEHM_GC}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
eautoreconf
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-05-02 16:15 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-05-02 16:15 UTC (permalink / raw
To: gentoo-commits
commit: e5ec811456ef12e63e5368df91c90454044f57cb
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Wed May 2 16:15:01 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Wed May 2 16:15:08 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e5ec8114
Fix live ebuild
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 069f906..f82041a 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 May 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Fix live ebuild
+
01 Mar 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Update deps in M2-live ebuild
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 6839fc3..f8414ab 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -11,16 +11,18 @@ IUSE="emacs optimization"
ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
BOEHM_GC="gc-7.3alpha1.2012.01.23"
-FACTORY="factory-3-1-4"
+FACTORY="factory-3-1-4-1"
LIBFAC="libfac-3-1-4"
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="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${FACTORY}.tar.gz
+SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
- ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${LIBFAC}.tar.gz
+ http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz"
+# Somebody changed the tarball after release... grrr.
+# ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
SLOT="0"
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-07-30 12:39 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-07-30 12:39 UTC (permalink / raw
To: gentoo-commits
commit: 136173a1696b90886f9399dbcd3f469b4498455f
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 30 12:39:26 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Mon Jul 30 12:39:42 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=136173a1
Update live ebuild
---
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index f8414ab..49cab70 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -10,7 +10,10 @@ IUSE="emacs optimization"
ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
+# Those packages will be built internally, Macaulay2 always wants the
+# latest and greatest
BOEHM_GC="gc-7.3alpha1.2012.01.23"
+GCLIBATOMIC_OPS="gc-libatomic_ops-7.3alpha2"
FACTORY="factory-3-1-4-1"
LIBFAC="libfac-3-1-4"
@@ -20,7 +23,8 @@ SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz"
+ http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz
+ http://www.math.uiuc.edu/Macaulay2/Extra/${GCLIBATOMIC_OPS}.tar.gz"
# Somebody changed the tarball after release... grrr.
# ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
@@ -85,6 +89,8 @@ src_prepare() {
# The resulting QA warning is known.
cp "${DISTDIR}/${BOEHM_GC}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
+ cp "${DISTDIR}/${GCLIBATOMIC_OPS}.tar.gz" "${S}/BUILD/tarfiles/" \
+ || die "copy failed"
eautoreconf
}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-08-06 7:23 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-08-06 7:23 UTC (permalink / raw
To: gentoo-commits
commit: c39c7ec80776e3d0091f77a540c574f8b9c0202d
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 6 07:23:29 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Mon Aug 6 07:23:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c39c7ec8
Update live dependencies
(Portage version: 2.1.11.9/git/Linux x86_64, unsigned Manifest commit)
---
sci-mathematics/Macaulay2/ChangeLog | 4 +++-
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 19 +++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index f82041a..0cd176d 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 Aug 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Update live dependencies
+
02 May 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Fix live ebuild
@@ -137,4 +140,3 @@
+metadata.xml +files/70Macaulay2-gentoo.el +files/patch-3.1.0b
Intial import (Bug #246095)
-
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 49cab70..0ef50e6 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -11,9 +11,9 @@ IUSE="emacs optimization"
ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
# Those packages will be built internally, Macaulay2 always wants the
-# latest and greatest
-BOEHM_GC="gc-7.3alpha1.2012.01.23"
+# latest and greatest (mostly git snapshots)
GCLIBATOMIC_OPS="gc-libatomic_ops-7.3alpha2"
+GC="gc-20120729"
FACTORY="factory-3-1-4-1"
LIBFAC="libfac-3-1-4"
@@ -23,10 +23,8 @@ SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz
+ http://www.math.uiuc.edu/Macaulay2/Extra/${GC}.tar.gz
http://www.math.uiuc.edu/Macaulay2/Extra/${GCLIBATOMIC_OPS}.tar.gz"
-# Somebody changed the tarball after release... grrr.
-# ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
SLOT="0"
LICENSE="GPL-2"
@@ -84,10 +82,10 @@ src_prepare() {
|| die "copy failed"
cp "${DISTDIR}/${LIBFAC}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
- # Macaulay 2 insists on a snapshot of boehm-gc that is not available elsewhere
- # We will let it build its internal version for now. Note:
- # The resulting QA warning is known.
- cp "${DISTDIR}/${BOEHM_GC}.tar.gz" "${S}/BUILD/tarfiles/" \
+ # Macaulay 2 insists on a git snapshot of gc We will let it build
+ # its internal version for now. Note: The resulting QA warning is
+ # known.
+ cp "${DISTDIR}/${GC}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
cp "${DISTDIR}/${GCLIBATOMIC_OPS}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
@@ -114,7 +112,8 @@ src_configure (){
src_compile() {
# Parallel build not supported yet
- emake -j1 || die "failed to build Macaulay"
+ # For trunk builds, let's ignore example errors
+ emake IgnoreExampleErrors=true -j1 || die "failed to build Macaulay"
if use emacs; then
cd "${S}/Macaulay2/emacs"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-08-19 9:17 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-08-19 9:17 UTC (permalink / raw
To: gentoo-commits
commit: eaadb67f97fbecd4e23e5b177c82c2c7e9e99b4e
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 19 09:16:37 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Sun Aug 19 09:16:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=eaadb67f
update to EAPI=4, cosmetics, deps
(Portage version: 2.1.11.10/git/Linux x86_64, unsigned Manifest commit)
---
sci-mathematics/Macaulay2/ChangeLog | 3 ++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 36 ++++++++++------------
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 0cd176d..16e439c 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Aug 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ update to EAPI=4, cosmetics, deps
+
06 Aug 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Update live dependencies
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 0ef50e6..6e7dfc1 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI=4
inherit autotools elisp-common eutils flag-o-matic subversion
@@ -10,10 +10,7 @@ IUSE="emacs optimization"
ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
-# Those packages will be built internally, Macaulay2 always wants the
-# latest and greatest (mostly git snapshots)
-GCLIBATOMIC_OPS="gc-libatomic_ops-7.3alpha2"
-GC="gc-20120729"
+# Those packages will be built internally.
FACTORY="factory-3-1-4-1"
LIBFAC="libfac-3-1-4"
@@ -23,8 +20,7 @@ SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Extra/${GC}.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Extra/${GCLIBATOMIC_OPS}.tar.gz"
+ http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz"
SLOT="0"
LICENSE="GPL-2"
@@ -51,6 +47,7 @@ DEPEND="
dev-util/ctags
sys-libs/ncurses
sys-process/time
+ >dev-libs/boehm-gc-7.1
emacs? ( virtual/emacs )"
RDEPEND="${DEPEND}"
@@ -82,12 +79,10 @@ src_prepare() {
|| die "copy failed"
cp "${DISTDIR}/${LIBFAC}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
- # Macaulay 2 insists on a git snapshot of gc We will let it build
- # its internal version for now. Note: The resulting QA warning is
- # known.
- cp "${DISTDIR}/${GC}.tar.gz" "${S}/BUILD/tarfiles/" \
- || die "copy failed"
- cp "${DISTDIR}/${GCLIBATOMIC_OPS}.tar.gz" "${S}/BUILD/tarfiles/" \
+ # Macaulay2 developers want that gtest is built internally because
+ # the documentation says it may fail if build with options not the
+ # same as the tested program.
+ cp "${DISTDIR}/gtest-1.6.0.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
eautoreconf
@@ -105,38 +100,39 @@ src_configure (){
--disable-encap \
--disable-strip \
$(use_enable optimization optimize) \
- --enable-build-libraries="factory gc libfac" \
+ --enable-build-libraries="factory libfac" \
--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
|| die "failed to configure Macaulay"
}
src_compile() {
# Parallel build not supported yet
- # For trunk builds, let's ignore example errors
- emake IgnoreExampleErrors=true -j1 || die "failed to build Macaulay"
+ # emake -j1
+ # For trunk builds we may wish to ignore example errors
+ emake IgnoreExampleErrors=true -j1
if use emacs; then
cd "${S}/Macaulay2/emacs"
- elisp-compile *.el || die "elisp-compile failed"
+ elisp-compile *.el
fi
}
src_test() {
# No parallel tests yet & Need to increase the time
# limit for long running tests in Schubert2 to pass
- emake TLIMIT=550 -j1 check || die "tests failed"
+ emake TLIMIT=550 -j1 check
}
src_install () {
# Parallel install not supported yet
- emake -j1 install || die "install failed"
+ emake -j1 install
# 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-install ${PN} *.elc *.el
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-10-12 0:16 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-10-12 0:16 UTC (permalink / raw
To: gentoo-commits
commit: 66b887a792880f4bdc624f74b74daf7893ef2113
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 12 00:16:30 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Fri Oct 12 00:16:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=66b887a7
improve live ebuild
(Portage version: 2.1.11.25/git/Linux x86_64)
---
sci-mathematics/Macaulay2/ChangeLog | 4 ++++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 2 ++
sci-mathematics/Macaulay2/metadata.xml | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 16e439c..597b087 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Oct 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild,
+ metadata.xml:
+ improve live ebuild
+
19 Aug 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
update to EAPI=4, cosmetics, deps
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 6e7dfc1..56001b2 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -60,6 +60,8 @@ RESTRICT="mirror"
pkg_setup () {
tc-export CC CPP CXX
append-cppflags "-I/usr/include/frobby"
+ # gtest needs python:2
+ python_set_active_version 2
}
src_prepare() {
diff --git a/sci-mathematics/Macaulay2/metadata.xml b/sci-mathematics/Macaulay2/metadata.xml
index bef9557..575e757 100644
--- a/sci-mathematics/Macaulay2/metadata.xml
+++ b/sci-mathematics/Macaulay2/metadata.xml
@@ -7,7 +7,7 @@
<name>Thomas Kahle</name>
</maintainer>
<use>
- <flag name="optimization">Accept upstream's choices for -O option, i.e. -O3 almost everywhere.</flag>
+ <flag name="optimization">Disable to build with -O0 for debugging.</flag>
</use>
<longdescription lang="en">
Macaulay2 is a research tool for algraic geometry and commutative
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-10-12 21:36 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-10-12 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 75bb58a4766e467e83339d505e026ee58f175325
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 12 21:34:31 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Fri Oct 12 21:36:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=75bb58a4
Fix deps of live ebuild
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 597b087..a8de11c 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Oct 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Fix deps of live ebuild
+
12 Oct 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild,
metadata.xml:
improve live ebuild
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 56001b2..67c1fee 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -48,6 +48,7 @@ DEPEND="
sys-libs/ncurses
sys-process/time
>dev-libs/boehm-gc-7.1
+ dev-libs/libatomic_ops
emacs? ( virtual/emacs )"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-10-12 22:08 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-10-12 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 851355a6681601bd967ad5b263c57c35fa5e10ca
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 12 22:08:37 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Fri Oct 12 22:08:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=851355a6
bump boehm-gc, fix python
(Portage version: 2.1.11.26/git/Linux x86_64)
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index a8de11c..d5348f6 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -3,6 +3,9 @@
# $Header: $
12 Oct 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ bump boehm-gc, fix python
+
+ 12 Oct 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Fix deps of live ebuild
12 Oct 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild,
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 67c1fee..20a80b2 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-inherit autotools elisp-common eutils flag-o-matic subversion
+inherit autotools elisp-common eutils flag-o-matic python subversion
IUSE="emacs optimization"
@@ -47,7 +47,7 @@ DEPEND="
dev-util/ctags
sys-libs/ncurses
sys-process/time
- >dev-libs/boehm-gc-7.1
+ >=dev-libs/boehm-gc-7.2_alpha6
dev-libs/libatomic_ops
emacs? ( virtual/emacs )"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-10-24 19:23 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-10-24 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 90f9112aaf15b751b7a7da0696f46e00ed88382a
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 19:23:11 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Wed Oct 24 19:23:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=90f9112a
Update M2 live ebuild
Package-Manager: portage-2.1.11.30
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 21 +++++++++++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index d5348f6..14895a0 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Oct 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Update M2 live ebuild
+
12 Oct 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
bump boehm-gc, fix python
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 20a80b2..a9ae846 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
inherit autotools elisp-common eutils flag-o-matic python subversion
-IUSE="emacs optimization"
+IUSE="debug emacs optimization"
ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
@@ -20,12 +20,18 @@ SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
+ http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/mpfr-3.0.1.tar.gz
http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""
+# Macaulay2 is broken with >=mpfr-3.1, to not force a downgrade on users
+# we let it built an internal copy :(
+# This dep was removed:
+# >=dev-libs/mpfr-3.0.0
+
DEPEND="
sys-libs/gdbm
>=dev-libs/ntl-5.5.2
@@ -37,7 +43,6 @@ DEPEND="
sci-mathematics/nauty
>=sci-mathematics/normaliz-2.7
sci-mathematics/gfan
- >=dev-libs/mpfr-3.0.0
>=sci-libs/mpir-2.1.1[cxx]
sci-libs/cdd+
sci-libs/cddlib
@@ -47,7 +52,7 @@ DEPEND="
dev-util/ctags
sys-libs/ncurses
sys-process/time
- >=dev-libs/boehm-gc-7.2_alpha6
+ >=dev-libs/boehm-gc-7.2_alpha6[threads]
dev-libs/libatomic_ops
emacs? ( virtual/emacs )"
RDEPEND="${DEPEND}"
@@ -87,6 +92,9 @@ src_prepare() {
# same as the tested program.
cp "${DISTDIR}/gtest-1.6.0.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
+ # Temporary internal build of mpfr-3.0:
+ cp "${DISTDIR}/mpfr-3.0.1.tar.gz" "${S}/BUILD/tarfiles/" \
+ || die "copy failed"
eautoreconf
}
@@ -103,16 +111,17 @@ src_configure (){
--disable-encap \
--disable-strip \
$(use_enable optimization optimize) \
- --enable-build-libraries="factory libfac" \
+ $(use_enable debug) \
+ --enable-build-libraries="factory libfac mpfr" \
--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
|| die "failed to configure Macaulay"
}
src_compile() {
# Parallel build not supported yet
- # emake -j1
+ emake -j1
# For trunk builds we may wish to ignore example errors
- emake IgnoreExampleErrors=true -j1
+ # emake IgnoreExampleErrors=true -j1
if use emacs; then
cd "${S}/Macaulay2/emacs"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2012-11-13 2:24 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2012-11-13 2:24 UTC (permalink / raw
To: gentoo-commits
commit: 32beca628f4f65b13fbd4a7de9126abab84bdf84
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 02:24:36 2012 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Tue Nov 13 02:24:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=32beca62
Update live ebuild for latest Normaliz
---
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 72b4584..a2b1127 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -16,12 +16,13 @@ LIBFAC="libfac-3-1-4"
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="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/mpfr-3.0.1.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz"
+ http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz
+ http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"
+# Need normaliz for an up to date normaliz.m2
SLOT="0"
LICENSE="GPL-2"
@@ -41,7 +42,7 @@ DEPEND="
sci-mathematics/frobby
sci-mathematics/4ti2
sci-mathematics/nauty
- >=sci-mathematics/normaliz-2.7
+ >=sci-mathematics/normaliz-2.8
sci-mathematics/gfan
>=sci-libs/mpir-2.1.1[cxx]
sci-libs/cdd+
@@ -55,7 +56,11 @@ DEPEND="
>=dev-libs/boehm-gc-7.2_alpha6[threads]
dev-libs/libatomic_ops
emacs? ( virtual/emacs )
- virtual/pkgconfig"
+ virtual/pkgconfig
+ app-arch/unzip
+ app-text/dos2unix"
+# Unzip and dos2unix just for normaliz
+
RDEPEND="${DEPEND}"
SITEFILE=70Macaulay2-gentoo.el
@@ -64,6 +69,11 @@ S="${WORKDIR}/${PN}-${PV}"
RESTRICT="mirror"
+src_unpack (){
+ unpack "Normaliz2.8.zip"
+ subversion_src_unpack
+}
+
pkg_setup () {
tc-export CC CPP CXX
append-cppflags "-I/usr/include/frobby"
@@ -72,6 +82,11 @@ pkg_setup () {
}
src_prepare() {
+ # Put updated Normaliz.m2 in place
+ cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \
+ "${S}/Macaulay2/packages" || die
+ dos2unix ${S}/Macaulay2/packages/Normaliz.m2 || die
+
# Patching .m2 files to look for external programs in
# /usr/bin
epatch "${FILESDIR}"/${PV}-paths-of-external-programs.patch
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2013-01-10 9:18 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2013-01-10 9:18 UTC (permalink / raw
To: gentoo-commits
commit: 143d931a0dd74fabff1cf16994ca917044ceeb28
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 09:17:49 2013 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Thu Jan 10 09:18:13 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=143d931a
migrate to git-2 eclass, fix lapack support
Package-Manager: portage-2.1.11.38
---
sci-mathematics/Macaulay2/ChangeLog | 5 ++++-
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 17 +++++++++++------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 2619c70..f97fdc7 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-mathematics/Macaulay2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Jan 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ migrate to git-2 eclass, fix lapack support
+
30 Oct 2012; Thomas Kahle <tomka@gentoo.org> +files/9999-lapack.patch,
Macaulay2-9999.ebuild:
Fix linking against arbitrary lapack implementation
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index a2b1127..0080340 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
-inherit autotools elisp-common eutils flag-o-matic python subversion
+inherit autotools elisp-common eutils flag-o-matic git-2 python
IUSE="debug emacs optimization"
-ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
+EGIT_REPO_URI="git://github.com/Macaulay2/M2.git"
# Those packages will be built internally.
FACTORY="factory-3-1-4-1"
@@ -65,13 +65,17 @@ RDEPEND="${DEPEND}"
SITEFILE=70Macaulay2-gentoo.el
-S="${WORKDIR}/${PN}-${PV}"
+S="${WORKDIR}/${PN}-${PV}/"
RESTRICT="mirror"
src_unpack (){
unpack "Normaliz2.8.zip"
- subversion_src_unpack
+ git-2_src_unpack
+ # Undo one level of directory until git allows to checkout
+ # subdirectories
+ mv "${S}"/M2/* "${S}" || die
+ rmdir "${S}"/M2 || die
}
pkg_setup () {
@@ -126,7 +130,8 @@ src_configure (){
fi
# configure instead of econf to enable install with --prefix
- ./configure --prefix="${D}/usr" \
+ ./configure LIBS="$(pkg-config --libs lapack)" \
+ --prefix="${D}/usr" \
--disable-encap \
--disable-strip \
$(use_enable optimization optimize) \
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2013-02-18 15:57 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2013-02-18 15:57 UTC (permalink / raw
To: gentoo-commits
commit: 90feafe1f687ca6e95335828361b94ab792ac2bc
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 15:56:35 2013 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Mon Feb 18 15:57:01 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=90feafe1
Update live ebuild
Package-Manager: portage-2.1.11.52
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 19 +++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 2237d2e..3505a7e 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -5,6 +5,9 @@
18 Feb 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Update live ebuild
+ 18 Feb 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Update live ebuild
+
10 Jan 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
migrate to git-2 eclass, fix lapack support
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 0bc34ec..3db0821 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -27,7 +27,13 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""
-DEPEND="
+DEPEND="sys-process/time
+ virtual/pkgconfig
+ app-arch/unzip
+ app-text/dos2unix"
+# Unzip and dos2unix just for normaliz
+
+RDEPEND="
sys-libs/gdbm
dev-libs/ntl
sci-mathematics/pari[gmp]
@@ -47,16 +53,9 @@ DEPEND="
virtual/lapack
dev-util/ctags
sys-libs/ncurses
- sys-process/time
>=dev-libs/boehm-gc-7.2_alpha6[threads]
dev-libs/libatomic_ops
- emacs? ( virtual/emacs )
- virtual/pkgconfig
- app-arch/unzip
- app-text/dos2unix"
-# Unzip and dos2unix just for normaliz
-
-RDEPEND="${DEPEND}"
+ emacs? ( virtual/emacs )"
SITEFILE=70Macaulay2-gentoo.el
@@ -84,7 +83,7 @@ src_prepare() {
# Put updated Normaliz.m2 in place
cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \
"${S}/Macaulay2/packages" || die
- dos2unix ${S}/Macaulay2/packages/Normaliz.m2 || die
+ dos2unix "${S}/Macaulay2/packages/Normaliz.m2" || die
# Patching .m2 files to look for external programs in
# /usr/bin
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2013-02-18 15:57 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2013-02-18 15:57 UTC (permalink / raw
To: gentoo-commits
commit: 55fa785f9bd0cbc6104fbd68425dc2388452c4fd
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 15:51:59 2013 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Mon Feb 18 15:57:01 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=55fa785f
Update live ebuild
Package-Manager: portage-2.1.11.52
---
sci-mathematics/Macaulay2/ChangeLog | 3 ++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 28 +++++++---------------
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index f97fdc7..2237d2e 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Feb 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Update live ebuild
+
10 Jan 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
migrate to git-2 eclass, fix lapack support
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 0080340..0bc34ec 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -19,7 +19,6 @@ HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/mpfr-3.0.1.tar.gz
http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz
http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"
# Need normaliz for an up to date normaliz.m2
@@ -28,15 +27,10 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""
-# Macaulay2 is broken with >=mpfr-3.1, to not force a downgrade on users
-# we let it built an internal copy :(
-# This dep was removed:
-# >=dev-libs/mpfr-3.0.0
-
DEPEND="
sys-libs/gdbm
- >=dev-libs/ntl-5.5.2
- >=sci-mathematics/pari-2.3.4[gmp]
+ dev-libs/ntl
+ sci-mathematics/pari[gmp]
>=sys-libs/readline-6.1
dev-libs/libxml2:2
sci-mathematics/frobby
@@ -44,7 +38,8 @@ DEPEND="
sci-mathematics/nauty
>=sci-mathematics/normaliz-2.8
sci-mathematics/gfan
- >=sci-libs/mpir-2.1.1[cxx]
+ sci-libs/mpir[cxx]
+ dev-libs/mpfr
sci-libs/cdd+
sci-libs/cddlib
sci-libs/lrslib[gmp]
@@ -95,9 +90,6 @@ src_prepare() {
# /usr/bin
epatch "${FILESDIR}"/${PV}-paths-of-external-programs.patch
- # Fixing make warnings about unavailable jobserver:
- sed -i "s/\$(MAKE)/+ \$(MAKE)/g" "${S}"/distributions/Makefile.in
-
# Shortcircuit lapack tests
epatch "${FILESDIR}"/${PV}-lapack.patch
@@ -115,9 +107,6 @@ src_prepare() {
# same as the tested program.
cp "${DISTDIR}/gtest-1.6.0.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
- # Temporary internal build of mpfr-3.0:
- cp "${DISTDIR}/mpfr-3.0.1.tar.gz" "${S}/BUILD/tarfiles/" \
- || die "copy failed"
eautoreconf
}
@@ -136,16 +125,16 @@ src_configure (){
--disable-strip \
$(use_enable optimization optimize) \
$(use_enable debug) \
- --enable-build-libraries="factory libfac mpfr" \
+ --enable-build-libraries="factory libfac" \
--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
|| die "failed to configure Macaulay"
}
src_compile() {
# Parallel build not supported yet
- emake -j1
+ # emake -j1
# For trunk builds we may wish to ignore example errors
- # emake IgnoreExampleErrors=true -j1
+ emake IgnoreExampleErrors=true -j1
if use emacs; then
cd "${S}/Macaulay2/emacs"
@@ -161,7 +150,8 @@ src_test() {
src_install () {
# Parallel install not supported yet
- emake -j1 install
+ # NumericalAlgebraicGeometry fails (during install too?)
+ emake IgnoreExampleErrors=true -j1 install
# Remove emacs files and install them in the
# correct place if use emacs
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2013-02-22 10:15 Justin Lecher
0 siblings, 0 replies; 28+ messages in thread
From: Justin Lecher @ 2013-02-22 10:15 UTC (permalink / raw
To: gentoo-commits
commit: ca78975fd7915dae4a4b66238decf1d64cf78356
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 09:33:04 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 09:33:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ca78975f
sci-mathematics/Macaulay2: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config#
Package-Manager: portage-2.2.0_alpha163
---
sci-mathematics/Macaulay2/ChangeLog | 4 ++++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 18 ++++++++++--------
sci-mathematics/Macaulay2/metadata.xml | 18 +++++++++---------
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 3505a7e..ec1c9af 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Feb 2013; Justin Lecher <jlec@gentoo.org> Macaulay2-9999.ebuild,
+ metadata.xml:
+ Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config#
+
18 Feb 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Update live ebuild
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 3db0821..b182641 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-inherit autotools elisp-common eutils flag-o-matic git-2 python
+inherit autotools elisp-common eutils flag-o-matic git-2 python toolchain-funcs
IUSE="debug emacs optimization"
@@ -16,18 +16,20 @@ LIBFAC="libfac-3-1-4"
DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
- ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz
- http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"
+SRC_URI="
+ ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
+ ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
+ http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
+ http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz
+ http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"
# Need normaliz for an up to date normaliz.m2
SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""
-DEPEND="sys-process/time
+DEPEND="
+ sys-process/time
virtual/pkgconfig
app-arch/unzip
app-text/dos2unix"
@@ -118,7 +120,7 @@ src_configure (){
fi
# configure instead of econf to enable install with --prefix
- ./configure LIBS="$(pkg-config --libs lapack)" \
+ ./configure LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" \
--prefix="${D}/usr" \
--disable-encap \
--disable-strip \
diff --git a/sci-mathematics/Macaulay2/metadata.xml b/sci-mathematics/Macaulay2/metadata.xml
index 575e757..096a577 100644
--- a/sci-mathematics/Macaulay2/metadata.xml
+++ b/sci-mathematics/Macaulay2/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-mathematics</herd>
-<maintainer>
- <email>tom111@gmx.de</email>
- <name>Thomas Kahle</name>
-</maintainer>
-<use>
- <flag name="optimization">Disable to build with -O0 for debugging.</flag>
-</use>
-<longdescription lang="en">
+ <herd>sci-mathematics</herd>
+ <maintainer>
+ <email>tom111@gmx.de</email>
+ <name>Thomas Kahle</name>
+ </maintainer>
+ <use>
+ <flag name="optimization">Disable to build with -O0 for debugging.</flag>
+ </use>
+ <longdescription lang="en">
Macaulay2 is a research tool for algraic geometry and commutative
algebra.
</longdescription>
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2013-04-18 6:56 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2013-04-18 6:56 UTC (permalink / raw
To: gentoo-commits
commit: 61ca16b08cdb269f410a1e089cd9cf9f2ef33cd6
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 06:56:05 2013 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Thu Apr 18 06:56:19 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=61ca16b0
Update factory/libfac version
---
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index b25ac45..c88ab6a 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -11,8 +11,8 @@ IUSE="debug emacs optimization"
EGIT_REPO_URI="git://github.com/Macaulay2/M2.git"
# Those packages will be built internally.
-FACTORY="factory-3-1-4-1"
-LIBFAC="libfac-3-1-4"
+FACTORY="factory-3-1-6"
+LIBFAC="libfac-3-1-6"
DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2013-12-04 16:22 Justin Lecher
0 siblings, 0 replies; 28+ messages in thread
From: Justin Lecher @ 2013-12-04 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 5b51f0cbdc77f4097824d010fcb62f845d9d1560
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 4 16:20:42 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec 4 16:20:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b51f0cb
sci-mathematics/Macaulay2: Bump EAPI to 5; Bump to python-single-r1 eclass
Package-Manager: portage-2.2.7
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 33 +++++++++++++------------
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index e164ec1..b012ef2 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Dec 2013; Justin Lecher <jlec@gentoo.org> Macaulay2-9999.ebuild:
+ Bump EAPI to 5; Bump to python-single-r1 eclass
+
27 Feb 2013; Justin Lecher <jlec@gentoo.org> files/9999-lapack.patch,
Macaulay2-9999.ebuild:
Use PKG_CONFIG instead of generic pkg-config
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index c88ab6a..d2413c0 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -2,13 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit autotools elisp-common eutils flag-o-matic git-2 python toolchain-funcs
+PYTHON_COMPAT=( python{2_6,2_7} )
-IUSE="debug emacs optimization"
-
-EGIT_REPO_URI="git://github.com/Macaulay2/M2.git"
+inherit autotools elisp-common eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs
# Those packages will be built internally.
FACTORY="factory-3-1-6"
@@ -23,19 +21,23 @@ SRC_URI="
http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz
http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"
# Need normaliz for an up to date normaliz.m2
+EGIT_REPO_URI="git://github.com/Macaulay2/M2.git"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""
+IUSE="debug emacs optimization"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DEPEND="
+DEPEND="${PYTHON_DEPS}
sys-process/time
virtual/pkgconfig
app-arch/unzip
app-text/dos2unix"
# Unzip and dos2unix just for normaliz
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
sys-libs/gdbm
dev-libs/ntl
sci-mathematics/pari[gmp]
@@ -67,7 +69,7 @@ RESTRICT="mirror"
src_unpack (){
unpack "Normaliz2.8.zip"
- git-2_src_unpack
+ git-r3_src_unpack
# Undo one level of directory until git allows to checkout
# subdirectories
mv "${S}"/M2/* "${S}" || die
@@ -75,14 +77,13 @@ src_unpack (){
}
pkg_setup () {
- tc-export CC CPP CXX
- append-cppflags "-I/usr/include/frobby"
- # gtest needs python:2
- python_set_active_version 2
+ tc-export CC CPP CXX PKG_CONFIG
+ append-cppflags "-I/usr/include/frobby"
+ # gtest needs python:2
+ python-single-r1_pkg_setup
}
src_prepare() {
- tc-export PKG_CONFIG
# Put updated Normaliz.m2 in place
cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \
"${S}/Macaulay2/packages" || die
@@ -139,7 +140,7 @@ src_compile() {
emake IgnoreExampleErrors=true -j1
if use emacs; then
- cd "${S}/Macaulay2/emacs"
+ cd "${S}/Macaulay2/emacs" || die
elisp-compile *.el
fi
}
@@ -157,9 +158,9 @@ src_install () {
# Remove emacs files and install them in the
# correct place if use emacs
- rm -rf "${D}"/usr/share/emacs/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/site-lisp || die
if use emacs; then
- cd "${S}/Macaulay2/emacs"
+ cd "${S}/Macaulay2/emacs" || die
elisp-install ${PN} *.elc *.el
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2014-04-29 6:17 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2014-04-29 6:17 UTC (permalink / raw
To: gentoo-commits
commit: ccd96d132a618c8d16664d39ead557a3ec3365db
Author: Thomas Kahle <thomas.kahle <AT> ovgu <DOT> de>
AuthorDate: Tue Apr 29 06:17:06 2014 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Tue Apr 29 06:17:06 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ccd96d13
Fix live ebuild
Package-Manager: portage-2.2.8-r1
---
sci-mathematics/Macaulay2/ChangeLog | 5 ++++-
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index b012ef2..59afbfd 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-mathematics/Macaulay2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Apr 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Fix live ebuild
+
04 Dec 2013; Justin Lecher <jlec@gentoo.org> Macaulay2-9999.ebuild:
Bump EAPI to 5; Bump to python-single-r1 eclass
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 7c39878..b3a6e7f 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -17,16 +17,16 @@ HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
SRC_URI="
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz
- http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"
+ ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
+ http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/gtest-1.7.0.tar.gz"
+# http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"
# Need normaliz for an up to date normaliz.m2
EGIT_REPO_URI="git://github.com/Macaulay2/M2.git"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""
-IUSE="debug emacs optimization"
+IUSE="debug emacs +optimization"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -68,12 +68,13 @@ S="${WORKDIR}/${PN}-${PV}/"
RESTRICT="mirror"
src_unpack (){
- unpack "Normaliz2.8.zip"
+ # unpack "Normaliz2.8.zip"
git-r3_src_unpack
# Undo one level of directory until git allows to checkout
# subdirectories
mv "${S}"/M2/* "${S}" || die
- rmdir "${S}"/M2 || die
+ # Need to get rid of this now because install wants this location later
+ rm -r "${S}/M2" || die
}
pkg_setup () {
@@ -85,9 +86,9 @@ pkg_setup () {
src_prepare() {
# Put updated Normaliz.m2 in place
- cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \
- "${S}/Macaulay2/packages" || die
- dos2unix "${S}/Macaulay2/packages/Normaliz.m2" || die
+ # cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \
+ # "${S}/Macaulay2/packages" || die
+ # dos2unix "${S}/Macaulay2/packages/Normaliz.m2" || die
# Patching .m2 files to look for external programs in
# /usr/bin
@@ -98,7 +99,6 @@ src_prepare() {
# 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
- mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed"
cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \
@@ -108,7 +108,7 @@ src_prepare() {
# Macaulay2 developers want that gtest is built internally because
# the documentation says it may fail if build with options not the
# same as the tested program.
- cp "${DISTDIR}/gtest-1.6.0.tar.gz" "${S}/BUILD/tarfiles/" \
+ cp "${DISTDIR}/gtest-1.7.0.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
eautoreconf
@@ -126,6 +126,7 @@ src_configure (){
--prefix="${D}/usr" \
--disable-encap \
--disable-strip \
+ --with-issue=Gentoo \
$(use_enable optimization optimize) \
$(use_enable debug) \
--enable-build-libraries="factory libfac" \
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2014-06-10 21:04 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2014-06-10 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 97d1c35866e2ca2fbb2d54b32d268bb833914544
Author: Thomas Kahle <thomas.kahle <AT> ovgu <DOT> de>
AuthorDate: Tue Jun 10 21:04:26 2014 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Tue Jun 10 21:04:35 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=97d1c358
update live ebuild
Package-Manager: portage-2.2.8-r1
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 12 ++++--------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 59afbfd..d28de71 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Jun 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ update live ebuild
+
29 Apr 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Fix live ebuild
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index b3a6e7f..888dc99 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -9,13 +9,11 @@ PYTHON_COMPAT=( python{2_6,2_7} )
inherit autotools elisp-common eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs
# Those packages will be built internally.
-FACTORY="factory-3-1-6"
-LIBFAC="libfac-3-1-6"
+FACTORY="factory-4.0.0"
DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
SRC_URI="
- ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/gtest-1.7.0.tar.gz"
@@ -97,14 +95,12 @@ src_prepare() {
# Shortcircuit lapack tests
epatch "${FILESDIR}"/${PV}-lapack.patch
- # 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
+ # Factory is a statically linked library which (in this flavor) are not used by any
+ # other program. We build it internally and don't install it.
cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
- cp "${DISTDIR}/${LIBFAC}.tar.gz" "${S}/BUILD/tarfiles/" \
- || die "copy failed"
# Macaulay2 developers want that gtest is built internally because
# the documentation says it may fail if build with options not the
# same as the tested program.
@@ -129,7 +125,7 @@ src_configure (){
--with-issue=Gentoo \
$(use_enable optimization optimize) \
$(use_enable debug) \
- --enable-build-libraries="factory libfac" \
+ --enable-build-libraries="factory" \
--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
|| die "failed to configure Macaulay"
}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2014-06-10 21:08 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2014-06-10 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 3f3ecfb0ad1c57a20c18a3ad53ba7dee86577ddc
Author: Thomas Kahle <thomas.kahle <AT> ovgu <DOT> de>
AuthorDate: Tue Jun 10 21:04:26 2014 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Tue Jun 10 21:07:36 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3f3ecfb0
update live ebuild
Package-Manager: portage-2.2.8-r1
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 12 ++++--------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 59afbfd..d28de71 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Jun 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ update live ebuild
+
29 Apr 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Fix live ebuild
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index b3a6e7f..888dc99 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -9,13 +9,11 @@ PYTHON_COMPAT=( python{2_6,2_7} )
inherit autotools elisp-common eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs
# Those packages will be built internally.
-FACTORY="factory-3-1-6"
-LIBFAC="libfac-3-1-6"
+FACTORY="factory-4.0.0"
DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
SRC_URI="
- ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/gtest-1.7.0.tar.gz"
@@ -97,14 +95,12 @@ src_prepare() {
# Shortcircuit lapack tests
epatch "${FILESDIR}"/${PV}-lapack.patch
- # 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
+ # Factory is a statically linked library which (in this flavor) are not used by any
+ # other program. We build it internally and don't install it.
cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
- cp "${DISTDIR}/${LIBFAC}.tar.gz" "${S}/BUILD/tarfiles/" \
- || die "copy failed"
# Macaulay2 developers want that gtest is built internally because
# the documentation says it may fail if build with options not the
# same as the tested program.
@@ -129,7 +125,7 @@ src_configure (){
--with-issue=Gentoo \
$(use_enable optimization optimize) \
$(use_enable debug) \
- --enable-build-libraries="factory libfac" \
+ --enable-build-libraries="factory" \
--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
|| die "failed to configure Macaulay"
}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2014-06-11 13:18 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2014-06-11 13:18 UTC (permalink / raw
To: gentoo-commits
commit: baf35ab2771c331b2b5dcd25323edfb7d735fdb1
Author: Thomas Kahle <thomas.kahle <AT> ovgu <DOT> de>
AuthorDate: Wed Jun 11 13:18:08 2014 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Wed Jun 11 13:18:08 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=baf35ab2
Update live ebuild
Package-Manager: portage-2.2.8-r1
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 15 +++++++--------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index d28de71..b54b9b7 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 Jun 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ Update live ebuild
+
10 Jun 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
update live ebuild
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 888dc99..40b96f5 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -8,17 +8,16 @@ PYTHON_COMPAT=( python{2_6,2_7} )
inherit autotools elisp-common eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs
-# Those packages will be built internally.
-FACTORY="factory-4.0.0"
+FACTORY="factory-4.0.0+m4"
+FACTORY_GFTABLES="factory.4.0.1-gftables"
DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
+BASE_URI="http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk"
SRC_URI="
- ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
- ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
- http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/gtest-1.7.0.tar.gz"
-# http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"
-# Need normaliz for an up to date normaliz.m2
+ ${BASE_URI}/${FACTORY}.tar.gz
+ ${BASE_URI}/${FACTORY_GFTABLES}.tar.gz
+ ${BASE_URI}/gtest-1.7.0.tar.gz"
EGIT_REPO_URI="git://github.com/Macaulay2/M2.git"
SLOT="0"
@@ -99,7 +98,7 @@ src_prepare() {
# other program. We build it internally and don't install it.
cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
- cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \
+ cp "${DISTDIR}/${FACTORY_GFTABLES}.tar.gz" "${S}/BUILD/tarfiles/" \
|| die "copy failed"
# Macaulay2 developers want that gtest is built internally because
# the documentation says it may fail if build with options not the
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2014-06-26 11:36 Thomas Kahle
0 siblings, 0 replies; 28+ messages in thread
From: Thomas Kahle @ 2014-06-26 11:36 UTC (permalink / raw
To: gentoo-commits
commit: 7e4850938063a368c596559535ea466c26bc407c
Author: Thomas Kahle <thomas.kahle <AT> ovgu <DOT> de>
AuthorDate: Thu Jun 26 11:37:06 2014 +0000
Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Thu Jun 26 11:37:14 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7e485093
add flint dependency
Package-Manager: portage-2.2.8-r1
---
sci-mathematics/Macaulay2/ChangeLog | 3 +++
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 1 +
2 files changed, 4 insertions(+)
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index b54b9b7..e9dbb4e 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 26 Jun 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+ add flint dependency
+
11 Jun 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
Update live ebuild
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 40b96f5..0a51719 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -40,6 +40,7 @@ RDEPEND="${PYTHON_DEPS}
sci-mathematics/pari[gmp]
>=sys-libs/readline-6.1
dev-libs/libxml2:2
+ sci-mathematics/flint[gc]
sci-mathematics/frobby
sci-mathematics/4ti2
sci-mathematics/nauty
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2021-01-16 21:29 Andrew Ammerlaan
0 siblings, 0 replies; 28+ messages in thread
From: Andrew Ammerlaan @ 2021-01-16 21:29 UTC (permalink / raw
To: gentoo-commits
commit: ec744b8b8ff2871b0cdc5da919951cf0166b21ba
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 16 21:29:09 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 16 21:29:09 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ec744b8b
sci-mathematics/Macaulay2: fix fetch, fix homepage
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 46e370ce0..529be005b 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
PYTHON_COMPAT=( python2_7 )
-inherit autotools elisp-common eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs
+inherit autotools elisp-common flag-o-matic git-r3 python-single-r1 toolchain-funcs
FACTORY="factory-4.0.0+m4"
FACTORY_GFTABLES="factory.4.0.1-gftables"
DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-BASE_URI="http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk"
+HOMEPAGE="https://faculty.math.illinois.edu/Macaulay2"
+BASE_URI="https://faculty.math.illinois.edu/Macaulay2/Downloads/OtherSourceCode/"
SRC_URI="
${BASE_URI}/${FACTORY}.tar.gz
${BASE_URI}/${FACTORY_GFTABLES}.tar.gz
@@ -56,7 +56,7 @@ RDEPEND="${PYTHON_DEPS}
sys-libs/ncurses
>=dev-libs/boehm-gc-7.2_alpha6[threads]
dev-libs/libatomic_ops
- emacs? ( virtual/emacs )"
+ emacs? ( app-editors/emacs )"
SITEFILE=70Macaulay2-gentoo.el
@@ -89,10 +89,12 @@ src_prepare() {
# Patching .m2 files to look for external programs in
# /usr/bin
- epatch "${FILESDIR}"/${PV}-paths-of-external-programs.patch
+ eapply "${FILESDIR}"/${PV}-paths-of-external-programs.patch
# Shortcircuit lapack tests
- epatch "${FILESDIR}"/${PV}-lapack.patch
+ eapply "${FILESDIR}"/${PV}-lapack.patch
+
+ eapply_user
# Factory is a statically linked library which (in this flavor) are not used by any
# other program. We build it internally and don't install it.
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2021-01-19 16:56 Andrew Ammerlaan
0 siblings, 0 replies; 28+ messages in thread
From: Andrew Ammerlaan @ 2021-01-19 16:56 UTC (permalink / raw
To: gentoo-commits
commit: b5fb630fbc5bfeadf108e0e58c7be13a60a8a81a
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 19 16:52:36 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 19 16:52:36 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b5fb630f
sci-mathematics/Macaulay2: add default for gc flag
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 529be005b..5b4e608c7 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${PYTHON_DEPS}
sci-mathematics/pari[gmp]
>=sys-libs/readline-6.1
dev-libs/libxml2:2
- sci-mathematics/flint[gc]
+ sci-mathematics/flint[gc(-)]
sci-mathematics/frobby
sci-mathematics/4ti2
sci-mathematics/nauty
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
@ 2021-01-30 15:22 Andrew Ammerlaan
0 siblings, 0 replies; 28+ messages in thread
From: Andrew Ammerlaan @ 2021-01-30 15:22 UTC (permalink / raw
To: gentoo-commits
commit: d15b3ea9dba7b0b66db33169f20dbe979313f836
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 30 15:21:35 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 30 15:21:35 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d15b3ea9
sci-mathematics/Macaulay2: remove redundant long description
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-mathematics/Macaulay2/metadata.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sci-mathematics/Macaulay2/metadata.xml b/sci-mathematics/Macaulay2/metadata.xml
index 05e3f791a..703c18dee 100644
--- a/sci-mathematics/Macaulay2/metadata.xml
+++ b/sci-mathematics/Macaulay2/metadata.xml
@@ -12,8 +12,4 @@
<use>
<flag name="optimization">Disable to build with -O0 for debugging.</flag>
</use>
- <longdescription lang="en">
-Macaulay2 is a research tool for algraic geometry and commutative
-algebra.
-</longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 28+ messages in thread
end of thread, other threads:[~2021-01-30 15:22 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-26 6:51 [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/ Thomas Kahle
-- strict thread matches above, loose matches on Subject: below --
2011-03-07 12:01 Justin Lecher
2011-08-09 11:46 Thomas Kahle
2011-09-25 7:27 Thomas Kahle
2012-03-01 16:33 Thomas Kahle
2012-05-02 16:15 Thomas Kahle
2012-07-30 12:39 Thomas Kahle
2012-08-06 7:23 Thomas Kahle
2012-08-19 9:17 Thomas Kahle
2012-10-12 0:16 Thomas Kahle
2012-10-12 21:36 Thomas Kahle
2012-10-12 22:08 Thomas Kahle
2012-10-24 19:23 Thomas Kahle
2012-11-13 2:24 Thomas Kahle
2013-01-10 9:18 Thomas Kahle
2013-02-18 15:57 Thomas Kahle
2013-02-18 15:57 Thomas Kahle
2013-02-22 10:15 Justin Lecher
2013-04-18 6:56 Thomas Kahle
2013-12-04 16:22 Justin Lecher
2014-04-29 6:17 Thomas Kahle
2014-06-10 21:04 Thomas Kahle
2014-06-10 21:08 Thomas Kahle
2014-06-11 13:18 Thomas Kahle
2014-06-26 11:36 Thomas Kahle
2021-01-16 21:29 Andrew Ammerlaan
2021-01-19 16:56 Andrew Ammerlaan
2021-01-30 15:22 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox