Fix slot-deps on gtk+ and other libs

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

5 files changed, 25 insertions, 21 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index d93b35a6cd12..19068861eccb 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.217 2011/03/12 19:42:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.218 2011/03/16 09:05:05 nirbheek Exp $
+
+  16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnumeric-1.10.6.ebuild, gnumeric-1.10.12.ebuild, gnumeric-1.10.13.ebuild:
+  Fix slot-deps on gtk+ and other libs
 
   12 Mar 2011; Raúl Porcel <armin76@gentoo.org> gnumeric-1.10.13.ebuild:
   alpha/ia64/sparc stable wrt #353436
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index c18cf8398dee..b7b39ff0efa7 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,8 +1,8 @@
 DIST gnumeric-1.10.12.tar.bz2 18292380 RMD160 3080c6bd37906aafc776ff37977061af1cd1c5b5 SHA1 db9bbe630a997e4f1c70a7459f5126882d49eb2c SHA256 c7ea3684c1d070f743928503a23649ff3e8b209bf8832498771a82b43b5b7cdd
 DIST gnumeric-1.10.13.tar.bz2 18275243 RMD160 85dde877e2314fb31d1666fb9ae0d7697cf7b73f SHA1 002ed0aefb53a7b2ed51cd6feb519775a68696e3 SHA256 2de0ea8e19f6741a2a6d991a91796ef2a48a64804fdef2a50b8c01cb92315033
 DIST gnumeric-1.10.6.tar.bz2 17787316 RMD160 15dbe348afcdd38c59fe9b0ea7ceae2426d79e14 SHA1 c885c1fd7033bd355245cd3d2820e73d668d1861 SHA256 7e1b6ad04ba9bf1b2015c6b88cf3c2b46ec69b67312a44284f049a2ff8aeed6d
-EBUILD gnumeric-1.10.12.ebuild 1768 RMD160 0d5a8aeffe43276e5da4dc879e7956bd8bd70ff5 SHA1 6b0cce7b2e1c4c39852cc1ed449048f3f7e35fef SHA256 278647c648507c91bff7c386bb188257a3371b2a08512b8ee3f93cb7cc3e1148
-EBUILD gnumeric-1.10.13.ebuild 1769 RMD160 4120c09fe39444dea24fab152a88ca18778bef07 SHA1 b5a02adb52ee89e2c51672a573a324ef45085605 SHA256 b145a728aa2d7368dc133fbc2e0b91e8f2fdf67545d28f4d0b8d801033041b6c
-EBUILD gnumeric-1.10.6.ebuild 1668 RMD160 e52bd50877f4dc64d6ee43ff9a94bf1743408c25 SHA1 47ff4d40e9a4e59dccb5b0a14f5bad43393a7212 SHA256 895bf97b023e18a60e7f1229f3e451ecc8d3bd6b65aeec21f298b9768b2a576e
-MISC ChangeLog 29954 RMD160 f3d1683e9e4fed4ffec7ec09685ab97695235d8a SHA1 655d24a53acdfc3de9e0f15ebaacb849b69a3d17 SHA256 c0fc635f82a000c7255b2892bdce72b985d1d6dac7994a946c795c1d2aa17bd3
+EBUILD gnumeric-1.10.12.ebuild 1777 RMD160 62ea802d54ce34f922b1ebfc77acd517d75cd412 SHA1 695b8c74360466593e2e70a0d8c440aabee5d987 SHA256 726d664d1e56420cd9c78f19a2e2f4f3df1d43721638a4576a06fbcfde3b7271
+EBUILD gnumeric-1.10.13.ebuild 1774 RMD160 6dc0fec05faf6e7b06a5052722343c0e89d9390e SHA1 fd17c48cdc5f6fa7f621273782d077bda829ca35 SHA256 64af2f625b01478e791e0f0bc082255eaac22b84fdadb6d3e32faf3741b01ca9
+EBUILD gnumeric-1.10.6.ebuild 1682 RMD160 1b336afa6c63bc4fa115692d5da0a9dcb2608bf8 SHA1 a413cc03ac688b930ff38e020be9f569a600481f SHA256 79ee556fb70eadd80d5ba4452bb90763fee06701f167fd35a281702a1ad228fa
+MISC ChangeLog 30125 RMD160 d6d83735003e722d5901eeb802895af5f2c15c9f SHA1 79fb9db91cdb3c36d3b9a3dfa0c77e8427996624 SHA256 5d5fcbcaaeb8242348c87717f6c3d42bedfbde2918630425ead740fc2ecc52d7
 MISC metadata.xml 364 RMD160 864c3698f6ae825aa9badd409f07ff4499cbf0f1 SHA1 39dbd02b506842082781dd6d08dceb3abaf20046 SHA256 d230daad082bc155b5f1dd6cfdfd4e1aa2584227b385e9c57a17db57e9bc940f
diff --git a/app-office/gnumeric/gnumeric-1.10.12.ebuild b/app-office/gnumeric/gnumeric-1.10.12.ebuild
index 8d86a08ba412..98c382acaf5f 100644
--- a/app-office/gnumeric/gnumeric-1.10.12.ebuild
+++ b/app-office/gnumeric/gnumeric-1.10.12.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-office/gnumeric/gnumeric-1.10.12.ebuild,v 1.1 2010/12/04 10:13:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.12.ebuild,v 1.2 2011/03/16 09:05:05 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -24,17 +24,17 @@ RESTRICT="test"
 
 RDEPEND="sys-libs/zlib
 	app-arch/bzip2
-	>=dev-libs/glib-2.12
+	>=dev-libs/glib-2.12:2
 	>=gnome-extra/libgsf-1.14.19[gnome?]
 	>=x11-libs/goffice-0.8.10:0.8
-	>=dev-libs/libxml2-2.4.12
+	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.12
 
 	>=x11-libs/gtk+-2.18:2
 	x11-libs/cairo[svg]
 
 	gnome? (
-		>=gnome-base/gconf-2
+		>=gnome-base/gconf-2:2
 		>=gnome-base/libgnome-2
 		>=gnome-base/libgnomeui-2
 		>=gnome-base/libbonobo-2.2
diff --git a/app-office/gnumeric/gnumeric-1.10.13.ebuild b/app-office/gnumeric/gnumeric-1.10.13.ebuild
index 48afdc16cfc7..4df9721d49cc 100644
--- a/app-office/gnumeric/gnumeric-1.10.13.ebuild
+++ b/app-office/gnumeric/gnumeric-1.10.13.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-office/gnumeric/gnumeric-1.10.13.ebuild,v 1.5 2011/03/12 19:42:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.13.ebuild,v 1.6 2011/03/16 09:05:05 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -27,14 +27,14 @@ RDEPEND="sys-libs/zlib
 	>=dev-libs/glib-2.12:2
 	>=gnome-extra/libgsf-1.14.19[gnome?]
 	>=x11-libs/goffice-0.8.10:0.8
-	>=dev-libs/libxml2-2.4.12
+	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.12
 
 	>=x11-libs/gtk+-2.18:2
 	x11-libs/cairo[svg]
 
 	gnome? (
-		>=gnome-base/gconf-2
+		>=gnome-base/gconf-2:2
 		>=gnome-base/libgnome-2
 		>=gnome-base/libgnomeui-2
 		>=gnome-base/libbonobo-2.2
diff --git a/app-office/gnumeric/gnumeric-1.10.6.ebuild b/app-office/gnumeric/gnumeric-1.10.6.ebuild
index 554a7cec9a22..466e69fbaae5 100644
--- a/app-office/gnumeric/gnumeric-1.10.6.ebuild
+++ b/app-office/gnumeric/gnumeric-1.10.6.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-office/gnumeric/gnumeric-1.10.6.ebuild,v 1.7 2010/09/13 13:01:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.6.ebuild,v 1.8 2011/03/16 09:05:05 nirbheek Exp $
 
 EAPI="2"
 
@@ -22,25 +22,25 @@ RESTRICT="test"
 
 RDEPEND="sys-libs/zlib
 	app-arch/bzip2
-	>=dev-libs/glib-2.12
+	>=dev-libs/glib-2.12:2
 	>=gnome-extra/libgsf-1.14.15[gnome?]
 	>=x11-libs/goffice-0.8.6:0.8
-	>=dev-libs/libxml2-2.4.12
+	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.12
 
-	>=x11-libs/gtk+-2.18
+	>=x11-libs/gtk+-2.18:2
 	x11-libs/cairo[svg]
-	>=gnome-base/libglade-2.3.6
+	>=gnome-base/libglade-2.3.6:2.0
 
 	gnome? (
-		>=gnome-base/gconf-2
+		>=gnome-base/gconf-2:2
 		>=gnome-base/libgnome-2
 		>=gnome-base/libgnomeui-2
 		>=gnome-base/libbonobo-2.2
 		>=gnome-base/libbonoboui-2.2 )
 	perl? ( dev-lang/perl )
 	python? (
-		>=dev-lang/python-2
+		=dev-lang/python-2*
 		>=dev-python/pygtk-2 )
 "
 #	libgda? (