Fix dbus deps so dbus-python is always there. Bug #171479

Package-Manager: portage-2.1.2.2

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index cd98bbbb0f757ca66df99c6154984fccb6b5cfea..0d48e40250aefa76079a8908872ca1ebf8034925 100644 (file)
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.47 2007/02/04 08:59:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.48 2007/03/19 20:16:55 dang Exp $
+
+  19 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  deskbar-applet-2.16.2-r1.ebuild:
+  Fix dbus deps so dbus-python is always there.  Bug #171479
 
   04 Feb 2007; Markus Rothe <corsair@gentoo.org>
   deskbar-applet-2.16.2-r1.ebuild:

diff --git a/gnome-extra/deskbar-applet/Manifest b/gnome-extra/deskbar-applet/Manifest
index 1e676e75b6d8a2ac0a0d518b39913732e75906c5..6f6f5d76ab52ee66e709b2f974a9a8960e9ab696 100644 (file)
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX deskbar-applet-2.13.91-multilib.patch 3380 RMD160 79216ae3fdd67cc68d04453b612cbb5339bb2582 SHA1 422e4f4f30d71cb7d6ed10db9ba2795a67e14886 SHA256 28e4c47803164b6f01ab7092812b03ab3d7360900b76e4ddb0e680f403453702
 MD5 8e8fdbd5aa2d0ab8bf18c380813c4ab0 files/deskbar-applet-2.13.91-multilib.patch 3380
 RMD160 79216ae3fdd67cc68d04453b612cbb5339bb2582 files/deskbar-applet-2.13.91-multilib.patch 3380
@@ -16,18 +19,18 @@ EBUILD deskbar-applet-2.14.2.ebuild 1168 RMD160 130012f2fe790b112817705c339569ee
 MD5 cbf6a13d7b7803cbc16b345f9398d8b7 deskbar-applet-2.14.2.ebuild 1168
 RMD160 130012f2fe790b112817705c339569ee73ccda32 deskbar-applet-2.14.2.ebuild 1168
 SHA256 99e3754049ae69210efccf73b71e32104a73567099df29f273fd1fd680575fb1 deskbar-applet-2.14.2.ebuild 1168
-EBUILD deskbar-applet-2.16.2-r1.ebuild 1588 RMD160 5545f28cbf23ebb703bcd12114a2f7b4292841f5 SHA1 7ef8552b3d24a35a157e1a9740a6b6fa8b59c4e5 SHA256 a101d5953b78b157541b5069cdf92d9b14d3d918297096de610ee2c9d4b5e130
-MD5 e775ff6104d9d340b3eef08025e11e0c deskbar-applet-2.16.2-r1.ebuild 1588
-RMD160 5545f28cbf23ebb703bcd12114a2f7b4292841f5 deskbar-applet-2.16.2-r1.ebuild 1588
-SHA256 a101d5953b78b157541b5069cdf92d9b14d3d918297096de610ee2c9d4b5e130 deskbar-applet-2.16.2-r1.ebuild 1588
+EBUILD deskbar-applet-2.16.2-r1.ebuild 1658 RMD160 af0aedd2693767fb91dffed3806b1aff17e7b462 SHA1 7033e71abf153d5b3e22e43c1d821e88888d5f08 SHA256 6935338fad0b328d8e92801a60488e727ee9b04c9229407f39d78f2375b8353d
+MD5 930730157043d4ddf367723c3cb83b09 deskbar-applet-2.16.2-r1.ebuild 1658
+RMD160 af0aedd2693767fb91dffed3806b1aff17e7b462 deskbar-applet-2.16.2-r1.ebuild 1658
+SHA256 6935338fad0b328d8e92801a60488e727ee9b04c9229407f39d78f2375b8353d deskbar-applet-2.16.2-r1.ebuild 1658
 EBUILD deskbar-applet-2.16.2.ebuild 1291 RMD160 17900ba0cc36abbd73de9b5350806559182046a5 SHA1 6d0a6947ef3e37e029e1209f216cedb0d8f8c837 SHA256 38ec973da93be60d97d10d19aad3107f90419251be376a3410a3a304746af17c
 MD5 b403e48329736c612bc145eed615f45a deskbar-applet-2.16.2.ebuild 1291
 RMD160 17900ba0cc36abbd73de9b5350806559182046a5 deskbar-applet-2.16.2.ebuild 1291
 SHA256 38ec973da93be60d97d10d19aad3107f90419251be376a3410a3a304746af17c deskbar-applet-2.16.2.ebuild 1291
-MISC ChangeLog 6905 RMD160 bf2dd73a948f38fbc8717f78267605b9d89bfb0f SHA1 38d04bbfc6be12dc88e3fac3325f07638ae827f3 SHA256 52a8d6d926dc99e6397e06f5a0a34bc9f838c0ddc73e9b0512e8d99287747db8
-MD5 28f276681e6bcf7a0fb5882efbfc0559 ChangeLog 6905
-RMD160 bf2dd73a948f38fbc8717f78267605b9d89bfb0f ChangeLog 6905
-SHA256 52a8d6d926dc99e6397e06f5a0a34bc9f838c0ddc73e9b0512e8d99287747db8 ChangeLog 6905
+MISC ChangeLog 7050 RMD160 480d8d2cea4a183b71748ff5c473f22a089c6f19 SHA1 6bb8490e473fc0b728d05396d6facb53bba1720a SHA256 8715c4656e46277fd885a19a8b938887704a19d06637281efa9f3694171d0d3f
+MD5 f099b29268d4aced9e68f9f9cbafa9ba ChangeLog 7050
+RMD160 480d8d2cea4a183b71748ff5c473f22a089c6f19 ChangeLog 7050
+SHA256 8715c4656e46277fd885a19a8b938887704a19d06637281efa9f3694171d0d3f ChangeLog 7050
 MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
 MD5 c96fe9e3f7052e7e1e929b940d8bb263 metadata.xml 413
 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa metadata.xml 413
@@ -41,3 +44,10 @@ SHA256 4f74f0cecf452942a65c1cb6ba007d44af9b84bb9a7637c500f8cf1d77b07dac files/di
 MD5 f8e269415f405b2cfde3794f10799877 files/digest-deskbar-applet-2.16.2-r1 268
 RMD160 3e4e75e5d4e22f993890850f941eeaf2f89f478c files/digest-deskbar-applet-2.16.2-r1 268
 SHA256 4f74f0cecf452942a65c1cb6ba007d44af9b84bb9a7637c500f8cf1d77b07dac files/digest-deskbar-applet-2.16.2-r1 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF/u+5omPajV0RnrERAgtwAJ4yDJYPxkB8rDX4umr/5fRR7a9XIgCfZTNL
+mOhQWxRlyrQxGz45BfWOto8=
+=SOH/
+-----END PGP SIGNATURE-----

diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild
index c4510b2b2600021e92810066b103ab2eb77a53ba..09757cd6572015376a8be3ce62fd4718a7c341a8 100644 (file)
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild,v 1.7 2007/02/04 08:59:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild,v 1.8 2007/03/19 20:16:55 dang Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -17,7 +17,10 @@ RDEPEND=">=dev-lang/python-2.4
                 >=dev-python/pygtk-2.6
                 >=dev-python/gnome-python-2.10
                 >=gnome-base/gnome-desktop-2.10
-                >=sys-apps/dbus-0.60
+                || (
+                               >=dev-python/dbus-python-0.71
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+                       )
                 >=dev-python/gnome-python-desktop-2.14.0
                 >=dev-python/gnome-python-extras-2.14
                 >=gnome-base/gconf-2