Bump, bug 225911, ebuild snatched from ikelos' overlay, patch acquired from miguel_ in #mono on irc.gnome.org

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

3 files changed, 304 insertions, 1 deletions

diff --git a/gnome-extra/gnome-do/ChangeLog b/gnome-extra/gnome-do/ChangeLog
index 4aa4bb9720b2..612a29424494 100644
--- a/gnome-extra/gnome-do/ChangeLog
+++ b/gnome-extra/gnome-do/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-do
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.7 2008/11/09 21:15:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.8 2008/12/05 22:32:22 loki_val Exp $
+
+*gnome-do-0.6.1.0 (05 Dec 2008)
+
+  05 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/gnome-do-0.6.1.0-mono-2.2.patch, +gnome-do-0.6.1.0.ebuild:
+  Bump, bug 225911, ebuild snatched from ikelos' overlay, patch acquired
+  from miguel_ in #mono on irc.gnome.org
 
 *gnome-do-0.4.2.0-r2 (09 Nov 2008)
 
diff --git a/gnome-extra/gnome-do/files/gnome-do-0.6.1.0-mono-2.2.patch b/gnome-extra/gnome-do/files/gnome-do-0.6.1.0-mono-2.2.patch
new file mode 100644
index 000000000000..d7ba390f86b6
--- /dev/null
+++ b/gnome-extra/gnome-do/files/gnome-do-0.6.1.0-mono-2.2.patch
@@ -0,0 +1,233 @@
+diff -ru gnome-do-0.6.1.0/Do/src/Do.Core/SearchControllers/SimpleSearchContext.cs gnome-do-0.6.1.0-new//Do/src/Do.Core/SearchControllers/SimpleSearchContext.cs
+--- gnome-do-0.6.1.0/Do/src/Do.Core/SearchControllers/SimpleSearchContext.cs	2008-09-23 04:29:33.000000000 -0400
++++ gnome-do-0.6.1.0-new//Do/src/Do.Core/SearchControllers/SimpleSearchContext.cs	2008-12-03 20:08:29.000000000 -0500
+@@ -45,13 +45,19 @@
+ 		
+ 		public string Query
+ 		{
+-			get { return query ?? query = string.Empty; }
++			get { if (query == null)
++					query = string.Empty;
++				return query;
++			}
+ 			set { query = value; }
+ 		}
+ 
+ 		public IObject[] Results
+ 		{
+-			get { return results ?? results = new IObject[0]; }
++			get { if (results == null)
++					results = new IObject[0];
++				return results;
++			}
+ 			set {
+ 				results = value ?? new IObject[0];
+ 				
+diff -ru gnome-do-0.6.1.0/Do/src/Do.cs gnome-do-0.6.1.0-new//Do/src/Do.cs
+--- gnome-do-0.6.1.0/Do/src/Do.cs	2008-09-23 04:29:33.000000000 -0400
++++ gnome-do-0.6.1.0-new//Do/src/Do.cs	2008-12-03 20:08:16.000000000 -0500
+@@ -117,35 +117,40 @@
+ 		}
+ 
+ 		public static DoPreferences Preferences {
+-			get { return preferences ?? 
+-					preferences = new DoPreferences (); 
++			get { if (preferences == null)
++					preferences = new DoPreferences ();
++				return preferences;
+ 			}
+ 		}
+ 		
+ 		public static CommandLinePreferences CLIPrefs {
+-			get { return cliprefs ?? 
+-					cliprefs = new CommandLinePreferences (args); 
++			get { if (cliprefs == null)
++					cliprefs = new CommandLinePreferences (args);
++				return cliprefs;
+ 			}
+ 		}
+ 
+ 		public static Controller Controller {
+ 			get {
+-				return controller ??
++				if (controller == null)
+ 					controller = new Controller ();
++				return controller;
+ 			}
+ 		}
+ 
+ 		public static IUniverseManager UniverseManager {
+ 			get {
+-				return universe_manager ??
++				if (universe_manager == null)
+ 					universe_manager = new SimpleUniverseManager ();
++				return universe_manager;
+ 			}
+ 		}
+ 		
+ 		public static NotificationIcon NotificationIcon {
+ 			get {
+-				return notification_icon ??
++				if ( notification_icon == null )
+ 					notification_icon = new NotificationIcon ();
++				return notification_icon;
+ 			}
+ 		}
+ 		
+diff -ru gnome-do-0.6.1.0/Do/src/Do.UI/MainMenu.cs gnome-do-0.6.1.0-new//Do/src/Do.UI/MainMenu.cs
+--- gnome-do-0.6.1.0/Do/src/Do.UI/MainMenu.cs	2008-09-23 04:29:33.000000000 -0400
++++ gnome-do-0.6.1.0-new//Do/src/Do.UI/MainMenu.cs	2008-12-03 20:08:25.000000000 -0500
+@@ -32,8 +32,9 @@
+ 
+ 		public static MainMenu Instance {
+ 			get {
+-				return instance ??
++				if (instance == null)
+ 					instance = new MainMenu ();
++				return instance;
+ 			}
+ 		}
+ 
+diff -ru gnome-do-0.6.1.0/Do/src/GconfPreferencesBackend.cs gnome-do-0.6.1.0-new//Do/src/GconfPreferencesBackend.cs
+--- gnome-do-0.6.1.0/Do/src/GconfPreferencesBackend.cs	2008-09-23 04:29:33.000000000 -0400
++++ gnome-do-0.6.1.0-new//Do/src/GconfPreferencesBackend.cs	2008-12-03 20:09:32.000000000 -0500
+@@ -74,6 +74,7 @@
+ 			try {
+ 				val = (T) client.Get (MakeKeyPath (key));
+ 			} catch {
++				val = default (T);
+ 				success = false;
+ 			}
+ 			return success;
+diff -ru gnome-do-0.6.1.0/Do.Addins/src/Do.Addins/SearchContext.cs gnome-do-0.6.1.0-new//Do.Addins/src/Do.Addins/SearchContext.cs
+--- gnome-do-0.6.1.0/Do.Addins/src/Do.Addins/SearchContext.cs	2008-09-23 04:29:33.000000000 -0400
++++ gnome-do-0.6.1.0-new//Do.Addins/src/Do.Addins/SearchContext.cs	2008-12-03 19:30:17.000000000 -0500
+@@ -81,7 +81,11 @@
+ 		
+ 		public List<IItem> Items
+ 		{
+-			get { return items ?? items = new List<IItem> (); }
++			get {
++				if (items == null)
++					items = new List<IItem> ();
++				return items;
++			}
+ 			set { items = value; }
+ 		}
+ 		
+@@ -99,13 +103,23 @@
+ 			
+ 		public string Query
+ 		{
+-			get { return query ?? query = ""; }
++			get {
++				if (query == null)
++					query = "";
++				
++				return query;
++			}
+ 			set { query = value; }
+ 		}
+ 
+ 		public IObject[] Results
+ 		{
+-			get { return results ?? results = new IObject[0]; }
++			get {
++				if (results == null)
++					results = new IObject [0];
++				
++				return results;
++			}
+ 			set {
+ 				results = value ?? new IObject[0];
+ 				cursor = 0;
+@@ -212,8 +226,13 @@
+ 		
+ 		public Type[] SearchTypes
+ 		{
+-			get { return searchTypes ??
+-					searchTypes = new Type[] {typeof (IItem), typeof (IAction)}; }
++			get {
++				if (searchTypes == null)
++					searchTypes = new Type[] {typeof (IItem), typeof (IAction)};
++				
++				return searchTypes;
++			}
++			
+ 			set {
+ 				PreviousSearchTypes = searchTypes;
+ 				searchTypes = value;
+@@ -222,8 +241,12 @@
+ 		
+ 		private Type[] PreviousSearchTypes
+ 		{
+-			get { return previousSearchTypes ??
+-					previousSearchTypes = new Type[] {typeof (IItem), typeof (IAction)}; }
++			get {
++				if (previousSearchTypes == null)
++					previousSearchTypes = new Type[] {typeof (IItem), typeof (IAction)};
++				
++				return previousSearchTypes;
++			}	
+ 			set {
+ 				previousSearchTypes = value;
+ 			}
+diff -ru gnome-do-0.6.1.0/Do.Addins/src/Do.UI/ClassicWindow/ClassicWindow.cs gnome-do-0.6.1.0-new//Do.Addins/src/Do.UI/ClassicWindow/ClassicWindow.cs
+--- gnome-do-0.6.1.0/Do.Addins/src/Do.UI/ClassicWindow/ClassicWindow.cs	2008-09-23 04:29:33.000000000 -0400
++++ gnome-do-0.6.1.0-new//Do.Addins/src/Do.UI/ClassicWindow/ClassicWindow.cs	2008-12-03 19:29:33.000000000 -0500
+@@ -72,8 +72,11 @@
+ 		
+ 		public PositionWindow PositionWindow {
+ 			get {
+-				return positionWindow ??
++				if (positionWindow == null)
+ 					positionWindow = new PositionWindow (this, resultsWindow);
++				
++				return positionWindow;
++					
+ 			}
+ 		}
+ 		
+diff -ru gnome-do-0.6.1.0/Do.Addins/src/Do.UI/DarkFrame/GlassWindow.cs gnome-do-0.6.1.0-new//Do.Addins/src/Do.UI/DarkFrame/GlassWindow.cs
+--- gnome-do-0.6.1.0/Do.Addins/src/Do.UI/DarkFrame/GlassWindow.cs	2008-09-23 04:29:33.000000000 -0400
++++ gnome-do-0.6.1.0-new//Do.Addins/src/Do.UI/DarkFrame/GlassWindow.cs	2008-12-03 19:29:47.000000000 -0500
+@@ -78,8 +78,9 @@
+ 		
+ 		public PositionWindow PositionWindow {
+ 			get {
+-				return positionWindow ?? 
++				if (positionWindow == null)
+ 					positionWindow = new PositionWindow(this, resultsWindow);
++				return positionWindow;
+ 			}
+ 		}
+ 		//---------------------ctor-----------------------
+diff -ru gnome-do-0.6.1.0/Do.Addins/src/Do.UI/MiniWindow/MiniWindow.cs gnome-do-0.6.1.0-new//Do.Addins/src/Do.UI/MiniWindow/MiniWindow.cs
+--- gnome-do-0.6.1.0/Do.Addins/src/Do.UI/MiniWindow/MiniWindow.cs	2008-09-23 04:29:33.000000000 -0400
++++ gnome-do-0.6.1.0-new//Do.Addins/src/Do.UI/MiniWindow/MiniWindow.cs	2008-12-03 19:30:00.000000000 -0500
+@@ -75,8 +75,10 @@
+ 		
+ 		public PositionWindow PositionWindow {
+ 			get {
+-				return positionWindow ??
++				if (positionWindow == null)
+ 					positionWindow = new PositionWindow (this, resultsWindow);
++
++				return positionWindow;
+ 			}
+ 		}
+ 		
+diff -ru gnome-do-0.6.1.0/Do.Addins/src/Do.Universe/ApplicationItem.cs gnome-do-0.6.1.0-new//Do.Addins/src/Do.Universe/ApplicationItem.cs
+--- gnome-do-0.6.1.0/Do.Addins/src/Do.Universe/ApplicationItem.cs	2008-09-23 04:29:33.000000000 -0400
++++ gnome-do-0.6.1.0-new//Do.Addins/src/Do.Universe/ApplicationItem.cs	2008-12-03 20:01:36.000000000 -0500
+@@ -107,8 +107,8 @@
+ 		/// </returns>
+ 		GLib.List IEnumerableToList<T> (IEnumerable<T> es)
+ 		{
+-			object [] arr;
+-	
++			T [] arr;
++
+ 			arr = new List<T> (es).ToArray ();
+ 			return new GLib.List (arr, typeof (T), false, true);
+ 		}
diff --git a/gnome-extra/gnome-do/gnome-do-0.6.1.0.ebuild b/gnome-extra/gnome-do/gnome-do-0.6.1.0.ebuild
new file mode 100644
index 000000000000..c3ba33392a30
--- /dev/null
+++ b/gnome-extra/gnome-do/gnome-do-0.6.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/gnome-do-0.6.1.0.ebuild,v 1.1 2008/12/05 22:32:22 loki_val Exp $
+
+# TODO: GNOME Do defaults to a debug build; to disable, --enable-release must
+# be passed. However, when doing this the build fails; figure out why.
+
+EAPI=2
+
+inherit gnome2 mono versionator eutils
+
+PVC=$(get_version_component_range 1-3)
+PVCS=$(get_version_component_range 1-2)
+
+DESCRIPTION="GNOME Do allows you to get things done quickly"
+HOMEPAGE="http://do.davebsd.com/"
+SRC_URI="https://launchpad.net/do/${PVCS}/${PVC}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/mono
+	>=dev-dotnet/gconf-sharp-2.24.0
+	>=dev-dotnet/gtk-sharp-2.12.6[glade]
+	dev-dotnet/dbus-sharp
+	dev-dotnet/dbus-glib-sharp
+	>=dev-dotnet/gnome-desktop-sharp-2.24.0
+	>=dev-dotnet/gnome-keyring-sharp-1.0.0
+	>=dev-dotnet/gnome-sharp-2.24.0
+	>=dev-dotnet/gnomevfs-sharp-2.24.0
+	>=dev-dotnet/wnck-sharp-2.24.0
+	>=dev-dotnet/art-sharp-2.24.0
+	dev-dotnet/mono-addins
+	dev-dotnet/notify-sharp
+	!<gnome-extra/gnome-do-plugins-0.6"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	dev-util/pkgconfig"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-mono-2.2.patch"
+}
+
+src_configure() {
+	gnome2_src_configure
+}
+
+src_compile() {
+	default
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "As of gnome-do-0.5 the plugins have been merged into the main"
+	elog "package, making gnome-extra/gnome-do-plugins obsolete."
+	elog
+	elog "For Evolution contacts support emerge dev-dotnet/evolution-sharp."
+}