Let the init script handle creating /var/run/powerman wrt #450538. Convert from EAPI 1 to 5.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 22 insertions, 12 deletions

diff --git a/sys-power/powerman/ChangeLog b/sys-power/powerman/ChangeLog
index 075a6c2db0d4..c6288c45af07 100644
--- a/sys-power/powerman/ChangeLog
+++ b/sys-power/powerman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/powerman
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/ChangeLog,v 1.13 2014/05/12 10:14:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/ChangeLog,v 1.14 2014/05/12 10:19:16 ssuominen Exp $
+
+  12 May 2014; Samuli Suominen <ssuominen@gentoo.org> files/powerman,
+  powerman-2.3.9.ebuild:
+  Let the init script handle creating /var/run/powerman wrt #450538. Convert
+  from EAPI 1 to 5.
 
   12 May 2014; Samuli Suominen <ssuominen@gentoo.org> -powerman-2.3.4-r1.ebuild,
   -powerman-2.3.5.ebuild, -powerman-2.3.ebuild:
diff --git a/sys-power/powerman/files/powerman b/sys-power/powerman/files/powerman
index 3845d492aace..2abee8094795 100644
--- a/sys-power/powerman/files/powerman
+++ b/sys-power/powerman/files/powerman
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 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.3 2009/03/04 14:12:22 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/files/powerman,v 1.4 2014/05/12 10:19:16 ssuominen Exp $
 
 depend() {
 	need net
@@ -9,6 +9,9 @@ depend() {
 
 start() {
 	ebegin "Starting powermand"
+
+	checkpath -q -d -m 0755 /var/run/powerman
+
 	start-stop-daemon --start \
 		--pidfile /var/run/powerman/powermand.pid \
 		--exec /usr/sbin/powermand
diff --git a/sys-power/powerman/powerman-2.3.9.ebuild b/sys-power/powerman/powerman-2.3.9.ebuild
index 6c61b0ec938a..4d26608ddd37 100644
--- a/sys-power/powerman/powerman-2.3.9.ebuild
+++ b/sys-power/powerman/powerman-2.3.9.ebuild
@@ -1,36 +1,38 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/powerman-2.3.9.ebuild,v 1.1 2011/04/02 18:07:37 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/powerman-2.3.9.ebuild,v 1.2 2014/05/12 10:19:16 ssuominen Exp $
 
-EAPI="1"
+EAPI=5
 
 DESCRIPTION="RPC/PDU control and monitoring service for data center or compute cluster power management"
 HOMEPAGE="http://code.google.com/p/powerman/"
 SRC_URI="http://powerman.googlecode.com/files/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+httppower -snmppower -h8power +genders"
+
 DEPEND="sys-devel/bison
 	httppower? ( net-misc/curl )
 	snmppower? ( net-analyzer/net-snmp )
 	!app-accessibility/speech-tools"
 RDEPEND=">=sys-libs/freeipmi-0.2.3"
 
-src_compile() {
+src_configure() {
 	# 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" \
+	econf \
+		--localstatedir=/var \
 		$(use_with httppower) \
 		$(use_with snmppower) \
 		$(use_with h8power) \
 		$(use_with genders)
-	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" -j1 install || die
-	rm -f "${D}/etc/init.d/powerman"
-	doinitd "${FILESDIR}/powerman" || die
+	emake DESTDIR="${D}" -j1 install
+	rm -rf "${D}"/{etc/init.d/${PN},var/run}
+	doinitd "${FILESDIR}"/${PN}
 	dodoc AUTHORS ChangeLog DISCLAIMER NEWS TODO
 }