fix dependencies for dbus-1.0

Package-Manager: portage-2.1.2_rc2-r1

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 0b640ad5d1e7a2c87731ec0abb1e18bba5c7f6bf..3f7915f35edd7b7c88f0a22bb49bb65378269fac 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,9 @@
 # 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.109 2006/11/19 23:59:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.110 2006/11/20 22:16:30 compnerd Exp $
+
+  20 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> hal-0.5.7-r3.ebuild:
+  Fix dbus dependencies for dbus-1.0 release
 
   19 Nov 2006; Doug Goldstein <cardoe@gentoo.org>
   files/hal-0.5.7.1-hibernate-fix.patch:

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 1ea6230d498551dd0a78c0e6f3a9440b651b6268..999d9016b7a301429733184518ca1762f8be22d5 100644 (file)
--- 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
@@ -72,10 +69,10 @@ EBUILD hal-0.5.5.1-r3.ebuild 3766 RMD160 0341accd029d9028f92f18b6b8aa65e395bbf6a
 MD5 af33a479d90c3f8814e6d370b1033a1a hal-0.5.5.1-r3.ebuild 3766
 RMD160 0341accd029d9028f92f18b6b8aa65e395bbf6ab hal-0.5.5.1-r3.ebuild 3766
 SHA256 ca56f995710840061ca42e6428427e56782fcda126db7ad83dbf3c71d6d791f7 hal-0.5.5.1-r3.ebuild 3766
-EBUILD hal-0.5.7-r3.ebuild 5710 RMD160 ed2e1a1f3f5d6caacb42350901c9be27033b7129 SHA1 545980cacd616760d21712c1f6a7cfa406e3e6fd SHA256 b919df1f99c86df595024d66201ecd351bccf216247b4b1e126a13c77da978a6
-MD5 fc3f2afae81bb28c7f2955a699606fb3 hal-0.5.7-r3.ebuild 5710
-RMD160 ed2e1a1f3f5d6caacb42350901c9be27033b7129 hal-0.5.7-r3.ebuild 5710
-SHA256 b919df1f99c86df595024d66201ecd351bccf216247b4b1e126a13c77da978a6 hal-0.5.7-r3.ebuild 5710
+EBUILD hal-0.5.7-r3.ebuild 5775 RMD160 d6a012c32cee798c8e2df4857589cafa347f3f43 SHA1 58bddf5d101ccf9d5925908220358c146ee000bc SHA256 f388660454c92d1c0a1b99ee9de1c77cdc4a3d95a6596ee6dcd77ed821223e03
+MD5 1251fd7925610492793f1a194b7f7716 hal-0.5.7-r3.ebuild 5775
+RMD160 d6a012c32cee798c8e2df4857589cafa347f3f43 hal-0.5.7-r3.ebuild 5775
+SHA256 f388660454c92d1c0a1b99ee9de1c77cdc4a3d95a6596ee6dcd77ed821223e03 hal-0.5.7-r3.ebuild 5775
 EBUILD hal-0.5.7.1-r1.ebuild 5917 RMD160 b7ff504a6522d1b45d65fc3d5e27e84b3f661383 SHA1 f61526316df27ad8740bc9367d4298ddfd72c298 SHA256 47fba625ecffa7737364e283f46675024f775efd3dfa7c669474dd8ad3972c83
 MD5 0761d07be52b7c56065ae2fbff047a92 hal-0.5.7.1-r1.ebuild 5917
 RMD160 b7ff504a6522d1b45d65fc3d5e27e84b3f661383 hal-0.5.7.1-r1.ebuild 5917
@@ -84,10 +81,10 @@ EBUILD hal-0.5.7.1-r2.ebuild 5927 RMD160 541c023e3f7a2981087a65f6d028cc3496e2ac8
 MD5 732c9bda37514b0be81e57a1d94de4a9 hal-0.5.7.1-r2.ebuild 5927
 RMD160 541c023e3f7a2981087a65f6d028cc3496e2ac89 hal-0.5.7.1-r2.ebuild 5927
 SHA256 82099a78707b22e69f532cb9a09c682933ffd5096fa9c1a3de78a8b492a1902a hal-0.5.7.1-r2.ebuild 5927
-MISC ChangeLog 16664 RMD160 4c6892db17fbd20cd63794281e6e21856a984f52 SHA1 4005d64e32ad4682bc95a2ba8ad3ab303f77a91c SHA256 e145c228d47af5be98b79f58d3a5695635ca88d51105e651aaaa35c2d17f51ff
-MD5 77f3e4bc288bd5b5dd09b288a89ea975 ChangeLog 16664
-RMD160 4c6892db17fbd20cd63794281e6e21856a984f52 ChangeLog 16664
-SHA256 e145c228d47af5be98b79f58d3a5695635ca88d51105e651aaaa35c2d17f51ff ChangeLog 16664
+MISC ChangeLog 16789 RMD160 39ac8dc3424650dcec47ed32f17f8fcac7c25763 SHA1 8b28adb68e33f466ff3e745b9cf7cfa6c480333c SHA256 0d404f2cba04590528f50b8f26664dd3768ea1b0472609664187d1948278e805
+MD5 46efce7e61052103d0ba6f5b480044a0 ChangeLog 16789
+RMD160 39ac8dc3424650dcec47ed32f17f8fcac7c25763 ChangeLog 16789
+SHA256 0d404f2cba04590528f50b8f26664dd3768ea1b0472609664187d1948278e805 ChangeLog 16789
 MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d
 MD5 885e3073744523eaf2450514a311758b metadata.xml 223
 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223
@@ -104,10 +101,3 @@ SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/di
 MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r2 238
 RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r2 238
 SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFYPGOoeSe8B0zEfwRAi/gAKCJLE5bcajfFEm7CH/p0BME/ifykQCcCWRV
-lycACI/1Ma3UeU+TYbOQ6ew=
-=3yUj
------END PGP SIGNATURE-----

diff --git a/sys-apps/hal/hal-0.5.7-r3.ebuild b/sys-apps/hal/hal-0.5.7-r3.ebuild
index 8d152949ebbf7e563868064e6f9ce22fdcbbe464..abda6b858ad01c72351a611d4fd5f28acc820af9 100644 (file)
--- a/sys-apps/hal/hal-0.5.7-r3.ebuild
+++ b/sys-apps/hal/hal-0.5.7-r3.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-r3.ebuild,v 1.12 2006/10/31 03:05:21 christel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7-r3.ebuild,v 1.13 2006/11/20 22:16:30 compnerd Exp $
 
 inherit eutils linux-info debug
 
@@ -14,7 +14,6 @@ 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
        >=sys-fs/udev-078
        >=sys-apps/util-linux-2.12r
        || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
@@ -23,6 +22,10 @@ RDEPEND=">=dev-libs/glib-2.6
        sys-apps/pciutils
        dev-libs/libusb
        sys-apps/hotplug
+       ||      (
+                       >=dev-libs/dbus-glib-0.71
+                       ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+               )
        dmi? ( >=sys-apps/dmidecode-2.7 )
        crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 )
        selinux? ( sys-libs/libselinux )"