Fix pidfile better. Drop patch.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-gentoo-r4 x86_64

5 files changed, 18 insertions, 33 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/Manifest b/sys-power/powerman/Manifest
index 88decaa86aed..0a5e2ae673f9 100644
--- a/sys-power/powerman/Manifest
+++ b/sys-power/powerman/Manifest
@@ -1,8 +1,7 @@
-AUX powerman 547 RMD160 5799044de00e4e968e6d38318a93c0cc67a087c5 SHA1 ee76ae869911642d7d588c3657b8e825bde20511 SHA256 c624845023533f6dec9860992e4b809f8dcfa7ea38976360ec03b816f4a244e4
-AUX powerman-1.0.20-new-yacc.patch 931 RMD160 2fa17c35a26addad7a79be486ccf4b0320cf71ee SHA1 c1ca2eb610608142fbdad17dfe30cf888d38e8dd SHA256 1b4f5863524e77a269aef116db9f3aa579ef0bb645d83c1115fe479899f165f9
+AUX powerman 565 RMD160 7fb27bbc62380e21929d3ff1c0a73be2de6a4be7 SHA1 1b4d814fdb5d22008ca48294b9cb844acc98c497 SHA256 3085aa5447618b4ec3c43d987797b471287df2fb96bdd01aae9b9f950175ba0e
 DIST powerman-2.3.4.tar.bz2 405351 RMD160 c65287924753be923df0b3eaee94c7f5372c00e3 SHA1 2dbc0b10334f281cfbfc296b8141a5db0819e39f SHA256 449fd9c2fa1ba4d3bd366fc5421fbf4fb185e28aa16188fb68dd55fe1fc71d88
 DIST powerman-2.3.tar.bz2 394441 RMD160 5dcc2512397c061e2f9f2955ed3fb3285865803b SHA1 dab54c8525292f92e78e8abe28c4a074f27406c0 SHA256 c1e95ff1178fb25d9098dcd3d412483f18248c72c3f0db05061a4896ef1e66d1
-EBUILD powerman-2.3.4.ebuild 868 RMD160 ab5850c15977f4e18974e319fcdb259d42fba6b0 SHA1 1fb677c196ad338ca4b64d62a4335a9281a9eacd SHA256 64e178067992f6d24fbd776d5decb7109bc546be17a623300ae54c6afcbba568
+EBUILD powerman-2.3.4-r1.ebuild 1035 RMD160 a4a66570e8a911fc133e9a3d71c4e1481a6148af SHA1 b3518c9cd9cce43386e2ae0229c3e7aa8f1f4823 SHA256 c0287611726f0cb5fb23a6ef4479d4a6bfba810f08c9f8ff3793257fc2a9e7aa
 EBUILD powerman-2.3.ebuild 866 RMD160 f5dab15b065e9597c25b1a35437d128e5006cc0c SHA1 2d1334439771e52b4459c0958bd4617f67905559 SHA256 5e6539b7107805fbcc3dd84a3733a8510ad1002ac218d623af6e25f44b4fe655
-MISC ChangeLog 1172 RMD160 8eb84977961348ea73add5d33f5ef05ea27809d7 SHA1 9ad3b67c85c0abefa875a2458de1d8907e577224 SHA256 7769e929cb3304f81c91c412640a00e713e59cc96a64da62e0ee408a0cd03872
+MISC ChangeLog 1401 RMD160 f8da2ddc31520371cabb6faf8feb72c1eae21280 SHA1 7d3369b8b0b16e8d12534d73a75f5b564b34aae5 SHA256 0c63f703d083324367c2e82e4e57b4d66a83772e7e16622eac07c21fec2a72a2
 MISC metadata.xml 739 RMD160 33efe215f42c09d10c3b28134186f01db607f05b SHA1 4b416979b766e432665f1f2f3c3b1deeb1198f1a SHA256 87879045220843fcf095d00c06a21aa994fe3062c25b97a804cb0d9bf13c972d
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