old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

7 files changed, 9 insertions, 282 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index 0b1bbacc0741..bfd2e6904678 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-laptop/laptop-mode-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.58 2012/01/16 19:14:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.59 2012/01/16 19:17:08 ssuominen Exp $
+
+  16 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -laptop-mode-tools-1.55-r4.ebuild, -laptop-mode-tools-1.55-r5.ebuild,
+  -files/laptop-mode-tools-1.55-linux3-support.patch,
+  -laptop-mode-tools-1.60.ebuild,
+  -files/laptop-mode-tools-1.60-pm-utils-1.4.0.patch,
+  -files/laptop_mode_tools.pmutils:
+  old
 
 *laptop-mode-tools-1.60-r1 (16 Jan 2012)
 
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
deleted file mode 100644
index aab707aedc6f..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-linux3-support.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/files/laptop-mode-tools-1.60-pm-utils-1.4.0.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.60-pm-utils-1.4.0.patch
deleted file mode 100644
index d9f7e3e359cc..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.60-pm-utils-1.4.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: laptop-mode-tools_1.60/install.sh
-===================================================================
---- laptop-mode-tools_1.60.orig/install.sh
-+++ laptop-mode-tools_1.60/install.sh
-@@ -180,15 +180,6 @@ if ( ! $INSTALL -m 744 man/* "$DESTDIR/$
- fi
- 
- 
--# Install pm-utils hook only if pm-utils config dir is present, or force the
--# install if we have a DESTDIR.
--if [ -n "$DESTDIR" -o -d "$DESTDIR/usr/lib/pm-utils/sleep.d" ] ; then
--	if ( ! $INSTALL -D -m 755 usr/lib/pm-utils/sleep.d/01laptop-mode "$DESTDIR/usr/lib/pm-utils/sleep.d/01laptop-mode" ) ; then
--		echo "$0: Failed to install 01-laptop-mode into /usr/lib/pm-utils/sleep.d. Installation failed."
--		exit 36
--	fi
--fi
--
- if [ -f "$DESTDIR/usr/lib/pm-utils/sleep.d/99laptop-mode" ]; then
- 	rm -f $DESTDIR/usr/lib/pm-utils/sleep.d/99laptop-mode;
- fi
diff --git a/app-laptop/laptop-mode-tools/files/laptop_mode_tools.pmutils b/app-laptop/laptop-mode-tools/files/laptop_mode_tools.pmutils
deleted file mode 100755
index 5444a4b3432f..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop_mode_tools.pmutils
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/sbin/laptop_mode auto
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r4.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r4.ebuild
deleted file mode 100644
index 29e2084bdb5d..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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-r4.ebuild,v 1.1 2011/12/31 21:25:29 idl0r 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
-}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r5.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r5.ebuild
deleted file mode 100644
index db2b0abb5f60..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 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-r5.ebuild,v 1.1 2012/01/01 14:44:49 hwoarang 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
-}
-
-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
-}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60.ebuild
deleted file mode 100644
index 3a12dcd900a8..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 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.60.ebuild,v 1.1 2012/01/01 16:04:34 hwoarang 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
-}
-
-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
-}
-
-pkg_postinst() {
-	if  use acpi ||  use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		ewarn
-		ewarn "To enable automatic power state event handling,"
-		ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-		ewarn "both laptop_mode and the ${daemon_name} daemon"
-		ewarn "must be added to a runlevel,"
-		ewarn "		rc-update add laptop_mode default"
-		ewarn "		rc-update add ${daemon_name} default"
-		ewarn
-	else
-		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
-}