Selectively synchronize only bug fixes with Debian patchset version 1.4.1-14.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

14 files changed, 386 insertions, 19 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index f0a23230f119..f40a4dbeb897 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-power/pm-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.68 2014/06/04 20:02:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.69 2014/06/04 20:46:47 ssuominen Exp $
+
+*pm-utils-1.4.1-r4 (04 Jun 2014)
+
+  04 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +pm-utils-1.4.1-r4.ebuild, +files/1.4.1-fix-alpm-typo.patch,
+  +files/1.4.1-ignore-led-failure.patch, +files/1.4.1-run-hook-logging.patch,
+  +files/1.4.1-suspend-hybrid.patch, +files/1.4.1-uswsusp-hibernate-mode.patch,
+  +files/1.4.1-xfs_buffer_arguments.patch, +files/power.d/pci_devices,
+  +files/power.d/usb_bluetooth, +files/sleep.d/50unload_alx:
+  Selectively synchronize only bug fixes with Debian patchset version 1.4.1-14.
 
   04 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.1-r3.ebuild:
   Remove $libdir/pm-utils/power.d/hal-cd-polling wrt #401257 by Nikoli
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 84f6bb75cec0..8d14ca9f5cdb 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -2,23 +2,33 @@
 Hash: SHA256
 
 AUX 1.4.1-bluetooth-sync.patch 1504 SHA256 2af763812d609f384c818635028791c875e3e56a1fa387e80b7f1ca5afc3c4e3 SHA512 35e02607280b4cd166fbbb1dfc44ef33d20debe1e564db9d532af74a773cc4f8cc3ee3be149318cbbc0f9cc451b5001a499609dd962ff42c0a7c3305215ef831 WHIRLPOOL ca8cd0a50962f100fd956254771a243d4433a6a518a3c8d925ee78f1b527888b0d3d37e71981779dd7b424f9771d5a418d8d2e82ee96ac3fcf401c574f644bcb
-AUX 1.4.1-disable-sata-alpm.patch 778 SHA256 c995912f25fd1f0c30c90136c36ac49e2d3a5fdb94ef1710a7e0426dd10dad8a SHA512 9359943f3909985995dd68197ab25cf2560bcc458ba17b3b60f5503fe805e40c31856ac909604fbf419d69e833f2cd722e89e7ef029523e87e17c8fe25586f54 WHIRLPOOL 355245370e32e77a47570af02726fc157aff00bb24e49c41328cb9003061c05675b448e1e10bcd9c4fa9bf6ed70961f6b988dca3b870ea4f0283771a4db06c16
+AUX 1.4.1-disable-sata-alpm.patch 578 SHA256 93fb45b92af2772975155f4c0dfc8d8c596dc4d0e67668313658aef19bf118f2 SHA512 ae2ed5c0170c3c54592819b39b3901f88c795b285decdffc1c505d3f05b2f68f9c5f9ff074157d7b176daa674cd63cda05faf11cd8f03a91a6010f3de1acf683 WHIRLPOOL 7e4a9ce758c7e40a9be37c37513c102c55b25fb10e1a1017c315169aed3215919329300bfdb5c5e5f0d2ddadbc6d54ac9e057edcfb2a0a070666a0784b49f033
+AUX 1.4.1-fix-alpm-typo.patch 1052 SHA256 340135cc9b8cfd538564c4e839922401011f0bd374dafde0b00252b4939f1726 SHA512 9858ad0400e420387c458349e375cf7d9c9fd40f54cc329595eda9458adf830cdd5033dc4c0408aae9fb010852face5c82df04a2ef1dce536d451e50372a2555 WHIRLPOOL 5ab4ec6412f0dfa9841269149e8e2d206781f713352fbd476428585020de519713edb4848e5e9b7f148cb38f2a990b89482e971dc4079fd41634b61d5e1af003
 AUX 1.4.1-fix-intel-audio-powersave-hook.patch 1412 SHA256 16d5355d1c5cff6316fef11768673434394582c67039c79e8b86aafe2d2f7797 SHA512 5c5cc0e810c9a189de5d3b603cac1c5adb69058f2033daad3558463d1a0f65c039e19132da54da373929fe8e652ae06e28edad2ea9ce17a2f73527e494eecaff WHIRLPOOL aa0f8191cd4697a3fe314c248624282284e6ef540add5998de11d1e910c1516103c3061490ce6b8750ac929891f4ce5b757532aee0f2d8e233fc83ec4d60410e
+AUX 1.4.1-ignore-led-failure.patch 269 SHA256 0d2262a68a2abdbcca99b310d39399fa11afc6e04bd6540d03502b902454e873 SHA512 7429d2adad4caa53a787456a223ae2b280b81285bebf3f952597a8e56ec818c61502721d95095ac58e9846769f70ab377cd1ea5bede7c4f9620a7ff0c4b9f0d3 WHIRLPOOL cb78388793c69fd2eb98dce7f4ada8d214723f85d786e8d081211e9d70af7ab6ae4a5d06449e0960133409c70cba563aa9ce3bc20617b37e7c0e39db0bd38eda
 AUX 1.4.1-inhibit-on-right-status.patch 568 SHA256 160a61d0517d8df086f98b935db2ddf174084ca18510be6939762f1bdf4e28bc SHA512 79e835bf1ba214e6fc5c4ea3d8861f61d83c583311d170215265cf1f7180dacd74b380ee4e14c36ed75cc9777f8f02004167c263fb2bf8a871538732f5adf3e9 WHIRLPOOL 71e18b41e827cfc224b8eb170ef7023b02c2c7df5e375a871f041074e66093efcaa55e5c5c8ec5b08804218bcf11d91a0dbb44173025955e10ba0577762db145
-AUX 1.4.1-logging-append.patch 683 SHA256 5622a42167a5f6b725ecbe473d8f0994c4b3ac32e5c6607ce1fab0888894f139 SHA512 608a98f8603748c97d05593f4a107d15656dffed46d3ecd9d1d8bd03c94309ad4419f4335c91dbdab15074d6b9120195a4d21903d5233116bc1d9f61158b2e57 WHIRLPOOL 34cd622b5cccd13b0711c6bdfc0c461c3adee5096dbd29a6465b9563ee869bc53861ac9dde040fa0634e16498e0a87c3ac4bc095bebdf9daa21302124f8218f7
+AUX 1.4.1-logging-append.patch 485 SHA256 955f80e12212988abd63f78e98d74ad894c0b84ca11355fc9554edae209e1abf SHA512 215f3ca6a01fc22fa2065a7d3be02a95e0cef15fb4c04121b1dec673a98318e78799a81545474535f8ec6d48309809af855b79cc122db2010193d24647c71b71 WHIRLPOOL 916d99a6255af11c3e96f175d0ddb915fe492d612016ff3ebe4c4b8f0f52fc4ab2c444b4a2ac3d64433e07b2f5e335f603b28ca2feda902152ff544bf9f4678c
+AUX 1.4.1-run-hook-logging.patch 461 SHA256 f320b0d77631a7a382dd4ed0796555f571dfd2705d6bc79587eec4cb99d5e9a9 SHA512 f6c136229527033765203344f7cb08959c289bb011a74ac44afc0e32a6a7e3983ea8dcbc5b0929a7ea23101a56ebceb79425614f88c131c9fe13b3885f008458 WHIRLPOOL cde40f7cbbbe6dab4b0b189abff1acecae3539ea4b0090c053aaa455a379eac862e848ba92dc809f5ae5bbc29fe0784bce31c67989fde69b2289e5d34448a4e0
+AUX 1.4.1-suspend-hybrid.patch 1096 SHA256 3d1d499fc62f9aba84d99950501496d444a3357db3fb27dd5e78d886cd0add12 SHA512 57fe2b4c55a6b946eccfba1701d9d21d9e9e3e8937b37be3a9d0984664e32dfb368373b3f6556382de0f72e3ea38dd710f4e6efc0ce8fca959e35c745243acc3 WHIRLPOOL 3fd03ee02267db0c4a24d7243a28e5e8017ee3f0936a2ffa2ce4c60c3e72ff47ab379f02cb7f95e45af081b12c7185605ca44fb9d1ff39ec80a0801a0811047a
+AUX 1.4.1-uswsusp-hibernate-mode.patch 385 SHA256 c2495e09767a5d2ca3299e0e98f38d20abde06e3d700bf32f51a166d3e14b73d SHA512 b558aef41b93ffc528e18d80a82db99bef3afc19955a112437adb1dcae2342272f45d14de758ae07f496bf3f36b479b3439959ad2731ab76f75d60f55134e3b0 WHIRLPOOL 8ec555e2f1482db36ccbc1dba8073a4da645ac4185eb1af7bdce3fce96c9c71d5e5d296c8d50aa9322f03adaf9cf1a9eeaa8901d64dc94578fa74d4947681606
+AUX 1.4.1-xfs_buffer_arguments.patch 956 SHA256 f22e2ffe0ed6e0ef7e18ce48509eb3a1b4ea84facef73f30ce015c8bbf399fbf SHA512 5e3a3394f941833446b6d2ee0f0d0fb570e1bafc1ebbff218bdd67dc8f15b2f7e919e2b45157c761e924e32811c28a7b0eacd1a571bccdb4ceaa6f029f99c0f8 WHIRLPOOL b8ddd5d2934ca5a5e6d216603a44173be311a19ca49f95c7c3af2007a520e8ead984d77b54d82d8150a927e02bba555cfbb4085b13b180b2c46b3e2c98930b37
+AUX power.d/pci_devices 1391 SHA256 cec8e843d992a01c98d51255674f86ec78ee2034f76bde917eb718c2b72d67e3 SHA512 62ec8d6b6704690304ab31612c6141a6f0362cde0a18c884606d1513afebad2acddb82268471bf57bd5a641604a6f196446c8da8d899ccc3e09c008db18df7b2 WHIRLPOOL ef807e96a8382ac569d2f577499ef33874217050870b2b28b99cdc77408eea1032b8818274158f3406a5c0a1bcff559a64544de6617a9520cd66614fa849e588
+AUX power.d/usb_bluetooth 1121 SHA256 f2f06d4a7179edf51a0022ca0f6d61b5013ace1f94944c8fac75f075d11c9e69 SHA512 b96abfdb8745f320ac3f1f368d1095195c68b0a56270aea4c5ad61e913ddc1641c5b5e1aadc6225d78f88956c4ffb2a396e031de02b9ecced09fac09765701bf WHIRLPOOL 6c82f5b5e2f844fea3a55a2ca7506e31862f3b1a21915d1a7c0b59b9860f0507c1c8c74b27d3e7acd8d5b5c79bb37fdd1abef554e4beef88c41e759bc6091306
+AUX sleep.d/50unload_alx 316 SHA256 7325ffde4b6cbb70eecfeafb301df4a053fe1db11cd3314275cdb3ca3af38a04 SHA512 64e7f77088a6157c90024d26ae6afde40abffc17d8ec2775e6a4ed17fac6c6fc1787c9f1b02cd0f4cd9e18dd74502f84e894006875b7dcacc39e509b3e0d86b0 WHIRLPOOL a5bc946803a0bedd84ff60938dcf98dd25b76374a8d9772475ff15d3d4807f51ef4b65b2ffad401e08a9b0b2b946a540155c5a0fc7ca884eeac85c90f79bbf60
 DIST pm-utils-1.4.1.tar.gz 208687 SHA256 8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b SHA512 5bc9479fe75f120aee136befeb24c8d7d85f61410b551177ed61fd1b4ea9cce7989796b067e357ea93b44b4ae9f66311687066f188236c5efdfd3750695a8017 WHIRLPOOL 7bf4752d96af776c90eb2d0319d615be157c8289551c72edb0c7fed05aeebbdc729f405d5ff04de401f4c12bfb8801e8b80242c3ba28e7b973442e51bf2374a3
 EBUILD pm-utils-1.4.1-r2.ebuild 1761 SHA256 bbae10e14ccde3123c934f9ab154bd0bdf18f5855cfa31d152c30c5e5a4590d1 SHA512 d85da0c40773c8681cf7e9811b14a38712c07535014cd246818b07292c86315c9c4cedace3d59faadc3c6d0c8764f28040690303b769666ec09881afb7706add WHIRLPOOL de9c8f73fa0e1c8a8a4fd02edd364a9239bda6cc5685cde39767f5e7e0a37dee3ad689c359c6d196b7d72ef862eb4ced005401fb1d307c5ff842eeaaa09ddb08
 EBUILD pm-utils-1.4.1-r3.ebuild 1958 SHA256 11b62c339f0fbc94fcb8a74095c5f25f14b6807788a381a803bf695f635d57f3 SHA512 316bd52202fd89b532acebb183216982ac4acafab65462d4d9410faa97f350869b980b1821bf6334618ea88e93414ac2ad5c9fc58372b4f879e89cc89b3ce73f WHIRLPOOL 9623ac6f42b59b76ad37277a7ce977193b667f032e3e5721f9d391fd3bc50ca7e803e8155e7973cf598614fb9901c9d8aa60c0d893c9048a7701653a362d15b4
-MISC ChangeLog 10364 SHA256 b65db0863aca448a94a07074b98897181c392aef81b1803abdbfa9d80009750f SHA512 f7f296ed38ab0361f5f2bfa20ea1b7fbe1c2a64e4c45231eb9b1361356f49168d902ff25e0a690ecee5b28e98f2abc9b60280ed08d76c4bdd6a9aa640cc5f7b4 WHIRLPOOL 0079250dfe281a15827496159dbd4aba2daef866103b1c4d104380a157169c552e39fba013dce5a2153b7eab1cf153054a3f89f513e6d8ae019f31d210e7b5f5
+EBUILD pm-utils-1.4.1-r4.ebuild 2550 SHA256 7bdbe9e1b0a0ce2a93b8f1ff351b140d5ddd2ad0a5d26bfff2f6e2ed442fd39b SHA512 5234a2dd3594db2f7b6f58bd8dbfd911411df200376b130a8caca3734bfdcef83f1303fd5eb68382bff7441e7e3c1a3a36d1d4afffdd4b37b87e804d72ab1c19 WHIRLPOOL 96c6ee59c23d2390cbde622bf02e2ab4f9f275bf410540ef4d402b5d018a9e1a02d507939fd106390953793115b98fdcc2a17c9399d1a7b1c3e786a23c124175
+MISC ChangeLog 10886 SHA256 8c2c230b9165a7093f8d6f20c6743fef8604f753381b50730c14b99c827ef6f0 SHA512 a2ca7215a2ff0ac92fb1bd210fbc8cecbb9bcccfe961f118c2c7aecd4327506618637ed127cb61c06f1328a0a9fcc501418d1b31ff5bb55f1c161664c663dc4d WHIRLPOOL 154bb1fa92465607c80ce1e3a095a0dc83dc6143a47d832218db509297e03cb30a14f67dda654d71b9d05ff9cead8c85d42bd1da8f91d119397a6dfd9ce95908
 MISC metadata.xml 333 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda SHA512 d8b286df144605f4e3657716212c1abb1b87c3ec2f1c55635e20902bcba0e3db1dccfc61ad5756112614765178a382f47a6075a1f3fbb5f7d0847f8198d0c914 WHIRLPOOL 1d4a80ba7c144b26b8e6e56592b375df545742da7cd9336d759d0e9e3861450d21d24cac8bea42d78126e989e2b06bff837f532c6e96b37697d52e2608160d94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTj3qxAAoJEEdUh39IaPFNycgH/jAT6W+UWJPYRiS84v2jONIA
-jqkXX0JG4UNkkvfSLNEmhqaQiAOjSYspk19jzZXRpdAHqV+aX+4EPYJ8Th5xTveD
-SsE+jYrAru4juWjlqXIQ7LaARWjxPND2TXIU3WdR6m6jFlDT4+QZ1ds3+xzNbFxm
-Ht8WzALrZTBOxdLWFVMIYdU/nrIrq9jYP5qvHQ0y67plhXessk/s/xW2FdEcMODb
-ZdTErMhSnsbOTwoT48xcuTHC+ZMqylkCh56H6u/Z7hd9vX1kBXgC8w/mQuZ9Utkz
-reiOCk4wVdSjmdJ9dxtV0zIebVuEnxoDyEY7SyEAYXqyv0sOf7eMJS+nj0c7b0Y=
-=DVb1
+iQEcBAEBCAAGBQJTj4UoAAoJEEdUh39IaPFNizUH/2xfrwgxFVv6mPWb23SnJ48U
+fSRLFgEeLs0oE3Ai8JnHXy5OaGW31/kwcZFxkWAdMcxtMtXYTVZnGDCxFGAPqBZt
+FmeUGvAj3IO8hqNIPjw5tNxXii5tx5rUoE83nySkI0pTCoE1u9giTcTRuzKka3TQ
+yKz/PL+AI+SuEcedSCZcPEyW6qyJCLvqy13A2E/Kv6HUAGDu9kMD8q1vGmMGgOyP
+r4OGGOGai7Po+gP0cdlfEVJ+KW0ZuELWmJrf48VVrcSj3MIAm88JxjbScWe7qRiu
+1FlCg+w0NZFt0EwuxPGGOJaFMw6s6ImiQfFvFUNO7WIyUsODqHNbZ+0PTpPbPME=
+=VJ3w
 -----END PGP SIGNATURE-----
diff --git a/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch b/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch
index 7b5494932c95..e3e3819b82eb 100644
--- a/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch
+++ b/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch
@@ -2,10 +2,8 @@ Description: Disable SATA link power management by default, as it still causes d
 Author: Martin Pitt <martin.pitt@ubuntu.com>
 Bug-Ubuntu: https://launchpad.net/bugs/539467
 
-Index: pm-utils/pm/power.d/sata_alpm
-===================================================================
---- pm-utils.orig/pm/power.d/sata_alpm	2011-02-01 15:53:09.164867778 +0100
-+++ pm-utils/pm/power.d/sata_alpm	2011-02-01 15:53:28.954867786 +0100
+--- pm/power.d/sata_alpm
++++ pm/power.d/sata_alpm
 @@ -2,7 +2,7 @@
  
  . "${PM_FUNCTIONS}"
diff --git a/sys-power/pm-utils/files/1.4.1-fix-alpm-typo.patch b/sys-power/pm-utils/files/1.4.1-fix-alpm-typo.patch
new file mode 100644
index 000000000000..799369159ff2
--- /dev/null
+++ b/sys-power/pm-utils/files/1.4.1-fix-alpm-typo.patch
@@ -0,0 +1,29 @@
+From 93d46b88f415c1931b017856e3162c192bfba07c Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Wed, 11 Jan 2012 15:39:53 +0100
+Subject: [PATCH 3/3] Fix typo in sata_alpm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ALPM → APLM
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44676
+Bug-Ubuntu: https://launchpad.net/bugs/900930
+---
+ pm/power.d/sata_alpm |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pm/power.d/sata_alpm b/pm/power.d/sata_alpm
+index 5ede307..400e1e7 100644
+--- a/pm/power.d/sata_alpm
++++ b/pm/power.d/sata_alpm
+@@ -28,7 +28,7 @@ set_sata_alpm() {
+     [ "${kv%-*}" \< "2.6.33" ] && exit $NA  # avoid fs corruption
+     for f in /sys/class/scsi_host/host*; do
+ 	[ -w "$f/link_power_management_policy" ] || continue
+-	printf "Setting SATA APLM on %s to %s..." "${f##*/}" "$1"
++	printf "Setting SATA ALPM on %s to %s..." "${f##*/}" "$1"
+ 	echo "$1" > "$f/link_power_management_policy" && echo Done. || \
+ 	    echo Failed.
+     done
diff --git a/sys-power/pm-utils/files/1.4.1-ignore-led-failure.patch b/sys-power/pm-utils/files/1.4.1-ignore-led-failure.patch
new file mode 100644
index 000000000000..7b8e4f2da1d1
--- /dev/null
+++ b/sys-power/pm-utils/files/1.4.1-ignore-led-failure.patch
@@ -0,0 +1,14 @@
+Description: LED operation should not block S3/S4
+Author: Adam Lee <adam8157@gmail.com>
+
+Some Lenovo Thinkpad models don't have a suspend LED, this should not
+block S3/S4.
+
+--- pm/sleep.d/95led
++++ pm/sleep.d/95led
+@@ -14,3 +14,5 @@
+ 	*) exit $NA
+ 		;;
+ esac
++
++exit 0
diff --git a/sys-power/pm-utils/files/1.4.1-logging-append.patch b/sys-power/pm-utils/files/1.4.1-logging-append.patch
index 987e0570a9c1..7a5d682b122d 100644
--- a/sys-power/pm-utils/files/1.4.1-logging-append.patch
+++ b/sys-power/pm-utils/files/1.4.1-logging-append.patch
@@ -4,10 +4,8 @@ Description: Do not clear the log file on each operation, but instead append to
 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255
 Bug-Ubuntu: https://launchpad.net/bugs/410352
 
-Index: pm-utils/pm/pm-functions.in
-===================================================================
---- pm-utils.orig/pm/pm-functions.in	2010-07-05 18:41:21.118322244 +0200
-+++ pm-utils/pm/pm-functions.in	2010-07-05 18:41:24.126325221 +0200
+--- pm/pm-functions.in
++++ pm/pm-functions.in
 @@ -271,7 +271,7 @@
  		return 1
  	fi
diff --git a/sys-power/pm-utils/files/1.4.1-run-hook-logging.patch b/sys-power/pm-utils/files/1.4.1-run-hook-logging.patch
new file mode 100644
index 000000000000..19ac4064d791
--- /dev/null
+++ b/sys-power/pm-utils/files/1.4.1-run-hook-logging.patch
@@ -0,0 +1,17 @@
+Description: In suspend log, put empty line after running the hook, not in between.
+Author: Dominique Brazziel <dbrazziel@snet.net>
+Bug-Debian: http://bugs.debian.org/661168
+
+--- pm/pm-functions.in
++++ pm/pm-functions.in
+@@ -199,9 +199,9 @@
+ 	hook_ok "$1" && "$@"
+ 	# log() changes the return value, so save it for later
+ 	local status=$?
+-	log ""
+ 	log -n "$*: " 
+ 	hook_exit_status $status && LAST_HOOK="${1##*/}" || inhibit
++	log ""
+ }
+ 
+ if profiling; then
diff --git a/sys-power/pm-utils/files/1.4.1-suspend-hybrid.patch b/sys-power/pm-utils/files/1.4.1-suspend-hybrid.patch
new file mode 100644
index 000000000000..8d92002733f3
--- /dev/null
+++ b/sys-power/pm-utils/files/1.4.1-suspend-hybrid.patch
@@ -0,0 +1,36 @@
+Description: Add support for in-kernel suspend to both
+Author: Bojan Smojver <bojan@rexursive.com>
+Author: Jaroslav Škarvada <jskarvad@redhat.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=52572
+Bug-Ubuntu: https://launchpad.net/bugs/1172692
+
+--- pm/pm-functions.in
++++ pm/pm-functions.in
+@@ -336,8 +336,28 @@
+ 	{
+ 		[ -n "${HIBERNATE_MODE}" ] && \
+ 		grep -qw "${HIBERNATE_MODE}" /sys/power/disk && \
++		HIBERNATE_MODE_SAVE=$(cat /sys/power/disk) && \
++		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE##*[}" && \
++		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE%%]*}" && \
+ 		echo -n "${HIBERNATE_MODE}" > /sys/power/disk
+ 		echo -n "disk" > /sys/power/state
++		RET=$?
++		echo -n "$HIBERNATE_MODE_SAVE" > /sys/power/disk
++		return "$RET"
++	}
++fi
++
++# for kernels that support suspend to both (i.e. hybrid suspend)
++# since kernel 3.6
++if [ -z "$SUSPEND_HYBRID_MODULE" ] && \
++	[ -f /sys/power/disk ] && \
++	grep -q disk /sys/power/state && \
++	grep -q suspend /sys/power/disk; then
++	SUSPEND_HYBRID_MODULE="kernel"
++	do_suspend_hybrid()
++	{
++		HIBERNATE_MODE="suspend"
++		do_hibernate
+ 	}
+ fi
diff --git a/sys-power/pm-utils/files/1.4.1-uswsusp-hibernate-mode.patch b/sys-power/pm-utils/files/1.4.1-uswsusp-hibernate-mode.patch
new file mode 100644
index 000000000000..8c970698d5bb
--- /dev/null
+++ b/sys-power/pm-utils/files/1.4.1-uswsusp-hibernate-mode.patch
@@ -0,0 +1,19 @@
+Description: Check HIBERNATE_MODE in uswsusp module
+Author: Vadim Solomin <vadic052@gmail.com>
+Bug-Debian: http://bugs.debian.org/589553
+
+--- pm/module.d/uswsusp
++++ pm/module.d/uswsusp
+@@ -87,7 +87,11 @@
+ 	HIBERNATE_MODULE="uswsusp"
+ 	do_hibernate()
+ 	{
+-		s2disk
++		if [ -n "$HIBERNATE_MODE" ]; then
++			s2disk -P "shutdown method=$HIBERNATE_MODE"
++		else
++			s2disk
++		fi
+ 	}
+ fi
+ 
diff --git a/sys-power/pm-utils/files/1.4.1-xfs_buffer_arguments.patch b/sys-power/pm-utils/files/1.4.1-xfs_buffer_arguments.patch
new file mode 100644
index 000000000000..3eee91166f88
--- /dev/null
+++ b/sys-power/pm-utils/files/1.4.1-xfs_buffer_arguments.patch
@@ -0,0 +1,31 @@
+From fdc626dadfd985e823f4e828f2a542c945aea219 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@st.com>
+Date: Tue, 10 Jan 2012 11:21:02 +0100
+Subject: [PATCH 2/2] pm/power.d/xfs_buffer: Fix wrong argument ordering
+
+Write the values in the correct order.
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44620
+Bug-Ubuntu: https://launchpad.net/bugs/645974
+
+Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
+---
+ pm/power.d/xfs_buffer |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pm/power.d/xfs_buffer b/pm/power.d/xfs_buffer
+index d21e845..9f06f6e 100644
+--- a/pm/power.d/xfs_buffer
++++ b/pm/power.d/xfs_buffer
+@@ -59,7 +59,7 @@ xfs_ac() {
+ xfs_battery() {
+     state_exists xfs_buffer_default || \
+ 	read_values |savestate xfs_buffer_default
+-    write_values "$XFS_AGE_BUFFER" "$XFS_BUFD" "$XFS_SYNCD"
++    write_values "$XFS_AGE_BUFFER" "$XFS_SYNCD" "$XFS_BUFD"
+ }
+ 
+ case $1 in
+-- 
+1.7.7.3
+
diff --git a/sys-power/pm-utils/files/power.d/pci_devices b/sys-power/pm-utils/files/power.d/pci_devices
new file mode 100644
index 000000000000..c06b706d82a7
--- /dev/null
+++ b/sys-power/pm-utils/files/power.d/pci_devices
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+#
+# This script adjusts the power control of a set of PCI devices that
+# prove beneficial to enable power savings
+#
+
+PCI_DEVICES_PM_ENABLE="${PCI_DEVICES_PM_ENABLE:-true}"
+
+set_pci_device()
+{
+	for dev in /sys/bus/pci/devices/* ; do
+		if [ -e $dev/class -a -e $dev/power/control ]; then
+			id=`basename $dev`
+			case `cat $dev/class` in
+			0x020000) # ethernet
+				echo "Setting Ethernet device $id to $1"
+				echo $1 > $dev/power/control
+				;;
+			0x028000) # wireless
+				echo "Setting Wireless device $id to $1"
+				echo $1 > $dev/power/control
+				;;
+			0x040300) # audio
+				echo "Setting Audio device $id to $1"
+				echo $1 > $dev/power/control
+				;;
+			0x060000) # host bridge
+				echo "Setting Host Bridge $id to $1"
+				echo $1 > $dev/power/control
+				;;
+			0x080500) # SD card reader
+				echo "Setting SD card reader device $id to $1"
+				echo $1 > $dev/power/control
+				;;
+			0x088000|0x088001) # card reader
+				echo "Setting card reader device $id to $1"
+				echo $1 > $dev/power/control
+				;;
+			0x0c0000|0x0c0010) # firewire
+				echo "Setting FireWire device $id to $1"
+				echo $1 > $dev/power/control
+				;;
+			esac
+		fi
+	done
+}
+
+case "$1" in
+	true) # powersaving on
+		[ "$PCI_DEVICES_PM_ENABLE" = true ] && set_pci_device "auto"
+		;;
+	false) # powersaving off
+		[ "$PCI_DEVICES_PM_ENABLE" = true ] && set_pci_device "on"
+		;;
+	*)
+		exit 254
+		;;
+esac
+
+exit 0
diff --git a/sys-power/pm-utils/files/power.d/usb_bluetooth b/sys-power/pm-utils/files/power.d/usb_bluetooth
new file mode 100644
index 000000000000..615d19e95631
--- /dev/null
+++ b/sys-power/pm-utils/files/power.d/usb_bluetooth
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+#
+# This script adjusts the USB bluetooth device settings via the USB
+# power control.  This simply sets this to "auto" for power saving and to "on"
+# for non-power saving.   This has been shown to save about 1W on some
+# systems.
+#
+# According to http://www.usb.org/developers/defined_class
+#   USB wireless bluetooth devices have baseclass 0xe0, subclass 0x01,
+#   protocol 0x01
+#
+
+USB_BLUETOOTH_PM_ENABLE="${USB_BLUETOOTH_PM_ENABLE:-true}"
+
+set_usb_bluetooth()
+{
+	for dev in /sys/bus/usb/devices/* ; do
+		if [ -e $dev/bDeviceClass -a \
+		     -e $dev/bDeviceSubClass -a \
+		     -e $dev/bDeviceProtocol -a \
+		     -e $dev/power/control ]; then
+			if [ x`cat $dev/bDeviceClass` = xe0 -a \
+		     	x`cat $dev/bDeviceSubClass` = x01 -a \
+		     	x`cat $dev/bDeviceProtocol` = x01 ]; then
+				echo Setting $dev to $1
+				echo $1 > $dev/power/control
+			fi
+		fi
+	done
+}
+
+case "$1" in
+	true) # powersaving on
+		[ "$USB_BLUETOOTH_PM_ENABLE" = true ] && set_usb_bluetooth "auto"
+		;;
+	false) # powersaving off
+		[ "$USB_BLUETOOTH_PM_ENABLE" = true ] && set_usb_bluetooth "on"
+		;;
+	*)
+		exit 254
+		;;
+esac
+
+exit 0
diff --git a/sys-power/pm-utils/files/sleep.d/50unload_alx b/sys-power/pm-utils/files/sleep.d/50unload_alx
new file mode 100644
index 000000000000..6d352c50f7c0
--- /dev/null
+++ b/sys-power/pm-utils/files/sleep.d/50unload_alx
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# 50unload_alx: unload the alx module during suspend (LP #1173952)
+
+[ -d /sys/module/alx ] || exit 0
+
+. "${PM_FUNCTIONS}"
+
+case "$1" in
+	suspend)
+		echo "Unloading alx kernel module ..."
+		modunload alx && echo Done. || echo Failed.
+		;;
+	resume)
+		echo "Reloading alx kernel module ..."
+		;;
+esac
+exit 0
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r4.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r4.ebuild
new file mode 100644
index 000000000000..3b08fd0a488e
--- /dev/null
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.4.1-r4.ebuild,v 1.1 2014/06/04 20:46:47 ssuominen Exp $
+
+EAPI=5
+inherit eutils multilib
+
+DESCRIPTION="Suspend and hibernation utilities"
+HOMEPAGE="http://pm-utils.freedesktop.org/"
+SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
+
+vbetool="!video_cards_intel? ( sys-apps/vbetool )"
+RDEPEND="!<app-laptop/laptop-mode-tools-1.55-r1
+	!sys-power/powermgmt-base[-pm-utils(+)]
+	sys-apps/dbus
+	>=sys-apps/util-linux-2.13
+	sys-power/pm-quirks
+	alsa? ( media-sound/alsa-utils )
+	ntp? ( || ( net-misc/ntp net-misc/openntpd ) )
+	amd64? ( ${vbetool} )
+	x86? ( ${vbetool} )
+	video_cards_radeon? ( app-laptop/radeontool )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO"
+
+src_prepare() {
+	local ignore="01grub"
+	use ntp || ignore+=" 90clock"
+
+	use debug && echo 'PM_DEBUG="true"' > "${T}"/gentoo
+	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${T}"/gentoo
+
+	epatch \
+		"${FILESDIR}"/${PV}-bluetooth-sync.patch \
+		"${FILESDIR}"/${PV}-disable-sata-alpm.patch \
+		"${FILESDIR}"/${PV}-fix-intel-audio-powersave-hook.patch \
+		"${FILESDIR}"/${PV}-logging-append.patch \
+		"${FILESDIR}"/${PV}-fix-alpm-typo.patch \
+		"${FILESDIR}"/${PV}-inhibit-on-right-status.patch \
+		"${FILESDIR}"/${PV}-ignore-led-failure.patch \
+		"${FILESDIR}"/${PV}-run-hook-logging.patch \
+		"${FILESDIR}"/${PV}-suspend-hybrid.patch \
+		"${FILESDIR}"/${PV}-uswsusp-hibernate-mode.patch \
+		"${FILESDIR}"/${PV}-xfs_buffer_arguments.patch
+}
+
+src_configure() {
+	econf --disable-doc
+}
+
+src_install() {
+	default
+	doman man/*.{1,8}
+
+	# Remove duplicate documentation install
+	rm -r "${D}"/usr/share/doc/${PN}
+
+	insinto /etc/pm/config.d
+	doins "${T}"/gentoo
+
+	insinto /usr/$(get_libdir)/pm-utils/sleep.d
+	doins "${FILESDIR}"/sleep.d/50unload_alx
+
+	insinto /usr/$(get_libdir)/pm-utils/power.d
+	doins "${FILESDIR}"/power.d/{pci_devices,usb_bluetooth}
+
+	# No longer required with current networkmanager (rm -f from debian/rules)
+	rm -f "${D}"/usr/$(get_libdir)/${PN}/sleep.d/55NetworkManager
+
+	# No longer required with current kernels (rm -f from debian/rules)
+	rm -f "${D}"/usr/$(get_libdir)/${PN}/sleep.d/49bluetooth
+
+	# Punt HAL related file wrt #401257 (rm -f from debian/rules)
+	rm -f "${D}"/usr/$(get_libdir)/${PN}/power.d/hal-cd-polling
+}