Fix slot-deps on gtk+ and other libs

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

4 files changed, 27 insertions, 22 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 1ec266e343f6..9f6c2385b7a7 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.328 2011/03/12 18:50:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.329 2011/03/16 10:45:17 nirbheek Exp $
+
+  16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnome-panel-2.30.2.ebuild, gnome-panel-2.32.1.ebuild,
+  gnome-panel-2.32.1-r1.ebuild:
+  Fix slot-deps on gtk+ and other libs
 
   12 Mar 2011; Raúl Porcel <armin76@gentoo.org> gnome-panel-2.32.1-r1.ebuild:
   alpha/arm/ia64/sh/sparc stable wrt #353436
diff --git a/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild
index b6c0dd983ced..b02bb78c3c79 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.30.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-base/gnome-panel/gnome-panel-2.30.2.ebuild,v 1.10 2011/01/15 19:54:58 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild,v 1.11 2011/03/16 10:45:17 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -15,21 +15,21 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc eds networkmanager policykit"
 
-RDEPEND="dev-lang/python
-	>=gnome-base/gnome-desktop-2.26.0
+RDEPEND="=dev-lang/python-2*
+	>=gnome-base/gnome-desktop-2.26.0:2
 	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.19.7
+	>=dev-libs/glib-2.18.0:2
+	>=x11-libs/gtk+-2.19.7:2
 	>=dev-libs/libgweather-2.27.90:2
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/orbit-2.4
-	>=x11-libs/libwnck-2.19.5
-	>=gnome-base/gconf-2.6.1
+	>=gnome-base/orbit-2.4:2
+	>=x11-libs/libwnck-2.19.5:1
+	>=gnome-base/gconf-2.6.1:2
 	>=media-libs/libcanberra-0.23[gtk]
 	>=gnome-base/gnome-menus-2.27.92
 	>=gnome-base/libbonobo-2.20.4
-	gnome-base/librsvg
+	gnome-base/librsvg:2
 	>=dev-libs/dbus-glib-0.71
 	>=sys-apps/dbus-1.1.2
 	>=x11-libs/cairo-1
diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild
index ca20fcd77f84..9d87e685c446 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-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-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild,v 1.7 2011/03/12 18:50:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild,v 1.8 2011/03/16 10:45:17 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -22,11 +22,11 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2
 	>=dev-libs/glib-2.25.12:2
 	>=x11-libs/gtk+-2.22:2[introspection?]
 	>=dev-libs/libgweather-2.27.90:2
-	dev-libs/libxml2
-	>=gnome-base/gconf-2.6.1[introspection?]
+	dev-libs/libxml2:2
+	>=gnome-base/gconf-2.6.1:2[introspection?]
 	>=media-libs/libcanberra-0.23[gtk]
 	>=gnome-base/gnome-menus-2.27.92
-	gnome-base/librsvg
+	gnome-base/librsvg:2
 	>=dev-libs/dbus-glib-0.80
 	>=sys-apps/dbus-1.1.2
 	>=x11-libs/cairo-1
@@ -36,7 +36,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2
 		>=gnome-base/libbonobo-2.20.4
 		>=gnome-base/libbonoboui-2.1.1
 		>=gnome-base/orbit-2.4
-		>=x11-libs/libwnck-2.19.5 )
+		>=x11-libs/libwnck-2.19.5:1 )
 	eds? ( >=gnome-extra/evolution-data-server-1.6 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1.ebuild
index 1a70f02c1738..79576064b878 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.32.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-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-base/gnome-panel/gnome-panel-2.32.1.ebuild,v 1.4 2011/02/04 11:03:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1.ebuild,v 1.5 2011/03/16 10:45:17 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -21,11 +21,11 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2
 	>=dev-libs/glib-2.25.12:2
 	>=x11-libs/gtk+-2.22:2[introspection?]
 	>=dev-libs/libgweather-2.27.90:2
-	dev-libs/libxml2
-	>=gnome-base/gconf-2.6.1[introspection?]
+	dev-libs/libxml2:2
+	>=gnome-base/gconf-2.6.1:2[introspection?]
 	>=media-libs/libcanberra-0.23[gtk]
 	>=gnome-base/gnome-menus-2.27.92
-	gnome-base/librsvg
+	gnome-base/librsvg:2
 	>=dev-libs/dbus-glib-0.80
 	>=sys-apps/dbus-1.1.2
 	>=x11-libs/cairo-1
@@ -34,8 +34,8 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2
 	bonobo? (
 		>=gnome-base/libbonobo-2.20.4
 		>=gnome-base/libbonoboui-2.1.1
-		>=gnome-base/orbit-2.4
-		>=x11-libs/libwnck-2.19.5 )
+		>=gnome-base/orbit-2.4:2
+		>=x11-libs/libwnck-2.19.5:1 )
 	eds? ( >=gnome-extra/evolution-data-server-1.6 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"