Inhibit on right status wrt #360673 by Gerard Neil

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

4 files changed, 103 insertions, 8 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index 0c54f30c05e2..30a11a2888dd 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/pm-utils
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.65 2013/09/01 10:43:25 eva Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.66 2014/06/04 19:51:49 ssuominen Exp $
+
+*pm-utils-1.4.1-r3 (04 Jun 2014)
+
+  04 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/1.4.1-inhibit-on-right-status.patch, +pm-utils-1.4.1-r3.ebuild:
+  Inhibit on right status wrt #360673 by Gerard Neil
 
   01 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org> pm-utils-1.4.1-r2.ebuild:
   Do not install docs twice, bug #396351.
@@ -282,4 +288,3 @@
   23 Nov 2007; Saleem Abdulrasool <compnerd@gentoo.org> +metadata.xml,
   +pm-utils-0.99.4.ebuild:
   Initial commit of pm-utils for HAL 0.5.10
-
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index fe2df177773f..f24ea93b29c2 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -4,16 +4,22 @@ 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-fix-intel-audio-powersave-hook.patch 1412 SHA256 16d5355d1c5cff6316fef11768673434394582c67039c79e8b86aafe2d2f7797 SHA512 5c5cc0e810c9a189de5d3b603cac1c5adb69058f2033daad3558463d1a0f65c039e19132da54da373929fe8e652ae06e28edad2ea9ce17a2f73527e494eecaff WHIRLPOOL aa0f8191cd4697a3fe314c248624282284e6ef540add5998de11d1e910c1516103c3061490ce6b8750ac929891f4ce5b757532aee0f2d8e233fc83ec4d60410e
+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
 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 1808 SHA256 6d05632e0d266c018ce4cd5c229dfd4dbedc19cf8b78a0326dc741fa3d559143 SHA512 8ee345bc57ab75012e75e94a2fab2d7b4d145c004f4b2496504e0e6a4cbcf784b53e402adcc4d978e2a13657c277d827d86d2dbc892bee49e0736fa925429b84 WHIRLPOOL 27b09ba3186a27d9caeb559d841a8fb76b0f5afdb1ff1d746497871e90bda8778f65fdd625ff82503f67eabc4a0d202d52b73dab93b81217c29ea9615e0e8f32
 EBUILD pm-utils-1.4.1.ebuild 1581 SHA256 d29333f16893b48c1ad3af0072c0f90e2afe6f2544137faa3509be776906ef18 SHA512 92c7fff89ce7c780b1755fcda177410ec40499dde3ba934feccd2aa5f4ed02003aaf7df3d9cf1924e538c86afafecb052ea2601895537aaa2f65671f024bde86 WHIRLPOOL f5b8b2eedb76ad616ccbfb01c7ca045492d07a04d87794cd3e1832adcfd298951242ef75890279347bd7833b2363926f39aa78f4ede5f1e1a02ef2ec37935873
-MISC ChangeLog 9907 SHA256 b1ee88246ec4b7abe08e82eb89880da226648e73e47c3b6e521a2b91db5ab53b SHA512 96cd801a130764eced1952ff999d03516fcc83fb4b6563e4e16402401d1f2c7559831687877660944d9d59d922980a1cd57e57dfbb2fdf14fba475710b3f1823 WHIRLPOOL e7424808e32e7193db04fdc620fe305d3b21c1a8c2ff8cae4e630680198533bf88ac0bc82f90cd810ed5bfd568d4ed1f1c9829fe62a4756eb74c4de75a39a811
+MISC ChangeLog 10127 SHA256 aad42393beb594a702ae8e8f07a8d13ecbbb4d6ad9d0d23658e1c3898f64952a SHA512 074782c1c667f1eaafd2f061872033d0b8d24a7485f037d0c1d0faad8fb9424ff7c80a1e0893912658f5be070a00e3d1eabe36af319d1d7d0adcd9a1ed7daeb3 WHIRLPOOL 1e3c64647a80a588ef61335bf310ddc0ea693b7a966af10504148a998f1c8bc74e71ad5779d1bb240eec4a887e9ef684ca2409935018da07114dbb2e2e7aa6bf
 MISC metadata.xml 333 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda SHA512 d8b286df144605f4e3657716212c1abb1b87c3ec2f1c55635e20902bcba0e3db1dccfc61ad5756112614765178a382f47a6075a1f3fbb5f7d0847f8198d0c914 WHIRLPOOL 1d4a80ba7c144b26b8e6e56592b375df545742da7cd9336d759d0e9e3861450d21d24cac8bea42d78126e989e2b06bff837f532c6e96b37697d52e2608160d94
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIjGk4ACgkQ1fmVwcYIWAalgQCeNtSepQeEcsrj031qBqd4qGso
-uWAAoIGJBII+6kdLpFy+8oB6RNOKt9Fr
-=BIK9
+iQEcBAEBCAAGBQJTj3hGAAoJEEdUh39IaPFNav4H/06KFDPjsF5F0ffO5luRjD9D
+s1XW/roihcRBU+G0ZKVKZqmJXx3Su3FqIfIzMUseyBFaPUKbWiaokuWjVq+ZSgUQ
+CMVT38z8yqeNy8rNuA1WvuBaPyKstXP373szp1DYxt10OrbdMSMD3UI9pVg3OVPX
+VKO4Q83/yTCbjU/Onkg9cF04wCR2xf5WV2ZbWa5YCMyyYeL/98FHV939sdQz8VNJ
+oSuh063mJV30YMBRFeOUpD9PoWollu550g0RZ29U//yHNUImYx3yWRxLGTttjORY
++CZmf3L/Ia7iJM/KXlIh6bQLsb5bw7poo8MMRuyka8p6xXufa6PJiLYtRZWGkRw=
+=LahP
 -----END PGP SIGNATURE-----
diff --git a/sys-power/pm-utils/files/1.4.1-inhibit-on-right-status.patch b/sys-power/pm-utils/files/1.4.1-inhibit-on-right-status.patch
new file mode 100644
index 000000000000..250ae0872fbd
--- /dev/null
+++ b/sys-power/pm-utils/files/1.4.1-inhibit-on-right-status.patch
@@ -0,0 +1,20 @@
+Description: Do not use the exit status of log rather the exit status of the hook.
+
+http://bugs.freedesktop.org/show_bug.cgi?id=32210
+http://bugs.gentoo.org/360673
+
+--- pm/pm-functions.in
++++ pm/pm-functions.in
+@@ -197,9 +197,11 @@
+ 	# rest of args passed to hook unchanged.
+ 	log "Running hook $*:"
+ 	hook_ok "$1" && "$@"
++	# log() changes the return value, so save it for later
++	local status=$?
+ 	log ""
+ 	log -n "$*: " 
+-	hook_exit_status $? && LAST_HOOK="${1##*/}" || inhibit
++	hook_exit_status $status && LAST_HOOK="${1##*/}" || inhibit
+ }
+ 
+ if profiling; then
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r3.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r3.ebuild
new file mode 100644
index 000000000000..2e02bbc7c1f6
--- /dev/null
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r3.ebuild
@@ -0,0 +1,64 @@
+# 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-r3.ebuild,v 1.1 2014/06/04 19:51:49 ssuominen Exp $
+
+EAPI=5
+inherit eutils
+
+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}-inhibit-on-right-status.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
+
+	# NetworkManager 0.8.2 is handling suspend/resume on it's own with UPower
+	find "${D}" -type f -name 55NetworkManager -exec rm -f '{}' +
+}