Fix pidfile better. Drop patch.

(Portage version: 2.2_rc20/cvs/Linux 2.6.26-gentoo-r4 x86_64)

4 files changed, 15 insertions, 29 deletions

diff --git a/sys-power/powerman/ChangeLog b/sys-power/powerman/ChangeLog
index d103c606ad59..a470d9ceb559 100644
--- a/sys-power/powerman/ChangeLog
+++ b/sys-power/powerman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/powerman
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/ChangeLog,v 1.6 2009/03/04 04:26:42 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/ChangeLog,v 1.7 2009/03/04 14:12:22 weaver Exp $
+
+*powerman-2.3.4-r1 (04 Mar 2009)
+
+  04 Mar 2009; Andrey Kislyuk <weaver@gentoo.org>
+  -files/powerman-1.0.20-new-yacc.patch, files/powerman,
+  -powerman-2.3.4.ebuild, +powerman-2.3.4-r1.ebuild:
+  Fix pidfile better. Drop patch.
 
 *powerman-2.3.4 (03 Mar 2009)
 
diff --git a/sys-power/powerman/files/powerman b/sys-power/powerman/files/powerman
index e2285be45f8d..3845d492aace 100644
--- a/sys-power/powerman/files/powerman
+++ b/sys-power/powerman/files/powerman
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/files/powerman,v 1.2 2009/01/03 06:00:47 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/files/powerman,v 1.3 2009/03/04 14:12:22 weaver Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting powermand"
 	start-stop-daemon --start \
-		--pidfile /var/run/powermand.pid \
+		--pidfile /var/run/powerman/powermand.pid \
 		--exec /usr/sbin/powermand
 	eend $?
 }
@@ -18,7 +18,7 @@ start() {
 stop() {
 	ebegin "Stopping powermand"
 	start-stop-daemon --stop \
-		--pidfile /var/run/powermand.pid \
+		--pidfile /var/run/powerman/powermand.pid \
 		--exec /usr/sbin/powermand
 	eend $?
 }
diff --git a/sys-power/powerman/files/powerman-1.0.20-new-yacc.patch b/sys-power/powerman/files/powerman-1.0.20-new-yacc.patch
deleted file mode 100644
index 027fb549011e..000000000000
--- a/sys-power/powerman/files/powerman-1.0.20-new-yacc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nuar powerman-1.0.20.orig/src/parse.y powerman-1.0.20/src/parse.y
---- powerman-1.0.20.orig/src/parse.y	2004-02-19 15:01:26.000000000 -0800
-+++ powerman-1.0.20/src/parse.y	2006-10-01 14:09:23.992747728 -0700
-@@ -754,6 +754,7 @@
-         case EPL_NONODES:
-             _errormsg("more plugs than nodes");
-         default:
-+	    break;
-     }
- 
-     if (!conf_addnodes(nodestr))
-diff -Nuar powerman-1.0.20.orig/src/Makefile powerman-1.0.20/src/Makefile
---- powerman-1.0.20.orig/src/Makefile	2006-10-01 14:27:37.716476000 -0700
-+++ powerman-1.0.20/src/Makefile	2006-10-01 14:28:09.056712008 -0700
-@@ -51,8 +51,6 @@
- # Fix for annoying "yyval used uninitialized" warning
- parse_tab.c parse_tab.h: parse.y
- 	$(YACC) -d -oparse_tab.c parse.y
--	sed s/YYSTYPE\ yyval/YYSTYPE\ yyval\ =\ NULL/ parse_tab.c >foo.c
--	mv foo.c parse_tab.c
- 
- parse_tab.o: parse_tab.c parse_tab.h powerman.h
- 	$(CC) $(CFLAGS) -c -o parse_tab.o parse_tab.c
diff --git a/sys-power/powerman/powerman-2.3.4.ebuild b/sys-power/powerman/powerman-2.3.4-r1.ebuild
index f0d73e8902ef..4f30f808aefe 100644
--- a/sys-power/powerman/powerman-2.3.4.ebuild
+++ b/sys-power/powerman/powerman-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/powerman-2.3.4.ebuild,v 1.1 2009/03/04 04:26:42 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/powerman-2.3.4-r1.ebuild,v 1.1 2009/03/04 14:12:22 weaver Exp $
 
 EAPI="1"
 
@@ -16,7 +16,9 @@ DEPEND="sys-devel/bison
 RDEPEND=">=sys-libs/freeipmi-0.2.3"
 
 src_compile() {
-	econf \
+	# Powerman stores the pidfile under $localstatedir/run.
+	# It's set to /var/lib in the release, but in gentoo pidfiles live under /var/run.
+	econf --localstatedir="/var" \
 		$(use_with httppower) \
 		$(use_with genders)
 	emake || die