Fix -9999 patch.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

3 files changed, 21 insertions, 27 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index aa3b25216e19..4404f8bfc35d 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mono
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.205 2010/11/27 15:50:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.206 2010/12/17 20:58:15 ali_bush Exp $
+
+  17 Dec 2010; Alistair Bush <ali_bush@gentoo.org>
+  files/mono-9999-libdir.patch:
+  Fix -9999 patch.
 
 *mono-2.8.1-r1 (27 Nov 2010)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index d65926fc4299..ceb741f72e7a 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mono-2.2-libdir126.patch 2788 RMD160 931e034c90accc2058596714d7ec07d138a77575 SHA1 7807f1d3e28c82ac0292cec2f49e063898a5d0cb SHA256 2d3de73c7aa6fdc90ddec67fc814910f40d6d8ed52ec918397ca9f5ac219c6a1
 AUX mono-2.2-ppc-threading.patch 563 RMD160 2ed9822034a966e31cc90312c09e4fec70951d38 SHA1 3dda8a39085fddec0b0e25e31743d49762575605 SHA256 b2a708fc4ec8b886bf095c0d5eacbfdb8c08e1bc58442cfb6fd116f93de466a7
 AUX mono-2.2-uselibdir.patch 714 RMD160 fb0478a9923c5de30b6f71fa1c1cad9703e3dc8c SHA1 790e357aaccb87cb76f08a1c12e16a8804e23b58 SHA256 0d97639d48e9a40847f1053799d00827323df0af615fdf26254a03f069123b03
 AUX mono-2.6.4-require-glib.patch 458 RMD160 312ffe40e55ae726ab2bdb8b323cfb110abf804a SHA1 4c1979a940bf550fcafbaa29a11470fa7e55eac1 SHA256 fc27512f901920a72c5e7744ecef134ed9081d2f2ff689e1af2f48f6fe9a6028
 AUX mono-2.8-libdir.patch 2721 RMD160 9a694e1a373fb3f18c79a75e76aaa4abbfbc283f SHA1 4ca811b882b2f9a6045cfe516cace7badb419c2d SHA256 58424336e2ff348fe9ad6f279936cd90e8ad918196382654bfb7fd60b7c928fc
 AUX mono-2.8.1-radegast-crash.patch 554 RMD160 178225b9a8afe118a478752a2d2ce3a358212381 SHA1 34e80ec5691d1f4f481a2c070de2e8f364bdf506 SHA256 6cf9a2adb3e6e1f6daf2a8c578a060e7a1598967116ad72af877d3a693b3c527
-AUX mono-9999-libdir.patch 2721 RMD160 9a694e1a373fb3f18c79a75e76aaa4abbfbc283f SHA1 4ca811b882b2f9a6045cfe516cace7badb419c2d SHA256 58424336e2ff348fe9ad6f279936cd90e8ad918196382654bfb7fd60b7c928fc
+AUX mono-9999-libdir.patch 2689 RMD160 daed4d116a1f497c86a3d6be3497f1ff7383f202 SHA1 35bc358f78f82f1751e70785c042c7ad6aabaedd SHA256 5065e4e4139add06d465089f9c537d18709fda79461aef08a688f6fc4207aad4
 DIST mono-2.6.7.tar.bz2 27921963 RMD160 5825ad284e4123e4ddb8933637a3dbf5f57f7f5a SHA1 6528c009d344a21eb0898876369222a7fff76838 SHA256 ae21a997d72e2fb8ea88644c87ab52471e9c97117b937e205ea1835b5a028ce4
 DIST mono-2.8.1.tar.bz2 31181201 RMD160 1d3c2a71fa46fcb93f201cdce2a19407cb1cd2ef SHA1 c46f9d8282803e8fd137acdb126e34421762b13c SHA256 ca4cc1b3f69458c3d8793b6694df51205f8b2cb3e8086d3986e753f7197e0da1
 EBUILD mono-2.6.7.ebuild 7564 RMD160 e83f25ce2d6bb38ecba81d86e96958a5ea7567d7 SHA1 a12f62b9decdc1c6ed93b6c6fbe4659d16e8074f SHA256 e8cbfd812e094cdd45149873461e5618be424219b5a6b7251e6f1d4371a09fed
 EBUILD mono-2.8.1-r1.ebuild 7720 RMD160 decb755cab713361f392ece3b71c97660ae15937 SHA1 cbc774f0ddad944481540c060754f769bba89068 SHA256 3b42688e653d16a5f8e320f3c4c9a537521c6ab7fd46b0445a66a168638791ee
 EBUILD mono-9999.ebuild 7853 RMD160 5a838495d09bb4fcdcfc6077c60bc1c7917fd2d2 SHA1 767925f8137f19f156bad600a056a3c6b76b6a15 SHA256 a64eb6185976d027c541a4ef530297441203f8ea23ebfb111630a159d24a176d
-MISC ChangeLog 43826 RMD160 63787a0dfc9706664620ef00e9c80a0079d00017 SHA1 d42da1126daa085d80f78a46f8219b1fa8e0659b SHA256 71f2bbd3cf7b42c309437a4bc0cd1e9aae63fe58f3e2cd9cfecd33b9a8a99411
+MISC ChangeLog 43932 RMD160 e19f43acc751fe589a1411d2df2646e89709205a SHA1 3dfe42a0c5d50d1a002a3cea843ebfcf9fb9c9bc SHA256 56f69aed9d713f5a265e8fe7a674f99e7a624a7550c76ecb427bb33943f20330
 MISC metadata.xml 484 RMD160 862882f919ccc94b3fbdcdb6d6218b0969fec187 SHA1 42a61b9a60f03068d6601262f26e5a6fde463022 SHA256 2953e2de5e3ec6d0a69e9b8e145e0b27fb43dc7e3d59ef6a546c15fbc960631d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzxKNcACgkQCaWpQKGI+9R0CACePMLmtkIjv1SfJI0eKo6sk+XF
-MGIAn2MexO+d7Fhp6eW98BPBnSioaFpr
-=e21c
------END PGP SIGNATURE-----
diff --git a/dev-lang/mono/files/mono-9999-libdir.patch b/dev-lang/mono/files/mono-9999-libdir.patch
index 6dd6bb51437b..99884a71521b 100644
--- a/dev-lang/mono/files/mono-9999-libdir.patch
+++ b/dev-lang/mono/files/mono-9999-libdir.patch
@@ -1,6 +1,6 @@
-diff -Naur mono-9999.bak/mono/mcs/tools/gacutil/driver.cs mono-9999/mono/mcs/tools/gacutil/driver.cs
---- mono-9999.bak/mono/mcs/tools/gacutil/driver.cs	2010-07-03 04:58:15.000000000 +1200
-+++ mono-9999/mono/mcs/tools/gacutil/driver.cs	2010-07-03 05:13:01.000000000 +1200
+diff -Naur mono-9999.bak/mcs/tools/gacutil/driver.cs mono-9999/mcs/tools/gacutil/driver.cs
+--- mono-9999.bak/mcs/tools/gacutil/driver.cs	2010-12-17 23:53:23.000000000 +1300
++++ mono-9999/mcs/tools/gacutil/driver.cs	2010-12-17 23:55:57.000000000 +1300
 @@ -808,7 +808,7 @@
  		private static string EnsureLib (string dir)
  		{
@@ -10,28 +10,28 @@ diff -Naur mono-9999.bak/mono/mcs/tools/gacutil/driver.cs mono-9999/mono/mcs/too
  				return dir;
  			return Path.Combine (dir, "lib");
  		}
-diff -Naur mono-9999.bak/mono/mono/metadata/assembly.c mono-9999/mono/mono/metadata/assembly.c
---- mono-9999.bak/mono/mono/metadata/assembly.c	2010-07-03 04:58:14.000000000 +1200
-+++ mono-9999/mono/mono/metadata/assembly.c	2010-07-03 05:11:47.000000000 +1200
-@@ -542,7 +542,7 @@
+diff -Naur mono-9999.bak/mono/metadata/assembly.c mono-9999/mono/metadata/assembly.c
+--- mono-9999.bak/mono/metadata/assembly.c	2010-12-17 23:53:22.000000000 +1300
++++ mono-9999/mono/metadata/assembly.c	2010-12-18 00:12:41.000000000 +1300
+@@ -566,7 +566,7 @@
  	}
  
  	config = g_build_filename (base, "etc", NULL);
 -	lib = g_build_filename (base, "lib", NULL);
 +	lib = g_build_filename (base, "@MONOLIBDIR@", NULL);
- 	mono = g_build_filename (lib, "mono/1.0", NULL);
+ 	mono = g_build_filename (lib, "mono/2.0", NULL);
  	if (stat (mono, &buf) == -1)
  		fallback ();
-@@ -595,7 +595,7 @@
+@@ -621,7 +621,7 @@
  
- 	bindir = g_path_get_dirname (name);
+ 	bindir = g_path_get_dirname (resolvedname);
  	installdir = g_path_get_dirname (bindir);
 -	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL);
 +	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "@MONOLIBDIR@", NULL);
  
  	config = g_build_filename (root, "..", "etc", NULL);
  #ifdef HOST_WIN32
-@@ -2066,7 +2066,7 @@
+@@ -2116,7 +2116,7 @@
  	if (extra_gac_paths) {
  		paths = extra_gac_paths;
  		while (!res && *paths) {
@@ -40,7 +40,7 @@ diff -Naur mono-9999.bak/mono/mono/metadata/assembly.c mono-9999/mono/mono/metad
  			res = probe_for_partial_name (gacpath, fullname, aname, status);
  			g_free (gacpath);
  			paths++;
-@@ -2117,7 +2117,7 @@
+@@ -2167,7 +2167,7 @@
  		if (*gp != G_DIR_SEPARATOR)
  			continue;
  		gp++;
@@ -49,7 +49,7 @@ diff -Naur mono-9999.bak/mono/mono/metadata/assembly.c mono-9999/mono/mono/metad
  			continue;
  		gp += 3;
  		if (*gp != G_DIR_SEPARATOR)
-@@ -2196,7 +2196,7 @@
+@@ -2246,7 +2246,7 @@
  		paths = extra_gac_paths;
  		while (!image && *paths) {
  			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
@@ -58,7 +58,7 @@ diff -Naur mono-9999.bak/mono/mono/metadata/assembly.c mono-9999/mono/mono/metad
  			image = mono_image_open (fullpath, NULL);
  			g_free (fullpath);
  			paths++;
-@@ -2488,7 +2488,7 @@
+@@ -2546,7 +2546,7 @@
  	if (extra_gac_paths) {
  		paths = extra_gac_paths;
  		while (!result && *paths) {