Fix slot-deps on gtk+ and other libs, remove old

(Portage version: 2.1.9.42/cvs/Linux x86_64)

4 files changed, 26 insertions, 61 deletions

diff --git a/gnome-base/libgnomeui/ChangeLog b/gnome-base/libgnomeui/ChangeLog
index ef1202b76a48..46cfb5580d82 100644
--- a/gnome-base/libgnomeui/ChangeLog
+++ b/gnome-base/libgnomeui/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/libgnomeui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.206 2011/03/12 16:22:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.207 2011/03/16 17:08:06 nirbheek Exp $
+
+  16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  libgnomeui-2.24.3.ebuild, -libgnomeui-2.24.4.ebuild,
+  libgnomeui-2.24.5.ebuild:
+  Fix slot-deps on gtk+ and other libs, remove old
+
+  16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  libgnomeui-2.24.3.ebuild, -libgnomeui-2.24.4.ebuild,
+  libgnomeui-2.24.5.ebuild:
+  Fix slot-deps on gtk+ and other libs, remove old
 
   12 Mar 2011; Raúl Porcel <armin76@gentoo.org> libgnomeui-2.24.5.ebuild:
   alpha/arm/ia64/sh/sparc stable wrt #353436
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.3.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.3.ebuild
index 6ff94aee67e3..d7a55dbaf40c 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.24.3.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.3.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-base/libgnomeui/libgnomeui-2.24.3.ebuild,v 1.9 2010/10/07 22:32:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.24.3.ebuild,v 1.10 2011/03/16 17:08:06 nirbheek Exp $
+
+EAPI="2"
 
 GCONF_DEBUG="no"
 
@@ -15,16 +17,16 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-inter
 IUSE="doc"
 
 # gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser
-COMMON_DEPEND=">=dev-libs/libxml2-2.4.20
+COMMON_DEPEND=">=dev-libs/libxml2-2.4.20:2
 	>=gnome-base/libgnome-2.13.7
 	>=gnome-base/libgnomecanvas-2
 	>=gnome-base/libbonoboui-2.13.1
-	>=gnome-base/gconf-2
+	>=gnome-base/gconf-2:2
 	>=x11-libs/pango-1.1.2
-	>=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.14
-	>=gnome-base/gnome-vfs-2.7.3
-	>=gnome-base/libglade-2
+	>=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.14:2
+	>=gnome-base/gnome-vfs-2.7.3:2
+	>=gnome-base/libglade-2:2.0
 	>=gnome-base/gnome-keyring-0.4
 	>=dev-libs/popt-1.5"
 RDEPEND="${COMMON_DEPEND}
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.4.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.4.ebuild
deleted file mode 100644
index 4b26437064f2..000000000000
--- a/gnome-base/libgnomeui/libgnomeui-2.24.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.24.4.ebuild,v 1.5 2011/01/30 18:51:07 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="User Interface routines for Gnome"
-HOMEPAGE="http://library.gnome.org/devel/libgnomeui/stable/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc test"
-
-# gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser
-RDEPEND=">=dev-libs/libxml2-2.4.20
-	>=gnome-base/libgnome-2.13.7
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libbonoboui-2.13.1
-	>=gnome-base/gconf-2
-	>=x11-libs/pango-1.1.2
-	>=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.14
-	>=gnome-base/gnome-vfs-2.7.3
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-keyring-0.4
-	>=dev-libs/popt-1.5"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="x11-themes/gnome-icon-theme"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		sed 's/ test-gnome//' -i Makefile.am Makefile.in || die "sed failed"
-	fi
-}
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild
index 338e48d8bc0e..89632ffb652e 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.5.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-base/libgnomeui/libgnomeui-2.24.5.ebuild,v 1.6 2011/03/12 16:22:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild,v 1.7 2011/03/16 17:08:06 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -16,16 +16,16 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-int
 IUSE="doc test"
 
 # gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser
-RDEPEND=">=dev-libs/libxml2-2.4.20
+RDEPEND=">=dev-libs/libxml2-2.4.20:2
 	>=gnome-base/libgnome-2.13.7
 	>=gnome-base/libgnomecanvas-2
 	>=gnome-base/libbonoboui-2.13.1
-	>=gnome-base/gconf-2
+	>=gnome-base/gconf-2:2
 	>=x11-libs/pango-1.1.2
 	>=dev-libs/glib-2.16:2
 	>=x11-libs/gtk+-2.14:2
-	>=gnome-base/gnome-vfs-2.7.3
-	>=gnome-base/libglade-2
+	>=gnome-base/gnome-vfs-2.7.3:2
+	>=gnome-base/libglade-2:2.0
 	>=gnome-base/gnome-keyring-0.4
 	>=dev-libs/popt-1.5"
 DEPEND="${RDEPEND}