Fix service status detection, bug #255431.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 35 insertions, 7 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index 8e859584c9d9..51742db17b0d 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/pm-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.14 2009/01/18 20:21:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.15 2009/01/18 20:53:35 eva Exp $
+
+  18 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/pm-utils-1.2.3-service-status.patch, pm-utils-1.2.3-r1.ebuild:
+  Fix service status detection, bug #255431.
 
 *pm-utils-1.2.3-r1 (18 Jan 2009)
 
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 960897ddd6f5..5ad1affd0e0d 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pm-utils-1.2.3-service-status.patch 524 RMD160 f1254757ede88d3c4753ae7e1aa475c5bd912fe7 SHA1 85d0b822dd50c67eaee2a69ef823601553ff6b1a SHA256 91704d64eae56a6ff8db648eb40f61840234625bb4ade9223d3f4bcd0fa403e3
 DIST pm-utils-1.1.1.tar.gz 143103 RMD160 009cff3428d9c27b47fb874da4c06a12fd8f14d7 SHA1 8ba604f19ed997641573c179e1f06492ed3003d6 SHA256 63187cc7667026c0a798e10549825ed087a7759a5beead4b7db937c868cc3bad
 DIST pm-utils-1.1.2.1.tar.gz 158307 RMD160 8524ec9b668c679664a4b2bf6fe0364434529ae5 SHA1 f16b94aec360f98e783bce741c1343912674956e SHA256 5019dc87196e24c1cc054f3cbf88237d67b3f2d451fa9ae5831435f53e8c67dd
 DIST pm-utils-1.2.3.tar.gz 176568 RMD160 0294a6b59647665e55fea810fd38bd352577668d SHA1 ec513f3742d6fc78eec7115bd003af3c36ae931f SHA256 e098fce7db4999e390a7332abf31b23b95c11515e48c1ff1818b11bf6ac26d07
 EBUILD pm-utils-1.1.1.ebuild 1445 RMD160 1a007bb54bef19665595e4e3bf08f519677d3c3f SHA1 f7d51e1fc2d03719db2e55f9c490640d482a5a5a SHA256 3ee21a1bdcce6c33e57fc9e569df1d438a2a3c6b1701db9df12f9395136bade3
 EBUILD pm-utils-1.1.2.1.ebuild 1464 RMD160 0c102b5e8cd319a54319ff564ad0cc6bdbc7d8b4 SHA1 9661d9a5860259f735856dd2efda4148f8e74018 SHA256 41eb63117a4216d4bfb2a20de7522de665ebd34f6fe463253e33f8ae666df546
-EBUILD pm-utils-1.2.3-r1.ebuild 1571 RMD160 1fa1a7d9e47acef133991af2c6b50a02e7e3c0f6 SHA1 e03861054fa2e8417ca5a6881014a0192f12f366 SHA256 d8a914dd67972266ebce932a46b1c1bb34696ecc17b6946d10683b2250e4362f
+EBUILD pm-utils-1.2.3-r1.ebuild 1673 RMD160 1635e67b0f982d171e2f91dedfd84a0ca9d8f6f7 SHA1 1865eeaecca030419d73385f93e5a58adc46b1b9 SHA256 db4992f7bb97e1608eb0a3f13a9a5282d07895fdb673ac2410a470bd4f724318
 EBUILD pm-utils-1.2.3.ebuild 1412 RMD160 e22f91a2b34c4a50f372c1e95242362389e37e0c SHA1 f7d8d7a9fa9493c81a14a2b963a0d531f357e27e SHA256 53433db427d9159380317fb4a9ff107a80eef84d808962862b47103117537d8c
-MISC ChangeLog 2226 RMD160 b5bfbbb940d298f479a5f8b1d763de2c27624b1e SHA1 2ce9b1c6450d8d40c3e776ff502bffa523a3bfd3 SHA256 d67ce03a8be894423df3ff78dee177459566c2fe25e4576b4bde8eb560d2f315
+MISC ChangeLog 2398 RMD160 b12af220b4ca22bd73cfa8575495df349b517bc5 SHA1 8f9293938db4a014d37d09cd316cfbeef8f8ffb8 SHA256 40232fd6dfc45eda0961bd914690448e520cebb9f167b38f11915b6ab1b70fe0
 MISC metadata.xml 251 RMD160 41781b66e083e1e4c11e135fe44eb40da50f15d6 SHA1 b61dc16b3f4c1ee71546729e1fd3c09f2b8ce153 SHA256 d0d5a53d56e26d590db0a3ca7280afbcca426b8f57f47477631a230d9e1f2125
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklzj1YACgkQ1fmVwcYIWAZFcwCgvbdOkfmhjfElRt9GU6j08zTP
-0pUAoOo9/tFruThSuZQ0gAR/mttqIrDd
-=FVz8
+iEYEARECAAYFAklzltUACgkQ1fmVwcYIWAYqDgCg5D8ARoT6mj6aCCwptkMfk01+
+zp4An3nq5ybyWOOh13fIW9Z+WYRw8ep4
+=c9lZ
 -----END PGP SIGNATURE-----
diff --git a/sys-power/pm-utils/files/pm-utils-1.2.3-service-status.patch b/sys-power/pm-utils/files/pm-utils-1.2.3-service-status.patch
new file mode 100644
index 000000000000..b1cb0c426b71
--- /dev/null
+++ b/sys-power/pm-utils/files/pm-utils-1.2.3-service-status.patch
@@ -0,0 +1,18 @@
+# https://bugs.gentoo.org/attachment.cgi?id=178922
+# Fix status detection under gentoo
+#
+# functions.in |    3 ++-
+# 1 file changed, 2 insertions(+), 1 deletion(-)
+#
+--- a/pm/functions.in	2009-01-18 21:11:52.000000000 +0100
++++ b/pm/functions.in	2009-01-18 21:12:19.000000000 +0100
+@@ -141,7 +141,8 @@
+ 
+ stopservice()
+ {
+-	if service "$1" status 2>/dev/null | grep -c -q running; then
++	if service "$1" status 2>/dev/null | grep -q -e running -e started
++	then
+ 		touch "${STORAGEDIR}/service:$1"
+ 		service "$1" stop
+ 	fi
diff --git a/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild b/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild
index 823e19f9b0a8..a72ac3c9b1dd 100644
--- a/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 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.2.3-r1.ebuild,v 1.1 2009/01/18 20:21:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild,v 1.2 2009/01/18 20:53:35 eva Exp $
+
+inherit eutils
 
 DESCRIPTION="Suspend and hibernation utilties for HAL"
 HOMEPAGE="http://pm-utils.freedesktop.org/"
@@ -29,6 +31,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# fix status detection, bug #255431
+	epatch "${FILESDIR}/${P}-service-status.patch"
+
 	# fix pkg-config file, bug #254492
 	sed -e 's:${pm_libdir):${pm_libdir}:' -i pm-utils.pc.in || die "sed failed"