Fix slot-deps on gnome libs

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

5 files changed, 27 insertions, 23 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index c836649107d1..73166afc788a 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.53 2011/03/14 16:41:43 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.54 2011/03/21 22:22:44 nirbheek Exp $
+
+  21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  midori-0.2.9-r1.ebuild, midori-0.3.3.ebuild, midori-9999.ebuild:
+  Fix slot-deps on gnome libs
 
 *midori-0.3.3 (14 Mar 2011)
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 5afdf61ee18d..04714b460ea3 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,8 +1,8 @@
 AUX midori-0.2.9-libnotify-0.7.patch 688 RMD160 329d7ada064e2825f6cfafe60fa4e19c003c17d1 SHA1 6c23d8ff63f12891eef0dd7cf1b12ba1de749ccb SHA256 603c99b9f0d745e6e80f87cd6b20438b6f11b081755e2061b2cea41b18f1b6b2
 DIST midori-0.2.9.tar.bz2 802627 RMD160 3b8f2f8fa55f10e80a9e769e4085f96b7fa769ab SHA1 3329c3b9cbe1d2fa0cb94e3f864802fae4fc5e9b SHA256 803bf534ab73cf7a50ddd38bbd68976258c36f335a3f1dc1880f53915c7fdf78
 DIST midori-0.3.3.tar.bz2 848720 RMD160 f2380250f3246a3a7c32edb3eba884d3c8ed946f SHA1 01baf6243f7b00af5e5b4eb6ac5d3233e60bc993 SHA256 236770d134e2eb9c44776e233903fc0afa760cd3b8b87d12316e1b25afe2d3fe
-EBUILD midori-0.2.9-r1.ebuild 2211 RMD160 76bc6b53c54dd3b736ee73f8b55f8b98afe1826d SHA1 812291f10a4e71f8b688ed8571bb55b7889b3103 SHA256 a8e855bdb89fc9c8a9a2a52e028f5913fad58d673fb604dbf2ee7b2e58c54c55
-EBUILD midori-0.3.3.ebuild 1826 RMD160 aeca1641f6816ec37b4ed89df380750dc7656c18 SHA1 c4b90828a2c26d75086f996d2d00bfb1b2ac3033 SHA256 4eb10776e29c2d3808940a7e336ed1738d166341b5ccbd4eccaae3ab4b367d63
-EBUILD midori-9999.ebuild 1834 RMD160 bf268eb1e5717cc64d56a74319c33b9f47bca6cb SHA1 91aeb704b44b8bfe31e5b45ed8e33871ab2b70e1 SHA256 31963f7262d4e05d7daef103320a17ecca7082f03dc6a8fb5bf0d245e040c093
-MISC ChangeLog 8546 RMD160 a9ca70a91055b2083b374ed4d2f9dad3adc4fa98 SHA1 00f072d663115ce0a96cf06e101f4883e075bfdb SHA256 77a543d7167ed24d22f1d38fadda249c0d2eed4cb06fed3c60a61a59236966fb
+EBUILD midori-0.2.9-r1.ebuild 2224 RMD160 24fb4e63cfeb639e6d0fa6795bd6160e210dfa99 SHA1 9aceca7fa7a4ff62565ec2d145a6a2fcf169a301 SHA256 2a1616c9d958db0be0ec86ed8ce6690344a98befe2d9d99dab072bf092bfd523
+EBUILD midori-0.3.3.ebuild 1839 RMD160 6cdf40a18902240474edab16f313fa4a7ce67503 SHA1 697c6b31324735222ee8f78df699d5e0ec6f4557 SHA256 ed39ebc4be8b8edb419b1ec9910d084a8c135148f229c9563d1bf10eb98449b2
+EBUILD midori-9999.ebuild 1847 RMD160 4e9a56b1ee3682b18b6479b4accd3e02e8b10a5d SHA1 8b9d612f5a4fccdaac1d97e28b9599a3e7df1fd3 SHA256 935c437080da60f5e9688a4f3eb4f09f6ad365d4e79248e5c7cca37dc4291664
+MISC ChangeLog 8699 RMD160 13a5012537b3efe96f3cf6cd80aa4f11390505eb SHA1 2ee5c1ed9ac2b4aacad796be8cfa4f04be944f5a SHA256 6e74e0342beb75dccac1048656f7ca3344c6fba836adedcccddf0dfd3d9e97d3
 MISC metadata.xml 421 RMD160 6cfe519ed62f8c3bf6061b0b263e59d7cea5e7b7 SHA1 ab68b240603bd56ea6d93521b50f58f150d9bf73 SHA256 f018e2038f1bcab47a1d1bd0acfb1f8f309481e70dbee9693b7605b9f4cebdfd
diff --git a/www-client/midori/midori-0.2.9-r1.ebuild b/www-client/midori/midori-0.2.9-r1.ebuild
index c16b6f3b4c5d..fe080ccb1d3c 100644
--- a/www-client/midori/midori-0.2.9-r1.ebuild
+++ b/www-client/midori/midori-0.2.9-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/www-client/midori/midori-0.2.9-r1.ebuild,v 1.5 2011/02/05 12:46:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.9-r1.ebuild,v 1.6 2011/03/21 22:22:44 nirbheek Exp $
 
 EAPI=3
 inherit eutils multilib python xfconf
@@ -15,14 +15,14 @@ KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
 IUSE="doc gnome +html idn libnotify nls +unique"
 
 RDEPEND="libnotify? ( x11-libs/libnotify )
-	>=net-libs/libsoup-2.25.2
-	>=net-libs/webkit-gtk-1.1.1
+	>=net-libs/libsoup-2.25.2:2.4
+	>=net-libs/webkit-gtk-1.1.1:2
 	>=dev-db/sqlite-3.0
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	>=x11-libs/gtk+-2.10:2
-	gnome? ( net-libs/libsoup-gnome )
+	gnome? ( net-libs/libsoup-gnome:2.4 )
 	idn? ( net-dns/libidn )
-	unique? ( dev-libs/libunique )"
+	unique? ( dev-libs/libunique:1 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
 	dev-util/intltool
diff --git a/www-client/midori/midori-0.3.3.ebuild b/www-client/midori/midori-0.3.3.ebuild
index ff84681fbff2..868b64158911 100644
--- a/www-client/midori/midori-0.3.3.ebuild
+++ b/www-client/midori/midori-0.3.3.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/www-client/midori/midori-0.3.3.ebuild,v 1.2 2011/03/16 16:09:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.3.3.ebuild,v 1.3 2011/03/21 22:22:44 nirbheek Exp $
 
 EAPI=3
 inherit eutils fdo-mime gnome2-utils python waf-utils
@@ -14,15 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
 IUSE="doc gnome idn libnotify nls +unique vala"
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="dev-libs/libxml2:2
 	>=dev-db/sqlite-3.0
-	>=net-libs/libsoup-2.25.2
-	net-libs/webkit-gtk
+	>=net-libs/libsoup-2.25.2:2.4
+	net-libs/webkit-gtk:2
 	x11-libs/gtk+:2
-	gnome? ( net-libs/libsoup-gnome )
+	gnome? ( net-libs/libsoup-gnome:2.4 )
 	idn? ( net-dns/libidn )
 	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique )
+	unique? ( dev-libs/libunique:1 )
 	vala? ( dev-lang/vala:0.10 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index a2e919a2d931..add5cdf264d6 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.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/www-client/midori/midori-9999.ebuild,v 1.30 2011/03/16 16:09:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.31 2011/03/21 22:22:44 nirbheek Exp $
 
 EAPI=3
 inherit git eutils fdo-mime gnome2-utils python waf-utils
@@ -15,15 +15,15 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc gnome idn libnotify nls +unique vala"
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="dev-libs/libxml2:2
 	>=dev-db/sqlite-3.0
-	>=net-libs/libsoup-2.25.2
-	net-libs/webkit-gtk
+	>=net-libs/libsoup-2.25.2:2.4
+	net-libs/webkit-gtk:2
 	x11-libs/gtk+:2
-	gnome? ( net-libs/libsoup-gnome )
+	gnome? ( net-libs/libsoup-gnome:2.4 )
 	idn? ( net-dns/libidn )
 	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique )
+	unique? ( dev-libs/libunique:1 )
 	vala? ( dev-lang/vala:0.10 )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )