Depend on proper gnome-panel library, bug #355059.

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

4 files changed, 17 insertions, 21 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index c5b759d11f7b..a643cee56d5f 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.338 2011/05/03 06:46:10 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.339 2011/05/19 16:26:52 eva Exp $
+
+  19 May 2011; Gilles Dartiguelongue <eva@gentoo.org> gdm-2.32.1.ebuild,
+  gdm-2.32.1-r1.ebuild:
+  Depend on proper gnome-panel library, bug #355059.
 
 *gdm-2.32.1-r1 (03 May 2011)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 4cba459c51a7..4501c628ec70 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -22,24 +22,14 @@ DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4
 DIST gdm-2.32.1.tar.bz2 2441685 RMD160 70526a3ddec3ff8a1313243641bf807a2218f3ae SHA1 75017d6acfc8e158e0df848629431021b25998a5 SHA256 7ba9cb2a8efb9856994467b14e4837a281fcf6d9dc9a267ea38a9aae1ec55abc
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 EBUILD gdm-2.20.11.ebuild 6981 RMD160 d89e163666b53c173578abce9846fed4dde4d5f9 SHA1 5dff7be8ab624c3b15b5dfe6bfb14ae1afc6f0d7 SHA256 174e8685993d432e3cad052626a318f6b622a07954d873ac79c27db0d8ebe3f5
-EBUILD gdm-2.32.1-r1.ebuild 5563 RMD160 426dd2f7526e923e3f947714f341ce0969c4c75e SHA1 28dc661eeca20e85cf8cdcb9387bc3d9f2e62b12 SHA256 baafbed541c18176749b8794cf6df3d3d810d9d8e752e481be4d361421e41817
-EBUILD gdm-2.32.1.ebuild 5564 RMD160 66521c1847ef72639e46c80bff3312581bf211c0 SHA1 6833be35516b42a90510d4ae7212dd2dc0155dbb SHA256 66dfd30db573124795a879bd8a8b28c02fdbe65a9b39e7829c676f5a1877505a
-MISC ChangeLog 47004 RMD160 b3f95e7013e090dccd25aa11d85f5db99eeb204b SHA1 68d42fdc750c6133421a4236b396827baa147b84 SHA256 32cf574d543aa9049b08af0c66c81f6e8845c223f092ea71ceda8da20f3fa774
+EBUILD gdm-2.32.1-r1.ebuild 5596 RMD160 69277cc8730fe8c9b5157db0fb8175ee5828e427 SHA1 c71e7cddf7f3fb6701901415170ef73c9e3460d0 SHA256 98ba7249fea7956e4978528c65c183499aa29bac33a317ea8a2325ff6f3b1e6c
+EBUILD gdm-2.32.1.ebuild 5602 RMD160 921d0774cb460a577868e5c68d4b57e6d73c1368 SHA1 b62cedc7eb647f0dd7f493c059a54691d124f349 SHA256 c75ebeeaa77288325da04258e6d12ae4bd7ed4d3c3b8ebc87d4399802e0ce262
+MISC ChangeLog 47150 RMD160 1ef9ee58e422886e112820bebfc03295f5a38cf8 SHA1 05831f50be46e0dc65d14bc4bac447b9f97e340c SHA256 28087f20fa741d82a3166a5c17cb2a59a405c71faeb74532347ec802a00deeae
 MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNv6S2AAoJEO/kOhxWD91kwS8P/jjl/YGyZ+rkvTUMf6RdUwbC
-NvTveC+xhajTds21Y8ttOz4UxQdpHXxlGooe1TdjUq1DxCwq1KRFjd2VrUkcD7Wt
-zkGrkoK2eGpN0pbYE1zaqaqGfUBv7Io4rH4I9OqL9vSAF8KJzUJxzxF0H20K2cA0
-6xZaH6PSh6pTchmqMIDDoQIhzKxeJkwbhdCst0N2C7Pk8NQZHbEuo4ZoOH0M5Df4
-/M0LPpupcVijJWwkzdK6l4bB6G8qbu/rQIqbAzpuUd4f0urTJZfXjs18NTV5YotO
-WKMGsOElsGBYVRGr+Ak4X+xN0JGvjUyuO4vcQ4+W7xJkvL4n9TnJyb/YiPRJvps/
-J1BZh+rnlP83aUa7NR9iG/VUlFvkZmSc+eblHXYrezB99d84IyQoUbi+d+Hqk6yI
-TT2vg48slzIRtwftVM53O49wja8NFLXrmisJJ1ROWUQlKycKJoJt1FbjqKINyeB2
-xU62AEIS+4uuyb6y25ucyd30pqPLAqJklX4PYGMGi0J+kkeix4XNcsxRr9qv5WG1
-zCHmtxjyceL/d50lRVDyFyNwbOj/I6ezto5U0++AqmP6Shw3MXnImG/943dYOdUG
-kLbLgK9m51hJwzHN1v4W00x96cdMgrMaMxA/JtS37h/crknq2XC1vuhvM1uMyyYS
-IWybjEws3OjiNb9r/nma
-=5zgw
+iEYEARECAAYFAk3VRNcACgkQ1fmVwcYIWAbgrwCgstYAt4y6cft1t+xZKl1qrvKW
+U9AAn2JXumCwqNPedwqZ8/1Dvd3y4ma2
+=Xup1
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-2.32.1-r1.ebuild b/gnome-base/gdm/gdm-2.32.1-r1.ebuild
index 8c0efcf273ca..f39ba6823424 100644
--- a/gnome-base/gdm/gdm-2.32.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-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/gdm/gdm-2.32.1-r1.ebuild,v 1.1 2011/05/03 06:46:10 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.32.1-r1.ebuild,v 1.2 2011/05/19 16:26:52 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -31,7 +31,8 @@ RDEPEND="
 	>=x11-libs/pango-1.3
 	>=media-libs/libcanberra-0.4[gtk]
 	>=gnome-base/gconf-2.31.3
-	>=gnome-base/gnome-panel-2
+	>=gnome-base/gnome-panel-2[bonobo]
+	<gnome-base/gnome-panel-2.91
 	>=gnome-base/gnome-session-2.28
 	>=x11-misc/xdg-utils-1.0.2-r3
 	>=sys-power/upower-0.9
diff --git a/gnome-base/gdm/gdm-2.32.1.ebuild b/gnome-base/gdm/gdm-2.32.1.ebuild
index c2e0e8826bef..4dd59119c798 100644
--- a/gnome-base/gdm/gdm-2.32.1.ebuild
+++ b/gnome-base/gdm/gdm-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/gdm/gdm-2.32.1.ebuild,v 1.1 2011/03/28 21:41:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.32.1.ebuild,v 1.2 2011/05/19 16:26:52 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -31,7 +31,8 @@ RDEPEND="
 	>=x11-libs/pango-1.3
 	>=media-libs/libcanberra-0.4[gtk]
 	>=gnome-base/gconf-2.31.3
-	>=gnome-base/gnome-panel-2
+	>=gnome-base/gnome-panel-2[bonobo]
+	<gnome-base/gnome-panel-2.91
 	>=gnome-base/gnome-session-2.28
 	>=x11-misc/xdg-utils-1.0.2-r3
 	>=sys-power/upower-0.9