sci-math/Macaulay2-9999 fixed

4 files changed, 19 insertions, 9 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 7d512316e..470a0546b 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Sep 2010; Thomas Kahle <tom111@gmx.de>
+  files/9999-paths-of-external-programs.patch, Macaulay2-9999.ebuild:
+  fixing live build
+
 *Macaulay2-9999 (19 Sep 2010)
 
   19 Sep 2010; Thomas Kahle <tom111@gmx.de>
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 271395f8f..8d4d6a6c8 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}"
 
 SITEFILE=70Macaulay2-gentoo.el
 
-S="${WORKDIR}/${PN}-${PV}-${MY_REV}"
+S="${WORKDIR}/${PN}-${PV}"
 
 RESTRICT="mirror"
 
@@ -64,6 +64,12 @@ src_prepare() {
 # 		epatch "${FILESDIR}"/respect-CFLAGS.patch
 # 	fi
 
+	# The Posets-Package refers to a non-existent Graphs package.
+	# We dump it for now.
+	rm "${S}"/Macaulay2/packages/Posets.m2
+	sed -i "/  Posets/d" "${S}"/configure.ac
+	sed -i "/Posets/d" "${S}"/Macaulay2/packages/Macaulay2Doc/changes.m2
+
 	# Fixing make warnings about unavailable jobserver:
 	sed -i "s/\$(MAKE)/+ \$(MAKE)/g" "${S}"/distributions/Makefile.in
 
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 71637eef3..bc1bc8ef8 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,5 +1,5 @@
 AUX 70Macaulay2-gentoo.el 597 RMD160 bdf3a30bb4d15a77e0dff86c866134d06c443fa0 SHA1 d4a4036042ab13bc20d8be90b559e9168bfc0ef5 SHA256 e5583d11e6ab662261abb32e90fcf31ccf6bd56f2b23b691b9255d1b8d8acb2f
-AUX 9999-paths-of-external-programs.patch 3170 RMD160 8ad9f330e761b3b13aa4b5864fc22938967f9775 SHA1 a515a63de6fd26553e04c669a634917a2c236ecd SHA256 1c42e806965d8ebd7e3196e2bb8750ea0bd492797e07450fb43cf45acb92c45b
+AUX 9999-paths-of-external-programs.patch 3175 RMD160 ad0f634b52b3fe883e49a53815481ca5b73d93c3 SHA1 4644c4b8c64678ca8205515436666651f467ee58 SHA256 162823069e075d7b7712db841d8c7bb8e1f03f2c33d4ade18e0b7a20543f5230
 AUX paths-of-dependencies.patch 2437 RMD160 9b63baeee97428406bed8bfbf67cf6fead95974a SHA1 cf245ad8bcdbe119e127242119b2b96342100035 SHA256 bffbaaf077f99f1e135fe0eff61be702c6eb138f4b4ae715cec8c5be62ee8046
 AUX respect-CFLAGS.patch 410 RMD160 9236f3e777d4b2d9510fa83ba71e8c4f4e114539 SHA1 adce86b7605e1aff654532968f8be7a199d2081e SHA256 13ba84357f79b7a779d3bbabdb4c367beeb08f7878ab8f4ca6d30ba219126349
 DIST Macaulay2-1.3.1.tar.bz2 3737431 RMD160 ce29e95d5b1b5409e368054f2edf0e5bd04d0dd3 SHA1 5a0f6b830b7a3a7cf045ac10e64ca2e3cb199600 SHA256 c07104d3a0edb70d61d3a221f7c8b0d23e0cca2d30b27127fe8ec7f763a2b4b1
@@ -11,6 +11,6 @@ DIST libfac-3-1-1.tar.gz 90104 RMD160 8ca086ad2dc1dfbf3d8824e244f0b1af087eef62 S
 DIST lrslib-042c.tar.gz 168765 RMD160 ada5b8b74808edb78c250d62147489381babdf49 SHA1 5614ea18725aa6a00f3deeb61d096f9e3564d753 SHA256 53f99b5271397bb5f317c96fa365edc1ac71fa7cba0295c8bd79e0882f5c3a4a
 EBUILD Macaulay2-1.3.1-r3.ebuild 2651 RMD160 ca4332c7ccbffd35ea516f968a77dfbc01e9c8eb SHA1 0551b9803cff0ff7993e4ca90d70b12eec628f6c SHA256 6f957b390ffadf97dce4c91ba30376cca016be8c3d93dedc83e4be23a2a96e92
 EBUILD Macaulay2-1.3.1-r4.ebuild 3323 RMD160 685a9e92768a913984f4b75e47bebac2c988d9ac SHA1 0247845b210eeb7b4f2e92764a99ca88b570e16e SHA256 07baf8dfcdc3ed2cf92db4f0a2530a3f63269452eab42c7d128f13c23ecf5d04
-EBUILD Macaulay2-9999.ebuild 3727 RMD160 ab596ff5a440d21c9e64acab075606e0f1da0d9f SHA1 2b4b3ad3877134f2c64df82d981b132ebbd1c472 SHA256 6a74b4026079f160323618d335c04baa2e339c41834b819d2b64c89d9af649c5
-MISC ChangeLog 2742 RMD160 3117d6906fa0d56978486b381811f7c07b36d782 SHA1 19849820f8087fe00cf3f35e35e18c48a15aa30c SHA256 3a69fb094718d3df2578f5409187d6cf97bd32940c7c514d39f1bec23ff303e8
+EBUILD Macaulay2-9999.ebuild 3956 RMD160 fce18da962f92841b40e2bf3703cef2f20f8ebbd SHA1 506069eb183b9a2f9e689c57afa0d550694354a6 SHA256 d9c0ca987460e889543fcd9b574ae950e79fafef24b5492a49f5c030c8fab154
+MISC ChangeLog 2877 RMD160 b7cb83950de63add2f9bd922aff9c1ce80dd8479 SHA1 1e91435370ce4e84403fe527eba2d1181f3e63f8 SHA256 49d9c2a926e23c02ff15e8d3d4c396a4f0663f6ef7d8f002fa30f4ccc6192b99
 MISC metadata.xml 486 RMD160 0e913360cd4f3dd6b814bf44341c83005739a22b SHA1 83fb4a5ca743b184562281c8f1a5b8f722528514 SHA256 5937610a5ea0ddb9d15953121aa4f512f6ba8c2bcd35882a2dfe401f1dbddaa7
diff --git a/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch b/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch
index 34376c19b..9b16e5a51 100644
--- a/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch
+++ b/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch
@@ -6,7 +6,7 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/FourTiTwo.m2 M2source.patches/M
  path'4ti2 = (options FourTiTwo).Configuration#"path"
  -- NOTE: the absolute path should be put into the .init file for 4ti2 inside the .Macaulay2 directory.
 -if path'4ti2 == "" then path'4ti2 = prefixDirectory | currentLayout#"programs"
-+if path'4ti2 == "" then path'4ti2 = "/usr/bin"
++if path'4ti2 == "" then path'4ti2 = "/usr/bin/"
  
  getFilename = () -> (
       filename := temporaryFileName();
@@ -18,7 +18,7 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/gfanInterface.m2 M2source.patch
  
  gfan'path = gfanInterface#Options#Configuration#"path"
 -if gfan'path == "" then gfan'path = prefixDirectory | currentLayout#"programs"
-+if gfan'path == "" then gfan'path = "/usr/bin"
++if gfan'path == "" then gfan'path = "/usr/bin/"
  if instance(gfan'path, String) then gfan'path = {gfan'path}
  if not instance(gfan'path,List) then error "expected configuration option gfan'path to be a list of strings or a string"
  gfan'path = join(
@@ -30,7 +30,7 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Nauty.m2 M2source.patches/Macau
  -- If it's not there, then use the M2-Programs directory.
  nauty'path = (options Nauty).Configuration#"path";
 -if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
-+if nauty'path == "" then nauty'path = "/usr/bin";
++if nauty'path == "" then nauty'path = "/usr/bin/";
 +
  
  -------------------
@@ -43,7 +43,7 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Normaliz.m2 M2source.patches/Ma
      );
  --    return nmzExec;
 -    return prefixDirectory | currentLayout#"programs" | nmzExec;
-+    return "/usr/bin" | nmzExec;
++    return "/usr/bin/" | nmzExec;
  );
  
  
@@ -55,7 +55,7 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/StatePolytope.m2 M2source.patch
  
  gfanCommand = (options StatePolytope)#Configuration#"gfan command"
 -if gfanCommand === "gfan" then gfanCommand = prefixDirectory | currentLayout#"programs" | gfanCommand
-+if gfanCommand === "gfan" then gfanCommand = "/usr/bin" | gfanCommand
++if gfanCommand === "gfan" then gfanCommand = "/usr/bin/" | gfanCommand
  gfanCommand = "!" | gfanCommand
  
  --The next two functions print out the ring and the ideal in the format required by gfan