Fixing D-Bus dependancies

Package-Manager: portage-2.1.2_rc2

4 files changed, 33 insertions, 17 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 614f473b74f3..f59f10c23130 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.130 2006/10/20 21:10:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.131 2006/11/19 19:37:18 cardoe Exp $
+
+  19 Nov 2006; Doug Goldstein <cardoe@gentoo.org> yelp-2.16.0.ebuild,
+  yelp-2.16.1.ebuild:
+  Fixing D-Bus dependancies
 
   20 Oct 2006; Aron Griffis <agriffis@gentoo.org> yelp-2.14.2-r2.ebuild:
   Mark 2.14.2-r2 stable on alpha
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 488eeaeffb41..0e7c688f670a 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX yelp-2.14.0-mozilla-include-fix.patch 276 RMD160 24d8144d6655617da708b7048536582bad257795 SHA1 2b66e08646e205fbae9d6fb4143c400c1b9ac1b7 SHA256 d8d44922f7710eeb7f80d57c68187fc138c318473f3c24455e53b9b2f2114356
 MD5 d3dd0a00ede7b453249075c979ddc6cc files/yelp-2.14.0-mozilla-include-fix.patch 276
 RMD160 24d8144d6655617da708b7048536582bad257795 files/yelp-2.14.0-mozilla-include-fix.patch 276
@@ -26,18 +29,18 @@ EBUILD yelp-2.14.2-r2.ebuild 1765 RMD160 34db483f40a3bed910938b6869f791b8b6f588d
 MD5 7fa211b7b120153abaeb82d0aed94d71 yelp-2.14.2-r2.ebuild 1765
 RMD160 34db483f40a3bed910938b6869f791b8b6f588d9 yelp-2.14.2-r2.ebuild 1765
 SHA256 9a34c8cf92d12c2a8203c5b04d2deed38d29e08d7192141f70bed22eb6cb8a24 yelp-2.14.2-r2.ebuild 1765
-EBUILD yelp-2.16.0.ebuild 1050 RMD160 487a638a741b4c3648cf1f5ddd9d07b47808ba62 SHA1 c288e5cf74bdf47266a4eb50fce5bbced4e19d05 SHA256 1bb093a4be044218133b4dd04953a2b52badb64f849a16361357a2c33c9caa3c
-MD5 e4678a20db20b262ee00dc4acf01ef47 yelp-2.16.0.ebuild 1050
-RMD160 487a638a741b4c3648cf1f5ddd9d07b47808ba62 yelp-2.16.0.ebuild 1050
-SHA256 1bb093a4be044218133b4dd04953a2b52badb64f849a16361357a2c33c9caa3c yelp-2.16.0.ebuild 1050
-EBUILD yelp-2.16.1.ebuild 1048 RMD160 1248ef4f2225bc55833f0ed9cfb645cda9eee00d SHA1 beabac2e76ec5317b57b2ff1900cf7fde290b8df SHA256 a161f70a25d643444a614987846e159ec948d65f1dadd1f4ff3863f773269bfb
-MD5 5ad68ac01d90d6cc846c989bf69e6b60 yelp-2.16.1.ebuild 1048
-RMD160 1248ef4f2225bc55833f0ed9cfb645cda9eee00d yelp-2.16.1.ebuild 1048
-SHA256 a161f70a25d643444a614987846e159ec948d65f1dadd1f4ff3863f773269bfb yelp-2.16.1.ebuild 1048
-MISC ChangeLog 14761 RMD160 40c59e99bc741b3bea389492c7e80dc2837b3c7a SHA1 aa5c16b783a223c902169f6b934129154447c3bf SHA256 e84dba33466226c7b12aba1c288cd9e1d5de99ad603ae8f82aa166db62478f0c
-MD5 43f2d843decd941300ad0f0ac9f5a43f ChangeLog 14761
-RMD160 40c59e99bc741b3bea389492c7e80dc2837b3c7a ChangeLog 14761
-SHA256 e84dba33466226c7b12aba1c288cd9e1d5de99ad603ae8f82aa166db62478f0c ChangeLog 14761
+EBUILD yelp-2.16.0.ebuild 1116 RMD160 5dbf9c8cd5c5bfd31904c77c59afbe718f375740 SHA1 b41a972182c41a162541980d8cf529a009b185a3 SHA256 ecc23515f4bd95f854f0047005959983ba0f79a11c995bf526cd576712deef49
+MD5 941c0e62ac659bf65e566837c89fc1dd yelp-2.16.0.ebuild 1116
+RMD160 5dbf9c8cd5c5bfd31904c77c59afbe718f375740 yelp-2.16.0.ebuild 1116
+SHA256 ecc23515f4bd95f854f0047005959983ba0f79a11c995bf526cd576712deef49 yelp-2.16.0.ebuild 1116
+EBUILD yelp-2.16.1.ebuild 1114 RMD160 3e8468a5bd06a07914e7839c7135c9a466e3cdad SHA1 fb81c6920fe4229242693db2cf687ef3187a484d SHA256 6a0713e15eaa6cc1e397940e4d07562c6d7d4ece13701e44338d085a4029c198
+MD5 5bcaa00dcd1e154c98152c0ecb28efbe yelp-2.16.1.ebuild 1114
+RMD160 3e8468a5bd06a07914e7839c7135c9a466e3cdad yelp-2.16.1.ebuild 1114
+SHA256 6a0713e15eaa6cc1e397940e4d07562c6d7d4ece13701e44338d085a4029c198 yelp-2.16.1.ebuild 1114
+MISC ChangeLog 14880 RMD160 316c40f432e868a70beff2d742372dfcc09cb35b SHA1 abe4d1ce81c55f7c2f1774e2c2b4f7571ace5f46 SHA256 a1babc88f3ca729d9c9b2cb356d83c979aebb88197d79f76f5c3503c4afe557b
+MD5 780c3f9ac4ca9d1572d4babdcd903008 ChangeLog 14880
+RMD160 316c40f432e868a70beff2d742372dfcc09cb35b ChangeLog 14880
+SHA256 a1babc88f3ca729d9c9b2cb356d83c979aebb88197d79f76f5c3503c4afe557b ChangeLog 14880
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -54,3 +57,10 @@ SHA256 10e957c4e0d38ad5cd42f7322e7e94980e2b42e794c0a443d91f36814625a7bc files/di
 MD5 63ebb87eeafac76883ec747415f9c1f0 files/digest-yelp-2.16.1 238
 RMD160 f0350c21fe28c0e21906782a252af8dc46024403 files/digest-yelp-2.16.1 238
 SHA256 e78214b0218bca02f8b5b1cd4ff67f5102a0569a58c5a80eab035c8360893d5b files/digest-yelp-2.16.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFYLJ6oeSe8B0zEfwRAnOwAJ0fysmpL+VbdCkYnq6SSyUxXMnecwCfV9AH
+W5vVrIwMjSV8ldWvBTotYII=
+=tulv
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/yelp-2.16.0.ebuild b/gnome-extra/yelp/yelp-2.16.0.ebuild
index d4def61a8d37..763e29c35976 100644
--- a/gnome-extra/yelp/yelp-2.16.0.ebuild
+++ b/gnome-extra/yelp/yelp-2.16.0.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-extra/yelp/yelp-2.16.0.ebuild,v 1.6 2006/10/14 21:33:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.0.ebuild,v 1.7 2006/11/19 19:37:18 cardoe Exp $
 
 inherit gnome2
 
@@ -23,7 +23,8 @@ RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/glib-2
-	sys-apps/dbus
+	|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
 	beagle? ( >=app-misc/beagle-0.2.4 )
 	>=www-client/mozilla-firefox-1.0.2-r1
 	sys-libs/zlib
diff --git a/gnome-extra/yelp/yelp-2.16.1.ebuild b/gnome-extra/yelp/yelp-2.16.1.ebuild
index 87c684b69fe9..7173ffe5e4ee 100644
--- a/gnome-extra/yelp/yelp-2.16.1.ebuild
+++ b/gnome-extra/yelp/yelp-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-extra/yelp/yelp-2.16.1.ebuild,v 1.2 2006/10/14 21:33:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.1.ebuild,v 1.3 2006/11/19 19:37:18 cardoe Exp $
 
 inherit gnome2
 
@@ -23,7 +23,8 @@ RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/glib-2
-	sys-apps/dbus
+	|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
 	beagle? ( >=app-misc/beagle-0.2.4 )
 	>=www-client/mozilla-firefox-1.0.2-r1
 	sys-libs/zlib