Bump. Includes a few new deps, to handle gnome-panel support, as well as a hacky patch for mono-1.1.4 compat. See bug #79890

(Portage version: 2.0.51.16)

5 files changed, 206 insertions, 4 deletions

diff --git a/app-misc/tomboy/ChangeLog b/app-misc/tomboy/ChangeLog
index 7c12fbdc8852..92cc3763db52 100644
--- a/app-misc/tomboy/ChangeLog
+++ b/app-misc/tomboy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/tomboy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.3 2005/01/01 15:26:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.4 2005/02/18 04:22:52 latexer Exp $
+
+*tomboy-0.3.1 (17 Feb 2005)
+
+  17 Feb 2005; Peter Johanson <latexer@gentoo.org>
+  +files/tomboy-0.3.1-mono-1.1.4-compat.diff, +tomboy-0.3.1.ebuild:
+  Bump. Includes a few new deps, to handle gnome-panel support, as well as a
+  hacky patch for mono-1.1.4 compat. See bug #79890
 
 *tomboy-0.2.2-r1 (01 Dec 2004)
 
diff --git a/app-misc/tomboy/Manifest b/app-misc/tomboy/Manifest
index 62448493f3ac..745752323dcf 100644
--- a/app-misc/tomboy/Manifest
+++ b/app-misc/tomboy/Manifest
@@ -1,6 +1,9 @@
+MD5 6f1f35ffe25e342a10a8745d2f0e5918 tomboy-0.2.2-r1.ebuild 691
+MD5 9312b3e6748bdf0fa3b0d17f8b41b1d1 tomboy-0.3.1.ebuild 965
+MD5 d2c9167688e0ffdefedad427e2a977b4 tomboy-0.2.2.ebuild 617
 MD5 63b014702ef9398669fb7710019994c2 ChangeLog 557
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
-MD5 d2c9167688e0ffdefedad427e2a977b4 tomboy-0.2.2.ebuild 617
-MD5 6f1f35ffe25e342a10a8745d2f0e5918 tomboy-0.2.2-r1.ebuild 691
-MD5 63af496a835d4816dc76a26ef1a847ff files/digest-tomboy-0.2.2 64
 MD5 63af496a835d4816dc76a26ef1a847ff files/digest-tomboy-0.2.2-r1 64
+MD5 9d572d432b79faf2a4788337b85d1afa files/tomboy-0.3.1-mono-1.1.4-compat.diff 6537
+MD5 63af496a835d4816dc76a26ef1a847ff files/digest-tomboy-0.2.2 64
+MD5 a55d790d6f5b13436c5244a0e9465a27 files/digest-tomboy-0.3.1 64
diff --git a/app-misc/tomboy/files/digest-tomboy-0.3.1 b/app-misc/tomboy/files/digest-tomboy-0.3.1
new file mode 100644
index 000000000000..f0fefdef72bb
--- /dev/null
+++ b/app-misc/tomboy/files/digest-tomboy-0.3.1
@@ -0,0 +1 @@
+MD5 5011568beecbdd20768590470613fc9f tomboy-0.3.1.tar.gz 517928
diff --git a/app-misc/tomboy/files/tomboy-0.3.1-mono-1.1.4-compat.diff b/app-misc/tomboy/files/tomboy-0.3.1-mono-1.1.4-compat.diff
new file mode 100644
index 000000000000..afd749d072f5
--- /dev/null
+++ b/app-misc/tomboy/files/tomboy-0.3.1-mono-1.1.4-compat.diff
@@ -0,0 +1,154 @@
+diff -aur tomboy-0.3.1-orig/Tomboy/Applet.cs tomboy-0.3.1/Tomboy/Applet.cs
+--- tomboy-0.3.1-orig/Tomboy/Applet.cs	2005-01-18 06:32:37.000000000 -0500
++++ tomboy-0.3.1/Tomboy/Applet.cs	2005-02-15 10:48:16.823646424 -0500
+@@ -7,7 +7,7 @@
+ 
+ namespace Tomboy
+ {
+-	public class TomboyApplet : PanelApplet
++	public class TomboyApplet : PanelApplet.PanelApplet
+ 	{
+ 		NoteManager manager;
+ 		TomboyTray tray;
+@@ -65,6 +65,10 @@
+ 
+ 			// FIXME: Connecting to this crashes in the C# bindings.
+ 			//ChangeBackground += OnChangeBackgroundEvent;
++			
++			// This is needed as on mono-1.1.4, the whole
++			// applet gets reaped, including needed menu_verbs
++			GLib.Timeout.Add(1000, ImALIVE);
+ 		}
+ 
+ 		void ShowPreferencesVerb ()
+@@ -82,6 +86,11 @@
+ 			tray.ShowAbout ();
+ 		}
+ 
++		bool ImALIVE()
++		{
++			return true;
++		}
++
+ 		void OnChangeBackgroundEvent (object sender, ChangeBackgroundArgs args)
+ 		{
+ 			// This is needed to support transparent panel
+diff -aur tomboy-0.3.1-orig/Tomboy/panelapplet/generated/ChangeBackgroundHandler.cs tomboy-0.3.1/Tomboy/panelapplet/generated/ChangeBackgroundHandler.cs
+--- tomboy-0.3.1-orig/Tomboy/panelapplet/generated/ChangeBackgroundHandler.cs	2004-10-23 14:21:58.000000000 -0400
++++ tomboy-0.3.1/Tomboy/panelapplet/generated/ChangeBackgroundHandler.cs	2005-02-15 10:48:16.824646272 -0500
+@@ -8,9 +8,9 @@
+ 	public delegate void ChangeBackgroundHandler(object o, ChangeBackgroundArgs args);
+ 
+ 	public class ChangeBackgroundArgs : GLib.SignalArgs {
+-		public PanelApplet.BackgroundType Type{
++		public BackgroundType Type{
+ 			get {
+-				return (PanelApplet.BackgroundType) Args[0];
++				return (BackgroundType) Args[0];
+ 			}
+ 		}
+ 
+diff -aur tomboy-0.3.1-orig/Tomboy/panelapplet/generated/FactoryCallback.cs tomboy-0.3.1/Tomboy/panelapplet/generated/FactoryCallback.cs
+--- tomboy-0.3.1-orig/Tomboy/panelapplet/generated/FactoryCallback.cs	2004-10-23 14:21:58.000000000 -0400
++++ tomboy-0.3.1/Tomboy/panelapplet/generated/FactoryCallback.cs	2005-02-15 10:48:16.824646272 -0500
+@@ -5,6 +5,6 @@
+ 
+ 	using System;
+ 
+-	public delegate bool FactoryCallback(PanelApplet.PanelApplet applet, string iid);
++	public delegate bool FactoryCallback(PanelApplet applet, string iid);
+ 
+ }
+diff -aur tomboy-0.3.1-orig/Tomboy/panelapplet/generated/PanelApplet.cs tomboy-0.3.1/Tomboy/panelapplet/generated/PanelApplet.cs
+--- tomboy-0.3.1-orig/Tomboy/panelapplet/generated/PanelApplet.cs	2004-10-31 21:55:25.000000000 -0500
++++ tomboy-0.3.1/Tomboy/panelapplet/generated/PanelApplet.cs	2005-02-15 10:48:16.826645968 -0500
+@@ -37,7 +37,7 @@
+ 		static void changebackground_cb (IntPtr applet, int type, ref Gdk.Color color, IntPtr pixmap)
+ 		{
+ 			PanelApplet obj = GLib.Object.GetObject (applet, false) as PanelApplet;
+-			obj.OnChangeBackground ((PanelApplet.BackgroundType)type, color, (Gdk.Pixmap) GLib.Object.GetObject(pixmap));
++			obj.OnChangeBackground ((BackgroundType)type, color, (Gdk.Pixmap) GLib.Object.GetObject(pixmap));
+ 		}
+ 
+ 		private static void OverrideChangeBackground (GLib.GType gtype)
+@@ -47,8 +47,8 @@
+ 			OverrideVirtualMethod (gtype, "change_background", ChangeBackgroundCallback);
+ 		}
+ 
+-		[GLib.DefaultSignalHandler(Type=typeof(PanelApplet.PanelApplet), ConnectionMethod="OverrideChangeBackground")]
+-		protected virtual void OnChangeBackground (PanelApplet.BackgroundType type, Gdk.Color color, Gdk.Pixmap pixmap)
++		[GLib.DefaultSignalHandler(Type=typeof(PanelApplet), ConnectionMethod="OverrideChangeBackground")]
++		protected virtual void OnChangeBackground (BackgroundType type, Gdk.Color color, Gdk.Pixmap pixmap)
+ 		{
+ 			GLib.Value ret = GLib.Value.Empty;
+ 			GLib.ValueArray inst_and_params = new GLib.ValueArray (4);
+@@ -65,7 +65,7 @@
+ 		}
+ 
+ 		[GLib.Signal("change_background")]
+-		public event PanelApplet.ChangeBackgroundHandler ChangeBackground {
++		public event ChangeBackgroundHandler ChangeBackground {
+ 			add {
+ 				if (value.Method.GetCustomAttributes(typeof(GLib.ConnectBeforeAttribute), false).Length > 0) {
+ 					if (BeforeHandlers["change_background"] == null)
+@@ -119,7 +119,7 @@
+ 			OverrideVirtualMethod (gtype, "move_focus_out_of_applet", MoveFocusOutOfAppletCallback);
+ 		}
+ 
+-		[GLib.DefaultSignalHandler(Type=typeof(PanelApplet.PanelApplet), ConnectionMethod="OverrideMoveFocusOutOfApplet")]
++		[GLib.DefaultSignalHandler(Type=typeof(PanelApplet), ConnectionMethod="OverrideMoveFocusOutOfApplet")]
+ 		protected virtual void OnMoveFocusOutOfApplet (Gtk.DirectionType direction)
+ 		{
+ 			GLib.Value ret = GLib.Value.Empty;
+@@ -133,7 +133,7 @@
+ 		}
+ 
+ 		[GLib.Signal("move_focus_out_of_applet")]
+-		public event PanelApplet.MoveFocusOutOfAppletHandler MoveFocusOutOfApplet {
++		public event MoveFocusOutOfAppletHandler MoveFocusOutOfApplet {
+ 			add {
+ 				if (value.Method.GetCustomAttributes(typeof(GLib.ConnectBeforeAttribute), false).Length > 0) {
+ 					if (BeforeHandlers["move_focus_out_of_applet"] == null)
+@@ -187,7 +187,7 @@
+ 			OverrideVirtualMethod (gtype, "change_size", ChangeSizeCallback);
+ 		}
+ 
+-		[GLib.DefaultSignalHandler(Type=typeof(PanelApplet.PanelApplet), ConnectionMethod="OverrideChangeSize")]
++		[GLib.DefaultSignalHandler(Type=typeof(PanelApplet), ConnectionMethod="OverrideChangeSize")]
+ 		protected virtual void OnChangeSize (uint size)
+ 		{
+ 			GLib.Value ret = GLib.Value.Empty;
+@@ -201,7 +201,7 @@
+ 		}
+ 
+ 		[GLib.Signal("change_size")]
+-		public event PanelApplet.ChangeSizeHandler ChangeSize {
++		public event ChangeSizeHandler ChangeSize {
+ 			add {
+ 				if (value.Method.GetCustomAttributes(typeof(GLib.ConnectBeforeAttribute), false).Length > 0) {
+ 					if (BeforeHandlers["change_size"] == null)
+@@ -303,9 +303,9 @@
+ 		[DllImport("panel-applet-2")]
+ 		static extern int panel_applet_get_background(IntPtr raw, ref Gdk.Color color, IntPtr pixmap);
+ 
+-		public PanelApplet.BackgroundType GetBackground(Gdk.Color color, Gdk.Pixmap pixmap) {
++		public BackgroundType GetBackground(Gdk.Color color, Gdk.Pixmap pixmap) {
+ 			int raw_ret = panel_applet_get_background(Handle, ref color, pixmap.Handle);
+-			PanelApplet.BackgroundType ret = (PanelApplet.BackgroundType)raw_ret;
++			BackgroundType ret = (BackgroundType)raw_ret;
+ 			return ret;
+ 		}
+ 
+@@ -373,10 +373,10 @@
+ 		[DllImport("panel-applet-2")]
+ 		static extern void panel_applet_set_flags(IntPtr raw, int flags);
+ 
+-		public PanelApplet.Flags AppletFlags { 
++		public Flags AppletFlags { 
+ 			get {
+ 				int raw_ret = panel_applet_get_flags(Handle);
+-				PanelApplet.Flags ret = (PanelApplet.Flags)raw_ret;
++				Flags ret = (Flags)raw_ret;
+ 				return ret;
+ 			}
+ 			set {
diff --git a/app-misc/tomboy/tomboy-0.3.1.ebuild b/app-misc/tomboy/tomboy-0.3.1.ebuild
new file mode 100644
index 000000000000..7b7f8596b9a5
--- /dev/null
+++ b/app-misc/tomboy/tomboy-0.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.3.1.ebuild,v 1.1 2005/02/18 04:22:52 latexer Exp $
+
+inherit gnome2 mono eutils
+
+DESCRIPTION="Desktop note-taking application"
+
+HOMEPAGE="http://www.beatniksoftware.com/tomboy/"
+SRC_URI="http://www.beatniksoftware.com/tomboy/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~x86"
+IUSE="doc"
+
+DEPEND=">=dev-dotnet/mono-1.0
+		>=dev-dotnet/gtk-sharp-1.0.4-r1
+		>=dev-dotnet/gnome-sharp-1.0.4
+		>=dev-dotnet/gconf-sharp-1.0.4
+		>=gnome-base/gnome-panel-2.8.2
+		>=dev-libs/atk-1.2.4
+		>=app-text/aspell-0.60.2
+		>=app-text/gtkspell-2"
+# Disable dbus for now, as it's causing some crashes
+		#>=sys-apps/dbus-0.23
+
+DOCS="AUTHORS Changelog INSTALL NEWS README"
+G2CONF="${G2CONF} --disable-dbus"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mono-1.1.4-compat.diff || die
+}
+