patch didn't work for some people

Package-Manager: portage-2.1.2_rc2

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index f515dce0864bff13b6fff1c7accb958d6f214bc0..0b640ad5d1e7a2c87731ec0abb1e18bba5c7f6bf 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # 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.108 2006/11/15 21:02:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.109 2006/11/19 23:59:16 cardoe Exp $
+
+  19 Nov 2006; Doug Goldstein <cardoe@gentoo.org>
+  files/hal-0.5.7.1-hibernate-fix.patch:
+  patch didn't work for some people
 
 *hal-0.5.7.1-r2 (15 Nov 2006)
 

diff --git a/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix.patch b/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix.patch
index 71a299b713d043423a57e2498b544ac171c25c15..86ac721096be3b35b5eff3ebdb8bd9422cc37d3e 100644 (file)
--- a/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix.patch
+++ b/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix.patch
@@ -1,12 +1,12 @@
---- tools/hal-system-power-suspend     2006-02-19 00:00:55.000000000 +0100
-+++ tools/hal-system-power-suspend2    2006-09-23 11:22:42.000000000 +0200
-@@ -62,6 +62,9 @@
+--- tools/hal-system-power-hibernate   2006-01-16 07:47:40.000000000 -0500
++++ tools/hal-system-power-hibernate-new       2006-11-19 18:50:43.000000000 -0500
+@@ -36,6 +36,9 @@
        elif [ -x "/usr/sbin/pmi" ] ; then
-           /usr/sbin/pmi action suspend force
-           RET=$?
+               /usr/sbin/pmi action hibernate force
+               RET=$?
 +      elif [ -x "/usr/sbin/hibernate-ram" ] ; then
-+          /usr/sbin/hibernate-ram
-+          RET=$?
-       elif [ -w "/sys/power/state" ] ; then
-           # Use the raw kernel sysfs interface
-           echo "mem" > /sys/power/state
++              /usr/sbin/hibernate-ram
++              RET=$?
+       elif [ -x "/usr/sbin/pm-hibernate" ] ; then
+               /usr/sbin/pm-hibernate
+               RET=$?