better checking of /proc/mounts's / reference. drop arches that don't have ~arch...

Package-Manager: portage-2.1.2.4

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index c81d7960328c99f7cd18c188b804bfcaf67cbb7f..e351f798b53751eec3fba8e9b7e950aa3f2db81e 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.173 2007/04/19 19:49:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.174 2007/04/20 23:22:33 cardoe Exp $
+
+  20 Apr 2007; Doug Goldstein <cardoe@gentoo.org> files/0.5.9-hald.rc,
+  hal-0.5.9.ebuild:
+  better checking of /proc/mounts's / reference. drop arches that don't have
+  ~arch for hal-info for QA.
 
   19 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
   +files/0.5.9/15_spec_fdi_matching.patch,

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 8d8704fd2b51e3d7296e073a39057df5e1765c52..28994ffe2631e2bb0533d87ab151690fca7c9798 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -9,10 +9,10 @@ AUX 0.5.9-hald.conf 364 RMD160 4c54ac942ecc130a585e90d07078372bfc3b5d58 SHA1 ff2
 MD5 daa36e163190cfec256b83e348ba012f files/0.5.9-hald.conf 364
 RMD160 4c54ac942ecc130a585e90d07078372bfc3b5d58 files/0.5.9-hald.conf 364
 SHA256 efc215155f79947827735972eb97a8a460de5084c74811da615292132888d707 files/0.5.9-hald.conf 364
-AUX 0.5.9-hald.rc 937 RMD160 56f390380986d653ff723228e418ca2f6e8b92ad SHA1 b913a04e7909ee227518b25d351228ac4e00d2fd SHA256 e600e26b44150563c2d2a777d4a96254ef834ecc1e56b05661d88d4c89efc29c
-MD5 b75bf2b15b661d1730417e186862b9df files/0.5.9-hald.rc 937
-RMD160 56f390380986d653ff723228e418ca2f6e8b92ad files/0.5.9-hald.rc 937
-SHA256 e600e26b44150563c2d2a777d4a96254ef834ecc1e56b05661d88d4c89efc29c files/0.5.9-hald.rc 937
+AUX 0.5.9-hald.rc 1100 RMD160 6188edd7acfa2b0c4c1d9926165ca92da11c9c82 SHA1 c7ee003d0b733cade64233945d61b84750c34aa6 SHA256 dd88b8632367d5149c20020f4b1656edcb2291abdd2a0c94b99881f5e4674bd5
+MD5 9597221d381dd27afc9e3fa9180c6237 files/0.5.9-hald.rc 1100
+RMD160 6188edd7acfa2b0c4c1d9926165ca92da11c9c82 files/0.5.9-hald.rc 1100
+SHA256 dd88b8632367d5149c20020f4b1656edcb2291abdd2a0c94b99881f5e4674bd5 files/0.5.9-hald.rc 1100
 AUX 0.5.9/01_luks_mount_fix.patch 2605 RMD160 00d6b01a0c96123ce6ee66d1762a00988c363139 SHA1 d5b0ce4140b0db59942ef384df640a4749b0c24c SHA256 f1dfdd118055efbc97163273e0f3930f8badf2be3e4f1ca327654c221faa951e
 MD5 526e8c9b50700bca6340f6a0d73f1aa4 files/0.5.9/01_luks_mount_fix.patch 2605
 RMD160 00d6b01a0c96123ce6ee66d1762a00988c363139 files/0.5.9/01_luks_mount_fix.patch 2605
@@ -187,14 +187,14 @@ EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498
 MD5 709ca20b11819f2e13e381be47e19535 hal-0.5.7.1-r5.ebuild 6426
 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498e hal-0.5.7.1-r5.ebuild 6426
 SHA256 6e020d3a29d82b993984f58ab8ef3659d837c11bce25f3ad25df6f4748e11207 hal-0.5.7.1-r5.ebuild 6426
-EBUILD hal-0.5.9.ebuild 7193 RMD160 a36f201410e369b8a939876bd13662c23df1a638 SHA1 6d818520ec9193c92d0e10290a588e49a34135c0 SHA256 7559e53b5a730ce8c819bd3c424311ef66bde22b1e54cbeb9b7844862f99cd04
-MD5 490583431bbaa7a9e38de2c1c0a89100 hal-0.5.9.ebuild 7193
-RMD160 a36f201410e369b8a939876bd13662c23df1a638 hal-0.5.9.ebuild 7193
-SHA256 7559e53b5a730ce8c819bd3c424311ef66bde22b1e54cbeb9b7844862f99cd04 hal-0.5.9.ebuild 7193
-MISC ChangeLog 28479 RMD160 77bbe1b5ff8c975d8e6f3644f8f759e5c6fdd9e4 SHA1 23a2e0e53b4f227de4de0faa2b9abe8149054bc4 SHA256 d3c8472cfb0e7fec9aabed9c121533eea7f63058e186d82ec7ceb7840fc46267
-MD5 d1676906775763acc531920594df6315 ChangeLog 28479
-RMD160 77bbe1b5ff8c975d8e6f3644f8f759e5c6fdd9e4 ChangeLog 28479
-SHA256 d3c8472cfb0e7fec9aabed9c121533eea7f63058e186d82ec7ceb7840fc46267 ChangeLog 28479
+EBUILD hal-0.5.9.ebuild 7177 RMD160 cf9131b3eb91be3e90efe501d125a02b18398062 SHA1 df399bd689fcf38581523d5aaeb54efbfc52c031 SHA256 dd9f4b2e4aba2a1dc43bb83f060cc5d13d09291ae861b412b51a75f81534b59c
+MD5 5bf97425f9c1ebe14d09e69b12078a8e hal-0.5.9.ebuild 7177
+RMD160 cf9131b3eb91be3e90efe501d125a02b18398062 hal-0.5.9.ebuild 7177
+SHA256 dd9f4b2e4aba2a1dc43bb83f060cc5d13d09291ae861b412b51a75f81534b59c hal-0.5.9.ebuild 7177
+MISC ChangeLog 28677 RMD160 fdcb1cbc044aa0318b4513f7bd6fc2c2f07e7dc7 SHA1 c4c867fc7b5b78cfaeb7bacf39586a1e4f55a317 SHA256 1bfba2979bef79ab964eea1d21b60e708e294255a75731285d9729ebc2a652e8
+MD5 30143900247a321391e5944ccb701834 ChangeLog 28677
+RMD160 fdcb1cbc044aa0318b4513f7bd6fc2c2f07e7dc7 ChangeLog 28677
+SHA256 1bfba2979bef79ab964eea1d21b60e708e294255a75731285d9729ebc2a652e8 ChangeLog 28677
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -211,7 +211,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGKQNXoeSe8B0zEfwRAvd9AJ9Khpu6SOGHzGSWeV/fDXJIRpvv7gCfcVmH
-YVPP516+0lGBMGAL44kAawE=
-=8gA2
+iD8DBQFGKUs7oeSe8B0zEfwRAliJAKCICA5LTTQIF4XpRRNewA1nP6ei/wCbBcYP
+AnOG+4CRLZieZhkX1KL5g+g=
+=Wuif
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/hal/files/0.5.9-hald.rc b/sys-apps/hal/files/0.5.9-hald.rc
index 4f4dac10b1bb97e26096bc48fba86e30064ac4ec..71aba2b2218c6a6486411e78d0a93a7a42b81b97 100644 (file)
--- a/sys-apps/hal/files/0.5.9-hald.rc
+++ b/sys-apps/hal/files/0.5.9-hald.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.9-hald.rc,v 1.5 2007/04/19 16:34:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.9-hald.rc,v 1.6 2007/04/20 23:22:33 cardoe Exp $
 
 depend() {
        need dbus
@@ -13,9 +13,13 @@ start() {
        [ -z "${HALD_VERBOSE}" ] && HALD_VERBOSE="no"
        ebegin "Starting Hardware Abstraction Layer daemon"
 
-       if [ ! -e /dev/root ]; then
-               echo "You need a /dev/root that points to your device that contains /"
+       REAL_ROOT=`mount -fv / | cut -d' ' -f1`
+       TEST_ROOT=`cat /proc/mounts | cut -d' ' -f1 | head -n 2 | tail -n 1`
+
+       if [ ! -e ${TEST_ROOT} ]; then
+               echo "You need a ${TEST_ROOT} that points to your ${REAL_ROOT}"
                echo "See http://bugs.gentoo.org/show_bug.cgi?id=175243"
+               echo "Quick fix is: ln -s ${REAL_ROOT} ${TEST_ROOT}"
                eend 2
        fi
 

diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild
index aba2d4e51c77256d105cb145560a6a5ba49074ef..b3352392c6965721121dbd2983236697e8c53de6 100644 (file)
--- a/sys-apps/hal/hal-0.5.9.ebuild
+++ b/sys-apps/hal/hal-0.5.9.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/sys-apps/hal/hal-0.5.9.ebuild,v 1.24 2007/04/18 14:31:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.25 2007/04/20 23:22:33 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 KERNEL_IUSE="kernel_linux kernel_FreeBSD"
 IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}"