Bump, and include some fixes for compilation with stricter mono-1.1.7

(Portage version: 2.0.51.21-r1)

7 files changed, 87 insertions, 2 deletions

diff --git a/app-misc/tomboy/ChangeLog b/app-misc/tomboy/ChangeLog
index 434568e16843..3afe3cb941ad 100644
--- a/app-misc/tomboy/ChangeLog
+++ b/app-misc/tomboy/ChangeLog
@@ -1,6 +1,14 @@
 # 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.8 2005/03/15 01:10:25 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.9 2005/05/05 17:51:24 latexer Exp $
+
+*tomboy-0.3.2 (05 May 2005)
+
+  05 May 2005; Peter Johanson <latexer@gentoo.org>
+  +files/tomboy-0.3.2-1.1.x-compat.diff,
+  +files/tomboy-0.3.2-mono-1.1.7-compat.diff, tomboy-0.3.1.ebuild,
+  +tomboy-0.3.2.ebuild:
+  Bump, and include some fixes for compilation with stricter mono-1.1.7
 
   14 Mar 2005; Peter Johanson <latexer@gentoo.org> tomboy-0.2.2-r1.ebuild,
   -tomboy-0.2.2.ebuild, tomboy-0.3.1.ebuild:
diff --git a/app-misc/tomboy/Manifest b/app-misc/tomboy/Manifest
index 9e0d5156c281..17a7c3257b90 100644
--- a/app-misc/tomboy/Manifest
+++ b/app-misc/tomboy/Manifest
@@ -2,6 +2,10 @@ MD5 7c1f88611e1cf6558a68937510fb26e5 tomboy-0.2.2-r1.ebuild 776
 MD5 a49978fd074ba3a4a5a280177d95e789 tomboy-0.3.1.ebuild 1053
 MD5 d75b76335f59a8af3b12b97209c4288d ChangeLog 1463
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
+MD5 1d2fe152cfb445c1251992f10ead1dbb tomboy-0.3.2.ebuild 1108
 MD5 63af496a835d4816dc76a26ef1a847ff files/digest-tomboy-0.2.2-r1 64
 MD5 a29ae36c54ef8ad24aad99ede4f6c01a files/tomboy-0.3.1-mono-1.1.4-compat.diff 6562
 MD5 a55d790d6f5b13436c5244a0e9465a27 files/digest-tomboy-0.3.1 64
+MD5 17178389ed36e995fdc0b724a23e0af9 files/tomboy-0.3.2-mono-1.1.7-compat.diff 421
+MD5 2cc22a6e76016a63eb327a2734bb5283 files/tomboy-0.3.2-1.1.x-compat.diff 542
+MD5 f9b0cda18b91473b3e94744e50bb93fd files/digest-tomboy-0.3.2 64
diff --git a/app-misc/tomboy/files/digest-tomboy-0.3.2 b/app-misc/tomboy/files/digest-tomboy-0.3.2
new file mode 100644
index 000000000000..14fa7d8e9823
--- /dev/null
+++ b/app-misc/tomboy/files/digest-tomboy-0.3.2
@@ -0,0 +1 @@
+MD5 cb4c48860601e636e075644c40b973de tomboy-0.3.2.tar.gz 549963
diff --git a/app-misc/tomboy/files/tomboy-0.3.2-1.1.x-compat.diff b/app-misc/tomboy/files/tomboy-0.3.2-1.1.x-compat.diff
new file mode 100644
index 000000000000..aba05f977ce7
--- /dev/null
+++ b/app-misc/tomboy/files/tomboy-0.3.2-1.1.x-compat.diff
@@ -0,0 +1,18 @@
+diff -aur tomboy-0.3.2-orig/Tomboy/Applet.cs tomboy-0.3.2/Tomboy/Applet.cs
+--- tomboy-0.3.2-orig/Tomboy/Applet.cs	2005-03-30 22:09:25.000000000 -0500
++++ tomboy-0.3.2/Tomboy/Applet.cs	2005-04-14 20:31:09.000000000 -0400
+@@ -62,6 +62,14 @@
+ 					   "GNOME_TomboyApplet.xml",
+ 					   "Tomboy",
+ 					   menu_verbs);
++			// This is needed as on mono-1.1.4, the whole
++			// applet gets reaped, including needed menu_verbs
++			GLib.Timeout.Add(1000, ImALIVE);
++		}
++
++		bool ImALIVE()
++		{
++			return true;
+ 		}
+ 
+ 		void ShowPreferencesVerb ()
diff --git a/app-misc/tomboy/files/tomboy-0.3.2-mono-1.1.7-compat.diff b/app-misc/tomboy/files/tomboy-0.3.2-mono-1.1.7-compat.diff
new file mode 100644
index 000000000000..d6801141fc08
--- /dev/null
+++ b/app-misc/tomboy/files/tomboy-0.3.2-mono-1.1.7-compat.diff
@@ -0,0 +1,12 @@
+diff -aur tomboy-0.3.2-orig/Tomboy/Trie.cs tomboy-0.3.2/Tomboy/Trie.cs
+--- tomboy-0.3.2-orig/Tomboy/Trie.cs	2005-01-18 02:33:54.000000000 -0500
++++ tomboy-0.3.2/Tomboy/Trie.cs	2005-05-05 13:26:48.000000000 -0400
+@@ -186,7 +186,7 @@
+ 					 MatchHandler match_handler)
+ 		{
+ 			TrieState q = root;
+-			TrieMatch m;
++			TrieMatch m = null;
+ 			int idx = 0, start_idx = 0, last_idx = 0;
+ 
+ 			while (idx < haystack.Length) {
diff --git a/app-misc/tomboy/tomboy-0.3.1.ebuild b/app-misc/tomboy/tomboy-0.3.1.ebuild
index dce74c9ded4c..93fc31b6a719 100644
--- a/app-misc/tomboy/tomboy-0.3.1.ebuild
+++ b/app-misc/tomboy/tomboy-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2005/03/15 01:10:25 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-0.3.1.ebuild,v 1.5 2005/05/05 17:51:24 latexer Exp $
 
 inherit gnome2 mono eutils
 
@@ -36,5 +36,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-mono-1.1.4-compat.diff || die
+	epatch ${FILESDIR}/${PN}-0.3.2-mono-1.1.7-compat.diff || die
 }
 
diff --git a/app-misc/tomboy/tomboy-0.3.2.ebuild b/app-misc/tomboy/tomboy-0.3.2.ebuild
new file mode 100644
index 000000000000..71089ad61294
--- /dev/null
+++ b/app-misc/tomboy/tomboy-0.3.2.ebuild
@@ -0,0 +1,41 @@
+# 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.2.ebuild,v 1.1 2005/05/05 17:51:24 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}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+
+DEPEND=">=dev-lang/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
+		=dev-dotnet/gtk-sharp-1.0*
+		=dev-dotnet/gnome-sharp-1.0*
+		=dev-dotnet/gconf-sharp-1.0*
+		>=gnome-base/gnome-panel-2.8.2
+		>=dev-libs/atk-1.2.4
+		>=app-text/aspell-0.60.2
+		>=sys-apps/dbus-0.23
+		>=app-text/gtkspell-2"
+# Disable dbus for now, as it's causing some crashes
+
+DOCS="AUTHORS Changelog INSTALL NEWS README"
+#G2CONF="${G2CONF} --disable-dbus"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-1.1.x-compat.diff || die
+	epatch ${FILESDIR}/${P}-mono-1.1.7-compat.diff || die
+}
+