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 439B0138AE6 for ; Mon, 18 Feb 2013 15:57:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7161E04BA; Mon, 18 Feb 2013 15:57:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50B13E04BA for ; Mon, 18 Feb 2013 15:57:14 +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 C2FC633DCC9 for ; Mon, 18 Feb 2013 15:57:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4E854E4073 for ; Mon, 18 Feb 2013 15:57:11 +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: <1361203021.55fa785f9bd0cbc6104fbd68425dc2388452c4fd.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: 55fa785f9bd0cbc6104fbd68425dc2388452c4fd X-VCS-Branch: master Date: Mon, 18 Feb 2013 15:57:11 +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: e1230ca0-c586-40fe-8228-8c2a5f0ad7b8 X-Archives-Hash: c40b3a825d93eca8462e555c6ec84eac commit: 55fa785f9bd0cbc6104fbd68425dc2388452c4fd Author: Thomas Kahle gentoo org> AuthorDate: Mon Feb 18 15:51:59 2013 +0000 Commit: Thomas Kahle gmx 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 Macaulay2-9999.ebuild: + Update live ebuild + 10 Jan 2013; Thomas Kahle 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