Fix live ebuild

(Portage version: 2.1.10.19/git/Linux i686, signed Manifest commit with key 0x20F2A3AE)

4 files changed, 54 insertions, 28 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index e3e7937dc..ab9d8e80d 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: $
 
+  25 Sep 2011; Thomas Kahle <tomka@gentoo.org>
+  files/9999-paths-of-external-programs.patch, Macaulay2-9999.ebuild:
+  Fix live ebuild
+
   09 Aug 2011; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
   adjusting boehm-gc source file
 
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index e4aa03caa..e313f6077 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -13,8 +13,8 @@ ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
 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="${SRC_BASE}/OtherSourceCode/1.3/factory-3-1-1.tar.gz
-		 ${SRC_BASE}/OtherSourceCode/1.3/libfac-3-1-1.tar.gz
+SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-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"
 
 SLOT="0"
@@ -67,9 +67,9 @@ src_prepare() {
 	# Factory, and libfac are statically linked libraries which (in this flavor) 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 elsewhere
 	# We will let it build its internal version for now.  Note:
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 46527cff9..e82ff09c6 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 70Macaulay2-gentoo.el 597 RMD160 bdf3a30bb4d15a77e0dff86c866134d06c443fa0 SHA1 d4a4036042ab13bc20d8be90b559e9168bfc0ef5 SHA256 e5583d11e6ab662261abb32e90fcf31ccf6bd56f2b23b691b9255d1b8d8acb2f
-AUX 9999-paths-of-external-programs.patch 3175 RMD160 ad0f634b52b3fe883e49a53815481ca5b73d93c3 SHA1 4644c4b8c64678ca8205515436666651f467ee58 SHA256 162823069e075d7b7712db841d8c7bb8e1f03f2c33d4ade18e0b7a20543f5230
+AUX 9999-paths-of-external-programs.patch 3767 RMD160 b13410a01285808e2a648d86064d95c2b578928d SHA1 6ecceef033f26b09483a6dfd24b090977daa4039 SHA256 af95d1332b04c6746af8c14477830cadb8807da097b14b07d30559df79f9a0bd
 AUX paths-of-dependencies.patch 2437 RMD160 9b63baeee97428406bed8bfbf67cf6fead95974a SHA1 cf245ad8bcdbe119e127242119b2b96342100035 SHA256 bffbaaf077f99f1e135fe0eff61be702c6eb138f4b4ae715cec8c5be62ee8046
-DIST factory-3-1-1.tar.gz 540431 RMD160 63b5d71c93b1c0f628d758959822f61b0a9c702c SHA1 2b0e087de5ff4d4b63c003e1b6f9926577f17264 SHA256 1f86833248ef2bb5fd7820201d08df864bda2d8be58bc69255ecdca6fdf12c1b
+DIST factory-3-1-3.tar.gz 628001 RMD160 4e4b65247266b0cfb9a7bd8774879e60c1fdbc59 SHA1 3e4e5ddff2cb606ac784a02c2d9a7b5a30ffe07b SHA256 7e8976ac16f69ab72c1e1a94f69a185854f35f59f5db16a58e4a407ef36ff661
 DIST gc-7.2alpha7-2011-07-25.tar.gz 1318092 RMD160 dfbf3c54ec301c02831029bd7fb8c2d7a4abcec5 SHA1 cd4fc4731fe1ad09574185c13bee17f240b35e8c SHA256 2578feb8d0cba997794277c7da0a8898838b34bf313d16e95a302eae16d1ec29
-DIST libfac-3-1-1.tar.gz 90104 RMD160 8ca086ad2dc1dfbf3d8824e244f0b1af087eef62 SHA1 3753363a6f56cfeb0d0be3bdf471d6bd55c14ede SHA256 4c463af2d22375aa62be4fb1f9a32cada6723ca5e3ddbd8a4f5cab72b675e33a
-EBUILD Macaulay2-9999.ebuild 3833 RMD160 5782e7975a4967e9ef305e6b10770df67dba354d SHA1 21f448ab81be3b80dfd1c640f61dcddf1b8abece SHA256 ec3d4ba198c9eda6dde232c37b8ed364f6bf1835a4ce0925d70cecc058b453ef
-MISC ChangeLog 4484 RMD160 9ed1c1c0d4d07624df625cc56ff17fbd02ab603a SHA1 060a6455b1536ef49224cf7e3155371e6311bd03 SHA256 67b99d2bfd949a2f643a05a94719330adb318bd595f8f9cca779aa86d8a158d2
+DIST libfac-3-1-3.tar.gz 84760 RMD160 dcb41afa852d782b64fdc05dde56d0d2e8699173 SHA1 d3fe1bf586331ae9d8c9bd7dc62899ef98159903 SHA256 17f63ebd74c36b22643c7b0e777e8759f7778ce716d8952b1f4aaed033f32b24
+EBUILD Macaulay2-9999.ebuild 3882 RMD160 d6f973570f7f179e1d92c717a02267607aaa7693 SHA1 f19afdc2f036e63439b5c390f7258fd8438939a8 SHA256 e28cab0bf0cf9676cad698c09bc64cae15003d9b960178955edcfbd06b5c0b2c
+MISC ChangeLog 4620 RMD160 5c3ecd060109ca262efd30cbd7ab03624406147c SHA1 c93b48e8c1d65844f426535c5a6f805c572a79ce SHA256 6c1b2c8025a221df15005abe57e9109e665263b1a530e5f82687eb2549c33ad3
 MISC metadata.xml 486 RMD160 0e913360cd4f3dd6b814bf44341c83005739a22b SHA1 83fb4a5ca743b184562281c8f1a5b8f722528514 SHA256 5937610a5ea0ddb9d15953121aa4f512f6ba8c2bcd35882a2dfe401f1dbddaa7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5+12UACgkQodBTJSDyo67xQgD9GpX6OGSI7uGrrlMmZyG6SE1H
+WClNR2RSuzuC1q6b2dsA/2rHdsUAtWXFtVWXTzenPCOT3K0LKw9BH52O3L36+O7q
+=Bc58
+-----END PGP SIGNATURE-----
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 9b16e5a51..4c090deec 100644
--- a/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch
+++ b/sci-mathematics/Macaulay2/files/9999-paths-of-external-programs.patch
@@ -1,6 +1,6 @@
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/FourTiTwo.m2 M2source.patches/Macaulay2/packages/FourTiTwo.m2
---- M2source.orig/Macaulay2/packages/FourTiTwo.m2	2010-09-19 02:32:45.000000000 +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.000000000 +0100
++++ M2source.patch/Macaulay2/packages/FourTiTwo.m2	2011-09-24 21:24:12.000000000 +0100
 @@ -47,7 +47,7 @@
  
  path'4ti2 = (options FourTiTwo).Configuration#"path"
@@ -10,10 +10,10 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/FourTiTwo.m2 M2source.patches/M
  
  getFilename = () -> (
       filename := temporaryFileName();
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/gfanInterface.m2 M2source.patches/Macaulay2/packages/gfanInterface.m2
---- M2source.orig/Macaulay2/packages/gfanInterface.m2	2010-09-19 02:32:45.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/gfanInterface.m2	2010-09-19 02:38:08.000000000 +0200
-@@ -26,7 +26,7 @@
+diff -U 3 -dHrN M2source/Macaulay2/packages/gfanInterface.m2 M2source.patch/Macaulay2/packages/gfanInterface.m2
+--- M2source/Macaulay2/packages/gfanInterface.m2	2011-05-14 12:00:59.000000000 +0100
++++ M2source.patch/Macaulay2/packages/gfanInterface.m2	2011-09-24 21:24:12.000000000 +0100
+@@ -25,7 +25,7 @@
       }
  
  gfan'path = gfanInterface#Options#Configuration#"path"
@@ -22,10 +22,22 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/gfanInterface.m2 M2source.patch
  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(
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Nauty.m2 M2source.patches/Macaulay2/packages/Nauty.m2
---- M2source.orig/Macaulay2/packages/Nauty.m2	2010-09-19 02:33:04.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/Nauty.m2	2010-09-19 02:40:46.000000000 +0200
-@@ -27,7 +27,8 @@
+diff -U 3 -dHrN M2source/Macaulay2/packages/NautyGraphs.m2 M2source.patch/Macaulay2/packages/NautyGraphs.m2
+--- M2source/Macaulay2/packages/NautyGraphs.m2	2011-08-26 11:05:30.000000000 +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 path.
+ -- If it's not there, then use the M2-Programs directory.
+ nauty'path = (options NautyGraphs).Configuration#"path";
+-if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
++if nauty'path == "" then nauty'path = "/usr/bin/";
+ 
+ -------------------
+ -- Exports
+diff -U 3 -dHrN M2source/Macaulay2/packages/Nauty.m2 M2source.patch/Macaulay2/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.000000000 +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 = (options Nauty).Configuration#"path";
@@ -35,11 +47,11 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Nauty.m2 M2source.patches/Macau
  
  -------------------
  -- Exports
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Normaliz.m2 M2source.patches/Macaulay2/packages/Normaliz.m2
---- M2source.orig/Macaulay2/packages/Normaliz.m2	2010-09-19 02:33:04.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/Normaliz.m2	2010-09-19 02:39:12.000000000 +0200
-@@ -156,7 +156,7 @@
-         nmzExec="norm64";
+diff -U 3 -dHrN M2source/Macaulay2/packages/Normaliz.m2 M2source.patch/Macaulay2/packages/Normaliz.m2
+--- M2source/Macaulay2/packages/Normaliz.m2	2011-05-25 16:47:50.000000000 +0100
++++ M2source.patch/Macaulay2/packages/Normaliz.m2	2011-09-24 21:24:12.000000000 +0100
+@@ -166,7 +166,7 @@
+         nmzExec="normaliz";
      );
  --    return nmzExec;
 -    return prefixDirectory | currentLayout#"programs" | nmzExec;
@@ -47,9 +59,9 @@ diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Normaliz.m2 M2source.patches/Ma
  );
  
  
-diff -U 3 -dHrN M2source.orig/Macaulay2/packages/StatePolytope.m2 M2source.patches/Macaulay2/packages/StatePolytope.m2
---- M2source.orig/Macaulay2/packages/StatePolytope.m2	2010-09-19 02:32:46.000000000 +0200
-+++ M2source.patches/Macaulay2/packages/StatePolytope.m2	2010-09-19 02:38:39.000000000 +0200
+diff -U 3 -dHrN M2source/Macaulay2/packages/StatePolytope.m2 M2source.patch/Macaulay2/packages/StatePolytope.m2
+--- M2source/Macaulay2/packages/StatePolytope.m2	2010-09-10 16:47:20.000000000 +0100
++++ M2source.patch/Macaulay2/packages/StatePolytope.m2	2011-09-24 21:24:12.000000000 +0100
 @@ -31,7 +31,7 @@