From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R7j8D-0004jU-61 for garchives@archives.gentoo.org; Sun, 25 Sep 2011 07:28:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7E6A21C0F6; Sun, 25 Sep 2011 07:27:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AD30D21C0F6 for ; Sun, 25 Sep 2011 07:27:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E78521B4017 for ; Sun, 25 Sep 2011 07:27:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3FA4380048 for ; Sun, 25 Sep 2011 07:27:56 +0000 (UTC) From: "Thomas Kahle" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Kahle" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/, sci-mathematics/Macaulay2/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/Macaulay2/ChangeLog sci-mathematics/Macaulay2/Macaulay2-9999.ebuild sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch X-VCS-Directories: sci-mathematics/Macaulay2/ sci-mathematics/Macaulay2/files/ X-VCS-Committer: tom111 X-VCS-Committer-Name: Thomas Kahle X-VCS-Revision: a4f1d8df2ba524786c87e9ca85ec66b37fbd6431 Date: Sun, 25 Sep 2011 07:27: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 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3ec4ef936b2817f212e5b34122d9f2cd commit: a4f1d8df2ba524786c87e9ca85ec66b37fbd6431 Author: Thomas Kahle gentoo org> AuthorDate: Sun Sep 25 07:25:25 2011 +0000 Commit: Thomas Kahle gmx de> CommitDate: Sun Sep 25 07:27:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Da4f1d8df Fix live ebuild (Portage version: 2.1.10.19/git/Linux i686, signed Manifest commit with k= ey 0x20F2A3AE) --- sci-mathematics/Macaulay2/ChangeLog | 4 ++ sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 8 ++-- .../files/9999-paths-of-external-programs.patch | 50 ++++++++++++--= ----- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaul= ay2/ChangeLog index e3e7937..ab9d8e8 100644 --- a/sci-mathematics/Macaulay2/ChangeLog +++ b/sci-mathematics/Macaulay2/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 25 Sep 2011; Thomas Kahle + files/9999-paths-of-external-programs.patch, Macaulay2-9999.ebuild: + Fix live ebuild + 09 Aug 2011; Thomas Kahle Macaulay2-9999.ebuild: adjusting boehm-gc source file =20 diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathem= atics/Macaulay2/Macaulay2-9999.ebuild index e4aa03c..e313f60 100644 --- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild +++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild @@ -13,8 +13,8 @@ ESVN_REPO_URI=3D"svn://svn.macaulay2.com/Macaulay2/trun= k/M2" DESCRIPTION=3D"Research tool for commutative algebra and algebraic geome= try" HOMEPAGE=3D"http://www.math.uiuc.edu/Macaulay2/" SRC_BASE=3D"http://www.math.uiuc.edu/${PN}/Downloads/" -SRC_URI=3D"${SRC_BASE}/OtherSourceCode/1.3/factory-3-1-1.tar.gz - ${SRC_BASE}/OtherSourceCode/1.3/libfac-3-1-1.tar.gz +SRC_URI=3D"ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfa= c-3-1-3.tar.gz + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-3-1-= 3.tar.gz http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha7-2011-07-25.tar.= gz" =20 SLOT=3D"0" @@ -67,9 +67,9 @@ src_prepare() { # Factory, and libfac are statically linked libraries which (in this fl= avor) are not used by any # other program. We build them internally and don't install them mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed" - cp "${DISTDIR}/factory-3-1-1.tar.gz" "${S}/BUILD/tarfiles/" \ + cp "${DISTDIR}/factory-3-1-3.tar.gz" "${S}/BUILD/tarfiles/" \ || die "copy failed" - cp "${DISTDIR}/libfac-3-1-1.tar.gz" "${S}/BUILD/tarfiles/" \ + cp "${DISTDIR}/libfac-3-1-3.tar.gz" "${S}/BUILD/tarfiles/" \ || die "copy failed" # Macaulay 2 insists on a snapshot of boehm-gc that is not available el= sewhere # We will let it build its internal version for now. Note: diff --git a/sci-mathematics/Macaulay2/files/9999-paths-of-external-progr= ams.patch b/sci-mathematics/Macaulay2/files/9999-paths-of-external-progra= ms.patch index 9b16e5a..4c090de 100644 --- a/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.pat= ch +++ b/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.pat= ch @@ -1,6 +1,6 @@ -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/FourTiTwo.m2 M2source.p= atches/Macaulay2/packages/FourTiTwo.m2 ---- M2source.orig/Macaulay2/packages/FourTiTwo.m2 2010-09-19 02:32:45.00= 0000000 +0200 -+++ M2source.patches/Macaulay2/packages/FourTiTwo.m2 2010-09-19 02:37:25= .000000000 +0200 +diff -U 3 -dHrN M2source/Macaulay2/packages/FourTiTwo.m2 M2source.patch/= Macaulay2/packages/FourTiTwo.m2 +--- M2source/Macaulay2/packages/FourTiTwo.m2 2011-09-22 14:36:51.0000000= 00 +0100 ++++ M2source.patch/Macaulay2/packages/FourTiTwo.m2 2011-09-24 21:24:12.0= 00000000 +0100 @@ -47,7 +47,7 @@ =20 path'4ti2 =3D (options FourTiTwo).Configuration#"path" @@ -10,10 +10,10 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Four= TiTwo.m2 M2source.patches/M =20 getFilename =3D () -> ( filename :=3D temporaryFileName(); -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/gfanInterface.m2 M2sour= ce.patches/Macaulay2/packages/gfanInterface.m2 ---- M2source.orig/Macaulay2/packages/gfanInterface.m2 2010-09-19 02:32:4= 5.000000000 +0200 -+++ M2source.patches/Macaulay2/packages/gfanInterface.m2 2010-09-19 02:3= 8:08.000000000 +0200 -@@ -26,7 +26,7 @@ +diff -U 3 -dHrN M2source/Macaulay2/packages/gfanInterface.m2 M2source.pa= tch/Macaulay2/packages/gfanInterface.m2 +--- M2source/Macaulay2/packages/gfanInterface.m2 2011-05-14 12:00:59.000= 000000 +0100 ++++ M2source.patch/Macaulay2/packages/gfanInterface.m2 2011-09-24 21:24:= 12.000000000 +0100 +@@ -25,7 +25,7 @@ } =20 gfan'path =3D gfanInterface#Options#Configuration#"path" @@ -22,10 +22,22 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/gfan= Interface.m2 M2source.patch if instance(gfan'path, String) then gfan'path =3D {gfan'path} if not instance(gfan'path,List) then error "expected configuration opti= on gfan'path to be a list of strings or a string" gfan'path =3D join( -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Nauty.m2 M2source.patch= es/Macaulay2/packages/Nauty.m2 ---- M2source.orig/Macaulay2/packages/Nauty.m2 2010-09-19 02:33:04.000000= 000 +0200 -+++ M2source.patches/Macaulay2/packages/Nauty.m2 2010-09-19 02:40:46.000= 000000 +0200 -@@ -27,7 +27,8 @@ +diff -U 3 -dHrN M2source/Macaulay2/packages/NautyGraphs.m2 M2source.patc= h/Macaulay2/packages/NautyGraphs.m2 +--- M2source/Macaulay2/packages/NautyGraphs.m2 2011-08-26 11:05:30.00000= 0000 +0100 ++++ M2source.patch/Macaulay2/packages/NautyGraphs.m2 2011-09-24 21:25:53= .000000000 +0100 +@@ -32,7 +32,7 @@ + -- Check the ~/.Macaulay2/init-NautyGraphs.m2 file for the absolute pat= h. + -- If it's not there, then use the M2-Programs directory. + nauty'path =3D (options NautyGraphs).Configuration#"path"; +-if nauty'path =3D=3D "" then nauty'path =3D prefixDirectory | currentLa= yout#"programs"; ++if nauty'path =3D=3D "" then nauty'path =3D "/usr/bin/"; +=20 + ------------------- + -- Exports +diff -U 3 -dHrN M2source/Macaulay2/packages/Nauty.m2 M2source.patch/Maca= ulay2/packages/Nauty.m2 +--- M2source/Macaulay2/packages/Nauty.m2 2011-08-26 11:05:30.000000000 += 0100 ++++ M2source.patch/Macaulay2/packages/Nauty.m2 2011-09-24 21:24:12.00000= 0000 +0100 +@@ -48,7 +48,8 @@ -- Check the ~/.Macaulay2/init-Nauty.m2 file for the absolute path. -- If it's not there, then use the M2-Programs directory. nauty'path =3D (options Nauty).Configuration#"path"; @@ -35,11 +47,11 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Naut= y.m2 M2source.patches/Macau =20 ------------------- -- Exports -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Normaliz.m2 M2source.pa= tches/Macaulay2/packages/Normaliz.m2 ---- M2source.orig/Macaulay2/packages/Normaliz.m2 2010-09-19 02:33:04.000= 000000 +0200 -+++ M2source.patches/Macaulay2/packages/Normaliz.m2 2010-09-19 02:39:12.= 000000000 +0200 -@@ -156,7 +156,7 @@ - nmzExec=3D"norm64"; +diff -U 3 -dHrN M2source/Macaulay2/packages/Normaliz.m2 M2source.patch/M= acaulay2/packages/Normaliz.m2 +--- M2source/Macaulay2/packages/Normaliz.m2 2011-05-25 16:47:50.00000000= 0 +0100 ++++ M2source.patch/Macaulay2/packages/Normaliz.m2 2011-09-24 21:24:12.00= 0000000 +0100 +@@ -166,7 +166,7 @@ + nmzExec=3D"normaliz"; ); -- return nmzExec; - return prefixDirectory | currentLayout#"programs" | nmzExec; @@ -47,9 +59,9 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Normal= iz.m2 M2source.patches/Ma ); =20 =20 -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/StatePolytope.m2 M2sour= ce.patches/Macaulay2/packages/StatePolytope.m2 ---- M2source.orig/Macaulay2/packages/StatePolytope.m2 2010-09-19 02:32:4= 6.000000000 +0200 -+++ M2source.patches/Macaulay2/packages/StatePolytope.m2 2010-09-19 02:3= 8:39.000000000 +0200 +diff -U 3 -dHrN M2source/Macaulay2/packages/StatePolytope.m2 M2source.pa= tch/Macaulay2/packages/StatePolytope.m2 +--- M2source/Macaulay2/packages/StatePolytope.m2 2010-09-10 16:47:20.000= 000000 +0100 ++++ M2source.patch/Macaulay2/packages/StatePolytope.m2 2011-09-24 21:24:= 12.000000000 +0100 @@ -31,7 +31,7 @@ =20 =20