Fix breakage. Bug #260652.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 36 insertions, 11 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/Manifest b/app-laptop/laptop-mode-tools/Manifest
index e0cb375f6df1..3f5f1c65a188 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX laptop-mode-tools-1.47-install.patch 734 RMD160 645af96007c662ea58bc9ef571aef6a56e22c317 SHA1 1fc7865f970ce61cdf5dbe515bf1716cea0b14a5 SHA256 505bed580e45929636cc91ee04f1fc428bff8d30878e2836722260880ce454d4
 AUX laptop_mode.init 970 RMD160 36e4f0ac62ca43f25689fe7c1eec6e0f8594dcd9 SHA1 d26a227b7eb9be3c78af91c78c5cc743ff846897 SHA256 aa8ee3b3f89c95c154243bae2c5b99a0db3915f0d50807637c271acddbbdcfad
 AUX laptop_mode.init-1.4 1044 RMD160 7a7c0e0f63b66437017cc66852b675845ef63b9e SHA1 7a7848151a831df846369949ee978e1e5f19dd4a SHA256 717d9890aae948cd6c9534dab96b33bc3583be653413fe38c7784ae9eb101dbc
 AUX laptop_mode_tools.pmutils 38 RMD160 fc746f824625d0ae2eb3c63d9474423bcadf8eb3 SHA1 ab72851ce8351f002bd8db9d23d7dbd4bcff6fb9 SHA256 1d5ae9a7045d0c0ec0d56ec8ff153ea80b27cf52cab82db8fcc49b1f835f5cfe
@@ -9,13 +10,13 @@ DIST laptop-mode-tools_1.34.tar.gz 66911 RMD160 32f67c629b5ad7133b7ee3026c9f3591
 DIST laptop-mode-tools_1.47.tar.gz 85195 RMD160 58d15ee73e9177a94bc8d773d1bf02dbbd145157 SHA1 e38745b17b7259289190b0630c15c5e9e77ff891 SHA256 47844f7cf824b28343494bf9b4f69ca8b9b6fd446e80a7576a8c5186342e2e29
 EBUILD laptop-mode-tools-1.31.ebuild 2300 RMD160 85460163af0594f0caa66dbddd3586307ee5155a SHA1 3111224410c7da20b21f1f4d76b7a36d4b087be9 SHA256 569d3b6091380455dec2d2f9bcc747cdc58fb2529299aab938b453bbb2247aff
 EBUILD laptop-mode-tools-1.34.ebuild 2302 RMD160 4b7ba9cc85df4e9ea4d4b015bb8e860a1d4ada68 SHA1 c88bc330991b69b0009596d75dd80e6dd7f73c31 SHA256 325cdaa1149d37a3c7493fb8734fff7fa6f8090931bb7d0388e84d2897ca07c5
-EBUILD laptop-mode-tools-1.47.ebuild 1697 RMD160 04c4741227a65d05ea372931f3d6330324260f91 SHA1 ce108ac22ea64c3bdd1628fcc26b2a83f6b4c3c4 SHA256 da49cf99ab36b06868ae7b6999cc45adf78be2a747e987bd51af82048814b67b
-MISC ChangeLog 7260 RMD160 8f3414d31af8c9d7146c40b55cab2cafd454bc4f SHA1 acd85a7b79c31a7827ddf69c9bf3bcbb3ff8d856 SHA256 455f9216971a452885f3f96ca2e97722837130fce6ed5a417b5999bf05b8b3f1
+EBUILD laptop-mode-tools-1.47.ebuild 1810 RMD160 b19ee5997ee975c002eb97cb8576d6658ba5cccf SHA1 61dcd76a58769cf24bb24774a58a01c2ce47a83d SHA256 1e5fa78f6ec98e71bb861ff9696e3efc7e4dd41d94b9d154a9b0d6d73de2edd0
+MISC ChangeLog 7421 RMD160 9f08c0c6ccc9543368145d895a550d3305fc81f7 SHA1 ae1eb88d7a69882c249254254e97107ed56dc66d SHA256 97c3559a12f3eed5607fc30c539be76a68cff7fad3d66bafb667587258813b29
 MISC metadata.xml 258 RMD160 d5cfed30adbe41387b0e7f435ce781dc90044c9e SHA1 4b1b83d58d1410fdb64efbc4792abd7053fdbdfe SHA256 a0dfbea03e2ef7978a9fd258493d8d50af7520a99400eba9a44be12d7bbce192
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmo3oYACgkQmOfEJZHYOKfd8QCgkzy2fmmIAyveuhqUnFf1rmJs
-6tAAn05d4VGSFO3SFlE+2PYcSf5CbSqU
-=jx4K
+iEYEARECAAYFAkmpiUMACgkQiqiDRvmkBmK9gwCfTbE/pImm8ChuFy44LizLU5V1
+YYUAn0KyqPyfC/LfXxkOQ4Ji2CaEvTOs
+=EnJB
 -----END PGP SIGNATURE-----
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() {