From 684e5204c9c03e10fcb7d666f19ec3cc8f6e9ced Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 21 Mar 2011 22:53:32 +0000 Subject: Fix slot-deps on gnome libs (Portage version: 2.1.9.44/cvs/Linux x86_64) --- dev-haskell/gtk2hs/ChangeLog | 8 ++++++-- dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild | 14 +++++++------- dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild | 18 ++++++++++-------- 3 files changed, 23 insertions(+), 17 deletions(-) (limited to 'dev-haskell/gtk2hs') diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog index 45774177fe3b..44e55f056495 100644 --- a/dev-haskell/gtk2hs/ChangeLog +++ b/dev-haskell/gtk2hs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/gtk2hs -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.56 2010/07/13 11:00:26 slyfox Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.57 2011/03/21 22:53:32 nirbheek Exp $ + + 21 Mar 2011; Nirbheek Chauhan + gtk2hs-0.9.12.1.ebuild, gtk2hs-0.10.1.ebuild: + Fix slot-deps on gnome libs 13 Jul 2010; Sergei Trofimovich gtk2hs-0.10.1.ebuild: Fixed build failure against ghc-6.12.2+ (bug #327903). Thanks to Renato diff --git a/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild index ec5291a1597a..4221da2305cb 100644 --- a/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild +++ b/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild,v 1.4 2010/07/13 11:00:26 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild,v 1.5 2011/03/21 22:53:32 nirbheek Exp $ EAPI="2" @@ -21,11 +21,11 @@ IUSE="doc profile glade gnome opengl svg" RDEPEND=">=dev-lang/ghc-6.6 dev-haskell/mtl[doc?] x11-libs/gtk+:2 - glade? ( gnome-base/libglade ) - gnome? ( gnome-base/libglade - >=x11-libs/gtksourceview-2.2 - gnome-base/gconf ) - svg? ( gnome-base/librsvg ) + glade? ( gnome-base/libglade:2.0 ) + gnome? ( gnome-base/libglade:2.0 + >=x11-libs/gtksourceview-2.2:2.0 + gnome-base/gconf:2 ) + svg? ( gnome-base/librsvg:2 ) opengl? ( x11-libs/gtkglext )" DEPEND="${RDEPEND} diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild index 39d71d006856..d6d1f2673365 100644 --- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild +++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.13 2010/06/28 14:28:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.14 2011/03/21 22:53:32 nirbheek Exp $ + +EAPI="1" inherit base eutils ghc-package multilib toolchain-funcs versionator @@ -16,12 +18,12 @@ IUSE="doc glade gnome opengl svg profile" RDEPEND=">=dev-lang/ghc-6.4 dev-haskell/mtl - >=x11-libs/gtk+-2 - glade? ( >=gnome-base/libglade-2 ) - gnome? ( >=gnome-base/libglade-2 - =gnome-base/gconf-2 ) - svg? ( >=gnome-base/librsvg-2.16 ) + >=x11-libs/gtk+-2:2 + glade? ( >=gnome-base/libglade-2:2.0 ) + gnome? ( >=gnome-base/libglade-2:2.0 + x11-libs/gtksourceview:1.0 + gnome-base/gconf:2 ) + svg? ( >=gnome-base/librsvg-2.16:2 ) opengl? ( x11-libs/gtkglext )" DEPEND="${RDEPEND} -- cgit v1.2.3-65-gdbad