sys-power/acpi-support: Version bump and some fixes

svn path=/sunrise/; revision=3413

6 files changed, 341 insertions, 4 deletions

diff --git a/sys-power/acpi-support/ChangeLog b/sys-power/acpi-support/ChangeLog
index 11785dab8..ab076248a 100644
--- a/sys-power/acpi-support/ChangeLog
+++ b/sys-power/acpi-support/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Apr 2007; AK <gentoo@horizon.ath.cx> +acpi-support-0.95.ebuild,
+  +files/acpi-support-0.95-gentoo.patch:
+  Version bump and some fixes
+
   06 Mar 2007; AK <gentoo@horizon.ath.cx> acpi-support-0.91.ebuild,
   files/acpi-support-0.91-gentoo.patch:
   Fixes, cleanups, more patching
diff --git a/sys-power/acpi-support/Manifest b/sys-power/acpi-support/Manifest
index 8fe4bb768..999134a41 100644
--- a/sys-power/acpi-support/Manifest
+++ b/sys-power/acpi-support/Manifest
@@ -2,15 +2,24 @@ AUX acpi-support-0.91-gentoo.patch 6723 RMD160 3d46a42075c1e9175b0f464d978fea4e7
 MD5 5d9524fb7a4e6404a3cd93fba4035d3c files/acpi-support-0.91-gentoo.patch 6723
 RMD160 3d46a42075c1e9175b0f464d978fea4e7ef7de77 files/acpi-support-0.91-gentoo.patch 6723
 SHA256 eec00c5b714cea7566f785023555852cc0437ec29c1c76fbfee5c77ec13280b0 files/acpi-support-0.91-gentoo.patch 6723
+AUX acpi-support-0.95-gentoo.patch 8373 RMD160 1fd47d46b4411690a83b7b8a8fc4c1acb8c08a3e SHA1 04983546b3e75da1ac0ec16a908e60d0a872522e SHA256 d9c1d805d0e9b99c3900e280a0a0d3a55e0a2684b0d1fa8021b4ce0d27b49b6b
+MD5 cfae70c95971ff0199790e56df58a653 files/acpi-support-0.95-gentoo.patch 8373
+RMD160 1fd47d46b4411690a83b7b8a8fc4c1acb8c08a3e files/acpi-support-0.95-gentoo.patch 8373
+SHA256 d9c1d805d0e9b99c3900e280a0a0d3a55e0a2684b0d1fa8021b4ce0d27b49b6b files/acpi-support-0.95-gentoo.patch 8373
 DIST acpi-support_0.91.tar.gz 40745 RMD160 427cb721b42e0db955cb27bcfaaa8bda1c5ecbe6 SHA1 8b61797cdd977df546ddee43c46b1c3cc3f72401 SHA256 4724a162cb63728761da9f2c10d106a63a33c523a335be6dc38bb1fe68173a5a
+DIST acpi-support_0.95.tar.gz 43813 RMD160 ae8cbddb8f6a18d033d528c2f7a169c9b23f5e89 SHA1 5aac3d6f33b9c24cfc3a2ae90b20d6f7b14b5ff0 SHA256 c717b06b32cb427d2f927711f0cf7066ad117475f29c1fea5394bbadd2e8a4a9
 EBUILD acpi-support-0.91.ebuild 2130 RMD160 bfccc140f15d55bda3779f3caaffd98fa1d3a7e4 SHA1 7e1b50b1a5fbb1308eaf00cc33c22107c7df16bc SHA256 6a737547efafe89b02ed4ce45608f1f7a8f21b74a56aa74aaa5d4f84bf5d7287
 MD5 60e26191ab036ec6245f33dbede8dd9d acpi-support-0.91.ebuild 2130
 RMD160 bfccc140f15d55bda3779f3caaffd98fa1d3a7e4 acpi-support-0.91.ebuild 2130
 SHA256 6a737547efafe89b02ed4ce45608f1f7a8f21b74a56aa74aaa5d4f84bf5d7287 acpi-support-0.91.ebuild 2130
-MISC ChangeLog 804 RMD160 df84882636bf6326d7fd03d61fc35e7e92e5e85f SHA1 3e97d5a986284e6c5967da82685d3289d1432466 SHA256 c0f22e670a3b1895a622d15a66b4500ad5d6e8463aaaef0c13323c642fb08294
-MD5 dab2ea270a9dbf6a61bfe9308ae6c2e2 ChangeLog 804
-RMD160 df84882636bf6326d7fd03d61fc35e7e92e5e85f ChangeLog 804
-SHA256 c0f22e670a3b1895a622d15a66b4500ad5d6e8463aaaef0c13323c642fb08294 ChangeLog 804
+EBUILD acpi-support-0.95.ebuild 2252 RMD160 e58f5226c1bbf330ba658001f8dc6c278d48e37c SHA1 f653997904c2b725c3b39b4b11ed6c93ca141a33 SHA256 3faa14b3b6e032fc89f285125ce9bd46f3b3fb952ea1219534277cbea411b43b
+MD5 eb518ff56457520a9d9193ba0fc6f85b acpi-support-0.95.ebuild 2252
+RMD160 e58f5226c1bbf330ba658001f8dc6c278d48e37c acpi-support-0.95.ebuild 2252
+SHA256 3faa14b3b6e032fc89f285125ce9bd46f3b3fb952ea1219534277cbea411b43b acpi-support-0.95.ebuild 2252
+MISC ChangeLog 945 RMD160 67d301d9bc0b5e502f7d85d2743238d2062e16cf SHA1 64a5f5255149f48e207b7488e32de7e50a563738 SHA256 93f6c782c415f34bcacaf503390a4e7f26acb7e1c8b12b0e5790e63c39499306
+MD5 68f0be5f94e6951f422adbf788b68df2 ChangeLog 945
+RMD160 67d301d9bc0b5e502f7d85d2743238d2062e16cf ChangeLog 945
+SHA256 93f6c782c415f34bcacaf503390a4e7f26acb7e1c8b12b0e5790e63c39499306 ChangeLog 945
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -18,3 +27,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 7311b7e4b5cef0cb561fdc455ea55f02 files/digest-acpi-support-0.91 250
 RMD160 8d323b2ef10cb60943bd231b182a9990a5b1d988 files/digest-acpi-support-0.91 250
 SHA256 eb264b6e323631b9f0c61e2e320ad217bafbe6ae678af1dbc053351f6fed5641 files/digest-acpi-support-0.91 250
+MD5 6ff4098a5c95b04638e4bad41978b31d files/digest-acpi-support-0.95 250
+RMD160 5d626fcf66b68c461494017d6e67e86c14490d12 files/digest-acpi-support-0.95 250
+SHA256 4b12e74a608f06384adde7f12d97dcfa7cf79c64b607039312450b1d5d2ac2f8 files/digest-acpi-support-0.95 250
diff --git a/sys-power/acpi-support/acpi-support-0.95.ebuild b/sys-power/acpi-support/acpi-support-0.95.ebuild
new file mode 100644
index 000000000..ac1382cb6
--- /dev/null
+++ b/sys-power/acpi-support/acpi-support-0.95.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Ubuntu scripts and events for acpid, power management, and vendor-specific laptop configuration"
+HOMEPAGE="http://packages.ubuntu.com/feisty/admin/acpi-support"
+SRC_URI="http://archive.ubuntu.com/ubuntu/pool/main/a/acpi-support/acpi-support_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="kde laptop-mode pcmcia toshiba i855 video_cards_radeon"
+
+DEPEND=""
+RDEPEND="sys-power/acpid
+	sys-apps/kbd
+	sys-apps/dmidecode
+	sys-apps/vbetool
+	sys-apps/ethtool
+	sys-power/powermgmt-base
+	x11-apps/xset
+	kde? ( =kde-base/kdelibs-3.5* )
+	toshiba? ( app-laptop/toshset )
+	laptop-mode? ( app-laptop/laptop-mode-tools )
+	video_cards_radeon? ( app-laptop/radeontool )
+	pcmcia? ( >=sys-apps/pcmciautils-013 )
+	i855? ( sys-apps/855resolution )"
+
+# Say thanks to whoever packaged this...
+S=${WORKDIR}/${PN}-0.94
+
+src_unpack() {
+	unpack ${A}
+	use video_cards_radeon && sed -i '/RADEON_LIGHT=true/ s/# //' "${S}/acpi-support"
+	sed -i "s!/etc/default/acpi-support!/etc/conf.d/${PN}!" "${S}"/*.sh "${S}/vbesave"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+src_compile() {
+	sed -i 's/strip acpi_fakekey//' Makefile
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin acpi_fakekey
+
+	insinto /usr/share/${PN}
+	doins key-constants lib/*
+
+	insinto /etc/acpi
+	insopts -m755
+	doins *.sh
+	doins -r *.d events
+
+	doconfd ${PN}
+	newinitd debian/init.d ${PN}
+
+	keepdir /etc/acpi/{local,{resume,battery,events,suspend,start,ac}.d} /var/lib/${PN}
+	dodoc README
+}
+
+pkg_postinst() {
+	elog "You may wish to read the Gentoo Linux Power Management Guide,"
+	elog "which can be found online at:"
+	elog
+	elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
+	elog
+	elog "The following packages provide additional functionality:"
+	elog "sys-power/powersave"
+	elog "sys-power/kpowersave"
+	elog "app-laptop/laptop-mode-tools"
+	elog
+	elog "To initialize power management options for your devices at"
+	elog "system startup, please run the following:"
+	elog
+	elog "rc-update add ${PN} default"
+	elog
+	elog "This package will not work until you restart acpid. Please run the following:"
+	elog
+	elog "/etc/init.d/acpid restart"
+}
diff --git a/sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch b/sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch
new file mode 100644
index 000000000..2e7af8b70
--- /dev/null
+++ b/sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch
@@ -0,0 +1,232 @@
+diff -ur orig/acpi-support-0.94/acpi-support work/acpi-support-0.94/acpi-support
+--- orig/acpi-support-0.94/acpi-support	2006-09-15 12:47:55.000000000 -0400
++++ work/acpi-support-0.94/acpi-support	2007-04-12 20:00:17.000000000 -0400
+@@ -67,3 +67,7 @@
+ # Switch to laptop-mode on battery power - off by default as it causes odd
+ # hangs on some machines
+ ENABLE_LAPTOP_MODE=false
++
++# Disable wake-on-LAN for wired Ethernet devices. WOL is on by default on some
++# laptops. Disabling it can save power during sleep. (Requires ethtool)
++DISABLE_WOL=false
+diff -ur orig/acpi-support-0.94/debian/init.d work/acpi-support-0.94/debian/init.d
+--- orig/acpi-support-0.94/debian/init.d	2006-03-28 11:26:44.000000000 -0500
++++ work/acpi-support-0.94/debian/init.d	2007-04-12 10:24:25.000000000 -0400
+@@ -1,39 +1,37 @@
+-#!/bin/bash
++#!/sbin/runscript
+ # INIT script to check whether we're on batteries, and so start with laptop 
+ # mode etc enabled.
+ 
+ # BUGS: unless we start *really* late, we have no way of throttling 
+ # xscreensaver, since it won't be there to command.
+-. /usr/share/acpi-support/power-funcs
+-
+-test -f /lib/lsb/init-functions || exit 1
+-. /lib/lsb/init-functions
+-
+-test -d /var/lib/acpi-support || exit 0
+-
+-shopt -s nullglob
+-
+-case "$1" in
+-  start)
+-    log_begin_msg "Checking battery state..."
+-    if [ `echo /proc/acpi/ac_adapter/*` ]; then 
+-	/etc/acpi/power.sh
+-    fi
+-    # Source everything in /etc/acpi/start.d/
+-    for SCRIPT in /etc/acpi/start.d/*.sh; do
+-	. $SCRIPT
+-    done
+-    log_end_msg 0
+-    ;;
+-  stop)
+-    log_begin_msg "Disabling power management..."
+-    if [ `echo /proc/acpi/ac_adapter/*` ]; then
+-	/etc/acpi/power.sh stop
+-    fi
+-    log_end_msg 0
+-    ;;
+-  *)
+-  ;;
+-esac
+-        
+ 
++depend() {
++	need acpid
++}
++
++start() {
++	ebegin "Starting acpi-support"
++	. /usr/share/acpi-support/power-funcs
++
++	test -d /var/lib/acpi-support || eend 0
++
++	shopt -s nullglob
++
++	ebegin "Checking battery state..."
++	if [ `echo /proc/acpi/ac_adapter/*` ]; then
++		/etc/acpi/power.sh
++	fi
++	# Source everything in /etc/acpi/start.d/
++	for SCRIPT in /etc/acpi/start.d/*.sh; do
++		. $SCRIPT
++	done
++	eend 0
++}
++
++stop() {
++	ebegin "Disabling power management..."
++	if [ `echo /proc/acpi/ac_adapter/*` ]; then
++		/etc/acpi/power.sh stop
++	fi
++	eend 0
++}
+diff -ur orig/acpi-support-0.94/hibernatebtn.sh work/acpi-support-0.94/hibernatebtn.sh
+--- orig/acpi-support-0.94/hibernatebtn.sh	2006-02-06 09:54:47.000000000 -0500
++++ work/acpi-support-0.94/hibernatebtn.sh	2007-04-12 10:25:25.000000000 -0400
+@@ -1,3 +1,3 @@
+ #!/bin/bash
+-. /usr/share/acpi-support/key-constants
+-acpi_fakekey $KEY_SUSPEND 
++
++. /etc/acpi/hibernate.sh
+diff -ur orig/acpi-support-0.94/lib/policy-funcs work/acpi-support-0.94/lib/policy-funcs
+--- orig/acpi-support-0.94/lib/policy-funcs	2006-05-19 16:21:58.000000000 -0400
++++ work/acpi-support-0.94/lib/policy-funcs	2007-04-12 10:27:15.000000000 -0400
+@@ -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.94/lib/power-funcs work/acpi-support-0.94/lib/power-funcs
+--- orig/acpi-support-0.94/lib/power-funcs	2005-11-29 12:50:02.000000000 -0500
++++ work/acpi-support-0.94/lib/power-funcs	2007-04-12 10:27:51.000000000 -0400
+@@ -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.94/resume.d/13-855-resolution-set.sh work/acpi-support-0.94/resume.d/13-855-resolution-set.sh
+--- orig/acpi-support-0.94/resume.d/13-855-resolution-set.sh	2005-09-26 20:29:27.000000000 -0400
++++ work/acpi-support-0.94/resume.d/13-855-resolution-set.sh	2007-04-12 19:34:31.000000000 -0400
+@@ -1,7 +1,6 @@
+ #!/bin/bash
+ 
+ if [ -x /usr/sbin/855resolution ]; then
+-    . /etc/default/855resolution
+     if [ "$MODE" != "" ] && [ "$XRESO" != "" ] && [ "$YRESO" != "" ]; then
+ 	/etc/init.d/855resolution start;
+     fi
+diff -ur orig/acpi-support-0.94/resume.d/40-infra-red.sh work/acpi-support-0.94/resume.d/40-infra-red.sh
+--- orig/acpi-support-0.94/resume.d/40-infra-red.sh	2006-04-21 10:12:54.000000000 -0400
++++ work/acpi-support-0.94/resume.d/40-infra-red.sh	2007-04-12 10:28:33.000000000 -0400
+@@ -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.94/resume.d/49-855-resolution-set.sh work/acpi-support-0.94/resume.d/49-855-resolution-set.sh
+--- orig/acpi-support-0.94/resume.d/49-855-resolution-set.sh	2005-09-26 20:29:27.000000000 -0400
++++ work/acpi-support-0.94/resume.d/49-855-resolution-set.sh	2007-04-12 19:34:31.000000000 -0400
+@@ -1,7 +1,6 @@
+ #!/bin/bash
+ 
+ if [ -x /usr/sbin/855resolution ]; then
+-    . /etc/default/855resolution
+     if [ "$MODE" != "" ] && [ "$XRESO" != "" ] && [ "$YRESO" != "" ]; then
+ 	/etc/init.d/855resolution start;
+     fi
+diff -ur orig/acpi-support-0.94/resume.d/62-ifup.sh work/acpi-support-0.94/resume.d/62-ifup.sh
+--- orig/acpi-support-0.94/resume.d/62-ifup.sh	2006-04-21 10:13:34.000000000 -0400
++++ work/acpi-support-0.94/resume.d/62-ifup.sh	2007-04-12 10:29:11.000000000 -0400
+@@ -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.94/sleepbtn.sh work/acpi-support-0.94/sleepbtn.sh
+--- orig/acpi-support-0.94/sleepbtn.sh	2006-02-06 09:55:00.000000000 -0500
++++ work/acpi-support-0.94/sleepbtn.sh	2007-04-12 10:29:48.000000000 -0400
+@@ -1,3 +1,3 @@
+ #!/bin/bash
+-. /usr/share/acpi-support/key-constants
+-acpi_fakekey $KEY_SLEEP 
++
++. /etc/acpi/sleep.sh
+diff -ur orig/acpi-support-0.94/suspend.d/50-irda-stop.sh work/acpi-support-0.94/suspend.d/50-irda-stop.sh
+--- orig/acpi-support-0.94/suspend.d/50-irda-stop.sh	2006-04-21 11:05:47.000000000 -0400
++++ work/acpi-support-0.94/suspend.d/50-irda-stop.sh	2007-04-12 10:30:31.000000000 -0400
+@@ -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
+ 
+Only in work/acpi-support-0.94/suspend.d: 52-disable-wol.sh
+diff -ur orig/acpi-support-0.94/suspend.d/55-down-interfaces.sh work/acpi-support-0.94/suspend.d/55-down-interfaces.sh
+--- orig/acpi-support-0.94/suspend.d/55-down-interfaces.sh	2006-05-16 07:57:43.000000000 -0400
++++ work/acpi-support-0.94/suspend.d/55-down-interfaces.sh	2007-04-12 10:30:52.000000000 -0400
+@@ -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.94/vbesave work/acpi-support-0.94/vbesave
+--- orig/acpi-support-0.94/vbesave	2006-05-03 16:31:51.000000000 -0400
++++ work/acpi-support-0.94/vbesave	2007-04-12 10:31:29.000000000 -0400
+@@ -3,8 +3,6 @@
+ test -x /usr/sbin/vbetool || exit 0
+ set -e
+ 
+-. /lib/lsb/init-functions
+-
+ test -f /etc/default/rcS && . /etc/default/rcS
+ test -f /etc/default/acpi-support && . /etc/default/acpi-support
+ test -f /usr/share/acpi-support/device-funcs && . /usr/share/acpi-support/device-funcs
+@@ -20,20 +18,16 @@
+ 	fi
+ 
+         DeviceConfig
+-	log_begin_msg "Saving VESA state..."
+ 	if [ "$SAVE_VBE_STATE" = "true" ]; then
+ 	    if [ "$VERBOSE" = no ]; then 
+ 		if ! vbetool vbestate save > $VBESTATE 2>/dev/null; then
+-		    log_end_msg $?
+ 		    exit 1
+ 		fi
+ 	    else
+ 		if ! vbetool vbestate save > $VBESTATE ; then
+-		    log_end_msg $?
+ 		    exit 1
+ 		fi
+ 	    fi
+-	    log_end_msg 0
+         fi
+         ;;
+  *)
diff --git a/sys-power/acpi-support/files/digest-acpi-support-0.91 b/sys-power/acpi-support/files/digest-acpi-support-0.91
new file mode 100644
index 000000000..aa238bc34
--- /dev/null
+++ b/sys-power/acpi-support/files/digest-acpi-support-0.91
@@ -0,0 +1,3 @@
+MD5 e8b0f07451b26108010dc7a75d3919fc acpi-support_0.91.tar.gz 40745
+RMD160 427cb721b42e0db955cb27bcfaaa8bda1c5ecbe6 acpi-support_0.91.tar.gz 40745
+SHA256 4724a162cb63728761da9f2c10d106a63a33c523a335be6dc38bb1fe68173a5a acpi-support_0.91.tar.gz 40745
diff --git a/sys-power/acpi-support/files/digest-acpi-support-0.95 b/sys-power/acpi-support/files/digest-acpi-support-0.95
new file mode 100644
index 000000000..123fc7698
--- /dev/null
+++ b/sys-power/acpi-support/files/digest-acpi-support-0.95
@@ -0,0 +1,3 @@
+MD5 d72acb04f6165fb4f8dcfd547436f45b acpi-support_0.95.tar.gz 43813
+RMD160 ae8cbddb8f6a18d033d528c2f7a169c9b23f5e89 acpi-support_0.95.tar.gz 43813
+SHA256 c717b06b32cb427d2f927711f0cf7066ad117475f29c1fea5394bbadd2e8a4a9 acpi-support_0.95.tar.gz 43813