sys-power/acpi-support: Fixes, cleanups, more patching

[~andy/sunrise] / sys-power / acpi-support / files / acpi-support-0.91-gentoo.patch

diff --git a/sys-power/acpi-support/files/acpi-support-0.91-gentoo.patch b/sys-power/acpi-support/files/acpi-support-0.91-gentoo.patch
index aba336085a3c5aed2ade72ec8e7710feebabd40a..615d25535abb4caa4c442f274df259d530c294d8 100644 (file)
--- a/sys-power/acpi-support/files/acpi-support-0.91-gentoo.patch
+++ b/sys-power/acpi-support/files/acpi-support-0.91-gentoo.patch
@@ -82,6 +82,55 @@ diff -ur orig/acpi-support-0.91/hibernatebtn.sh work/acpi-support-0.91/hibernate
 -acpi_fakekey $KEY_SUSPEND 
 +
 +. /etc/acpi/hibernate.sh
+diff -ur orig/acpi-support-0.91/lib/policy-funcs work/acpi-support-0.91/lib/policy-funcs
+--- orig/acpi-support-0.91/lib/policy-funcs    2006-05-19 16:21:58.000000000 -0400
++++ work/acpi-support-0.91/lib/policy-funcs    2007-03-06 16:39:26.000000000 -0500
+@@ -1,6 +1,6 @@
+ CheckPolicy() {
+       if pidof gnome-power-manager kpowersave > /dev/null ||
+-         (pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop kded kded loadedModules | grep -q klaptopdaemon) ; then
++         (pidof dcopserver > /dev/null && test -x /usr/kde/3.5/bin/dcop && /usr/kde/3.5/bin/dcop kded kded loadedModules | grep -q klaptopdaemon) ; then
+               echo 0;
+       else
+               echo 1;
+diff -ur orig/acpi-support-0.91/lib/power-funcs work/acpi-support-0.91/lib/power-funcs
+--- orig/acpi-support-0.91/lib/power-funcs     2005-11-29 12:50:02.000000000 -0500
++++ work/acpi-support-0.91/lib/power-funcs     2007-03-06 16:38:39.000000000 -0500
+@@ -6,9 +6,9 @@
+ POWERSTATE="/var/lib/acpi-support/powerstate"
+ 
+ getXuser() {
+-        user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
++        user=`who| grep -m1 ":$displaynum " | awk '{print $1}'`
+       if [ x"$user" = x"" ]; then
+-              user=`finger| grep -m1 ":$displaynum" | awk '{print $1}'`
++              user=`who| grep -m1 ":$displaynum" | awk '{print $1}'`
+       fi
+       if [ x"$user" != x"" ]; then
+               userhome=`getent passwd $user | cut -d: -f6`
+diff -ur orig/acpi-support-0.91/resume.d/40-infra-red.sh work/acpi-support-0.91/resume.d/40-infra-red.sh
+--- orig/acpi-support-0.91/resume.d/40-infra-red.sh    2006-04-21 10:12:54.000000000 -0400
++++ work/acpi-support-0.91/resume.d/40-infra-red.sh    2007-03-06 16:37:12.000000000 -0500
+@@ -3,7 +3,6 @@
+ # Restart IR if necessary
+ if [ -f /var/run/irdadev ] && [ x$RESTART_IRDA = xtrue ]; then
+     rm /var/run/irdadev;
+-    /etc/init.d/irda-setup start;
+-    /etc/init.d/irda-utils start;
++    /etc/init.d/irda start;
+ fi;
+ 
+diff -ur orig/acpi-support-0.91/resume.d/62-ifup.sh work/acpi-support-0.91/resume.d/62-ifup.sh
+--- orig/acpi-support-0.91/resume.d/62-ifup.sh 2006-04-21 10:13:34.000000000 -0400
++++ work/acpi-support-0.91/resume.d/62-ifup.sh 2007-03-06 16:40:59.000000000 -0500
+@@ -3,6 +3,6 @@
+ # Bring up the interfaces (this should probably be left up to some policy
+ # manager, but at the moment we just bring back whatever we ifdowned)
+ for x in $INTERFACES; do
+-    ifup $x &
++    /etc/init.d/net.$x start &
+ done
+ 
 diff -ur orig/acpi-support-0.91/sleepbtn.sh work/acpi-support-0.91/sleepbtn.sh
 --- orig/acpi-support-0.91/sleepbtn.sh 2006-02-06 09:55:00.000000000 -0500
 +++ work/acpi-support-0.91/sleepbtn.sh 2007-02-28 09:41:59.000000000 -0500
@@ -91,6 +140,30 @@ diff -ur orig/acpi-support-0.91/sleepbtn.sh work/acpi-support-0.91/sleepbtn.sh
 -acpi_fakekey $KEY_SLEEP 
 +
 +. /etc/acpi/sleep.sh
+diff -ur orig/acpi-support-0.91/suspend.d/50-irda-stop.sh work/acpi-support-0.91/suspend.d/50-irda-stop.sh
+--- orig/acpi-support-0.91/suspend.d/50-irda-stop.sh   2006-04-21 11:05:47.000000000 -0400
++++ work/acpi-support-0.91/suspend.d/50-irda-stop.sh   2007-03-06 16:36:57.000000000 -0500
+@@ -2,7 +2,7 @@
+ 
+ # Stop IRDA if it's running
+ if [ -f /var/run/irattach.pid ]; then
+-    /etc/init.d/irda-utils stop
++    /etc/init.d/irda stop
+     killall -9 irattach
+ fi
+ 
+diff -ur orig/acpi-support-0.91/suspend.d/55-down-interfaces.sh work/acpi-support-0.91/suspend.d/55-down-interfaces.sh
+--- orig/acpi-support-0.91/suspend.d/55-down-interfaces.sh     2006-05-16 07:57:43.000000000 -0400
++++ work/acpi-support-0.91/suspend.d/55-down-interfaces.sh     2007-03-06 16:40:01.000000000 -0500
+@@ -10,7 +10,7 @@
+ 
+ # And shut them down
+ for x in $INTERFACES; do
+-    ifdown $x;
++    /etc/init.d/net.$x stop;
+     ifconfig $x down;
+ done
+ 
 diff -ur orig/acpi-support-0.91/vbesave work/acpi-support-0.91/vbesave
 --- orig/acpi-support-0.91/vbesave     2006-05-03 16:31:51.000000000 -0400
 +++ work/acpi-support-0.91/vbesave     2007-02-28 09:17:44.000000000 -0500