Fix importing of newer gnome desktop library

Package-Manager: portage-2.1.4.5

4 files changed, 86 insertions, 5 deletions

diff --git a/gnome-extra/gnome-do/ChangeLog b/gnome-extra/gnome-do/ChangeLog
index 85324cf3a8da..4aa4bb9720b2 100644
--- a/gnome-extra/gnome-do/ChangeLog
+++ b/gnome-extra/gnome-do/ChangeLog
@@ -1,6 +1,15 @@
 # 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.6 2008/09/28 09:30:04 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.7 2008/11/09 21:15:35 graaff Exp $
+
+*gnome-do-0.4.2.0-r2 (09 Nov 2008)
+
+  09 Nov 2008; Hans de Graaff <graaff@gentoo.org>
+  +files/gnome-do-0.4.2.0-generic-gnome-desktop.patch,
+  +gnome-do-0.4.2.0-r2.ebuild:
+  Add a patch to not use the major version when looking for the gnome desktop
+  library. This may break on future versions but currently allows gnome-do to
+  work with both < 2.24 and >= 2.24 versions of the library.
 
 *gnome-do-0.4.2.0-r1 (28 Sep 2008)
 
diff --git a/gnome-extra/gnome-do/Manifest b/gnome-extra/gnome-do/Manifest
index cd7871b53096..d1ea8e389453 100644
--- a/gnome-extra/gnome-do/Manifest
+++ b/gnome-extra/gnome-do/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnome-do-0.4.2.0-generic-gnome-desktop.patch 1473 RMD160 17a2e45aa8727386bb5fbaae78e7fd701ed8a32d SHA1 f7e5197beec233fdf5a74066cd35c74e7bbc220a SHA256 88a4ef6a4bb7ec3f2ed3505ded395c5652d89700fe549f68ed89811d4031f204
 DIST gnome-do-0.4.2.0.tar.gz 457275 RMD160 7248b37a0d20c7415a548522d0f097efa1fd8c3e SHA1 8ecb747e1adc0b0e2102ed3a86a6bb9e74f49e8e SHA256 a54b8c5b2331716804c2f91f8b5ff0852a0dbc98a152c16c56aa1cd845460882
 EBUILD gnome-do-0.4.2.0-r1.ebuild 869 RMD160 b45d64e14ee991ad3484f23cee8abdc28dcd9b1f SHA1 c3a224eeb0c4367b6b3311bc0e5d4354776d6cd7 SHA256 dab15aeef303edbcf72bb4c1c60e5107d7f14e91864d963f64158250930f413d
+EBUILD gnome-do-0.4.2.0-r2.ebuild 974 RMD160 83500a7d49cb7df59937ef69b404f08eefd85f0d SHA1 8b372bf2430bc7125a5dccd32ffd99da94e50b07 SHA256 0380dffbbe34834c714ffa45428eda09899a9a53b330bfbe20fd877604c5751e
 EBUILD gnome-do-0.4.2.0.ebuild 848 RMD160 55b6b3e1cba1bee331e589d981f7ef08f9b30043 SHA1 231de03e014ee7aabf451455c4b38dc63573ae9e SHA256 28849085f86db8026fe781258fea5698dc7aca46004f4ac01b4c96c29682b4eb
-MISC ChangeLog 1307 RMD160 a449c73f43241cda3dc7a7266b3bd7935c3a363d SHA1 9de06577958931e96d8024eed1c289e9a862d22a SHA256 f58d1faae7402270c5f6ae4edec293061a0c3b1c42690da745a19073ea06893d
+MISC ChangeLog 1697 RMD160 a5e09c6247f74f56726ebc7fc5e80aa1294a5a93 SHA1 5dfcd952a43095be44fb3d028ebe7559fdab4563 SHA256 73efc647f77bae8d472e6b8f3785075035d9764b1c1af8efecb382e3e869ddd5
 MISC metadata.xml 636 RMD160 f016877bc198c2413301b83bb4506e7c09511b43 SHA1 69fedc8d43b14c5c5d71da683d245a42c3602f48 SHA256 0fbd964312685771f9333468bcf42f0ebf010b3170bcd17a614ec7b8cac7f697
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjfTqgACgkQCzgcb6sPj4/A0wCeKmc+1yVgVd5dvba8JdckZCAD
-/WEAoI+5tTHO6a2/emYznGZ4Ko/E9e32
-=bTH6
+iEYEARECAAYFAkkXUwIACgkQCzgcb6sPj4++jwCdFUp3iKz86DcPM9YVNfoxz+Kx
+JIsAn04+YeNiTxu+JML7hhF2uCyINIjk
+=mrxB
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-do/files/gnome-do-0.4.2.0-generic-gnome-desktop.patch b/gnome-extra/gnome-do/files/gnome-do-0.4.2.0-generic-gnome-desktop.patch
new file mode 100644
index 000000000000..58dfc7992ba8
--- /dev/null
+++ b/gnome-extra/gnome-do/files/gnome-do-0.4.2.0-generic-gnome-desktop.patch
@@ -0,0 +1,34 @@
+Use the .so name to be a bit more resilient against minor updates of
+the library.
+
+--- Do.Addins/src/Do.Universe/ApplicationItem.cs.~1~	2008-03-14 09:26:18.000000000 +0100
++++ Do.Addins/src/Do.Universe/ApplicationItem.cs	2008-11-09 22:03:14.118065667 +0100
+@@ -122,22 +122,22 @@
+ 			gnome_desktop_item_drop_uri_list (desktopFilePtr, uri_list, 0, IntPtr.Zero);
+ 		}
+ 		
+-		[DllImport ("libgnome-desktop-2.so.2")]
++		[DllImport ("libgnome-desktop-2.so")]
+ 		private static extern IntPtr gnome_desktop_item_new_from_file (string file, int flags, IntPtr error);
+ 
+-		[DllImport ("libgnome-desktop-2.so.2")]
++		[DllImport ("libgnome-desktop-2.so")]
+ 		private static extern void gnome_desktop_item_unref (IntPtr item);
+ 
+-		[DllImport ("libgnome-desktop-2.so.2")]
++		[DllImport ("libgnome-desktop-2.so")]
+ 		private static extern IntPtr gnome_desktop_item_drop_uri_list (IntPtr item, string list, int flags, IntPtr error);
+ 
+-		[DllImport ("libgnome-desktop-2.so.2")]
++		[DllImport ("libgnome-desktop-2.so")]
+ 		private static extern int gnome_desktop_item_launch (IntPtr item, IntPtr args, int flags, IntPtr error);
+ 
+-		[DllImport ("libgnome-desktop-2.so.2")]
++		[DllImport ("libgnome-desktop-2.so")]
+ 		private static extern IntPtr gnome_desktop_item_get_localestring (IntPtr item, string id);
+ 
+-		[DllImport ("libgnome-desktop-2.so.2")]
++		[DllImport ("libgnome-desktop-2.so")]
+ 		private static extern IntPtr gnome_desktop_item_get_string (IntPtr item, string id);
+ 	}
+ }
diff --git a/gnome-extra/gnome-do/gnome-do-0.4.2.0-r2.ebuild b/gnome-extra/gnome-do/gnome-do-0.4.2.0-r2.ebuild
new file mode 100644
index 000000000000..83067964b28e
--- /dev/null
+++ b/gnome-extra/gnome-do/gnome-do-0.4.2.0-r2.ebuild
@@ -0,0 +1,36 @@
+# 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.4.2.0-r2.ebuild,v 1.1 2008/11/09 21:15:35 graaff Exp $
+
+inherit eutils gnome2 mono versionator
+
+PVC=$(get_version_component_range 1-2)
+
+DESCRIPTION="GNOME Do allows you to search for and perform actions on items in your desktop environment"
+HOMEPAGE="http://do.davebsd.com/"
+SRC_URI="https://launchpad.net/do/trunk/${PVC}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-dotnet/gtk-sharp-2.0
+	>=dev-dotnet/gnome-sharp-2.0
+	>=dev-dotnet/gconf-sharp-2.0
+	>=dev-dotnet/glade-sharp-2.0
+	>=dev-dotnet/gnomevfs-sharp-2.0
+	dev-dotnet/dbus-sharp
+	dev-dotnet/dbus-glib-sharp
+	x11-misc/xdg-utils"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-generic-gnome-desktop.patch"
+}