Fix slot-deps on gtk+ and other libs, drop keywords on old ebuild

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

4 files changed, 26 insertions, 32 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 25106ba0db25..be99c3f0e81b 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.263 2011/03/11 08:41:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.264 2011/03/20 22:21:20 nirbheek Exp $
+
+  20 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  epiphany-2.26.3-r4.ebuild, epiphany-2.30.2-r1.ebuild:
+  Fix slot-deps on gtk+ and other libs, drop keywords on old ebuild
 
   11 Mar 2011; Pacho Ramos <pacho@gentoo.org> epiphany-2.30.6.ebuild,
   +files/epiphany-2.30.6-dbus-fix.patch,
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index c8537a2015fe..fb9ac54bb1da 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX epiphany-2.26-fix-sandbox-violations.patch 552 RMD160 a7902ab192b698c2edc79a3ff3b6f2476ec68031 SHA1 1db80a7f829e41d605b50dce6caecb35984a9d57 SHA256 94d66760b1c493093febcc399a0418eb37708da1a3bf1d3bc7c851a527b061f1
 AUX epiphany-2.26.0-xulrunner191.patch 491 RMD160 ae36fd6f67b9afb3c03413bed685f10816ac24d2 SHA1 b5ba78085dcf35677361af9008f3f8998788ddd8 SHA256 3c8804a9004ed27f4f2ad99f4e434d6d4050711d000ce73ce2c0fc8bc0d197df
 AUX epiphany-2.26.1-automagic-libcanberra.patch 1838 RMD160 b98c6a734f240ea000e8938ac690426c904ec37f SHA1 9a782c3c8babf1ae8ac18c2602e0eb2d46b6eb82 SHA256 9cc20da812e7a95e535e905efaedf05720e2e8c1828d644934636ccb05f77fa3
@@ -21,15 +18,8 @@ AUX epiphany-2.30.6-libnotify-0.7.patch 1048 RMD160 3607af827a5732561f2e89d9065f
 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
 DIST epiphany-2.30.2.tar.bz2 5881032 RMD160 c0bb5e1a14ccbe72531cbf3f0f416c5172437a86 SHA1 76b55e002131ffc00f5b1f244d77e2b75e3fcf1b SHA256 cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a
 DIST epiphany-2.30.6.tar.bz2 5927938 RMD160 60f2c7d699dd8728dc79cce012475972943c4007 SHA1 a4bde975f9b2b97d6aad14b4b8a715b40d19a155 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
-EBUILD epiphany-2.26.3-r4.ebuild 3375 RMD160 fd0a7fef17847cba104c8f159f8252af94c5e96f SHA1 e98c98f7776b33e03d0dd89d9a9cfd4de6138812 SHA256 9e3f3fda0179ee5f54b3d5eb389c87e13a7942f5b873458e0c0afba66982dde0
-EBUILD epiphany-2.30.2-r1.ebuild 2437 RMD160 06791f67471a8d063d7c2d4ba0efbcff9a1313ed SHA1 1aa96b91dfb8bf0250ddc5c45bff1abab1fd4e1a SHA256 23c7bd2b9992d43a61e2fe4b09d9d2bd663df7bd841bafcd49d3d9b519d35643
+EBUILD epiphany-2.26.3-r4.ebuild 3360 RMD160 d72d8f06cba5529e69add1c09e7cb3a7dc37f7c1 SHA1 84fa5041c9fcd2bbdf0ac5bced17bb31d38673c3 SHA256 6336af83e310010874276fe2b8a4c8321c2ef818662a1d76d2acb4d090596468
+EBUILD epiphany-2.30.2-r1.ebuild 2451 RMD160 d1e9a80f4d288dcba907114fe52b257e8f2b1f98 SHA1 399aec7725d983a8f608247be3ae8d73e3c34554 SHA256 885184ae0a6cca1892b09d3dcec727772b5915a077b21e165eb7b99507424b81
 EBUILD epiphany-2.30.6.ebuild 2331 RMD160 92a6d9679e0fdcd371c731e3f4ce2c19fc542298 SHA1 e6b5ea9aaeff83f47046c0abce5428eb8880add1 SHA256 33c84c0a4bf32ff10416e207efc9a63a843220a8932c86c2ecf96fc18c238a61
-MISC ChangeLog 51584 RMD160 968dd605eafa0f571e257ff186f896fea5e5eeeb SHA1 b5446e884fbae575c9b42787e1e565105e0b80ec SHA256 83d4a11d98dc4440bfb2893b64189abca3370f7833439c76943cb6a6c1e1b996
+MISC ChangeLog 51766 RMD160 a801d21e38b8b1ce9dff96283701f3a287e309d2 SHA1 92a128cdbdef84c86ede966f38b29d7a78cc358b SHA256 d6658cd049cce2292a21d0332b0a4533cefed8c449b5ce440c549e293a301abf
 MISC metadata.xml 375 RMD160 4b38d1fe16a065d10967f7f17d768dc02bf1fae8 SHA1 96a760f61a9e0bb73120bb75a53b2247b84e9f14 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk154EMACgkQCaWpQKGI+9T82QCeOC68hKmB8O0og0th6B60ZzP2
-+DMAnjR27oaJbG3RRJXxyGC/SHaTa0nZ
-=90l2
------END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.26.3-r4.ebuild b/www-client/epiphany/epiphany-2.26.3-r4.ebuild
index 40bcb0792165..16eb481d75e5 100644
--- a/www-client/epiphany/epiphany-2.26.3-r4.ebuild
+++ b/www-client/epiphany/epiphany-2.26.3-r4.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/epiphany/epiphany-2.26.3-r4.ebuild,v 1.9 2011/02/05 16:13:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.3-r4.ebuild,v 1.10 2011/03/20 22:21:20 nirbheek Exp $
 
 EAPI="2"
 
@@ -11,31 +11,31 @@ HOMEPAGE="http://www.gnome.org/projects/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="ppc64"
 IUSE="avahi doc networkmanager python spell"
 
-RDEPEND=">=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.16.0
-	>=dev-libs/libxml2-2.6.12
+RDEPEND=">=dev-libs/glib-2.18.0:2
+	>=x11-libs/gtk+-2.16.0:2
+	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
+	>=gnome-base/libglade-2.3.1:2.0
 	>=gnome-base/libgnome-2.14
 	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/gnome-desktop-2.9.91:2
 	>=x11-libs/startup-notification-0.5
 	>=x11-libs/libnotify-0.4
 	<x11-libs/libnotify-0.7
 	>=media-libs/libcanberra-0.3[gtk]
 	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
+	>=gnome-base/gconf-2:2
 	>=app-text/iso-codes-0.35
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	networkmanager? ( net-misc/networkmanager )
 	=net-libs/xulrunner-1.9.2*
 	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6 )
+		=dev-lang/python-2*
+		>=dev-python/pygtk-2.7.1:2
+		>=dev-python/gnome-python-2.6:2 )
 	spell? ( app-text/enchant )
 	x11-themes/gnome-icon-theme"
 DEPEND="${RDEPEND}
diff --git a/www-client/epiphany/epiphany-2.30.2-r1.ebuild b/www-client/epiphany/epiphany-2.30.2-r1.ebuild
index acf30a04ed65..279c61d38f22 100644
--- a/www-client/epiphany/epiphany-2.30.2-r1.ebuild
+++ b/www-client/epiphany/epiphany-2.30.2-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/epiphany/epiphany-2.30.2-r1.ebuild,v 1.9 2011/02/05 16:13:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2-r1.ebuild,v 1.10 2011/03/20 22:21:20 nirbheek Exp $
 
 EAPI="2"
 
@@ -17,18 +17,18 @@ KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="avahi doc networkmanager +nss test"
 
 # TODO: add seed support
-RDEPEND=">=dev-libs/glib-2.19.7
-	>=x11-libs/gtk+-2.19.5
-	>=dev-libs/libxml2-2.6.12
+RDEPEND=">=dev-libs/glib-2.19.7:2
+	>=x11-libs/gtk+-2.19.5:2
+	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=x11-libs/startup-notification-0.5
 	>=x11-libs/libnotify-0.4
 	<x11-libs/libnotify-0.7
 	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
+	>=gnome-base/gconf-2:2
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.1.22
-	>=net-libs/libsoup-gnome-2.29.91
+	>=net-libs/webkit-gtk-1.1.22:2
+	>=net-libs/libsoup-gnome-2.29.91:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 
 	x11-libs/libICE