fix dbus dependency for dbus-1.0 (bug #155295)

Package-Manager: portage-2.1.2_rc2

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index e4a2d02442f94c7e215ffb50efe418e554442c44..6e1993e605d9a6c4ac4d6e455291bd6a9b7a1fc5 100644 (file)
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.202 2006/11/05 04:37:14 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.203 2006/11/18 22:12:11 compnerd Exp $
+
+  18 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  control-center-2.16.1.ebuild:
+  Fix dbus dependencies for dbus-1.0 (bug #155295)
 
   05 Nov 2006; Mart Raudsepp <leio@gentoo.org>
   -control-center-2.16.0.ebuild, control-center-2.16.1.ebuild:

diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 365f24c5d8518031f45b993073f0bc8b4a21e2b7..462fd9cbfb6205f8c67144e2355462899931c03f 100644 (file)
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX control-center-1.4.0.5-cflags.patch 744 RMD160 ff6037cf0346a87164183c6c8eeb6b7a88539ce1 SHA1 5ece0bd4b5fb59c0fe9f563382f4948e2db5f083 SHA256 fec02a1e8ec40fca0591eeeb1f41bb0d8acf592a56a383f7f2dce9fffe13baa3
 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 RMD160 ff6037cf0346a87164183c6c8eeb6b7a88539ce1 files/control-center-1.4.0.5-cflags.patch 744
@@ -82,14 +79,14 @@ EBUILD control-center-2.14.2.ebuild 2444 RMD160 689ba4fe0b7468731183154ff10ae5ac
 MD5 983f7e1a0d21717ee1ced77ae71f38b9 control-center-2.14.2.ebuild 2444
 RMD160 689ba4fe0b7468731183154ff10ae5acbe69bd54 control-center-2.14.2.ebuild 2444
 SHA256 79231146c56b8b159171ed3f860c8d7785e972b89c47a70252b120078c25a1f1 control-center-2.14.2.ebuild 2444
-EBUILD control-center-2.16.1.ebuild 2207 RMD160 77d3eddb52331170aaf21b5e19f88cb8959dd204 SHA1 de360c4e8d2e37d66b97004c81975923dedf04ac SHA256 dafe848c101abb189d377e945f8fd63858c759faf86c9bd6ef9e16d1ad5f5fa3
-MD5 dc2914bccab9cacdb1c4a14c4ddf6748 control-center-2.16.1.ebuild 2207
-RMD160 77d3eddb52331170aaf21b5e19f88cb8959dd204 control-center-2.16.1.ebuild 2207
-SHA256 dafe848c101abb189d377e945f8fd63858c759faf86c9bd6ef9e16d1ad5f5fa3 control-center-2.16.1.ebuild 2207
-MISC ChangeLog 27048 RMD160 701aa4d4105c7ee07770301c5116c984a2849f69 SHA1 e80572777759fc66a098d739af85fd99a5ea2ac3 SHA256 d9e8982ebb4cad9dc9896678a00f5cc626b31d23aebc5cea3bc869f72d35a54e
-MD5 8998cfab342027c0cd753107d01830eb ChangeLog 27048
-RMD160 701aa4d4105c7ee07770301c5116c984a2849f69 ChangeLog 27048
-SHA256 d9e8982ebb4cad9dc9896678a00f5cc626b31d23aebc5cea3bc869f72d35a54e ChangeLog 27048
+EBUILD control-center-2.16.1.ebuild 2280 RMD160 673b8f72b7f9d9e9b88ee40217f93030cf5dd8c6 SHA1 f1000d5d30dab5ec7f37f3f1867906388232d8a6 SHA256 bf009ea079d7cfce09d1038c27b00eb30d0bd55f5f3c3368a36a6b1e150d26ac
+MD5 8035c57ae542c5a062b41dd7f7d22f8d control-center-2.16.1.ebuild 2280
+RMD160 673b8f72b7f9d9e9b88ee40217f93030cf5dd8c6 control-center-2.16.1.ebuild 2280
+SHA256 bf009ea079d7cfce09d1038c27b00eb30d0bd55f5f3c3368a36a6b1e150d26ac control-center-2.16.1.ebuild 2280
+MISC ChangeLog 27192 RMD160 f05390788077f753f3769292e961185e31e33ce9 SHA1 c4a9f747eb566e55eef389cf0ddda8b75e6367af SHA256 30a4f522e3011617d17be672025e30654bad8da014b09935e4d21a12129aaf0d
+MD5 b8dee77345c69c30cdbe5458ad279781 ChangeLog 27192
+RMD160 f05390788077f753f3769292e961185e31e33ce9 ChangeLog 27192
+SHA256 30a4f522e3011617d17be672025e30654bad8da014b09935e4d21a12129aaf0d ChangeLog 27192
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -115,10 +112,3 @@ SHA256 3bf3043fb1d93928d2672697ddfd129eda99445af22cf40aff730ad11cbe6d14 files/di
 MD5 f7ce3794ea17c413976b24b68f9eecf1 files/digest-control-center-2.16.1 271
 RMD160 1398e03c49df4e861133b960d230d1745e9ef081 files/digest-control-center-2.16.1 271
 SHA256 56cf6118a6e83f6082578f4f4d3638e3f93d337566f438454903e643269e8951 files/digest-control-center-2.16.1 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFVpcTamhnQswr0vIRAvdLAKCpTGt3C65e5w7hoOz9EtURrdlTcwCeJL/H
-21DEtV9N9lmH4FXvWbcIIc0=
-=nQJl
------END PGP SIGNATURE-----

diff --git a/gnome-base/control-center/control-center-2.16.1.ebuild b/gnome-base/control-center/control-center-2.16.1.ebuild
index 84980955f0c2bc452bc318b0a66ffce12c065d4d..32085348a8c354a54b5dc1dd7c883898c5f6de74 100644 (file)
--- a/gnome-base/control-center/control-center-2.16.1.ebuild
+++ b/gnome-base/control-center/control-center-2.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.16.1.ebuild,v 1.3 2006/11/05 04:37:14 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.16.1.ebuild,v 1.4 2006/11/18 22:12:11 compnerd Exp $
 
 inherit eutils gnome2 autotools
 
@@ -34,12 +34,15 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2
                >=gnome-base/gnome-menus-2.11.1
                media-sound/esound
                >=sys-apps/hal-0.5.6
-               >=sys-apps/dbus-0.60
                >=x11-wm/metacity-2.8.6-r1
                >=x11-libs/libxklavier-2.91
                >=gnome-base/libgnome-2.2
                media-libs/freetype
                >=gnome-base/orbit-2.12.4
+               ||  (
+                               >=dev-libs/dbus-glib-0.71
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+                       )
                eds? ( >=gnome-extra/evolution-data-server-1.7 )
                !arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
                >=media-libs/gst-plugins-base-0.10.2