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, 22 deletions

diff --git a/net-news/blam/ChangeLog b/net-news/blam/ChangeLog
index 84dbafd593f6..c43187e2712c 100644
--- a/net-news/blam/ChangeLog
+++ b/net-news/blam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-news/blam
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.49 2008/11/26 01:11:17 loki_val Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.50 2009/01/05 17:22:51 loki_val Exp $
+
+  05 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> blam-1.8.4.ebuild,
+  blam-1.8.6.ebuild:
+  Fix for new gtk-sharp-module eclass
 
   26 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
   -blam-1.8.4_pre2.ebuild:
diff --git a/net-news/blam/Manifest b/net-news/blam/Manifest
index f727a9339757..84de8aad5b57 100644
--- a/net-news/blam/Manifest
+++ b/net-news/blam/Manifest
@@ -2,7 +2,7 @@ AUX blam-1.8.4_pre2-gtk-sharp-2.10-compat.diff 1139 RMD160 fbba3c0717b825613e0fe
 AUX blam-1.8.4_pre2-remove-funky-non-printable.diff 821 RMD160 89145f6d4a5cb1357973264d850bb1d5b3153d0e SHA1 a19bb9c9086462f16b8d5f41f400e447d40530f0 SHA256 c3fc97ff7f7a8e118a58ca1805fc9fc6925ee55e981ea7b7150bed75cf41c7e4
 DIST blam-1.8.4.tar.gz 636444 RMD160 ce7162da9869c22b12321564b7f0bbf3e7e1449c SHA1 69acefe92464b51eb2516254bbd0b71bafd8cd0e SHA256 544de2b443fdd1aa5693e6c04479b83837e759d3c9c684171b4117627c0effc3
 DIST blam_1.8.6.orig.tar.gz 310503 RMD160 5279c94c36aa60636118a7dd94a11c5c241cee76 SHA1 94bb5504bd3af3fbb53b823a08a03b4c92a21171 SHA256 f20c061371c4ec4f7f730a117f1285e3391b3d0c5c8ecdd34affa2c6d324f63f
-EBUILD blam-1.8.4.ebuild 1525 RMD160 a53947e4f85548941361e4ac491e05cf35a87f4c SHA1 916f3a6476158b8020c2b98eacb4c555ff6170e2 SHA256 13c28041f96d61b490e9d0f547e34117c4774347feaa738db98c14652f2223c2
-EBUILD blam-1.8.6.ebuild 913 RMD160 1813ea882e058b7159912e64760538e28e4d4a06 SHA1 cf6e9d6407c0353498381cbcc715d67fd3b4bbce SHA256 230447b26babfd0f01fa29994f415c0d2b62c4a177948f7c76493bcbde47865d
-MISC ChangeLog 7553 RMD160 a16073c8db08cdc351dfb8a3a83faafe477bbf60 SHA1 86f69e371c89341089e687b83e66e5a1877ccf9c SHA256 65c31b38c49e3e58eaf7aceabf0b2a92c5d97d6bfcdde59889e2d6f471f1cc0a
+EBUILD blam-1.8.4.ebuild 1187 RMD160 6c5404898114bb01768fed4a9818c6f129e9fa2c SHA1 62448c9fcda3b99eb74536bd9e0b66ef749225ba SHA256 d6cc9b5323d3865bc5d2dc24bcb2f09b5a491c9fbf4c3318bacaaeb1ba0f66b3
+EBUILD blam-1.8.6.ebuild 939 RMD160 63129c35760fda09804b41e6c79944c6c5c8b278 SHA1 dba420cb5577e17e8bd89422c5aac50ba269e1f7 SHA256 7681243e7d8c487f9296851b16e378fb20c9f99442b6ad129c608ad1a62dbc84
+MISC ChangeLog 7685 RMD160 1e3df1a9a43e0a2921d68930223ef6eff62d5260 SHA1 1e2498db0e9831d039eca7f68733564571ac7daf SHA256 4cca59bb9f0f11cbadb6c560c597402a480ef3cf9d878868920d3711103c66ae
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
diff --git a/net-news/blam/blam-1.8.4.ebuild b/net-news/blam/blam-1.8.4.ebuild
index a3c2e3e6cc58..27b9813ff5ff 100644
--- a/net-news/blam/blam-1.8.4.ebuild
+++ b/net-news/blam/blam-1.8.4.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/net-news/blam/blam-1.8.4.ebuild,v 1.5 2008/11/25 16:11:26 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.8.4.ebuild,v 1.6 2009/01/05 17:22:51 loki_val Exp $
 
 inherit mono eutils autotools
 
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND=">=dev-lang/mono-1.1.17
 		>=dev-dotnet/gtk-sharp-2.8.2
-		|| ( >=dev-dotnet/gtk-sharp-2.12.6 >=dev-dotnet/glade-sharp-2.8.2 )
+		>=dev-dotnet/glade-sharp-2.8.2
 		>=dev-dotnet/gconf-sharp-2.8.2
 		>=dev-dotnet/gecko-sharp-0.11-r1
 		>=gnome-base/libgnomeui-2.2
@@ -28,17 +28,6 @@ DEPEND="${RDEPEND}
 # Disable parallel builds
 MAKEOPTS="$MAKEOPTS -j1"
 
-pkg_setup() {
-	if has_version '>=dev-dotnet/gtk-sharp-2.12.6'
-	then
-		if ! built_with_use --missing false 'dev-dotnet/gtk-sharp' 'glade'
-		then
-			eerror "Please rebuild >=dev-dotnet/gtk-sharp-2.12.6 with USE='glade'"
-			die "Please rebuild >=dev-dotnet/gtk-sharp-2.12.6 with USE='glade'"
-		fi
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/net-news/blam/blam-1.8.6.ebuild b/net-news/blam/blam-1.8.6.ebuild
index d33825b38b0f..2049f15c9513 100644
--- a/net-news/blam/blam-1.8.6.ebuild
+++ b/net-news/blam/blam-1.8.6.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/net-news/blam/blam-1.8.6.ebuild,v 1.1 2008/11/26 01:09:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.8.6.ebuild,v 1.2 2009/01/05 17:22:51 loki_val Exp $
 
 EAPI=2
 
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/mono-2
-	>=dev-dotnet/gtk-sharp-2.12.6[glade]
+	>=dev-dotnet/gtk-sharp-2.12.6
+	>=dev-dotnet/glade-sharp-2.12.6
 	>=dev-dotnet/gnome-sharp-2.16.1
 	>=dev-dotnet/gconf-sharp-2.8.2
 	>=dev-dotnet/webkit-sharp-0.2