FIX for new gtk-sharp-module eclass

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-rc9 x86_64

4 files changed, 16 insertions, 24 deletions

diff --git a/gnome-extra/gnome-do/ChangeLog b/gnome-extra/gnome-do/ChangeLog
index 6b6dca0f8059..bcf9fc82c3e3 100644
--- a/gnome-extra/gnome-do/ChangeLog
+++ b/gnome-extra/gnome-do/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2008/12/13 15:15:48 graaff Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.11 2009/01/05 17:25:56 loki_val Exp $
+
+  05 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  gnome-do-0.4.2.0-r2.ebuild, gnome-do-0.6.1.0.ebuild:
+  Fix for new gtk-sharp-module eclass
 
   13 Dec 2008; Hans de Graaff <graaff@gentoo.org> -gnome-do-0.4.2.0.ebuild,
   -gnome-do-0.4.2.0-r1.ebuild, gnome-do-0.6.1.0.ebuild:
diff --git a/gnome-extra/gnome-do/Manifest b/gnome-extra/gnome-do/Manifest
index 985391be0095..3d51121e76d6 100644
--- a/gnome-extra/gnome-do/Manifest
+++ b/gnome-extra/gnome-do/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-do-0.4.2.0-generic-gnome-desktop.patch 1473 RMD160 17a2e45aa8727386bb5fbaae78e7fd701ed8a32d SHA1 f7e5197beec233fdf5a74066cd35c74e7bbc220a SHA256 88a4ef6a4bb7ec3f2ed3505ded395c5652d89700fe549f68ed89811d4031f204
 AUX gnome-do-0.6.1.0-mono-2.2.patch 7422 RMD160 bcd15cd5990a3ba9828497f95893bc688af0bd68 SHA1 508194501656f3b6b6fdfa1a666a22cfc7e43a91 SHA256 ea43ddf9ad19d440c6ceb0bf680f48a822731ace7c3a6ca6f1493b9cfc56f87f
 DIST gnome-do-0.4.2.0.tar.gz 457275 RMD160 7248b37a0d20c7415a548522d0f097efa1fd8c3e SHA1 8ecb747e1adc0b0e2102ed3a86a6bb9e74f49e8e SHA256 a54b8c5b2331716804c2f91f8b5ff0852a0dbc98a152c16c56aa1cd845460882
 DIST gnome-do-0.6.1.0.tar.gz 519091 RMD160 c68c4ea535947ee27f3a3fb09a8bc28063e33d3e SHA1 fa815839a3c565ca7ed160eb1d0476c9eea24f8f SHA256 01977eafa2b9b615459b1a96b4e70dcc0e04592b0d58068457793b87c49fc6d8
-EBUILD gnome-do-0.4.2.0-r2.ebuild 1069 RMD160 872eb4d36e2f5787d39dd5055b1e265cbf2691d8 SHA1 6d5137c8ef22dcef594a1381de53d290af752146 SHA256 9b67fd443d36cfd596c040b5f6376c621de0faf2510a369204aeab1c8c5a4d36
-EBUILD gnome-do-0.6.1.0.ebuild 1441 RMD160 6a99c13be6e18ea1b3b0909573c9328234a13137 SHA1 a51969792ecec2c9babd52e7be4abbb3ca0ef074 SHA256 88698fdef5abf89beb00990c95286e0e95b2b4bc71cb3b2e7fa3d9bd84858cf2
-MISC ChangeLog 2396 RMD160 669c2fb2f915dd1aeb6092cf72de9abae286d2c4 SHA1 4ea97f32c7242446b7aefba3313db40a63f8be66 SHA256 d6a36d268d6b012b24cf6be8fed4db04cf71279d5b0ce40798572c1eedc7ffbe
+EBUILD gnome-do-0.4.2.0-r2.ebuild 984 RMD160 3d6fcdf50bf0bd2f444e25d35019b36099f2554d SHA1 7bb1bda90497c0b3d033ca1e4369e0bd17737737 SHA256 41d6a944ccb00fb10ac79c18a5540e3a796840eac2d2613d3e09dfcb5ba118a2
+EBUILD gnome-do-0.6.1.0.ebuild 1469 RMD160 e05ed2dc5109fc843db3c141c3cb9ce98253283e SHA1 c651cebb8073560489eba88da920a29eda3c91bd SHA256 c9f55b6a24351435888c05e4c000393878ef5d9e276a3612cca7abd990122192
+MISC ChangeLog 2545 RMD160 bc8bd053a6bb3ec9e9bab9afadab7317b193ef35 SHA1 9aaefdde3cba2c7287c5ea0c92fd9a86e665ff06 SHA256 f9e742bba989aeb1e2295ae82dd71fd7af61c6c2eaab4a65426cb57b588d0088
 MISC metadata.xml 636 RMD160 f016877bc198c2413301b83bb4506e7c09511b43 SHA1 69fedc8d43b14c5c5d71da683d245a42c3602f48 SHA256 0fbd964312685771f9333468bcf42f0ebf010b3170bcd17a614ec7b8cac7f697
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklD0asACgkQqj4ysMWt/vtcXgCaAxpZlAh0OV/zAc0fU0MDrpPs
-InkAoJc/W72SlTiqs3x67Hr+qdYG43um
-=f4FG
------END PGP SIGNATURE-----
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
index d6fce184fd93..b9465055c52f 100644
--- 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
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/12/06 12:27:44 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/gnome-do-0.4.2.0-r2.ebuild,v 1.3 2009/01/05 17:25:56 loki_val Exp $
 
 EAPI=2
 
@@ -21,10 +21,7 @@ RDEPEND="
 	>=dev-dotnet/gtk-sharp-2.0
 	>=dev-dotnet/gnome-sharp-2.0
 	>=dev-dotnet/gconf-sharp-2.0
-	|| (
-		>=dev-dotnet/gtk-sharp-2.12.6[glade]
-		( >=dev-dotnet/gtk-sharp-2.10 >=dev-dotnet/glade-sharp-2.4 )
-	)
+	>=dev-dotnet/glade-sharp-2.4
 	>=dev-dotnet/gnomevfs-sharp-2.0
 	dev-dotnet/dbus-sharp
 	dev-dotnet/dbus-glib-sharp
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
index 0822073aebd6..ed63aa69ef7b 100644
--- a/gnome-extra/gnome-do/gnome-do-0.6.1.0.ebuild
+++ b/gnome-extra/gnome-do/gnome-do-0.6.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/12/13 15:15:48 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/gnome-do-0.6.1.0.ebuild,v 1.3 2009/01/05 17:25:56 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.
@@ -23,7 +23,8 @@ IUSE=""
 
 RDEPEND="dev-lang/mono
 	>=dev-dotnet/gconf-sharp-2.24.0
-	>=dev-dotnet/gtk-sharp-2.12.6[glade]
+	>=dev-dotnet/gtk-sharp-2.12.6
+	>=dev-dotnet/glade-sharp-2.12.6
 	dev-dotnet/dbus-sharp
 	dev-dotnet/dbus-glib-sharp
 	>=dev-dotnet/gnome-desktop-sharp-2.24.0