summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2009-02-28 18:56:31 +0000
committerRyan Hill <dirtyepic@gentoo.org>2009-02-28 18:56:31 +0000
commitf0e0eb3909647c2e13e59f8d8e38ebacf9edacca (patch)
tree1b439a077e503b7e0ce5582542d239f28122f4fa /app-laptop/laptop-mode-tools
parentBump to 20090131 (diff)
downloadgentoo-2-f0e0eb3909647c2e13e59f8d8e38ebacf9edacca.tar.gz
gentoo-2-f0e0eb3909647c2e13e59f8d8e38ebacf9edacca.tar.bz2
gentoo-2-f0e0eb3909647c2e13e59f8d8e38ebacf9edacca.zip
Fix breakage. Bug #260652.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'app-laptop/laptop-mode-tools')
-rw-r--r--app-laptop/laptop-mode-tools/ChangeLog7
-rw-r--r--app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.47-install.patch12
-rw-r--r--app-laptop/laptop-mode-tools/laptop-mode-tools-1.47.ebuild15
3 files changed, 29 insertions, 5 deletions
diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index 1d5e68687512..f2c365a69292 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-laptop/laptop-mode-tools
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.39 2009/02/28 06:49:37 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.40 2009/02/28 18:56:31 dirtyepic Exp $
+
+ 28 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+ +files/laptop-mode-tools-1.47-install.patch,
+ laptop-mode-tools-1.47.ebuild:
+ Fix breakage. Bug #260652.
*laptop-mode-tools-1.47 (28 Feb 2009)
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
new file mode 100644
index 000000000000..3df965de6d70
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.47-install.patch
@@ -0,0 +1,12 @@
+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.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.47.ebuild
index 54355bd28e44..fd33b4167294 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.47.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.47.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.ebuild,v 1.1 2009/02/28 06:49:37 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.47.ebuild,v 1.2 2009/02/28 18:56:31 dirtyepic Exp $
inherit eutils
@@ -32,6 +32,13 @@ RDEPEND="sys-apps/ethtool
S="${WORKDIR}/${MY_P}"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-install.patch
+}
+
src_compile() {
:
}
@@ -43,13 +50,13 @@ src_install() {
APM="$(use apm && echo force || echo disabled)" \
ACPI="$(use acpi && echo force || echo disabled)" \
PMU="$(false && echo force || echo disabled)" \
- ./install.sh
+ ./install.sh || die "Install failed."
dodoc Documentation/laptop-mode.txt README
newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
- insinto /etc/pm/power.d
- doexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools
+ exeinto /etc/pm/power.d
+ newexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools
}
pkg_postinst() {