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

svn path=/sunrise/; revision=3155

5 files changed, 110 insertions, 18 deletions

diff --git a/sys-power/acpi-support/ChangeLog b/sys-power/acpi-support/ChangeLog
index 6dad6cd47..11785dab8 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: $
 
+  06 Mar 2007; AK <gentoo@horizon.ath.cx> acpi-support-0.91.ebuild,
+  files/acpi-support-0.91-gentoo.patch:
+  Fixes, cleanups, more patching
+
   05 Mar 2007; Markus Ullmann <jokey@gentoo.org> acpi-support-0.91.ebuild:
   Whiteys and elog
 
diff --git a/sys-power/acpi-support/Manifest b/sys-power/acpi-support/Manifest
index 81d5fb7d3..8fe4bb768 100644
--- a/sys-power/acpi-support/Manifest
+++ b/sys-power/acpi-support/Manifest
@@ -1,5 +1,20 @@
-AUX acpi-support-0.91-gentoo.patch 3436 RMD160 ae281ea3525a06b1c37c1fe1ae1931212bc0f9f0 SHA1 5cef02fd662ebcaf810f351ad49e1edb1c8d99b2 SHA256 2d6303a518c1f58cdf852706023c9e226ec21906e589e139125080628997f7a6
+AUX acpi-support-0.91-gentoo.patch 6723 RMD160 3d46a42075c1e9175b0f464d978fea4e7ef7de77 SHA1 2abdebad5b7fb2ddeb0d2c0c71b351d2de613124 SHA256 eec00c5b714cea7566f785023555852cc0437ec29c1c76fbfee5c77ec13280b0
+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
 DIST acpi-support_0.91.tar.gz 40745 RMD160 427cb721b42e0db955cb27bcfaaa8bda1c5ecbe6 SHA1 8b61797cdd977df546ddee43c46b1c3cc3f72401 SHA256 4724a162cb63728761da9f2c10d106a63a33c523a335be6dc38bb1fe68173a5a
-EBUILD acpi-support-0.91.ebuild 2367 RMD160 778386683bd71a9da91af145a14152fade697c95 SHA1 9cfcb5a88ec390b15f99de6c31711a3a57064182 SHA256 b23f28ba4bc6369a4a6b99561f9c34a6da31163669d3ec449fa31b4e5b1c609b
-MISC ChangeLog 662 RMD160 65aee29131beb491aefd9351b3f97f804ee8a471 SHA1 365bb36963edc46d84857e505fb0078057691bf4 SHA256 cb1e2f4e53e074055506e416c6cde491a75ba1ae56e9cb4168fa7c392e87b869
+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
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
+RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
+SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
+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
diff --git a/sys-power/acpi-support/acpi-support-0.91.ebuild b/sys-power/acpi-support/acpi-support-0.91.ebuild
index ffeb3e29c..70e482d8c 100644
--- a/sys-power/acpi-support/acpi-support-0.91.ebuild
+++ b/sys-power/acpi-support/acpi-support-0.91.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://archive.ubuntu.com/ubuntu/pool/main/a/acpi-support/acpi-support_
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="kde laptop-mode video_cards_radeon"
+IUSE="kde laptop-mode pcmcia video_cards_radeon"
 
 DEPEND=""
 RDEPEND="sys-power/acpid
@@ -19,21 +19,17 @@ RDEPEND="sys-power/acpid
 	sys-apps/dmidecode
 	sys-apps/vbetool
 	sys-power/powermgmt-base
+	x11-apps/xset
 	kde? ( =kde-base/kdelibs-3.5* )
 	laptop-mode? ( =app-laptop/laptop-mode-tools-1.32 )
-	video_cards_radeon? ( app-laptop/radeontool )"
-#	sys-power/hibernate-script
-#	sys-apps/ethtool
+	video_cards_radeon? ( app-laptop/radeontool )
+	pcmcia? ( >=sys-apps/pcmciautils-013 )"
 
 src_unpack() {
 	unpack ${A}
 	use video_cards_radeon && sed -i 's/# RADEON_LIGHT=true/RADEON_LIGHT=true/' "${S}/acpi-support"
 	sed -i 's!/etc/default/acpi-support!/etc/conf.d/acpi-support!' "${S}"/*.sh "${S}/vbesave"
-	sed -i 's!/usr/bin/dcop!/usr/kde/3.5/bin/dcop!' "${S}/lib/policy-funcs"
-	sed -i 's!finger!who!' "${S}/lib/power-funcs"
-
 	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# TODO: fix acpi_fakekey, vbesave, integrate hibernate-script, ethtool, resume.d/*-855-resolution-set.sh: . /etc/default/855resolution
 }
 
 src_compile() {
@@ -60,21 +56,22 @@ src_install() {
 }
 
 pkg_postinst() {
-#	[ -e /etc/acpi/actions/startup.d/10-save-dmidecode.sh ] \
-#		&& /etc/acpi/actions/startup.d/10-save-dmidecode.sh
-	einfo
 	elog "You may wish to read the Gentoo Linux Power Management Guide,"
 	elog "which can be found online at:"
-	einfo
+	elog
 	elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
-	einfo
+	elog
 	elog "The following packages provide additional functionality:"
 	elog "sys-power/powersave"
 	elog "sys-power/kpowersave"
 	elog "app-laptop/laptop-mode-tools"
-	einfo
+	elog
 	elog "To initialize power management options for your devices at"
 	elog "system startup, please run the following:"
-	einfo
+	elog
 	elog "rc-update add acpi-support 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.91-gentoo.patch b/sys-power/acpi-support/files/acpi-support-0.91-gentoo.patch
index aba336085..615d25535 100644
--- 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
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