Use doexe instead of doins for power.d/pci_devices, power.d/usb_bluetooth and sleep.d/50unload_alx. Mark defaults file executable as per debian/rules. Remove unstable power.d/harddrive wrt #452362 (also removed by debian/rules). Remove power.d/journal-commit and power.d/readahead as they have been shown to increase power usage instead of reduce it as per debian/rules. These should be last stolen bits from Debian patchset 1.4.1-14.

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

3 files changed, 114 insertions, 9 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index ec42e9fd57f0..96be1d3c8a74 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.70 2014/06/04 20:53:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.71 2014/06/23 14:03:11 ssuominen Exp $
+
+*pm-utils-1.4.1-r6 (23 Jun 2014)
+
+  23 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> +pm-utils-1.4.1-r6.ebuild:
+  Use doexe instead of doins for power.d/pci_devices, power.d/usb_bluetooth and
+  sleep.d/50unload_alx. Mark defaults file executable as per debian/rules.
+  Remove unstable power.d/harddrive wrt #452362 (also removed by debian/rules).
+  Remove power.d/journal-commit and power.d/readahead as they have been shown to
+  increase power usage instead of reduce it as per debian/rules. These should be
+  last stolen bits from Debian patchset 1.4.1-14.
 
 *pm-utils-1.4.1-r5 (04 Jun 2014)
 
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 04cdc8ac370b..bca29f747b2d 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -21,16 +21,17 @@ EBUILD pm-utils-1.4.1-r2.ebuild 1761 SHA256 bbae10e14ccde3123c934f9ab154bd0bdf18
 EBUILD pm-utils-1.4.1-r3.ebuild 1958 SHA256 11b62c339f0fbc94fcb8a74095c5f25f14b6807788a381a803bf695f635d57f3 SHA512 316bd52202fd89b532acebb183216982ac4acafab65462d4d9410faa97f350869b980b1821bf6334618ea88e93414ac2ad5c9fc58372b4f879e89cc89b3ce73f WHIRLPOOL 9623ac6f42b59b76ad37277a7ce977193b667f032e3e5721f9d391fd3bc50ca7e803e8155e7973cf598614fb9901c9d8aa60c0d893c9048a7701653a362d15b4
 EBUILD pm-utils-1.4.1-r4.ebuild 2550 SHA256 7bdbe9e1b0a0ce2a93b8f1ff351b140d5ddd2ad0a5d26bfff2f6e2ed442fd39b SHA512 5234a2dd3594db2f7b6f58bd8dbfd911411df200376b130a8caca3734bfdcef83f1303fd5eb68382bff7441e7e3c1a3a36d1d4afffdd4b37b87e804d72ab1c19 WHIRLPOOL 96c6ee59c23d2390cbde622bf02e2ab4f9f275bf410540ef4d402b5d018a9e1a02d507939fd106390953793115b98fdcc2a17c9399d1a7b1c3e786a23c124175
 EBUILD pm-utils-1.4.1-r5.ebuild 2629 SHA256 2235d3a8194acf96c670b831688a044d8d0d9200d2ae6ad3785523c62250dad7 SHA512 c3eadec593de8a0e91e880b064375b5d2d187afaaf0628f46df9f62398ebf55f8996281d2de221784cc2d33402f9594b140e31cfb26a3b591906f412ad6cb62f WHIRLPOOL 69cf7fc5323541be9769de0383f7e765cd508ffb0cf33fa3d3b5775457303f0ebe1f1d678f6ec4a2c7eb87ddcf50f5af85bc201fa10a6d2ff9b38b8ded20bffe
-MISC ChangeLog 11081 SHA256 7e874fbcde31b8a0c1cf04ff00db46845a9c73e69f8ac04f9ef7c2750e439475 SHA512 53c3a18a4212e41d8fdb3f3f63338fe3a3ec9233298c0c9409973375ad62fa4220726563b83a49c28c6f2e2997b32ee1a64d8902af033dc5329b75cd914e0739 WHIRLPOOL 10d10583180e41a8a91478fe5b290df314792cf3b6b2d8e7dbe85778115e0a06cf19e4f453dbffbe9d46f4e408beda2783baa81dd7d8fc859e59d04b91464194
+EBUILD pm-utils-1.4.1-r6.ebuild 3037 SHA256 4084cc66f466afe5fa1e2085faac37ae721fecf45f12ace6bfbccb3167f4bba8 SHA512 b38009d898bb7cf0a4cd83eb7e1e897d887f65c605ac93a97c3923f7b0412e837bb1df79c529962e36e4c7a0ffcf038e3712337535c906ee285d44fba72b2b1b WHIRLPOOL 47172a0766800757b8cc843ecc7f201ff6925714a78c5e4af76f7d2f3e51c312bc7232f845d5d0bbe95ec76e2d59d6c698ab09878b51a5aee3a89fa4e8bc33b4
+MISC ChangeLog 11644 SHA256 d4df7195afa65644d6cda11732fa70a8d36de4c0bd395b889a77ec07d18ee9c0 SHA512 bf1bce65f879231e79a26eb6de0e17f6806cf5c29c14b4d650cdeedbbaaa26b0e1eac99c830c36d45745280cf5e1e7e26987f289a1fdf0677229a2c913ba26a0 WHIRLPOOL 7d2d921905d19161f16690643167a712e9563cda6ebcc1a92aec796e6599a2f03cbc323adc52856f3a9d12848ce462e31ea44154634e833722c06a74b4a03bcc
 MISC metadata.xml 333 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda SHA512 d8b286df144605f4e3657716212c1abb1b87c3ec2f1c55635e20902bcba0e3db1dccfc61ad5756112614765178a382f47a6075a1f3fbb5f7d0847f8198d0c914 WHIRLPOOL 1d4a80ba7c144b26b8e6e56592b375df545742da7cd9336d759d0e9e3861450d21d24cac8bea42d78126e989e2b06bff837f532c6e96b37697d52e2608160d94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTj4a4AAoJEEdUh39IaPFNS+gH/jMisUXB/vWkrjvex9RmOpTl
-VxtgWvuXE9db9sC4FJ2Msa3/CmmAFRAm78W1ASaa+r7DkUpaFjmWFG+T1DbbbigK
-LfwW1Z4QFN2me1BbGXtEkJIm6gqspw+vRf9HNYr8IFGSw5QHpU+LnZ8UV/bES3EE
-vvEJQQJCqeN1VuF5oTV/1Clu+Ggh4bz+yS3tqNzv7TZneWtAlx2yzVTY8DOUSv7Y
-9xIs+dT8M6WA/XruovB5GIiVDEbX1Lfj5hXAFgBAytDuC/o0TU+gI2UU5bjvl89E
-N28Alp2DoeftLTMUDlsQYB/AlDWcdBur2exoppS/QtEPQWSL7DGz896FOMdhL6I=
-=/DmV
+iQEcBAEBCAAGBQJTqDLFAAoJEEdUh39IaPFNESwIAIvWX4IAVP+G0L/YSQwgd4tb
+8i7aexUUU2mlPfGRjBiS1bqwC1N7UZReq1UxRqLEpVtyNgsqWrdY8MBGsVuEK5Ec
+q0bR2ruhIlwvNz2CDtLep2q0o4DEbYjgdgrpSSV6pT4YkYIXHLKIgi/XG+0sn8cy
+XDKLiyVqRhcO0sekpw4Iq+4x0Yc4RyJpvGJ+eqDU+iqX9+bOaVMRD64ke9FJZq7x
+m+JvcPgnGhu11eixspxEqp/ojtmd+oNqkej1OsWqnImjEX2oy+Ga+mVf4XWrPfJH
+Fml+aIGUiXkEMOVqveX8QrS/Bh3UiZ1ARt/2sK31saZJkmWHjBjsWPRy+PtV1jQ=
+=I9dv
 -----END PGP SIGNATURE-----
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
new file mode 100644
index 000000000000..30f884edee75
--- /dev/null
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
@@ -0,0 +1,94 @@
+# 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-r6.ebuild,v 1.1 2014/06/23 14:03:11 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 "${ED}"/usr/share/doc/${PN}
+
+	insinto /etc/pm/config.d
+	doins "${T}"/gentoo
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN} #408091
+
+	exeinto /usr/$(get_libdir)/${PN}/sleep.d
+	doexe "${FILESDIR}"/sleep.d/50unload_alx
+
+	exeinto /usr/$(get_libdir)/${PN}/power.d
+	doexe "${FILESDIR}"/power.d/{pci_devices,usb_bluetooth}
+
+	# No longer required with current networkmanager (rm -f from debian/rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/sleep.d/55NetworkManager
+
+	# No longer required with current kernels (rm -f from debian/rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/sleep.d/49bluetooth
+
+	# Punt HAL related file wrt #401257 (rm -f from debian/rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/hal-cd-polling
+
+	# Punt hooks which have shown to not reduce, or even increase power usage
+	# (rm -f from debian rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/{journal-commit,readahead}
+
+	# Remove hooks which are not stable enough yet (rm -f from debian/rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/harddrive
+
+	# Change to executable (chmod +x from debian/rules)
+	fperms +x /usr/$(get_libdir)/${PN}/defaults
+}