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 E1418138010 for ; Wed, 24 Oct 2012 19:23:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83289E051E; Wed, 24 Oct 2012 19:23:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E7578E051E for ; Wed, 24 Oct 2012 19:23:42 +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 1F52333D8AF for ; Wed, 24 Oct 2012 19:23:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A7843E5436 for ; Wed, 24 Oct 2012 19:23:39 +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: <1351106608.90f9112aaf15b751b7a7da0696f46e00ed88382a.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: 90f9112aaf15b751b7a7da0696f46e00ed88382a X-VCS-Branch: master Date: Wed, 24 Oct 2012 19:23:39 +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: 438bff33-9d12-434d-b63d-221d8b90c6c8 X-Archives-Hash: 1d6def84d2bde381d54c2fccfd40326d commit: 90f9112aaf15b751b7a7da0696f46e00ed88382a Author: Thomas Kahle gentoo org> AuthorDate: Wed Oct 24 19:23:11 2012 +0000 Commit: Thomas Kahle gmx 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 Macaulay2-9999.ebuild: + Update M2 live ebuild + 12 Oct 2012; Thomas Kahle 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"