From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0A74B13800E for ; Mon, 6 Aug 2012 07:24:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1FB5E067D; Mon, 6 Aug 2012 07:23:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 51F66E067D for ; Mon, 6 Aug 2012 07:23:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3579D1B401B for ; Mon, 6 Aug 2012 07:23:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 29545E5439 for ; Mon, 6 Aug 2012 07:23:54 +0000 (UTC) From: "Thomas Kahle" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Kahle" Message-ID: <1344237827.c39c7ec80776e3d0091f77a540c574f8b9c0202d.tom111@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/Macaulay2/ChangeLog sci-mathematics/Macaulay2/Macaulay2-9999.ebuild X-VCS-Directories: sci-mathematics/Macaulay2/ X-VCS-Committer: tom111 X-VCS-Committer-Name: Thomas Kahle X-VCS-Revision: c39c7ec80776e3d0091f77a540c574f8b9c0202d X-VCS-Branch: master Date: Mon, 6 Aug 2012 07:23:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa2e7f3a-4521-48f6-a595-4f67ada079c8 X-Archives-Hash: 5bcf3b372c59b35c9142946df17264c5 commit: c39c7ec80776e3d0091f77a540c574f8b9c0202d Author: Thomas Kahle gentoo org> AuthorDate: Mon Aug 6 07:23:29 2012 +0000 Commit: Thomas Kahle gmx 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 Macaulay2-9999.ebuild: + Update live dependencies + 02 May 2012; Thomas Kahle 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"