sys-power/acpi-support: integrate w/hibernate-script, fix use-conditional statements in ebuild

svn path=/sunrise/; revision=3422

4 files changed, 93 insertions, 23 deletions

diff --git a/sys-power/acpi-support/ChangeLog b/sys-power/acpi-support/ChangeLog
index b72d97df5..3580edd3c 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: $
 
+  14 Apr 2007; AK <gentoo@horizon.ath.cx> acpi-support-0.95.ebuild,
+  files/acpi-support-0.95-gentoo.patch:
+  integrate w/hibernate-script, fix use-conditional statements in ebuild
+
   13 Apr 2007; AK <gentoo@horizon.ath.cx> acpi-support-0.95.ebuild:
   typo
 
diff --git a/sys-power/acpi-support/Manifest b/sys-power/acpi-support/Manifest
index a59a1537f..fe997769c 100644
--- a/sys-power/acpi-support/Manifest
+++ b/sys-power/acpi-support/Manifest
@@ -2,24 +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
+AUX acpi-support-0.95-gentoo.patch 10738 RMD160 704f66b855fc4bebae197b8817ff50bc0260b5e5 SHA1 1b2349a363fa68fc738d016efef204d9e579b2a8 SHA256 c95ca160931bbfa0837884d2b9034bebc66bed016d54e2182cf4883bab053b5f
+MD5 6666a6897cd353985276413f61c1ae54 files/acpi-support-0.95-gentoo.patch 10738
+RMD160 704f66b855fc4bebae197b8817ff50bc0260b5e5 files/acpi-support-0.95-gentoo.patch 10738
+SHA256 c95ca160931bbfa0837884d2b9034bebc66bed016d54e2182cf4883bab053b5f files/acpi-support-0.95-gentoo.patch 10738
 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
-EBUILD acpi-support-0.95.ebuild 2398 RMD160 973521a098a6d8f51e6ef8403437becf511c9414 SHA1 844f8ca7a03c6d8dcf44283633dbd7925e0d0f18 SHA256 76b34dfe2d18a66a690df06932fab9d6b88fc23208161ed49b80a95f70e4bbe7
-MD5 0559fc9353582196d3042f72a6836f32 acpi-support-0.95.ebuild 2398
-RMD160 973521a098a6d8f51e6ef8403437becf511c9414 acpi-support-0.95.ebuild 2398
-SHA256 76b34dfe2d18a66a690df06932fab9d6b88fc23208161ed49b80a95f70e4bbe7 acpi-support-0.95.ebuild 2398
-MISC ChangeLog 1146 RMD160 2dc2b82abe0cb75e2de2a24d5faedb178dd917ff SHA1 e2cf71a0095569882870bc6b7936180bfbe1f30d SHA256 7eecffc4ae1d509952860ffe70431f93fe6fb5b08799de6f3d2472811fec45dd
-MD5 d17a3e7ebfdaa930c720b93536a34517 ChangeLog 1146
-RMD160 2dc2b82abe0cb75e2de2a24d5faedb178dd917ff ChangeLog 1146
-SHA256 7eecffc4ae1d509952860ffe70431f93fe6fb5b08799de6f3d2472811fec45dd ChangeLog 1146
+EBUILD acpi-support-0.95.ebuild 2514 RMD160 bf132b5ca60bc3a994b7000eef915ff51990e904 SHA1 fff85744e30a43d1c36f6622fb2cc205b33e5e4c SHA256 3e9626aa721bdf76ada076ac92c9dcda60d678052676b61d24874adca20c0298
+MD5 fe3c2126a35229e0934feada0403fd9a acpi-support-0.95.ebuild 2514
+RMD160 bf132b5ca60bc3a994b7000eef915ff51990e904 acpi-support-0.95.ebuild 2514
+SHA256 3e9626aa721bdf76ada076ac92c9dcda60d678052676b61d24874adca20c0298 acpi-support-0.95.ebuild 2514
+MISC ChangeLog 1328 RMD160 1979d4d9d86fb857f524873fe70249daf7630d55 SHA1 363955eb05f568f27dbff88372d58a55b8855285 SHA256 d28623203fa1efbd8d7b3a05bb04026ad87463a897e42eb18e77ea1410ab29b4
+MD5 7eb3a3c2b6d45ab23ee2693c14240139 ChangeLog 1328
+RMD160 1979d4d9d86fb857f524873fe70249daf7630d55 ChangeLog 1328
+SHA256 d28623203fa1efbd8d7b3a05bb04026ad87463a897e42eb18e77ea1410ab29b4 ChangeLog 1328
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/sys-power/acpi-support/acpi-support-0.95.ebuild b/sys-power/acpi-support/acpi-support-0.95.ebuild
index 1a61790da..a936150f9 100644
--- a/sys-power/acpi-support/acpi-support-0.95.ebuild
+++ b/sys-power/acpi-support/acpi-support-0.95.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 pcmcia toshiba intel-855 X video_cards_radeon"
+IUSE="hibernate-script intel-855 kde laptop-mode pcmcia toshiba X video_cards_radeon"
 
 DEPEND=""
 RDEPEND="sys-power/acpid
@@ -20,23 +20,25 @@ RDEPEND="sys-power/acpid
 	sys-apps/vbetool
 	sys-apps/ethtool
 	sys-power/powermgmt-base
-	X? ( x11-apps/xset )
-	kde? ( =kde-base/kdelibs-3.5* )
-	toshiba? ( app-laptop/toshset )
+	hibernate-script? ( sys-power/hibernate-script )
+	intel-855? ( sys-apps/855resolution )
 	laptop-mode? ( app-laptop/laptop-mode-tools )
-	video_cards_radeon? ( app-laptop/radeontool )
+	kde? ( =kde-base/kdelibs-3.5* )
 	pcmcia? ( >=sys-apps/pcmciautils-013 )
-	intel-855? ( sys-apps/855resolution )"
+	toshiba? ( app-laptop/toshset )
+	X? ( x11-apps/xset )
+	video_cards_radeon? ( app-laptop/radeontool )"
 
 # 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" || die "sed failed"
-	use X || sed -i '/xset/ s/\(.*\)/#\1/' "${S}/"{lid.sh,lib/screenblank} || die "sed failed"
-	sed -i "s!/etc/default/acpi-support!/etc/conf.d/${PN}!" "${S}/"{*.sh,vbesave} || die "sed failed"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
+	use hibernate-script && sed -i '/USE_HIBERNATE_SCRIPT=true/ s/# //' "${S}/acpi-support"
+	use video_cards_radeon && sed -i '/RADEON_LIGHT=true/ s/# //' "${S}/acpi-support"
+	use X || sed -i '/xset/ s/\(.*\)/#\1/' "${S}/"{lid.sh,lib/screenblank}
+	sed -i "s!/etc/default/acpi-support!/etc/conf.d/${PN}!" "${S}/"{*.sh,vbesave} || die "sed failed"
 }
 
 src_compile() {
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
index 2e7af8b70..3ab6d1065 100644
--- a/sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch
+++ b/sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch
@@ -1,7 +1,7 @@
 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 @@
++++ work/acpi-support-0.94/acpi-support	2007-04-13 20:31:15.000000000 -0400
+@@ -67,3 +67,11 @@
  # Switch to laptop-mode on battery power - off by default as it causes odd
  # hangs on some machines
  ENABLE_LAPTOP_MODE=false
@@ -9,6 +9,10 @@ diff -ur orig/acpi-support-0.94/acpi-support work/acpi-support-0.94/acpi-support
 +# 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
++
++# Use hibernate-script to handle hibernation and sleep. Hibernate-script uses
++# configuration files in /etc/hibernate and does not use the options above.
++# USE_HIBERNATE_SCRIPT=true
 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
@@ -83,6 +87,8 @@ diff -ur orig/acpi-support-0.94/debian/init.d work/acpi-support-0.94/debian/init
 +	fi
 +	eend 0
 +}
+Only in work/acpi-support-0.94/events: ibm-ultrabay-eject
+Only in work/acpi-support-0.94/events: ibm-ultrabay-insert
 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
@@ -92,6 +98,21 @@ diff -ur orig/acpi-support-0.94/hibernatebtn.sh work/acpi-support-0.94/hibernate
 -acpi_fakekey $KEY_SUSPEND 
 +
 +. /etc/acpi/hibernate.sh
+diff -ur orig/acpi-support-0.94/hibernate.sh work/acpi-support-0.94/hibernate.sh
+--- orig/acpi-support-0.94/hibernate.sh	2006-09-15 16:43:46.000000000 -0400
++++ work/acpi-support-0.94/hibernate.sh	2007-04-13 20:22:19.000000000 -0400
+@@ -8,6 +8,11 @@
+   exit;
+ fi
+ 
++if [[ $USE_HIBERNATE_SCRIPT == true ]] && [[ -x /usr/sbin/hibernate ]] ; then
++	/usr/sbin/hibernate
++	exit
++fi
++
+ # Unset video posting - it's not needed for suspend to disk
+ unset POST_VIDEO
+ unset USE_DPMS
 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
@@ -163,6 +184,19 @@ diff -ur orig/acpi-support-0.94/resume.d/62-ifup.sh work/acpi-support-0.94/resum
 +    /etc/init.d/net.$x start &
  done
  
+diff -ur orig/acpi-support-0.94/resume.d/67-sound.sh work/acpi-support-0.94/resume.d/67-sound.sh
+--- orig/acpi-support-0.94/resume.d/67-sound.sh	2006-04-21 10:19:38.000000000 -0400
++++ work/acpi-support-0.94/resume.d/67-sound.sh	2007-04-13 13:27:05.000000000 -0400
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ # Get sound back
+-if [ -x /etc/init.d/alsa-utils ]; then
+-  /etc/init.d/alsa-utils start
++if [ -x /etc/init.d/alsasound ]; then
++  /etc/init.d/alsasound start
+ fi
+ 
 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
@@ -172,6 +206,21 @@ diff -ur orig/acpi-support-0.94/sleepbtn.sh work/acpi-support-0.94/sleepbtn.sh
 -acpi_fakekey $KEY_SLEEP 
 +
 +. /etc/acpi/sleep.sh
+diff -ur orig/acpi-support-0.94/sleep.sh work/acpi-support-0.94/sleep.sh
+--- orig/acpi-support-0.94/sleep.sh	2006-05-19 15:37:32.000000000 -0400
++++ work/acpi-support-0.94/sleep.sh	2007-04-13 20:23:41.000000000 -0400
+@@ -16,6 +16,11 @@
+     exit;
+ fi
+ 
++if [[ $USE_HIBERNATE_SCRIPT == true ]] && [[ -x /usr/sbin/hibernate ]] ; then
++	/usr/sbin/hibernate --config-file=/etc/hibernate/ram.conf
++	exit;
++fi
++
+ if [ x$LOCK_SCREEN = xtrue ]; then
+     if pidof xscreensaver > /dev/null; then 
+ 	for x in /tmp/.X11-unix/*; do
 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
@@ -197,6 +246,21 @@ diff -ur orig/acpi-support-0.94/suspend.d/55-down-interfaces.sh work/acpi-suppor
      ifconfig $x down;
  done
  
+diff -ur orig/acpi-support-0.94/suspend.d/85-alsa-state.sh work/acpi-support-0.94/suspend.d/85-alsa-state.sh
+--- orig/acpi-support-0.94/suspend.d/85-alsa-state.sh	2006-04-21 11:00:08.000000000 -0400
++++ work/acpi-support-0.94/suspend.d/85-alsa-state.sh	2007-04-13 13:27:14.000000000 -0400
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ # Save the ALSA state
+-if [ -x /etc/init.d/alsa-utils ]; then
+-  /etc/init.d/alsa-utils stop
++if [ -x /etc/init.d/alsasound ]; then
++  /etc/init.d/alsasound stop
+ fi
+ 
+Only in work/acpi-support-0.94: thinkpad-ultrabay-eject.sh
+Only in work/acpi-support-0.94: thinkpad-ultrabay-insert.sh
 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