Add split dbus dependencies

Package-Manager: portage-2.1.1

3 files changed, 16 insertions, 21 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index a8dace1e983e..6907180ef277 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.103 2006/09/16 17:40:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.104 2006/09/17 12:35:48 steev Exp $
+
+  17 Sep 2006; Steev Klimaszewski <steev@gentoo.org> hal-0.5.7.1-r1.ebuild:
+  Added split dependency on either dbus-glib *or* dbus, that way, those people
+  who have unmasked dbus-glib it will depend on that first, and if not, fall
+  back on dbus monolithic.
 
 *hal-0.5.7.1-r1 (16 Sep 2006)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 3acacd8b75d7..4199ed4fdb32 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a84ee58cefa923cbc922a1c961fbdb17aa6 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161
 MD5 facf81eeca7ebddff5d030acb36de31d files/0.5-hald.rc 681
 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 files/0.5-hald.rc 681
@@ -97,18 +94,18 @@ EBUILD hal-0.5.7-r3.ebuild 5662 RMD160 a8a7312be795164627614bb33d6a08798e4e66c8
 MD5 635af581c44b2622b66029f34cfda7b4 hal-0.5.7-r3.ebuild 5662
 RMD160 a8a7312be795164627614bb33d6a08798e4e66c8 hal-0.5.7-r3.ebuild 5662
 SHA256 f765c3eca17d13dd0bb0b4656f699db0f40bba68f31583f89ee84fa1940f2041 hal-0.5.7-r3.ebuild 5662
-EBUILD hal-0.5.7.1-r1.ebuild 5838 RMD160 5b354af2bda56e9b1b3ea2afa659e99f0cd5203d SHA1 6923e359a5b4547d6645249fcd51b9eb2f91fa5c SHA256 3fe60490cbbb8ecd7441c2e63185c12b9b0eb101c20e4c026c0be6606107426e
-MD5 d1f24d1ddcf0186d6a57b01a006ca808 hal-0.5.7.1-r1.ebuild 5838
-RMD160 5b354af2bda56e9b1b3ea2afa659e99f0cd5203d hal-0.5.7.1-r1.ebuild 5838
-SHA256 3fe60490cbbb8ecd7441c2e63185c12b9b0eb101c20e4c026c0be6606107426e hal-0.5.7.1-r1.ebuild 5838
+EBUILD hal-0.5.7.1-r1.ebuild 5857 RMD160 d889c3b905cf0db618c6690a4e2d44b85b514ff1 SHA1 6c0c55736eade9a8d4b8c8cd800acaf3a83121aa SHA256 f2f7c776144c302a05d3cd36139e67257518050af4c1bf0451714fc62249ec5f
+MD5 f9768e9ef87fece6400bf8c8b10f8a04 hal-0.5.7.1-r1.ebuild 5857
+RMD160 d889c3b905cf0db618c6690a4e2d44b85b514ff1 hal-0.5.7.1-r1.ebuild 5857
+SHA256 f2f7c776144c302a05d3cd36139e67257518050af4c1bf0451714fc62249ec5f hal-0.5.7.1-r1.ebuild 5857
 EBUILD hal-0.5.7.1.ebuild 5764 RMD160 21640eca5bad9ad1ea690830c64e37aec185a8a7 SHA1 cf1361a7793e61825fad82959659b8d712d47c5e SHA256 6ae3ea70d464bd3bb6be9f16dbc66fc3cb89ae8060344ccce86680bb36d97e0b
 MD5 1c906e388735aa037f85bf0b90d7476f hal-0.5.7.1.ebuild 5764
 RMD160 21640eca5bad9ad1ea690830c64e37aec185a8a7 hal-0.5.7.1.ebuild 5764
 SHA256 6ae3ea70d464bd3bb6be9f16dbc66fc3cb89ae8060344ccce86680bb36d97e0b hal-0.5.7.1.ebuild 5764
-MISC ChangeLog 15216 RMD160 95afc10dc27f2e407766da9587d913464101ca92 SHA1 1bba1eca90b0e5ff1f07901877d9172fef60e932 SHA256 8ab3dcb728a86f7c80ad93ec7a2606b7bafcb404f59fcd786d045da9d15794c4
-MD5 d006e3cdd10a2fe232db1ce8a9dadd0a ChangeLog 15216
-RMD160 95afc10dc27f2e407766da9587d913464101ca92 ChangeLog 15216
-SHA256 8ab3dcb728a86f7c80ad93ec7a2606b7bafcb404f59fcd786d045da9d15794c4 ChangeLog 15216
+MISC ChangeLog 15475 RMD160 e68a51df53ba9d25d1ebf37748cef78d74f772b5 SHA1 23de23ba026f23cd2f3194da9b19a75853e12d1c SHA256 a44b70010f0bae8f77dfa78337734554bf18650d0493a3fd1ea16ff9d60e19dd
+MD5 1f0510ef8471090d78c9539e8058a1a9 ChangeLog 15475
+RMD160 e68a51df53ba9d25d1ebf37748cef78d74f772b5 ChangeLog 15475
+SHA256 a44b70010f0bae8f77dfa78337734554bf18650d0493a3fd1ea16ff9d60e19dd ChangeLog 15475
 MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d
 MD5 885e3073744523eaf2450514a311758b metadata.xml 223
 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223
@@ -128,10 +125,3 @@ SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/di
 MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r1 238
 RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r1 238
 SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFDDbzoeSe8B0zEfwRAnqeAJ4hhyc4d2DFp3M8OIbuvqrnT5DNLQCdEmPC
-bMoOKC+XE6vRORs+xociKRo=
-=fWhy
------END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.5.7.1-r1.ebuild b/sys-apps/hal/hal-0.5.7.1-r1.ebuild
index 052752105b66..be97eac87ec4 100644
--- a/sys-apps/hal/hal-0.5.7.1-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.7.1-r1.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/sys-apps/hal/hal-0.5.7.1-r1.ebuild,v 1.1 2006/09/16 17:40:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r1.ebuild,v 1.2 2006/09/17 12:35:48 steev Exp $
 
 inherit eutils linux-info debug
 
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="acpi crypt debug doc dmi pcmcia selinux"
 
 RDEPEND=">=dev-libs/glib-2.6
-	>=sys-apps/dbus-0.60
+	|| ( dev-libs/dbus-glibs sys-apps/dbus )
 	>=sys-fs/udev-078
 	>=sys-apps/util-linux-2.12r
 	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )