Fix bug 229797, update deps for gtksharp-2.12.6, drop old.

(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64)

5 files changed, 140 insertions, 62 deletions

diff --git a/dev-util/bless/ChangeLog b/dev-util/bless/ChangeLog
index 8fb7decefdc9..527c7f8c666e 100644
--- a/dev-util/bless/ChangeLog
+++ b/dev-util/bless/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/bless
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/ChangeLog,v 1.11 2007/10/28 18:56:18 compnerd Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/ChangeLog,v 1.12 2008/11/25 16:42:28 loki_val Exp $
+
+  25 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/bless-0.5.2-mono-2.patch, -bless-0.5.0.ebuild, -bless-0.5.1.ebuild,
+  bless-0.5.2.ebuild:
+  Fix bug 229797, update deps for gtksharp-2.12.6, drop old.
 
 *bless-0.5.2 (28 Oct 2007)
 
diff --git a/dev-util/bless/bless-0.5.0.ebuild b/dev-util/bless/bless-0.5.0.ebuild
deleted file mode 100644
index 17bd917f21db..000000000000
--- a/dev-util/bless/bless-0.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/bless-0.5.0.ebuild,v 1.2 2007/05/14 20:35:41 compnerd Exp $
-
-inherit autotools eutils gnome2 mono
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="http://home.gna.org/bless/"
-SRC_URI="http://download.gna.org/bless/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-lang/mono-1.1.14
-		 >=dev-dotnet/gtk-sharp-2.8
-		 >=dev-dotnet/glade-sharp-2.8"
-DEPEND="${RDEPEND}
-		  app-text/scrollkeeper
-		>=sys-devel/gettext-0.15
-		>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-unix-specific $(use_enable debug)"
-}
diff --git a/dev-util/bless/bless-0.5.1.ebuild b/dev-util/bless/bless-0.5.1.ebuild
deleted file mode 100644
index e37b33f0ce31..000000000000
--- a/dev-util/bless/bless-0.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/bless-0.5.1.ebuild,v 1.1 2007/06/02 21:48:13 compnerd Exp $
-
-inherit autotools eutils gnome2 mono
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="http://home.gna.org/bless/"
-SRC_URI="http://download.gna.org/bless/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-lang/mono-1.1.14
-		 >=dev-dotnet/gtk-sharp-2.8
-		 >=dev-dotnet/glade-sharp-2.8"
-DEPEND="${RDEPEND}
-		  app-text/scrollkeeper
-		>=sys-devel/gettext-0.15
-		>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-unix-specific $(use_enable debug)"
-}
diff --git a/dev-util/bless/bless-0.5.2.ebuild b/dev-util/bless/bless-0.5.2.ebuild
index 074486b7fdf1..d16131fe135c 100644
--- a/dev-util/bless/bless-0.5.2.ebuild
+++ b/dev-util/bless/bless-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/bless-0.5.2.ebuild,v 1.1 2007/10/28 18:56:18 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bless/bless-0.5.2.ebuild,v 1.2 2008/11/25 16:42:28 loki_val Exp $
 
 inherit autotools eutils gnome2 mono
 
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-lang/mono-1.1.14
-		 >=dev-dotnet/gtk-sharp-2.8
-		 >=dev-dotnet/glade-sharp-2.8"
+		>=dev-dotnet/gtk-sharp-2.8
+		|| ( >=dev-dotnet/gtk-sharp-2.12.6 >=dev-dotnet/glade-sharp-2.8 )"
 DEPEND="${RDEPEND}
 		  app-text/scrollkeeper
 		>=sys-devel/gettext-0.15
@@ -24,6 +24,15 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
+	if has_version '>=dev-dotnet/gtk-sharp-2.12.6'
+	then
+		if ! built_with_use --missing false 'dev-dotnet/gtk-sharp' 'glade'
+		then
+			eerror "Please rebuild >=dev-dotnet/gtk-sharp-2.12.6 with USE='glade'"
+			die "Please rebuild >=dev-dotnet/gtk-sharp-2.12.6 with USE='glade'"
+		fi
+	fi
+
 	G2CONF="${G2CONF} --enable-unix-specific $(use_enable debug)"
 
 	# Stolen from enlightenment.eclass
@@ -33,8 +42,10 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
+	epatch "${FILESDIR}/${P}-mono-2.patch"
 
 	einfo "Running gettextize -f --no-changelog..."
 	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
 	eautoreconf
 }
+
diff --git a/dev-util/bless/files/bless-0.5.2-mono-2.patch b/dev-util/bless/files/bless-0.5.2-mono-2.patch
new file mode 100644
index 000000000000..4271046c56d4
--- /dev/null
+++ b/dev-util/bless/files/bless-0.5.2-mono-2.patch
@@ -0,0 +1,118 @@
+diff -Naur blessbroken/src/gui/plugins/BitwiseOperationsPlugin.cs bless-0.5.2/src/gui/plugins/BitwiseOperationsPlugin.cs
+--- blessbroken/src/gui/plugins/BitwiseOperationsPlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/BitwiseOperationsPlugin.cs	2008-07-08 01:33:38.352260344 +0200
+@@ -102,7 +102,7 @@
+ 		uim.InsertActionGroup(group, 0);
+ 		uim.AddUiFromString(uiXml);
+ 
+-		performAction = (Action)uim.GetAction("/DefaultAreaPopup/ExtraAreaPopupItems/PerformBitwiseOperation");
++		performAction = (Gtk.Action)uim.GetAction("/DefaultAreaPopup/ExtraAreaPopupItems/PerformBitwiseOperation");
+ 
+ 		uim.EnsureUpdate();
+ 
+diff -Naur blessbroken/src/gui/plugins/EditOperationsPlugin.cs bless-0.5.2/src/gui/plugins/EditOperationsPlugin.cs
+--- blessbroken/src/gui/plugins/EditOperationsPlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/EditOperationsPlugin.cs	2008-07-08 01:35:00.027629029 +0200
+@@ -151,12 +151,12 @@
+ 	void ConnectEditAccelerators(bool v)
+ 	{
+ 		if (editAccelCount == 0 && v == true) {
+-			foreach(Action a in editActionGroup.ListActions())
++			foreach(Gtk.Action a in editActionGroup.ListActions())
+ 			a.ConnectAccelerator();
+ 			editAccelCount = 1;
+ 		}
+ 		else if (editAccelCount == 1 && v == false) {
+-			foreach(Action a in editActionGroup.ListActions())
++			foreach(Gtk.Action a in editActionGroup.ListActions())
+ 			a.DisconnectAccelerator();
+ 			editAccelCount = 0;
+ 		}
+@@ -207,15 +207,15 @@
+ 		uim.InsertActionGroup(miscActionGroup, 0);
+ 
+ 		uim.AddUiFromString(uiXml);
+-		UndoAction = (Action)uim.GetAction("/menubar/Edit/Undo");
+-		RedoAction = (Action)uim.GetAction("/menubar/Edit/Redo");
+-		CutAction = (Action)uim.GetAction("/menubar/Edit/Cut");
+-		CopyAction = (Action)uim.GetAction("/menubar/Edit/Copy");
+-		PasteAction = (Action)uim.GetAction("/menubar/Edit/Paste");
+-		DeleteAction = (Action)uim.GetAction("/menubar/Edit/Delete");
++		UndoAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Undo");
++		RedoAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Redo");
++		CutAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Cut");
++		CopyAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Copy");
++		PasteAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Paste");
++		DeleteAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Delete");
+ 
+ 
+-		foreach (Action a in editActionGroup.ListActions()) {
++		foreach (Gtk.Action a in editActionGroup.ListActions()) {
+ 			// for some reason the accelerators are connected twice
+ 			// ... so disconnect them twice
+ 			for (int i = 0; i < 2; i++)
+diff -Naur blessbroken/src/gui/plugins/FileOperationsPlugin.cs bless-0.5.2/src/gui/plugins/FileOperationsPlugin.cs
+--- blessbroken/src/gui/plugins/FileOperationsPlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/FileOperationsPlugin.cs	2008-07-08 01:35:48.083280812 +0200
+@@ -159,11 +159,11 @@
+ 
+ 		uim.InsertActionGroup(group, 0);
+ 		uim.AddUiFromString(uiXml);
+-		SaveAction = (Action)uim.GetAction("/menubar/File/Save");
+-		SaveAsAction = (Action)uim.GetAction("/menubar/File/SaveAs");
+-		CloseAction = (Action)uim.GetAction("/menubar/File/Close");
+-		QuitAction = (Action)uim.GetAction("/menubar/File/Quit");
+-		RevertAction = (Action)uim.GetAction("/menubar/File/Revert");
++		SaveAction = (Gtk.Action)uim.GetAction("/menubar/File/Save");
++		SaveAsAction = (Gtk.Action)uim.GetAction("/menubar/File/SaveAs");
++		CloseAction = (Gtk.Action)uim.GetAction("/menubar/File/Close");
++		QuitAction = (Gtk.Action)uim.GetAction("/menubar/File/Quit");
++		RevertAction = (Gtk.Action)uim.GetAction("/menubar/File/Revert");
+ 
+ 		uim.EnsureUpdate();
+ 
+diff -Naur blessbroken/src/gui/plugins/FindReplacePlugin.cs bless-0.5.2/src/gui/plugins/FindReplacePlugin.cs
+--- blessbroken/src/gui/plugins/FindReplacePlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/FindReplacePlugin.cs	2008-07-08 01:36:15.427064932 +0200
+@@ -38,10 +38,10 @@
+ 	DataBook dataBook;
+ 	FindReplaceWidget widget;
+ 
+-	Action FindAction;
+-	Action FindNextAction;
+-	Action FindPreviousAction;
+-	Action ReplaceAction;
++	Gtk.Action FindAction;
++	Gtk.Action FindNextAction;
++	Gtk.Action FindPreviousAction;
++	Gtk.Action ReplaceAction;
+ 
+ 	IFinder finder;
+ 	Window mainWindow;
+@@ -162,10 +162,10 @@
+ 		uim.InsertActionGroup(group, 0);
+ 		uim.AddUiFromString(uiXml);
+ 
+-		FindAction = (Action)uim.GetAction("/menubar/Search/Find");
+-		FindNextAction = (Action)uim.GetAction("/menubar/Search/FindNext");
+-		FindPreviousAction = (Action)uim.GetAction("/menubar/Search/FindPrevious");
+-		ReplaceAction = (Action)uim.GetAction("/menubar/Search/Replace");
++		FindAction = (Gtk.Action)uim.GetAction("/menubar/Search/Find");
++		FindNextAction = (Gtk.Action)uim.GetAction("/menubar/Search/FindNext");
++		FindPreviousAction = (Gtk.Action)uim.GetAction("/menubar/Search/FindPrevious");
++		ReplaceAction = (Gtk.Action)uim.GetAction("/menubar/Search/Replace");
+ 
+ 		uim.EnsureUpdate();
+ 
+diff -Naur blessbroken/src/gui/plugins/HistoryPlugin.cs bless-0.5.2/src/gui/plugins/HistoryPlugin.cs
+--- blessbroken/src/gui/plugins/HistoryPlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/HistoryPlugin.cs	2008-07-08 01:36:49.074794118 +0200
+@@ -61,7 +61,7 @@
+ 		// clear previous list
+ 		uiManager.RemoveUi(mergeId);
+ 		uiManager.RemoveActionGroup(historyActionGroup);
+-		foreach(Action action in historyActionGroup.ListActions()) {
++		foreach(Gtk.Action action in historyActionGroup.ListActions()) {
+ 			historyActionGroup.Remove(action);
+ 		}
+