Linux3 support for my laptop to save power again.

(Portage version: 2.2.0_alpha43/cvs/Linux i686)

3 files changed, 119 insertions, 2 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index b1a6b064c712..b8f95bf22e5a 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/laptop-mode-tools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.53 2010/09/09 03:15:31 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.54 2011/07/12 20:41:51 robbat2 Exp $
+
+*laptop-mode-tools-1.55-r2 (12 Jul 2011)
+
+  12 Jul 2011; Robin H. Johnson <robbat2@gentoo.org>
+  +laptop-mode-tools-1.55-r2.ebuild,
+  +files/laptop-mode-tools-1.55-linux3-support.patch:
+  Linux3 support for my laptop to save power again.
 
   09 Sep 2010; Joseph Jezak <josejx@gentoo.org>
   laptop-mode-tools-1.55-r1.ebuild:
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-linux3-support.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-linux3-support.patch
new file mode 100644
index 000000000000..aab707aedc6f
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-linux3-support.patch
@@ -0,0 +1,40 @@
+Add support for Linux 3.0 kernels
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*~' laptop-mode-tools_1.55.orig//usr/sbin/laptop_mode laptop-mode-tools_1.55/usr/sbin/laptop_mode
+--- laptop-mode-tools_1.55.orig//usr/sbin/laptop_mode	2010-05-26 08:54:44.000000000 -0700
++++ laptop-mode-tools_1.55/usr/sbin/laptop_mode	2011-07-12 13:29:38.000000000 -0700
+@@ -496,6 +496,7 @@
+ case "$KLEVEL" in
+ 	"2.4" ) ;;
+ 	"2.6" ) ;;
++	"3.0" ) ;;
+ 	*)
+ 		log "ERR" "Unhandled kernel version: $KLEVEL ('uname -r' = '$(uname -r)')" >&2
+ 		exit 1
+diff -Nuar --exclude '*~' laptop-mode-tools_1.55.orig//usr/share/laptop-mode-tools/modules/laptop-mode laptop-mode-tools_1.55/usr/share/laptop-mode-tools/modules/laptop-mode
+--- laptop-mode-tools_1.55.orig//usr/share/laptop-mode-tools/modules/laptop-mode	2010-05-26 08:54:44.000000000 -0700
++++ laptop-mode-tools_1.55/usr/share/laptop-mode-tools/modules/laptop-mode	2011-07-12 13:29:20.000000000 -0700
+@@ -193,8 +193,8 @@
+ 			set_sysctl /proc/sys/vm/laptop_mode   1
+ 			set_sysctl /proc/sys/vm/bdflush       "30 500 0 0 $AGE $AGE 60 20 0"
+ 			;;
+-		"2.6")
+-			log "VERBOSE" "Adjusting 2.6 kernel parameters to enable laptop mode."
++		"2.6"|"3.0")
++			log "VERBOSE" "Adjusting $KLEVEL kernel parameters to enable laptop mode."
+ 			set_sysctl /proc/sys/vm/laptop_mode		  "$LM_SECONDS_BEFORE_SYNC"
+ 			set_sysctl /proc/sys/vm/dirty_writeback_centisecs "$AGE"
+ 			set_sysctl /proc/sys/vm/dirty_expire_centisecs    "$AGE"
+@@ -321,8 +321,8 @@
+ 			log "VERBOSE" "Adjusting 2.4 kernel parameters to disable laptop mode."
+ 			set_sysctl /proc/sys/vm/bdflush "30 500 0 0 $U_AGE $B_AGE 60 20 0"
+ 			;;
+-		"2.6")
+-			log "VERBOSE" "Adjusting 2.6 kernel parameters to disable laptop mode."
++		"2.6"|"3.0")
++			log "VERBOSE" "Adjusting $KLEVEL kernel parameters to disable laptop mode."
+ 			set_sysctl /proc/sys/vm/dirty_writeback_centisecs   "$U_AGE"
+ 			set_sysctl /proc/sys/vm/dirty_expire_centisecs      "$B_AGE"
+ 			set_sysctl /proc/sys/vm/dirty_ratio		    "$NOLM_DIRTY_RATIO"
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r2.ebuild
new file mode 100644
index 000000000000..84bd8302afe5
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r2.ebuild,v 1.1 2011/07/12 20:41:51 robbat2 Exp $
+
+EAPI=2
+inherit eutils
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="http://www.samwel.tk/laptop_mode/"
+SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="acpi apm bluetooth scsi"
+
+RDEPEND="sys-apps/ethtool
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez )
+	scsi? ( sys-apps/sdparm )
+	sys-apps/hdparm"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Patching to avoid !sys-power/pm-utils depend wrt #327443
+	epatch "${FILESDIR}"/${P}-pm-utils-1.4.0.patch
+	# Add support for Linux3
+	epatch "${FILESDIR}"/${P}-linux3-support.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	DESTDIR="${D}" \
+		INIT_D="none" \
+		MAN_D="/usr/share/man" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		./install.sh || die
+
+	dodoc Documentation/*.txt README || die
+	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+	# Commented out to avoid !sys-power/pm-utils depend wrt #327443
+	# exeinto /etc/pm/power.d
+	# newexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools
+
+	keepdir /var/run/laptop-mode-tools
+}
+
+pkg_postinst() {
+	if ! use acpi && ! use apm; then
+		ewarn
+		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+		ewarn "automatically disable laptop_mode on low battery."
+		ewarn
+		ewarn "This means you can lose up to 10 minutes of work if running"
+		ewarn "out of battery while laptop_mode is enabled."
+		ewarn
+		ewarn "Please see /usr/share/doc/${PF}/laptop-mode.txt.gz for further"
+		ewarn "information."
+		ewarn
+	fi
+}