Adding patches for building with newer mono. Resolves bug #130826

Package-Manager: portage-2.1_pre9-r5

5 files changed, 80 insertions, 23 deletions

diff --git a/dev-util/bless/ChangeLog b/dev-util/bless/ChangeLog
index 4797299e5eb5..660eac271f69 100644
--- a/dev-util/bless/ChangeLog
+++ b/dev-util/bless/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bless
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/ChangeLog,v 1.2 2006/03/20 00:42:02 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/ChangeLog,v 1.3 2006/04/28 20:46:17 compnerd Exp $
+
+  28 Apr 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/bless-0.4.0-namespace.patch, +files/bless-0.4.0-strictness.patch,
+  bless-0.4.0.ebuild:
+  Adding patches from FreeBSD for building with >=mono-1.1.10; bumped mono to
+  the same. Resolves bug #130826.
 
   20 Mar 2006; Luis Medinas <metalgod@gentoo.org> bless-0.4.0.ebuild:
   Added ~amd64 keyword. Closes bug #122938.
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
index fa37f003c793..0bab937d22d3 100644
--- a/dev-util/bless/Manifest
+++ b/dev-util/bless/Manifest
@@ -1,22 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4c98d2a274c47586152459b851b1d811 ChangeLog 467
-RMD160 eb67b24b6a53f39ab497991c3305be6a6d0c17a1 ChangeLog 467
-SHA256 8eee6a1315dbd7e13437bd1428ebac28d7e0dc3262ef7aa23aaf4d5b7b9394ed ChangeLog 467
-MD5 9214f23a1070a63738aadd274b61aa3e bless-0.4.0.ebuild 747
-RMD160 e1592e0b740522b176b9bfe83eaa57ddd39d7738 bless-0.4.0.ebuild 747
-SHA256 e009954882953b807806d4d87af79b12275d930e1acfcfe76a1ed731a0d69c8d bless-0.4.0.ebuild 747
-MD5 6a5bcfdadb41ae4a1e30017d858fcbf9 files/digest-bless-0.4.0 235
-RMD160 40b4c6c1f625526438138d8ac0bee9e731c24f66 files/digest-bless-0.4.0 235
-SHA256 bd1a576d1bd7f0f14ccf6b2aa6ac75afeccd2cd6fa5de072406e830dad21540f files/digest-bless-0.4.0 235
+AUX bless-0.4.0-namespace.patch 1103 RMD160 b361bf28aa7df5d9827c26a57e9bb6ea2fa456c3 SHA1 952ad89d517fc432168dbbfda710ffcdcf6f52de SHA256 7708b81d3cecbd813e95ed41b9156ab3f34ef23443bfb31b56943ef35ded7931 size 1103
+MD5 8c198096d74a4f52a213e6221dc25bbd files/bless-0.4.0-namespace.patch 1103
+RMD160 b361bf28aa7df5d9827c26a57e9bb6ea2fa456c3 files/bless-0.4.0-namespace.patch 1103
+SHA256 7708b81d3cecbd813e95ed41b9156ab3f34ef23443bfb31b56943ef35ded7931 files/bless-0.4.0-namespace.patch 1103
+AUX bless-0.4.0-strictness.patch 419 RMD160 b9046ed4c12991dcc2d688af198850cb72c30fe4 SHA1 93a41ac1c602b1bdde334c94a5ec55538f6ed6ac SHA256 95abaf3933c300c5822d9de49cfb7c9e345afa659d5bce66fc96c06d782df2b2 size 419
+MD5 20017320b548a8b449d015d758da403a files/bless-0.4.0-strictness.patch 419
+RMD160 b9046ed4c12991dcc2d688af198850cb72c30fe4 files/bless-0.4.0-strictness.patch 419
+SHA256 95abaf3933c300c5822d9de49cfb7c9e345afa659d5bce66fc96c06d782df2b2 files/bless-0.4.0-strictness.patch 419
+DIST bless-0.4.0.tar.gz 534055 RMD160 65370b1b4653e232e44befd6769a61d85d792459 SHA256 35b79f37288f77fe89d60abc06eef4713c52f1422a4903caec5c287624eb22d4 size 534055
+EBUILD bless-0.4.0.ebuild 1005 RMD160 6d2f0779628693a787885b38e86cbb7bdc9191ad SHA1 17ecad85f66c3a29febd7b8abd98420fef2aaf5d SHA256 1d24d59597de0a598a85d97c25cf553324dcfa42ef92e63b2f560855484d5087 size 1005
+MD5 e80c9f2dae4e5e3304069d476ecdc7b9 bless-0.4.0.ebuild 1005
+RMD160 6d2f0779628693a787885b38e86cbb7bdc9191ad bless-0.4.0.ebuild 1005
+SHA256 1d24d59597de0a598a85d97c25cf553324dcfa42ef92e63b2f560855484d5087 bless-0.4.0.ebuild 1005
+MISC ChangeLog 733 RMD160 1a9dc2c4c8796324c3e86900494fcac6a25560f1 SHA1 820696d39fb998dc534654e286e939d8e7d2bd2c SHA256 bfcff36beef3330fd8bc7a46b30a091d8148c50e53071386f3795f8afff9ba2b size 733
+MD5 54cc0e2fe0032aea8e20e8edca9d4adc ChangeLog 733
+RMD160 1a9dc2c4c8796324c3e86900494fcac6a25560f1 ChangeLog 733
+SHA256 bfcff36beef3330fd8bc7a46b30a091d8148c50e53071386f3795f8afff9ba2b ChangeLog 733
+MISC metadata.xml 310 RMD160 76975cdc839045839ee7f4c853a608ff0d4b7305 SHA1 2703c041ee9bd1a059d5e29b34f54a3836e8d64c SHA256 eeb79b2ed9914e98857a71c66ef6f0a74a6074b4b0e2cf3916e60dcb801a903a size 310
 MD5 feb5f0f8ee912cfcfca3bcb9ea269f27 metadata.xml 310
 RMD160 76975cdc839045839ee7f4c853a608ff0d4b7305 metadata.xml 310
 SHA256 eeb79b2ed9914e98857a71c66ef6f0a74a6074b4b0e2cf3916e60dcb801a903a metadata.xml 310
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHfpawUpWvClEHQoRAu3RAJ9JE5T4mOg9Zxt75aQnb91pldLPRACfdlRW
-mH9XN09M1WCgHvIcI+xe9D0=
-=Ph5L
------END PGP SIGNATURE-----
+MD5 6a5bcfdadb41ae4a1e30017d858fcbf9 files/digest-bless-0.4.0 235
+RMD160 40b4c6c1f625526438138d8ac0bee9e731c24f66 files/digest-bless-0.4.0 235
+SHA256 bd1a576d1bd7f0f14ccf6b2aa6ac75afeccd2cd6fa5de072406e830dad21540f files/digest-bless-0.4.0 235
diff --git a/dev-util/bless/bless-0.4.0.ebuild b/dev-util/bless/bless-0.4.0.ebuild
index 4daccd7b5ee4..aa21536745ec 100644
--- a/dev-util/bless/bless-0.4.0.ebuild
+++ b/dev-util/bless/bless-0.4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/bless-0.4.0.ebuild,v 1.3 2006/03/20 00:42:02 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/bless-0.4.0.ebuild,v 1.4 2006/04/28 20:46:17 compnerd Exp $
 
-inherit mono
+inherit mono eutils
 
 DESCRIPTION="GTK# Hex Editor"
 HOMEPAGE="http://home.gna.org/bless/"
@@ -13,12 +13,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/mono-1.1.4
+RDEPEND=">=dev-lang/mono-1.1.10
 		 >=dev-dotnet/gtk-sharp-2
 		 >=dev-dotnet/glade-sharp-2"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch for >=mono-1.1.10 (Mono.Unix -> Mono.Unix.Native)
+	epatch ${FILESDIR}/${PN}-0.4.0-namespace.patch
+
+	# Patch for strictness.  Iterators are not mutable
+	epatch ${FILESDIR}/${PN}-0.4.0-strictness.patch
+}
+
 src_compile() {
 	econf --enable-unix-specific --without-scrollkeeper || die "conf failed"
 	emake || die "make failed"
diff --git a/dev-util/bless/files/bless-0.4.0-namespace.patch b/dev-util/bless/files/bless-0.4.0-namespace.patch
new file mode 100644
index 000000000000..b9f898b0d296
--- /dev/null
+++ b/dev-util/bless/files/bless-0.4.0-namespace.patch
@@ -0,0 +1,26 @@
+--- src/ByteBuffer/SaveAsOperation.cs	Sun Sep 11 12:22:16 2005
++++ src/ByteBuffer/SaveAsOperation.cs	Sat Feb 18 15:31:08 2006
+@@ -63,8 +63,8 @@
+ 	{
+ #if ENABLE_UNIX_SPECIFIC
+ 		// get info about the device the file will be saved on
+-		Mono.Unix.Statvfs stat=new Mono.Unix.Statvfs();
+-		Mono.Unix.Syscall.statvfs(Path.GetDirectoryName(fn), out stat);
++		Mono.Unix.Native.Statvfs stat=new Mono.Unix.Native.Statvfs();
++		Mono.Unix.Native.Syscall.statvfs(Path.GetDirectoryName(fn), out stat);
+ 			
+ 		long freeSpace=(long)(stat.f_bavail*stat.f_bsize);
+ 			
+--- src/ByteBuffer/SaveOperation.cs	Wed May 11 16:10:19 2005
++++ src/ByteBuffer/SaveOperation.cs	Sat Feb 18 15:41:21 2006
+@@ -53,8 +53,8 @@
+ 		// get info about the device the file will be saved on
+ 		FileInfo fi=new FileInfo(bb.Filename);
+ 			
+-		Mono.Unix.Statvfs stat=new Mono.Unix.Statvfs();
+-		Mono.Unix.Syscall.statvfs(bb.Filename, out stat);
++		Mono.Unix.Native.Statvfs stat=new Mono.Unix.Native.Statvfs();
++		Mono.Unix.Native.Syscall.statvfs(bb.Filename, out stat);
+ 			
+ 		long freeSpace=(long)(stat.f_bavail*stat.f_bsize) + fi.Length;
+ 			
diff --git a/dev-util/bless/files/bless-0.4.0-strictness.patch b/dev-util/bless/files/bless-0.4.0-strictness.patch
new file mode 100644
index 000000000000..84cf643de2c5
--- /dev/null
+++ b/dev-util/bless/files/bless-0.4.0-strictness.patch
@@ -0,0 +1,12 @@
+--- src/gui/dialogs/SaveConfirmationMultiAlert.cs	Mon Feb  7 06:46:46 2005
++++ src/gui/dialogs/SaveConfirmationMultiAlert.cs	Fri Apr 14 21:04:08 2006
+@@ -80,8 +80,7 @@
+ 			tv.AppendColumn ("Name", new CellRendererText(), "text", 1);
+ 			
+ 			foreach (SaveFileItem item in list) {
+-				item.Save=true;
+-				store.AppendValues(item.Save, item.Name);	
++				store.AppendValues(true, item.Name);	
+ 			}
+ 			 
+ 			return tv;