Cleaned old ||() depend issue.

Package-Manager: portage-2.0.53

5 files changed, 36 insertions, 21 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 1088ed20612f..4473e18a7d05 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.56 2005/11/29 17:20:17 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.57 2005/12/14 07:04:06 cardoe Exp $
+
+  14 Dec 2005; Doug Goldstein <cardoe@gentoo.org> hal-0.4.8.ebuild,
+  hal-0.5.4.ebuild, hal-0.5.5.1.ebuild:
+  Fixed old typo in ||()
 
   29 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> hal-0.5.4.ebuild:
   Adding a revdep-rebuild warning as per comment on bug #113818
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index a8ef87900e18..358e5b7d371b 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,4 +1,7 @@
-MD5 c4ae5e6790a66fe5b058bc462b6be49c ChangeLog 8005
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 87fd6fc780499c35842e891d4e94c2d2 ChangeLog 8137
 MD5 40a7b45f127bfdcacaa142660ad8b5f9 files/0.5-hald.rc 537
 MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5-r2 62
 MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7-r2 62
@@ -19,7 +22,14 @@ MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
 MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
 MD5 2cf5b3c9219c87b1d9aee01f4f5f19bb hal-0.4.5-r2.ebuild 3118
 MD5 1a146b79d18a689bbc8a96b81f74c7f6 hal-0.4.7-r2.ebuild 3455
-MD5 8420501e80e55b313d30f4e0309c08dd hal-0.4.8.ebuild 3419
-MD5 0f845310f938f2c422815649173aedab hal-0.5.4.ebuild 4041
-MD5 c587e7d02a20b445d6b164a8c71fc1da hal-0.5.5.1.ebuild 3937
+MD5 c6d1202b415d119777b338fd1787592e hal-0.4.8.ebuild 3420
+MD5 4359ce85a732bb15c55819f50ee1e74f hal-0.5.4.ebuild 4040
+MD5 1909745ea18a261467f2a3b4a5c51deb hal-0.5.5.1.ebuild 3912
 MD5 a60767d83157413d549c69b98fac962c metadata.xml 303
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDn8QKBtvusYtCZMsRAgt9AJ9NfK8Z9q30XINdSnCHnfvloMXwiQCfUxmZ
+0w1lMMVtXQIXAjGgGZz6hlE=
+=b1eK
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.4.8.ebuild b/sys-apps/hal/hal-0.4.8.ebuild
index 86348f5944d8..3c410776d9f1 100644
--- a/sys-apps/hal/hal-0.4.8.ebuild
+++ b/sys-apps/hal/hal-0.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.8.ebuild,v 1.4 2005/10/19 02:07:39 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.8.ebuild,v 1.5 2005/12/14 07:04:06 cardoe Exp $
 
 inherit eutils python linux-info versionator flag-o-matic
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.4
 	sys-libs/libcap
 	dev-libs/popt
 	>=sys-apps/util-linux-2.12i
-	||( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )"
+	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/sys-apps/hal/hal-0.5.4.ebuild b/sys-apps/hal/hal-0.5.4.ebuild
index 78a3c7d16b5c..b486211a0c93 100644
--- a/sys-apps/hal/hal-0.5.4.ebuild
+++ b/sys-apps/hal/hal-0.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.4.ebuild,v 1.7 2005/11/29 17:20:17 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.4.ebuild,v 1.8 2005/12/14 07:04:06 cardoe Exp $
 
 inherit eutils linux-info
 
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	>=sys-fs/udev-063
 	sys-apps/hotplug
 	>=sys-apps/util-linux-2.12i
-	||( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
+	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
 	dev-libs/libusb
 	pam_console? ( sys-libs/pam )"
 
diff --git a/sys-apps/hal/hal-0.5.5.1.ebuild b/sys-apps/hal/hal-0.5.5.1.ebuild
index 1867de89dc04..d776711626bc 100644
--- a/sys-apps/hal/hal-0.5.5.1.ebuild
+++ b/sys-apps/hal/hal-0.5.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.5.1.ebuild,v 1.2 2005/11/27 06:10:37 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.5.1.ebuild,v 1.3 2005/12/14 07:04:06 cardoe Exp $
 
 inherit eutils linux-info
 
@@ -14,18 +14,19 @@ KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64 ~sparc"
 IUSE="acpi debug doc pam_console pcmcia"
 
 RDEPEND=">=dev-libs/glib-2.6
-		 >=sys-apps/dbus-0.50
-		 >=sys-fs/udev-071
-		 >=sys-apps/util-linux-2.12i
-		 ||( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
-		   dev-libs/expat
-		   dev-libs/libusb
-		   sys-apps/hotplug
-		 pam_console? ( sys-libs/pam )"
+	>=sys-apps/dbus-0.50
+	>=sys-fs/udev-071
+	>=sys-apps/util-linux-2.12i
+	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
+	dev-libs/expat
+	dev-libs/libusb
+	sys-apps/hotplug
+	pam_console? ( sys-libs/pam )"
+
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.29
-		doc? ( app-doc/doxygen app-text/docbook-sgml-utils )"
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( app-doc/doxygen app-text/docbook-sgml-utils )"
 
 ## HAL Daemon drops privledges so we need group access to read disks
 HALDAEMON_GROUPS="haldaemon,disk,cdrom,cdrw,floppy,usb"