Backporting changes to reported version

Package-Manager: portage-2.0.53_rc7

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 81103d67e2b60dbc0c4d1050ecc231f9d4e04b08..a361574f086ec10459e2a96834089401d6056943 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,9 @@
 # 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.54 2005/11/27 06:10:37 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.55 2005/11/27 06:18:11 compnerd Exp $
+
+  27 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> hal-0.5.4.ebuild:
+  Backporting kernel check to origival reported version.
 
   27 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> hal-0.5.5.1.ebuild:
   Adding check for CONFIG_KOBJECT_UEVENT to resolve Bug #112186. Thanks to

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 1e9e0279e5708be05739db3cc9f13c53f113a94a..5e66e1653b62b77a40c7396d45665015a16cde54 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,4 +1,4 @@
-MD5 fbf61b94d41914efd0c95d4b3d492d2e ChangeLog 7734
+MD5 5ed9742d08b98d3b16f0385c666441fa ChangeLog 7866
 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
@@ -20,6 +20,6 @@ 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 4b5c3135d20b391903d7a8e2626313dd hal-0.5.4.ebuild 3443
+MD5 2744acb42095e55b428f68bff0d9c2ec hal-0.5.4.ebuild 3778
 MD5 c587e7d02a20b445d6b164a8c71fc1da hal-0.5.5.1.ebuild 3937
 MD5 a60767d83157413d549c69b98fac962c metadata.xml 303

diff --git a/sys-apps/hal/hal-0.5.4.ebuild b/sys-apps/hal/hal-0.5.4.ebuild
index 690c31492fe1d0ca870ec12ec6d5c1de0d8b9c28..ced07bc0ee3790fd8f36de557378936e77475338 100644 (file)
--- 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.5 2005/11/08 17:25:24 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.4.ebuild,v 1.6 2005/11/27 06:18:11 compnerd Exp $
 
 inherit eutils linux-info
 
@@ -31,12 +31,26 @@ DEPEND="${RDEPEND}
 ## HAL Daemon drops privledges so we need group access to read disks
 HALDAEMON_GROUPS="haldaemon,disk,cdrom,cdrw,floppy,usb"
 
+function notify_uevent() {
+       eerror
+       eerror "You must enable Kernel Userspace Events in your kernel."
+       eerror "This can be set under 'General Setup'.  It is marked as"
+       eerror "CONFIG_KOBJECT_UEVENT in the config file."
+       eerror
+       ebeep 5
+
+       die "KOBJECT_UEVENT is not set"
+}
+
 pkg_setup() {
 
        linux-info_pkg_setup
        kernel_is ge 2 6 10 \
                || die "You need a 2.6.10 or newer kernel to run this package"
 
+       linux_chkconfig_present KOBJECT_UEVENT \
+               || notify_uevent
+
        if use pam_console && ! built_with_use sys-libs/pam pam_console ; then
                        eerror "You need to build pam with pam_console support"
                        eerror "Please remerge sys-libs/pam with USE=pam_console"