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 7736F1381F3 for ; Tue, 13 Nov 2012 02:25:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5B2821C008; Tue, 13 Nov 2012 02:25:00 +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 368AF21C008 for ; Tue, 13 Nov 2012 02:25:00 +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 0701033D781 for ; Tue, 13 Nov 2012 02:24:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CEF34E5436 for ; Tue, 13 Nov 2012 02:24:56 +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: <1352773484.32beca628f4f65b13fbd4a7de9126abab84bdf84.tom111@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/ X-VCS-Repository: proj/sci X-VCS-Files: 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: 32beca628f4f65b13fbd4a7de9126abab84bdf84 X-VCS-Branch: master Date: Tue, 13 Nov 2012 02:24:56 +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: 7d3ab94e-dc7e-400f-a063-6be973e1bd34 X-Archives-Hash: 15618a67a639094c4f7eb23656b6a0b7 commit: 32beca628f4f65b13fbd4a7de9126abab84bdf84 Author: Thomas Kahle gentoo org> AuthorDate: Tue Nov 13 02:24:36 2012 +0000 Commit: Thomas Kahle gmx 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