old

(Portage version: 2.2_rc87/cvs/Linux x86_64)

4 files changed, 6 insertions, 147 deletions

diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.47-install.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.47-install.patch
deleted file mode 100644
index 3df965de6d70..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.47-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp laptop-mode-tools_1.47-orig/install.sh laptop-mode-tools_1.47/install.sh
---- laptop-mode-tools_1.47-orig/install.sh	2009-01-26 13:45:20.000000000 -0600
-+++ laptop-mode-tools_1.47/install.sh	2009-02-28 12:45:47.000000000 -0600
-@@ -183,7 +183,7 @@ 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/etc/pm/sleep.d" ] ; then
--	if ( ! $INSTALL -m 755 etc/pm/sleep.d/99laptop-mode "$DESTDIR/etc/pm/sleep.d" ) ; then
-+	if ( ! $INSTALL -D -m 755 etc/pm/sleep.d/99laptop-mode "$DESTDIR/etc/pm/sleep.d/99laptop-mode" ) ; then
- 		echo "$0: Failed to install 99-laptop-mode into /etc/pm/sleep.d. Installation failed."
- 		exit 36
- 	fi
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.47-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.47-r1.ebuild
deleted file mode 100644
index 93e3b242e96c..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.47-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 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.47-r1.ebuild,v 1.6 2010/06/11 11:56:12 ssuominen Exp $
-
-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 hal scsi"
-
-DEPEND=""
-
-RDEPEND="sys-apps/ethtool
-		acpi? ( sys-power/acpid )
-		apm? ( sys-apps/apmd )
-		bluetooth? ( net-wireless/bluez )
-		hal? ( sys-apps/hal )
-		scsi? ( sys-apps/sdparm )
-		sys-apps/hdparm"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-install.patch
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	DESTDIR="${D}" \
-		MAN_D="/usr/share/man" \
-		INIT_D="none" \
-		APM="$(use apm && echo force || echo disabled)" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		./install.sh || die "Install failed."
-
-	dodoc Documentation/laptop-mode.txt README
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	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.55-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild
index 886cafacc872..9a1d87673fbc 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.4 2010/09/09 03:15:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild,v 1.5 2010/09/28 05:23:31 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -27,6 +27,7 @@ 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
 }
 
@@ -44,6 +45,10 @@ src_install() {
 	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
 }
 
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55.ebuild
deleted file mode 100644
index 5d6bc9e9ec0a..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.2 2010/07/08 10:06:14 ssuominen Exp $
-
-EAPI=2
-
-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-2.0.4 )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez )
-	scsi? ( sys-apps/sdparm )
-	sys-apps/hdparm"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() { :; }
-
-src_install() {
-	dodir /etc/pm/sleep.d
-
-	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
-
-	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
-}