FIX for new gtk-sharp-module eclass

(Portage version: 2.2_rc20/cvs/Linux 2.6.28-rc9 x86_64)

3 files changed, 13 insertions, 19 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/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