Fix slot-dep on gtk+

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

30 files changed, 130 insertions, 244 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 4cc965263f51..69c27a8d2141 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/acroread
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.164 2011/02/26 11:44:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.165 2011/03/27 12:16:34 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> acroread-9.4.1.ebuild,
+  acroread-9.4.2.ebuild:
+  Fix slot-dep on gtk+
 
   26 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   acroread-9.4.2.ebuild:
diff --git a/app-text/acroread/acroread-9.4.1.ebuild b/app-text/acroread/acroread-9.4.1.ebuild
index 3a2c1e433e62..c0e208d08696 100644
--- a/app-text/acroread/acroread-9.4.1.ebuild
+++ b/app-text/acroread/acroread-9.4.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.4.1.ebuild,v 1.4 2011/02/25 21:04:41 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.4.1.ebuild,v 1.5 2011/03/27 12:16:34 nirbheek Exp $
+
+EAPI="1"
 
 inherit eutils gnome2-utils nsplugins
 
@@ -34,7 +36,7 @@ RESTRICT="strip mirror"
 RDEPEND="media-libs/fontconfig
 	x86? ( =dev-libs/openssl-0.9.8* )
 	cups? ( net-print/cups )
-	x86? ( >=x11-libs/gtk+-2.0
+	x86? ( x11-libs/gtk+:2
 			ldap? ( net-nds/openldap )
 			!minimal? ( || ( net-libs/xulrunner
 						www-client/mozilla-firefox
diff --git a/app-text/acroread/acroread-9.4.2.ebuild b/app-text/acroread/acroread-9.4.2.ebuild
index 64e26219a33f..230c84e3615f 100644
--- a/app-text/acroread/acroread-9.4.2.ebuild
+++ b/app-text/acroread/acroread-9.4.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.4.2.ebuild,v 1.3 2011/02/26 11:44:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.4.2.ebuild,v 1.4 2011/03/27 12:16:34 nirbheek Exp $
+
+EAPI="1"
 
 inherit eutils gnome2-utils nsplugins
 
@@ -34,7 +36,7 @@ RESTRICT="strip mirror"
 RDEPEND="media-libs/fontconfig
 	x86? ( =dev-libs/openssl-0.9.8* )
 	cups? ( net-print/cups )
-	x86? ( >=x11-libs/gtk+-2.0
+	x86? ( x11-libs/gtk+:2
 			ldap? ( net-nds/openldap )
 			!minimal? ( || ( net-libs/xulrunner
 						www-client/mozilla-firefox
diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog
index 731324f7473e..f2579994fca5 100644
--- a/app-text/fbreader/ChangeLog
+++ b/app-text/fbreader/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/fbreader
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.18 2011/02/13 19:32:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.19 2011/03/27 12:17:32 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  fbreader-0.12.10.ebuild:
+  Fix slot-dep on gtk+
 
   13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -fbreader-0.12.7.ebuild,
   fbreader-0.12.10.ebuild:
diff --git a/app-text/fbreader/fbreader-0.12.10.ebuild b/app-text/fbreader/fbreader-0.12.10.ebuild
index 0f5833cc24e9..3ccea2106b85 100644
--- a/app-text/fbreader/fbreader-0.12.10.ebuild
+++ b/app-text/fbreader/fbreader-0.12.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild,v 1.4 2011/02/13 19:32:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild,v 1.5 2011/03/27 12:17:32 nirbheek Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ DEPEND="dev-libs/expat
 	app-arch/bzip2
 	dev-db/sqlite
 	qt4? ( x11-libs/qt-gui:4 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
 	"
 RDEPEND="${DEPEND}"
 
diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 0f193a959d46..3baa2c9c5035 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.109 2011/02/23 22:12:07 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.110 2011/03/27 12:19:15 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  ghostscript-gpl-8.71-r6.ebuild, ghostscript-gpl-9.00-r1.ebuild,
+  ghostscript-gpl-9.01.ebuild:
+  Fix slot-dep on gtk+
 
 *ghostscript-gpl-9.01 (23 Feb 2011)
 
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r6.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r6.ebuild
index 2434c188b86e..583eb2fe52fb 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r6.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r6.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/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r6.ebuild,v 1.8 2010/11/07 19:17:54 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r6.ebuild,v 1.9 2011/03/27 12:19:15 nirbheek Exp $
 
 EAPI=3
 inherit autotools eutils versionator flag-o-matic
@@ -29,7 +29,7 @@ COMMON_DEPEND="app-text/libpaper
 	!bindist? ( djvu? ( app-text/djvu ) )
 	cairo? ( >=x11-libs/cairo-1.2.0 )
 	cups? ( >=net-print/cups-1.3.8 )
-	gtk? ( >=x11-libs/gtk+-2.0 )
+	gtk? ( x11-libs/gtk+:2 )
 	jpeg2k? ( media-libs/jasper )
 	X? ( x11-libs/libXt x11-libs/libXext )"
 
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild
index b8b7d3bf3a30..841191f4d37c 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild,v 1.1 2011/02/01 19:02:39 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild,v 1.2 2011/03/27 12:19:15 nirbheek Exp $
 
 EAPI=3
 inherit autotools eutils versionator flag-o-matic
@@ -29,7 +29,7 @@ COMMON_DEPEND="app-text/libpaper
 	>=sys-libs/zlib-1.2.3
 	!bindist? ( djvu? ( app-text/djvu ) )
 	cups? ( >=net-print/cups-1.3.8 )
-	gtk? ( >=x11-libs/gtk+-2.0 )
+	gtk? ( x11-libs/gtk+:2 )
 	idn? ( net-dns/libidn )
 	jpeg2k? ( media-libs/jasper )
 	X? ( x11-libs/libXt x11-libs/libXext )"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild
index c16edec93ec3..537b5ab225f4 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild,v 1.1 2011/02/23 22:12:07 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild,v 1.2 2011/03/27 12:19:15 nirbheek Exp $
 
 EAPI=3
 inherit autotools eutils versionator flag-o-matic
@@ -29,7 +29,7 @@ COMMON_DEPEND="app-text/libpaper
 	>=sys-libs/zlib-1.2.3
 	!bindist? ( djvu? ( app-text/djvu ) )
 	cups? ( >=net-print/cups-1.3.8 )
-	gtk? ( >=x11-libs/gtk+-2.0 )
+	gtk? ( x11-libs/gtk+:2 )
 	idn? ( net-dns/libidn )
 	jpeg2k? ( media-libs/jasper )
 	X? ( x11-libs/libXt x11-libs/libXext )"
diff --git a/app-text/glosung/ChangeLog b/app-text/glosung/ChangeLog
index 6e227e3c8562..10b2e8afd694 100644
--- a/app-text/glosung/ChangeLog
+++ b/app-text/glosung/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/glosung
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/ChangeLog,v 1.10 2010/05/16 00:32:59 beandog Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/ChangeLog,v 1.11 2011/03/27 12:20:05 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> glosung-2.1.3.ebuild,
+  glosung-3.2.2.ebuild, glosung-3.4.2.ebuild, glosung-3.5.2.ebuild:
+  Fix slot-dep on gtk+
 
 *glosung-3.5.2 (16 May 2010)
 
diff --git a/app-text/glosung/glosung-2.1.3.ebuild b/app-text/glosung/glosung-2.1.3.ebuild
index cd3b1111c3ca..25ade0e4fccd 100644
--- a/app-text/glosung/glosung-2.1.3.ebuild
+++ b/app-text/glosung/glosung-2.1.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-2.1.3.ebuild,v 1.4 2008/06/26 01:55:12 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-2.1.3.ebuild,v 1.5 2011/03/27 12:20:05 nirbheek Exp $
+
+EAPI="1"
 
 DESCRIPTION="watch word program for the GNOME2 desktop (watch word (german): losung)"
 HOMEPAGE="http://www.godehardt.org/losung.html"
@@ -11,8 +13,8 @@ IUSE=""
 
 KEYWORDS="amd64 x86"
 
-RDEPEND=">=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.4
+RDEPEND=">=gnome-base/gconf-2.0:2
+	>=x11-libs/gtk+-2.4:2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2"
 DEPEND="${RDEPEND}
diff --git a/app-text/glosung/glosung-3.2.2.ebuild b/app-text/glosung/glosung-3.2.2.ebuild
index bb97ff1f0031..a5930e93975f 100644
--- a/app-text/glosung/glosung-3.2.2.ebuild
+++ b/app-text/glosung/glosung-3.2.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.2.2.ebuild,v 1.3 2008/06/26 01:55:12 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.2.2.ebuild,v 1.4 2011/03/27 12:20:05 nirbheek Exp $
+
+EAPI="1"
 
 DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
 HOMEPAGE="http://www.godehardt.org/losung.html"
@@ -10,8 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.4
+RDEPEND=">=gnome-base/gconf-2.0:2
+	>=x11-libs/gtk+-2.4:2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
 	net-misc/curl"
diff --git a/app-text/glosung/glosung-3.4.2.ebuild b/app-text/glosung/glosung-3.4.2.ebuild
index 9e87050bb851..b3c3385845f2 100644
--- a/app-text/glosung/glosung-3.4.2.ebuild
+++ b/app-text/glosung/glosung-3.4.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.4.2.ebuild,v 1.1 2009/07/24 20:17:44 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.4.2.ebuild,v 1.2 2011/03/27 12:20:05 nirbheek Exp $
+
+EAPI="1"
 
 DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
 HOMEPAGE="http://www.godehardt.org/losung.html"
@@ -10,8 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.4
+RDEPEND=">=gnome-base/gconf-2.0:2
+	>=x11-libs/gtk+-2.4:2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
 	net-misc/curl"
diff --git a/app-text/glosung/glosung-3.5.2.ebuild b/app-text/glosung/glosung-3.5.2.ebuild
index 6fdd0de53a7f..d2f0de4bfab1 100644
--- a/app-text/glosung/glosung-3.5.2.ebuild
+++ b/app-text/glosung/glosung-3.5.2.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/app-text/glosung/glosung-3.5.2.ebuild,v 1.1 2010/05/16 00:32:59 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.5.2.ebuild,v 1.2 2011/03/27 12:20:05 nirbheek Exp $
+
+EAPI="1"
 
 DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
 HOMEPAGE="http://www.godehardt.org/losung.html"
@@ -10,8 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.4
+RDEPEND=">=gnome-base/gconf-2.0:2
+	>=x11-libs/gtk+-2.4:2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
 	net-misc/curl"
diff --git a/app-text/gsview/ChangeLog b/app-text/gsview/ChangeLog
index 1436c46ceb9f..ca3e68d608d5 100644
--- a/app-text/gsview/ChangeLog
+++ b/app-text/gsview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/gsview
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/ChangeLog,v 1.33 2010/10/03 12:46:18 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/ChangeLog,v 1.34 2011/03/27 12:20:51 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gsview-4.8.ebuild,
+  gsview-4.9.ebuild:
+  Fix slot-dep on gtk+
 
   03 Oct 2010; Justin Lecher <jlec@gentoo.org> gsview-4.8.ebuild,
   gsview-4.9.ebuild:
diff --git a/app-text/gsview/gsview-4.8.ebuild b/app-text/gsview/gsview-4.8.ebuild
index 39481712f08c..d33c8af50f0a 100644
--- a/app-text/gsview/gsview-4.8.ebuild
+++ b/app-text/gsview/gsview-4.8.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/app-text/gsview/gsview-4.8.ebuild,v 1.15 2010/10/03 12:46:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/gsview-4.8.ebuild,v 1.16 2011/03/27 12:20:51 nirbheek Exp $
+
+EAPI="1"
 
 inherit eutils
 
@@ -14,12 +16,12 @@ SLOT="0"
 LICENSE="Aladdin"
 KEYWORDS="amd64 hppa ppc x86"
 
-RDEPEND="=x11-libs/gtk+-1.2*
+RDEPEND="x11-libs/gtk+:1
 	app-text/epstool
 	app-text/pstotext
 	app-text/ghostscript-gpl"
 DEPEND="app-arch/unzip
-	=x11-libs/gtk+-1.2*"
+	x11-libs/gtk+:1"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-text/gsview/gsview-4.9.ebuild b/app-text/gsview/gsview-4.9.ebuild
index d4ef08de96e8..49b555d6d7fd 100644
--- a/app-text/gsview/gsview-4.9.ebuild
+++ b/app-text/gsview/gsview-4.9.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/app-text/gsview/gsview-4.9.ebuild,v 1.2 2010/10/03 12:46:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/gsview-4.9.ebuild,v 1.3 2011/03/27 12:20:51 nirbheek Exp $
 
 EAPI="3"
 
@@ -17,12 +17,12 @@ SLOT="0"
 LICENSE="Aladdin"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="=x11-libs/gtk+-1.2*
+RDEPEND="x11-libs/gtk+:1
 	app-text/epstool
 	app-text/pstotext
 	app-text/ghostscript-gpl"
 DEPEND="app-arch/unzip
-	=x11-libs/gtk+-1.2*"
+	x11-libs/gtk+:1"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
diff --git a/app-text/notecase/ChangeLog b/app-text/notecase/ChangeLog
index 6c250589c88f..1a2028bd9c7c 100644
--- a/app-text/notecase/ChangeLog
+++ b/app-text/notecase/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/notecase
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/ChangeLog,v 1.24 2009/07/27 19:21:40 dirtyepic Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/ChangeLog,v 1.25 2011/03/27 12:21:59 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> notecase-1.9.8.ebuild:
+  Fix slot-dep on gtk+
 
   27 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> notecase-1.9.8.ebuild,
   +files/notecase-1.9.8-gcc44.patch:
diff --git a/app-text/notecase/notecase-1.9.8.ebuild b/app-text/notecase/notecase-1.9.8.ebuild
index edd283b0c2c5..829ec6f2e8ee 100644
--- a/app-text/notecase/notecase-1.9.8.ebuild
+++ b/app-text/notecase/notecase-1.9.8.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/notecase-1.9.8.ebuild,v 1.2 2009/07/27 19:21:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/notecase-1.9.8.ebuild,v 1.3 2011/03/27 12:21:59 nirbheek Exp $
+
+EAPI="1"
 
 inherit eutils fdo-mime
 
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gnome nls"
 
-RDEPEND=">=x11-libs/gtk+-2.6"
+RDEPEND=">=x11-libs/gtk+-2.6:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
diff --git a/app-text/searchmonkey/ChangeLog b/app-text/searchmonkey/ChangeLog
index dc8998edbccf..e8969c8ea6a8 100644
--- a/app-text/searchmonkey/ChangeLog
+++ b/app-text/searchmonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/searchmonkey
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/ChangeLog,v 1.4 2008/02/29 17:50:22 carlo Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/ChangeLog,v 1.5 2011/03/27 12:22:21 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  searchmonkey-0.8.1.ebuild:
+  Fix slot-dep on gtk+
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> searchmonkey-0.8.1.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/app-text/searchmonkey/searchmonkey-0.8.1.ebuild b/app-text/searchmonkey/searchmonkey-0.8.1.ebuild
index 79bd14882d16..691a0d0eed41 100644
--- a/app-text/searchmonkey/searchmonkey-0.8.1.ebuild
+++ b/app-text/searchmonkey/searchmonkey-0.8.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/searchmonkey-0.8.1.ebuild,v 1.3 2008/02/29 17:50:22 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/searchmonkey/searchmonkey-0.8.1.ebuild,v 1.4 2011/03/27 12:22:21 nirbheek Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.6"
+RDEPEND=">=x11-libs/gtk+-2.6:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index f1ee17d6c31a..086e5c81f86a 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/stardict
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.8 2010/09/18 16:10:49 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.9 2011/03/27 12:23:55 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -stardict-2.4.8-r1.ebuild, -stardict-3.0.1-r1.ebuild,
+  stardict-3.0.1-r2.ebuild, stardict-3.0.1-r3.ebuild:
+  Fix slot-dep on gtk+
 
   18 Sep 2010; Raúl Porcel <armin76@gentoo.org> stardict-3.0.1-r3.ebuild:
   sparc stable wrt #288555
diff --git a/app-text/stardict/stardict-2.4.8-r1.ebuild b/app-text/stardict/stardict-2.4.8-r1.ebuild
deleted file mode 100644
index 93a5e1cdc712..000000000000
--- a/app-text/stardict/stardict-2.4.8-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-2.4.8-r1.ebuild,v 1.1 2010/02/03 07:54:24 pva Exp $
-
-inherit gnome2 eutils
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-#       their indexes seem to be in a different format. So we'll keep them
-#       seperate for now.
-
-IUSE="gnome"
-DESCRIPTION="A GNOME2 international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict.sourceforge.net/ http://cosoft.org.cn/projects/stardict/"
-SRC_URI="mirror://sourceforge/stardict/${P}.tar.bz2"
-
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-# when adding keywords, remember to add to stardict.eclass
-KEYWORDS="~amd64 ppc ~ppc64 ~sparc x86"
-
-RDEPEND="gnome? ( >=gnome-base/libbonobo-2.2.0
-		>=gnome-base/libgnome-2.2.0
-		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
-		>=gnome-base/orbit-2.6
-		app-text/scrollkeeper )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/popt-1.7
-	>=x11-libs/gtk+-2.6"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.22
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"/src
-	epatch "${FILESDIR}"/${P}-ClipboardReceivedCallback.patch
-	epatch "${FILESDIR}"/${P}-floatwin-disappear.patch
-	gnome2_omf_fix
-}
-
-src_compile() {
-	export PKG_CONFIG=$(type -P pkg-config)
-	G2CONF="$(use_enable gnome gnome-support)"
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-	# dictionary index generation files
-	exeinto /usr/share/stardict/tools
-	doexe "${S}"/src/tools/{dictd2dic,directory2dic,olddic2newdic,oxford2dic,pydict2dic,wquick2dic,stardict_dict_update}
-}
-
-pkg_postinst() {
-	elog "You will now need to install stardict dictionary files. If"
-	elog "you have not, execute the below to get a list of dictionaries:"
-	elog
-	elog "  emerge -s stardict-"
-	elog
-	ewarn "If you upgraded from 2.4.1 or lower and use your own dictionary"
-	ewarn "files, you'll need to run: /usr/share/stardict/tools/stardict_dict_update"
-}
diff --git a/app-text/stardict/stardict-3.0.1-r1.ebuild b/app-text/stardict/stardict-3.0.1-r1.ebuild
deleted file mode 100644
index cc6e374a0822..000000000000
--- a/app-text/stardict/stardict-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r1.ebuild,v 1.2 2010/05/03 23:47:26 ssuominen Exp $
-
-inherit gnome2 eutils autotools
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-#       their indexes seem to be in a different format. So we'll keep them
-#       seperate for now.
-
-IUSE="festival espeak gnome gucharmap qqwry pronounce spell"
-DESCRIPTION="A GNOME2 international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stardict/${P}.tar.bz2
-		qqwry? ( mirror://sourceforge/stardict/QQWry.Dat.bz2 )
-		pronounce? ( mirror://sourceforge/stardict/WyabdcRealPeopleTTS.tar.bz2 )"
-
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
-		>=gnome-base/libgnome-2.2.0
-		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
-		>=gnome-base/orbit-2.6
-		app-text/scrollkeeper )
-	spell? ( app-text/enchant )
-	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.12"
-
-RDEPEND="${DEP}
-	espeak? ( >=app-accessibility/espeak-1.29 )
-	festival? ( =app-accessibility/festival-1.96_beta )"
-
-DEPEND="${DEP}
-	>=dev-util/intltool-0.22
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if (use gnome && use pronounce && ! built_with_use gnome-base/libgnome esd); then
-		ewarn 'Note, being built with USE="gnome" stardict uses gnome_sound_play()'
-		ewarn 'to play RealPeopleTTS sounds, which plays sounds only in case'
-		ewarn 'gnome-base/libgnome was built with USE="esd".'
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-configure.in-EST.diff
-	epatch "${FILESDIR}"/${P}-gconf-m4.diff
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-transparent_trayicon.patch
-	epatch "${FILESDIR}"/${P}-changelog-minor-typo-fixes.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	AT_M4DIR="m4" eautoreconf
-	gnome2_omf_fix
-}
-
-src_compile() {
-	export PKG_CONFIG=$(type -P pkg-config)
-	# Festival plugin crashes, bug 188684. Disable for now.
-	G2CONF="$(use_enable gnome gnome-support)
-		$(use_enable spell)
-		$(use_enable gucharmap)
-		$(use_enable espeak)
-		$(use_enable qqwry)
-		--disable-festival
-		--disable-advertisement
-		--disable-updateinfo"
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-	if use qqwry; then
-		insinto /usr/share/stardict/data
-		doins ../QQWry.Dat
-	fi
-	if use pronounce; then
-		dodir /usr/share/
-		mv ../WyabdcRealPeopleTTS "${D}"/usr/share/
-	fi
-	dodoc doc/{FAQ,HowToCreateDictionary,StarDictFileFormat,Translation,HACKING}
-}
-
-pkg_postinst() {
-	if use festival; then
-		elog "Note: festival text to speach (TTS) plugin is not built. To use festival"
-		elog 'TTS plugin, please, enable "Use TTS program." at:'
-		elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
-		elog '"echo %s | festival --tts"'
-		elog
-	fi
-	elog "You will now need to install stardict dictionary files. If"
-	elog "you have not, execute the below to get a list of dictionaries:"
-	elog
-	elog "  emerge -s stardict-"
-}
diff --git a/app-text/stardict/stardict-3.0.1-r2.ebuild b/app-text/stardict/stardict-3.0.1-r2.ebuild
index 3e0f5aef65ee..fbf8c41f1703 100644
--- a/app-text/stardict/stardict-3.0.1-r2.ebuild
+++ b/app-text/stardict/stardict-3.0.1-r2.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/app-text/stardict/stardict-3.0.1-r2.ebuild,v 1.4 2010/02/09 21:13:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r2.ebuild,v 1.5 2011/03/27 12:23:55 nirbheek Exp $
 
 EAPI="2"
 
@@ -26,14 +26,14 @@ DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
 		>=gnome-base/libgnome-2.2.0
 		pronounce? ( >=gnome-base/libgnome-2.2.0[esd] )
 		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
+		>=gnome-base/gconf-2:2
 		>=gnome-base/orbit-2.6
 		app-text/scrollkeeper )
 	spell? ( app-text/enchant )
 	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
 	dev-libs/libsigc++
 	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.12"
+	>=x11-libs/gtk+-2.12:2"
 
 RDEPEND="${DEP}
 	espeak? ( >=app-accessibility/espeak-1.29 )
diff --git a/app-text/stardict/stardict-3.0.1-r3.ebuild b/app-text/stardict/stardict-3.0.1-r3.ebuild
index 88db19a61156..537a05b81585 100644
--- a/app-text/stardict/stardict-3.0.1-r3.ebuild
+++ b/app-text/stardict/stardict-3.0.1-r3.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/app-text/stardict/stardict-3.0.1-r3.ebuild,v 1.2 2010/09/18 16:10:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r3.ebuild,v 1.3 2011/03/27 12:23:55 nirbheek Exp $
 
 EAPI="2"
 
@@ -26,14 +26,14 @@ DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
 		>=gnome-base/libgnome-2.2.0
 		pronounce? ( >=gnome-base/libgnome-2.2.0[esd] )
 		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
+		>=gnome-base/gconf-2:2
 		>=gnome-base/orbit-2.6
 		app-text/scrollkeeper )
 	spell? ( app-text/enchant )
 	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
 	dev-libs/libsigc++
 	sys-libs/zlib
-	>=x11-libs/gtk+-2.12"
+	>=x11-libs/gtk+-2.12:2"
 
 RDEPEND="${DEP}
 	espeak? ( >=app-accessibility/espeak-1.29 )
diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 67529849562a..56201a815c99 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xournal
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.13 2010/02/10 14:26:42 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.14 2011/03/27 12:25:04 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  xournal-0.4.2.1-r1.ebuild, xournal-0.4.5.ebuild, xournal-0.4.5-r1.ebuild:
+  Fix slot-dep on gtk+
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   xournal-0.4.2.1-r1.ebuild, xournal-0.4.5.ebuild, xournal-0.4.5-r1.ebuild:
diff --git a/app-text/xournal/xournal-0.4.2.1-r1.ebuild b/app-text/xournal/xournal-0.4.2.1-r1.ebuild
index 072f652224bb..dd0beff24db9 100644
--- a/app-text/xournal/xournal-0.4.2.1-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.2.1-r1.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/app-text/xournal/xournal-0.4.2.1-r1.ebuild,v 1.6 2010/02/10 14:26:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.2.1-r1.ebuild,v 1.7 2011/03/27 12:25:04 nirbheek Exp $
 
 EAPI=2
 inherit gnome2 autotools
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE="pdf doc"
 
 DEPEND="${DEPEND}
-	>=x11-libs/gtk+-2.6
+	>=x11-libs/gtk+-2.6:2
 	>=gnome-base/libgnomecanvas-2.4
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2"
diff --git a/app-text/xournal/xournal-0.4.5-r1.ebuild b/app-text/xournal/xournal-0.4.5-r1.ebuild
index 883b937a6c10..f5e0309dce47 100644
--- a/app-text/xournal/xournal-0.4.5-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.5-r1.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/app-text/xournal/xournal-0.4.5-r1.ebuild,v 1.3 2010/02/10 14:26:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5-r1.ebuild,v 1.4 2011/03/27 12:25:04 nirbheek Exp $
 
 EAPI=2
 inherit gnome2 eutils
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="pdf doc"
 
-DEPEND=">=x11-libs/gtk+-2.10
+DEPEND=">=x11-libs/gtk+-2.10:2
 	>=gnome-base/libgnomecanvas-2.4
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2
diff --git a/app-text/xournal/xournal-0.4.5.ebuild b/app-text/xournal/xournal-0.4.5.ebuild
index 67b9c7a6f8c5..889a368bf097 100644
--- a/app-text/xournal/xournal-0.4.5.ebuild
+++ b/app-text/xournal/xournal-0.4.5.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/app-text/xournal/xournal-0.4.5.ebuild,v 1.4 2010/02/10 14:26:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5.ebuild,v 1.5 2011/03/27 12:25:04 nirbheek Exp $
 
 EAPI=2
 inherit gnome2
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="pdf doc"
 
-DEPEND=">=x11-libs/gtk+-2.10
+DEPEND=">=x11-libs/gtk+-2.10:2
 	>=gnome-base/libgnomecanvas-2.4
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2