diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2009-01-18 20:53:36 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-01-18 20:53:36 +0000 |
| commit | 4519b45216795b1fdf953558ef98ba0259e7531d (patch) | |
| tree | 9ce3b8788a667ff9dfe05ebf48be93d11d193b26 /sys-power | |
| parent | New snapshot of available color schemes. (diff) | |
| download | gentoo-2-4519b45216795b1fdf953558ef98ba0259e7531d.tar.gz gentoo-2-4519b45216795b1fdf953558ef98ba0259e7531d.tar.bz2 gentoo-2-4519b45216795b1fdf953558ef98ba0259e7531d.zip | |
Fix service status detection, bug #255431.
(Portage version: 2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/pm-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-power/pm-utils/files/pm-utils-1.2.3-service-status.patch | 18 | ||||
| -rw-r--r-- | sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild | 7 |
3 files changed, 29 insertions, 2 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/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" |