Gentoo Archives: gentoo-commits

From: Thomas Kahle <tom111@×××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/
Date: Thu, 01 Mar 2012 16:33:25
Message-Id: 1330619586.ec4d0cbf48fd6686e20d99708da842f1b9148935.tom111@gentoo
1 commit: ec4d0cbf48fd6686e20d99708da842f1b9148935
2 Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 1 16:32:43 2012 +0000
4 Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de>
5 CommitDate: Thu Mar 1 16:33:06 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ec4d0cbf
7
8 Update deps in M2 live ebuild
9
10 ---
11 sci-mathematics/Macaulay2/ChangeLog | 5 ++++-
12 sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 21 ++++++++++++++-------
13 2 files changed, 18 insertions(+), 8 deletions(-)
14
15 diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
16 index ab9d8e8..069f906 100644
17 --- a/sci-mathematics/Macaulay2/ChangeLog
18 +++ b/sci-mathematics/Macaulay2/ChangeLog
19 @@ -1,7 +1,10 @@
20 # ChangeLog for sci-mathematics/Macaulay2
21 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
22 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
23 # $Header: $
24
25 + 01 Mar 2012; Thomas Kahle <tomka@g.o> Macaulay2-9999.ebuild:
26 + Update deps in M2-live ebuild
27 +
28 25 Sep 2011; Thomas Kahle <tomka@g.o>
29 files/9999-paths-of-external-programs.patch, Macaulay2-9999.ebuild:
30 Fix live ebuild
31
32 diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
33 index e313f60..6839fc3 100644
34 --- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
35 +++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
36 @@ -1,4 +1,4 @@
37 -# Copyright 1999-2011 Gentoo Foundation
38 +# Copyright 1999-2012 Gentoo Foundation
39 # Distributed under the terms of the GNU General Public License v2
40 # $Header: $
41
42 @@ -10,12 +10,17 @@ IUSE="emacs optimization"
43
44 ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
45
46 +BOEHM_GC="gc-7.3alpha1.2012.01.23"
47 +FACTORY="factory-3-1-4"
48 +LIBFAC="libfac-3-1-4"
49 +
50 DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
51 HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
52 SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
53 -SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-1-3.tar.gz
54 - ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-3-1-3.tar.gz
55 - http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha7-2011-07-25.tar.gz"
56 +SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${FACTORY}.tar.gz
57 + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
58 + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${LIBFAC}.tar.gz
59 + http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz"
60
61 SLOT="0"
62 LICENSE="GPL-2"
63 @@ -67,14 +72,16 @@ src_prepare() {
64 # Factory, and libfac are statically linked libraries which (in this flavor) are not used by any
65 # other program. We build them internally and don't install them
66 mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed"
67 - cp "${DISTDIR}/factory-3-1-3.tar.gz" "${S}/BUILD/tarfiles/" \
68 + cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
69 + || die "copy failed"
70 + cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \
71 || die "copy failed"
72 - cp "${DISTDIR}/libfac-3-1-3.tar.gz" "${S}/BUILD/tarfiles/" \
73 + cp "${DISTDIR}/${LIBFAC}.tar.gz" "${S}/BUILD/tarfiles/" \
74 || die "copy failed"
75 # Macaulay 2 insists on a snapshot of boehm-gc that is not available elsewhere
76 # We will let it build its internal version for now. Note:
77 # The resulting QA warning is known.
78 - cp "${DISTDIR}/gc-7.2alpha7-2011-07-25.tar.gz" "${S}/BUILD/tarfiles/" \
79 + cp "${DISTDIR}/${BOEHM_GC}.tar.gz" "${S}/BUILD/tarfiles/" \
80 || die "copy failed"
81
82 eautoreconf