Fix slot-deps on gnome libs, remove old

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

23 files changed, 56 insertions, 593 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 8c03b572c411..42c1f1017a12 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.215 2011/03/22 19:24:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.216 2011/03/23 08:11:09 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gcalctool-5.28.2.ebuild, -gcalctool-5.30.2.ebuild,
+  gcalctool-5.32.2.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gcalctool-5.32.2.ebuild:
   Marking gcalctool-5.32.2 ppc stable for bug 353436
diff --git a/gnome-extra/gcalctool/gcalctool-5.28.2.ebuild b/gnome-extra/gcalctool/gcalctool-5.28.2.ebuild
deleted file mode 100644
index 9d638425d3f7..000000000000
--- a/gnome-extra/gcalctool/gcalctool-5.28.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.28.2.ebuild,v 1.8 2011/01/27 12:52:12 xarthisius Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.14.0
-	>=dev-libs/glib-2
-	>=dev-libs/atk-1.5
-	>=gnome-base/gconf-2
-	!<gnome-extra/gnome-utils-2.3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix bashisms
-	sed 's/\[\[\(.*\)\]\]/[\1]/g' -i configure.in configure || die "sed failed"
-}
diff --git a/gnome-extra/gcalctool/gcalctool-5.30.2.ebuild b/gnome-extra/gcalctool/gcalctool-5.30.2.ebuild
deleted file mode 100644
index 13cddf8da863..000000000000
--- a/gnome-extra/gcalctool/gcalctool-5.30.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.30.2.ebuild,v 1.10 2011/01/27 07:57:40 fauli Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 sh sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.18.0
-	>=dev-libs/glib-2
-	>=gnome-base/gconf-2.1.9
-	dev-libs/libxml2
-	!<gnome-extra/gnome-utils-2.3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix bashisms
-	sed 's/\[\[\(.*\)\]\]/[\1]/g' -i configure.ac configure || die "sed failed"
-}
diff --git a/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild b/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild
index fbc4a7c5c5fc..4d8a7cff1e73 100644
--- a/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.32.2.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/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild,v 1.6 2011/03/22 19:24:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild,v 1.7 2011/03/23 08:11:09 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.18:2
 	>=dev-libs/glib-2.25.10:2
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	!<gnome-extra/gnome-utils-2.3"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 5defa8acbeed..81c2e1ee3760 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.215 2011/03/22 19:28:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.216 2011/03/23 08:14:44 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gnome-utils-2.30.0.ebuild, gnome-utils-2.32.0-r1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gnome-utils-2.32.0-r1.ebuild:
   Marking gnome-utils-2.32.0-r1 ppc stable for bug 353436
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild
deleted file mode 100644
index 08f8197339a2..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild,v 1.12 2010/10/17 15:47:08 armin76 Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Utilities for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="doc ipv6 test"
-
-RDEPEND=">=dev-libs/glib-2.20.0
-	>=x11-libs/gtk+-2.18.0
-	>=gnome-base/gnome-panel-2.13.4
-	>=gnome-base/libgtop-2.12
-	>=gnome-base/gconf-2
-	>=media-libs/libcanberra-0.4[gtk]
-	x11-libs/libXext
-	x11-libs/libX11"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	app-text/gnome-doc-utils
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
-pkg_setup() {
-	if ! use debug; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF}
-		$(use_enable ipv6)
-		--enable-maintainer-flags=no
-		--enable-zlib
-		--disable-static
-		--disable-schemas-install
-		--disable-scrollkeeper"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove idiotic -D.*DISABLE_DEPRECATED cflags
-	# This method is kinda prone to breakage. Recheck carefully with next bump.
-	# bug 339074
-	find . -iname 'Makefile.am' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
-	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
-	find . -iname 'Makefile.in' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
-
-	if ! use test ; then
-		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild
index b50c7f75e501..a471dff495e0 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.32.0-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/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.7 2011/03/22 19:28:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.8 2011/03/23 08:14:44 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -18,7 +18,7 @@ IUSE="bonobo doc ipv6 test"
 RDEPEND=">=dev-libs/glib-2.20:2
 	>=x11-libs/gtk+-2.20:2
 	>=gnome-base/libgtop-2.12
-	>=gnome-base/gconf-2
+	>=gnome-base/gconf-2:2
 	>=media-libs/libcanberra-0.4[gtk]
 	x11-libs/libXext
 	x11-libs/libX11
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 3930cfeda1ae..20812ea5ba28 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.235 2011/03/22 19:28:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.236 2011/03/23 08:16:40 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gtkhtml-2.11.1.ebuild,
+  -gtkhtml-3.30.2.ebuild, -gtkhtml-3.30.3.ebuild, -gtkhtml-3.32.1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gtkhtml-3.32.2.ebuild:
   Marking gtkhtml-3.32.2 ppc stable for bug 353436
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
index 07fe08979b9f..7a3c993ebfe7 100644
--- a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-2.11.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/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild,v 1.13 2010/07/20 02:20:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild,v 1.14 2011/03/23 08:16:40 nirbheek Exp $
+
+EAPI="1"
 
 inherit eutils gnome2 versionator autotools
 
@@ -19,9 +21,9 @@ IUSE="accessibility test"
 
 # gnome-vfs is only needed to run testgtkhtml (1/3 tests)
 
-RDEPEND=">=x11-libs/gtk+-2.13.0
-	>=dev-libs/libxml2-2.4.16
-	test? ( >=gnome-base/gnome-vfs-2 )"
+RDEPEND=">=x11-libs/gtk+-2.13.0:2
+	>=dev-libs/libxml2-2.4.16:2
+	test? ( >=gnome-base/gnome-vfs-2:2 )"
 DEPEND="${RDEPEND}
 	 >=dev-util/pkgconfig-0.12.0"
 
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild
deleted file mode 100644
index 9ce653e96016..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild,v 1.10 2010/10/17 14:57:27 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-# We keep bonobo until we can make sure no apps in tree uses
-# the old composer code.
-RDEPEND=">=x11-libs/gtk+-2.18
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# XXX: This is fixed with --disable-deprecations in >=3.31.90
-	sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS/CFLAGS="$CFLAGS/' \
-		-i configure.ac configure || die "Warning flags sed failed"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild
deleted file mode 100644
index 5c91b21afb8f..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild,v 1.5 2011/01/30 19:34:28 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-# We keep bonobo until we can make sure no apps in tree uses
-# the old composer code.
-RDEPEND=">=x11-libs/gtk+-2.20
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# XXX: This is fixed with --disable-deprecations in >=3.31.90
-	sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS/CFLAGS="$CFLAGS/' \
-		-i configure.ac configure || die "Warning flags sed failed"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild
deleted file mode 100644
index 25b67e89cd56..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild,v 1.1 2010/11/28 14:43:21 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecated-warning-flags"
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgtkhtml-editor.so.0
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgtkhtml-editor.so.0
-}
-
-src_install() {
-	gnome2_src_install
-	# Remove .la files since old will be removed anyway while updating
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index 0eacae47dd1a..ba61b2fc5540 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.159 2011/03/22 19:29:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.160 2011/03/23 08:17:05 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gucharmap-2.30.2.ebuild, -gucharmap-2.30.3.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gucharmap-2.32.1.ebuild:
   Marking gucharmap-2.32.1 ppc stable for bug 353436
diff --git a/gnome-extra/gucharmap/gucharmap-2.30.2.ebuild b/gnome-extra/gucharmap/gucharmap-2.30.2.ebuild
deleted file mode 100644
index cf772b0d9992..000000000000
--- a/gnome-extra/gucharmap/gucharmap-2.30.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.30.2.ebuild,v 1.8 2010/10/17 15:31:44 armin76 Exp $
-
-inherit gnome2
-
-DESCRIPTION="Unicode character map viewer"
-HOMEPAGE="http://gucharmap.sourceforge.net/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cjk doc gnome python test"
-
-# FIXME: add gobject-introspection support once available
-RDEPEND=">=dev-libs/glib-2.16.3
-	>=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2.13.6
-	gnome? ( gnome-base/gconf )
-	python? ( >=dev-python/pygtk-2.7.1 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.9.0
-	doc? ( >=dev-util/gtk-doc-1.0 )
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-DOCS="ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-maintainer-mode
-		--disable-introspection
-		$(use_enable gnome gconf)
-		$(use_enable cjk unihan)
-		$(use_enable python python-bindings)"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/gnome-extra/gucharmap/gucharmap-2.30.3.ebuild b/gnome-extra/gucharmap/gucharmap-2.30.3.ebuild
deleted file mode 100644
index a2bab43d7d36..000000000000
--- a/gnome-extra/gucharmap/gucharmap-2.30.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.30.3.ebuild,v 1.4 2011/01/30 19:32:15 armin76 Exp $
-
-inherit gnome2
-
-DESCRIPTION="Unicode character map viewer"
-HOMEPAGE="http://gucharmap.sourceforge.net/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cjk doc gnome python test"
-
-# FIXME: add gobject-introspection support once available
-RDEPEND=">=dev-libs/glib-2.16.3
-	>=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2.13.6
-	gnome? ( gnome-base/gconf )
-	python? ( >=dev-python/pygtk-2.7.1 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.9.0
-	doc? ( >=dev-util/gtk-doc-1.0 )
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-DOCS="ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-maintainer-mode
-		--disable-introspection
-		$(use_enable gnome gconf)
-		$(use_enable cjk unihan)
-		$(use_enable python python-bindings)"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/gnome-extra/hamster-applet/ChangeLog b/gnome-extra/hamster-applet/ChangeLog
index d6aed48199fb..92d28d75ddb6 100644
--- a/gnome-extra/hamster-applet/ChangeLog
+++ b/gnome-extra/hamster-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/hamster-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.42 2011/03/22 19:30:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.43 2011/03/23 08:17:48 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -hamster-applet-2.30.2-r1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> hamster-applet-2.32.1.ebuild:
   Marking hamster-applet-2.32.1 ppc stable for bug 353436
diff --git a/gnome-extra/hamster-applet/hamster-applet-2.30.2-r1.ebuild b/gnome-extra/hamster-applet/hamster-applet-2.30.2-r1.ebuild
deleted file mode 100644
index 730544f6a274..000000000000
--- a/gnome-extra/hamster-applet/hamster-applet-2.30.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/hamster-applet-2.30.2-r1.ebuild,v 1.8 2010/10/17 16:21:00 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-SCROLLKEEPER_UPDATE="no"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Time tracking for the masses, in a GNOME applet"
-HOMEPAGE="http://projecthamster.wordpress.com/"
-
-# license on homepage is out-of-date, was changed to GPL-2 on 2008-04-16
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="eds libnotify"
-
-RDEPEND=">=dev-lang/python-2.5[sqlite]
-	dev-python/gconf-python
-	dev-python/libgnome-python
-	dev-python/libwnck-python
-	dev-python/gnome-applets-python
-	dev-python/gnome-desktop-python
-	dev-python/dbus-python
-	dev-python/pyxdg
-	eds? ( dev-python/evolution-python )
-	libnotify? ( dev-python/notify-python )
-	>=dev-python/pygobject-2.14
-	>=dev-python/pygtk-2.12
-	>=x11-libs/gtk+-2.12
-	x11-libs/libXScrnSaver"
-
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=app-text/gnome-doc-utils-0.17.3"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix import in some setups, upstream bug #623336, bug #329171
-	epatch "${FILESDIR}/${PN}-2.30.2-fix-import.patch"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/hamster
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/hamster
-}
diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 390f165c4d41..67bf8147d2d1 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.173 2011/03/22 19:31:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.174 2011/03/23 08:21:45 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -libgsf-1.14.18.ebuild, libgsf-1.14.19.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> libgsf-1.14.19.ebuild:
   Marking libgsf-1.14.19 ppc stable for bug 353436
diff --git a/gnome-extra/libgsf/libgsf-1.14.18.ebuild b/gnome-extra/libgsf/libgsf-1.14.18.ebuild
deleted file mode 100644
index f564b8699779..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.18.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.18.ebuild,v 1.9 2010/10/07 21:27:50 ssuominen Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 python multilib
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gnome-mplayer-0.9.6-gconf-2.m4.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc gnome gtk python thumbnail"
-
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.4.16
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gnome? (
-		>=gnome-base/libbonobo-2
-		>=gnome-base/gnome-vfs-2.2 )
-	gtk? ( >=x11-libs/gtk+-2 )
-	python? (
-		>=dev-python/pygobject-2.10
-		>=dev-python/pygtk-2.10 )
-	thumbnail? ( >=gnome-base/gconf-2 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35.0
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="gnome? ( || (
-	media-gfx/imagemagick
-	media-gfx/graphicsmagick[imagemagick] ) )"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gio
-		--disable-static
-		$(use_with bzip2 bz2)
-		$(use_with gnome gnome-vfs)
-		$(use_with gnome bonobo)
-		$(use_with python)
-		$(use_with gtk gdk-pixbuf)
-		$(use_with thumbnail gconf)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	cp "${WORKDIR}/gnome-mplayer-0.9.6-gconf-2.m4" m4/ \
-		|| die "failed to copy gconf macro"
-
-	# Fix gconf automagic, bug #289856
-	epatch "${FILESDIR}/${PN}-1.14.16-gconf-automagic.patch"
-
-	# Fix useless variable in toplevel Makefile.am, bug #298813
-	epatch "${FILESDIR}/${PN}-1.14.16-automake-fixes.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgsf-1.so.1
-	preserve_old_lib /usr/$(get_libdir)/libgsf-gnome-1.so.1
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize $(python_get_sitedir)/gsf
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.1
-	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-gnome-1.so.1
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.19.ebuild b/gnome-extra/libgsf/libgsf-1.14.19.ebuild
index 51a84c1e958c..5db94dda4f73 100644
--- a/gnome-extra/libgsf/libgsf-1.14.19.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.19.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/gnome-extra/libgsf/libgsf-1.14.19.ebuild,v 1.9 2011/03/22 19:31:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.19.ebuild,v 1.10 2011/03/23 08:21:45 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -21,16 +21,16 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-
 IUSE="bzip2 doc gnome gtk python thumbnail"
 
 RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.4.16
+	>=dev-libs/glib-2.16:2
+	>=dev-libs/libxml2-2.4.16:2
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
 	gnome? ( >=gnome-base/libbonobo-2 )
-	gtk? ( >=x11-libs/gtk+-2 )
+	gtk? ( x11-libs/gtk+:2 )
 	python? (
-		>=dev-python/pygobject-2.10
-		>=dev-python/pygtk-2.10 )
-	thumbnail? ( >=gnome-base/gconf-2 )"
+		>=dev-python/pygobject-2.10:2
+		>=dev-python/pygtk-2.10:2 )
+	thumbnail? ( >=gnome-base/gconf-2:2 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/gnome-extra/mousetweaks/ChangeLog b/gnome-extra/mousetweaks/ChangeLog
index 4ec67709e1b2..dda117a4b262 100644
--- a/gnome-extra/mousetweaks/ChangeLog
+++ b/gnome-extra/mousetweaks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/mousetweaks
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/ChangeLog,v 1.60 2011/03/22 19:31:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/ChangeLog,v 1.61 2011/03/23 08:21:12 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -mousetweaks-2.30.2.ebuild, mousetweaks-2.32.1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> mousetweaks-2.32.1.ebuild:
   Marking mousetweaks-2.32.1 ppc stable for bug 353436
diff --git a/gnome-extra/mousetweaks/mousetweaks-2.30.2.ebuild b/gnome-extra/mousetweaks/mousetweaks-2.30.2.ebuild
deleted file mode 100644
index 0b33dcff69eb..000000000000
--- a/gnome-extra/mousetweaks/mousetweaks-2.30.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/mousetweaks-2.30.2.ebuild,v 1.7 2010/10/17 15:32:30 armin76 Exp $
-
-inherit gnome2
-
-DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Mousetweaks/Home"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.16
-	>=gnome-base/gconf-2.16
-	>=dev-libs/dbus-glib-0.72
-	>=gnome-base/gnome-panel-2
-	gnome-extra/at-spi
-
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXfixes
-	x11-libs/libXcursor"
-DEPEND="${RDEPEND}
-	  gnome-base/gnome-common
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.17"
diff --git a/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild b/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild
index 8fa29fddca70..d1321036a9d8 100644
--- a/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild
+++ b/gnome-extra/mousetweaks/mousetweaks-2.32.1.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/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild,v 1.7 2011/03/22 19:31:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild,v 1.8 2011/03/23 08:21:12 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ IUSE=""
 RDEPEND="
 	>=dev-libs/glib-2.25.9:2
 	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/gconf-2.16
+	>=gnome-base/gconf-2.16:2
 	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
 
 	x11-libs/libX11