Clean up old revisions. glib/gtk+ fixed to slot 2.

(Portage version: 2.2_rc89/cvs/Linux x86_64)

7 files changed, 11 insertions, 219 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 14ed28c297a9..752a73b9894f 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.83 2010/10/17 15:10:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.84 2010/10/20 21:29:54 eva Exp $
+
+  20 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/libgnomekbd-2.21.1-no-libbonobo.patch,
+  -files/libgnomekbd-2.22.0-system-relink.patch, -libgnomekbd-2.26.0.ebuild,
+  -files/libgnomekbd-2.26.0-libxklavier4.patch, -libgnomekbd-2.28.2.ebuild,
+  libgnomekbd-2.32.0.ebuild:
+  Clean up old revisions. glib/gtk+ fixed to slot 2.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> libgnomekbd-2.30.2.ebuild:
   alpha/ia64/sh/sparc stable wrt #324077
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.21.1-no-libbonobo.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.21.1-no-libbonobo.patch
deleted file mode 100644
index 706aabf973ee..000000000000
--- a/gnome-base/libgnomekbd/files/libgnomekbd-2.21.1-no-libbonobo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gkbd-indicator-plugins-add.c
-===================================================================
---- capplet/gkbd-indicator-plugins-add.c	(revision 200)
-+++ capplet/gkbd-indicator-plugins-add.c	(working copy)
-@@ -26,7 +26,7 @@
- 
- #include <gdk/gdkx.h>
- #include <glade/glade.h>
--#include <libbonobo.h>
-+#include <glib/gi18n.h>
- 
- #include <libxklavier/xklavier.h>
- 
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.22.0-system-relink.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.22.0-system-relink.patch
deleted file mode 100644
index 9d0e1f2aaca3..000000000000
--- a/gnome-base/libgnomekbd/files/libgnomekbd-2.22.0-system-relink.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f23aea30c608f73b5bfc0b60363757c7f783d772 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 26 Apr 2009 21:57:27 +0200
-Subject: [PATCH] Avoid re-linking to system's libgnomekbd
-
- Fix suggested by vaiper on https://bugs.gentoo.org/show_bug.cgi?id=265428
----
- libgnomekbd/Makefile.am |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
-index 65b77b7..6d2fa49 100644
---- a/libgnomekbd/Makefile.am
-+++ b/libgnomekbd/Makefile.am
-@@ -33,9 +33,9 @@ libgnomekbd_la_LDFLAGS = $(common_LDFLAGS)
- libgnomekbd_la_LIBADD =  $(common_LIBADD)
- 
- libgnomekbdui_la_LDFLAGS = $(common_LDFLAGS)
--libgnomekbdui_la_LIBADD =  $(common_LIBADD) \
--                           $(GTK_LIBS) \
--                           libgnomekbd.la
-+libgnomekbdui_la_LIBADD = libgnomekbd.la \
-+                           $(common_LIBADD) \
-+                           $(GTK_LIBS)
- 
- libgnomekbd_la_SOURCES = \
-                          gkbd-desktop-config.c \
--- 
-1.6.2.3
-
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.26.0-libxklavier4.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.26.0-libxklavier4.patch
deleted file mode 100644
index b9828abd8e96..000000000000
--- a/gnome-base/libgnomekbd/files/libgnomekbd-2.26.0-libxklavier4.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 6661dd08e3a08a4fd42a19d5c4359ae494cfffe2 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 20 Jul 2009 23:49:21 +0200
-Subject: [PATCH] Add support for libxklavier-4
-
----
- configure.in                 |    4 +++-
- libgnomekbd/gkbd-indicator.c |    6 ++++++
- 2 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 121c976..b1ee544 100644
---- a/configure.in
-+++ b/configure.in
-@@ -82,7 +82,9 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED gdk-x11-2.0 >= $GDK_REQUIRED)
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
--PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= $LIBXKLAVIER_REQUIRED)
-+PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= 4,
-+	[AC_DEFINE(HAVE_XKL_4, [1], [libxklavier 4 support])],
-+	[PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= $LIBXKLAVIER_REQUIRED)])
- 
- AC_SUBST(LIBXKLAVIER_CFLAGS)
- AC_SUBST(LIBXKLAVIER_LIBS)
-diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
-index 48b59cb..608652e 100644
---- a/libgnomekbd/gkbd-indicator.c
-+++ b/libgnomekbd/gkbd-indicator.c
-@@ -17,6 +17,8 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include <config.h>
-+
- #include <memory.h>
- 
- #include <gdk/gdkkeysyms.h>
-@@ -717,7 +719,11 @@ gkbd_indicator_global_init (void)
- 	globals.registry =
- 	    xkl_config_registry_get_instance (globals.engine);
- 
-+#ifdef HAVE_XKL_4
-+	xkl_config_registry_load (globals.registry, FALSE);
-+#else
- 	xkl_config_registry_load (globals.registry);
-+#endif
- 
- 	gconf_client = gconf_client_get_default ();
- 
--- 
-1.6.3.3
-
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild
deleted file mode 100644
index cd01f36a9392..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild,v 1.12 2010/07/20 02:09:17 jer Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-0.92
-	>=dev-libs/dbus-glib-0.34
-	>=gnome-base/gconf-2.14
-	>=x11-libs/gtk+-2.13
-	>=gnome-base/libglade-2.6
-	>=x11-libs/libxklavier-3.2"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# Only user interaction required graphical tests at the time of 2.22.0 - not useful for us
-	G2CONF="${G2CONF} --disable-tests --disable-static"
-}
-
-src_prepare() {
-	# Fix linking to system's library, bug #265428
-	epatch "${FILESDIR}/${PN}-2.22.0-system-relink.patch"
-
-	# Fix silly upstream CFLAGS, bug #277291
-	sed "s/-Werror//g" -i capplet/Makefile.am capplet/Makefile.in \
-		libgnomekbd/Makefile.am libgnomekbd/Makefile.in \
-		test/Makefile.am test/Makefile.in \
-		configure.in configure || die "removing -Werror failed"
-
-	# Fix libxklavier-4 API changes, bug #278367
-	epatch "${FILESDIR}/${PN}-2.26.0-libxklavier4.patch"
-
-	# Make it libtool-1 compatible
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_compile() {
-	# FreeBSD doesn't like -j
-	use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1"
-	gnome2_src_compile
-}
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.28.2.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.28.2.ebuild
deleted file mode 100644
index aafcd0a0533d..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-2.28.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.28.2.ebuild,v 1.7 2010/08/18 21:37:42 maekke Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-0.92
-	>=dev-libs/dbus-glib-0.34
-	>=gnome-base/gconf-2.14
-	>=x11-libs/gtk+-2.13
-	>=x11-libs/libxklavier-4.0"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# Only user interaction required graphical tests at the time of 2.22.0 - not useful for us
-	G2CONF="${G2CONF} --disable-tests --disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed expression failed"
-}
-
-src_compile() {
-	# FreeBSD doesn't like -j, upstream? bug #????
-	use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1"
-	gnome2_src_compile
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgnomekbd.so.3
-	preserve_old_lib /usr/$(get_libdir)/libgnomekbdui.so.3
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnomekbd.so.3
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnomekbdui.so.3
-}
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.32.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.32.0.ebuild
index a5e83907f3b9..4eb5a6480e33 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.32.0.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.32.0.ebuild,v 1.1 2010/10/12 18:29:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.32.0.ebuild,v 1.2 2010/10/20 21:29:54 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -16,9 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-
 IUSE="test"
 
 # gtk+-2.20 needed for tests
-RDEPEND=">=dev-libs/glib-2.18
+RDEPEND=">=dev-libs/glib-2.18:2
 	>=gnome-base/gconf-2.14
-	>=x11-libs/gtk+-2.20
+	>=x11-libs/gtk+-2.20:2
 	>=x11-libs/libxklavier-5.0"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35