Version bump, drop old, fix initscript

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-tuxonice i686)

4 files changed, 45 insertions, 57 deletions

diff --git a/sys-power/powerman/ChangeLog b/sys-power/powerman/ChangeLog
index 75bd288f5c63..71430b11a36e 100644
--- a/sys-power/powerman/ChangeLog
+++ b/sys-power/powerman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/powerman
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/ChangeLog,v 1.4 2008/10/20 15:08:34 weaver Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/ChangeLog,v 1.5 2009/01/03 06:00:47 weaver Exp $
+
+*powerman-2.3 (03 Jan 2009)
+
+  03 Jan 2009; weaver <weaver@gentoo.org> files/powerman,
+  -powerman-1.0.20.ebuild, +powerman-2.3.ebuild:
+  Version bump, drop v1.0.20, fix initscript pidfile
 
   20 Oct 2008; weaver <weaver@gentoo.org> powerman-2.2.ebuild:
   Add curl dep per bug 241424, thanks to flameeyes
diff --git a/sys-power/powerman/files/powerman b/sys-power/powerman/files/powerman
index 80f6a35cf1a5..e2285be45f8d 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.1 2008/09/12 18:14:52 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/files/powerman,v 1.2 2009/01/03 06:00:47 weaver Exp $
 
 depend() {
 	need net
@@ -9,12 +9,16 @@ depend() {
 
 start() {
 	ebegin "Starting powermand"
-	start-stop-daemon --start --exec /usr/sbin/powermand
+	start-stop-daemon --start \
+		--pidfile /var/run/powermand.pid \
+		--exec /usr/sbin/powermand
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping powermand"
-	start-stop-daemon --stop --exec /usr/sbin/powermand
+	start-stop-daemon --stop \
+		--pidfile /var/run/powermand.pid \
+		--exec /usr/sbin/powermand
 	eend $?
 }
diff --git a/sys-power/powerman/powerman-1.0.20.ebuild b/sys-power/powerman/powerman-1.0.20.ebuild
deleted file mode 100644
index 6bacc1903ba7..000000000000
--- a/sys-power/powerman/powerman-1.0.20.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powerman/powerman-1.0.20.ebuild,v 1.2 2007/04/23 19:45:06 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="PowerMan - Power to the Cluster"
-HOMEPAGE="http://www.llnl.gov/linux/powerman/"
-SRC_URI="ftp://ftp.llnl.gov/pub/linux/${PN}/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND="sys-devel/bison
-		dev-lang/perl"
-RDEPEND=">=sys-libs/freeipmi-0.2.3"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-new-yacc.patch
-	sed -i.orig \
-		-e "/^CFLAGS/s#-g#-g ${CFLAGS} #g" \
-		${S}/src/Makefile \
-		|| die "couldn't set custom CFLAGS"
-	sed -i.orig \
-		-e "s,PTHREAD_THREADS_MAX,32768,g" \
-		${S}/test/vpcd.c \
-		|| die "Couldn't set pthreads max"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 install \
-		DESTDIR="${D}" \
-		mandir="/usr/share/man" \
-		|| die "emake install failed"
-	rm "${D}"/etc/rc.d/init.d/powerman
-	newdoc scripts/powerman.init powerman_redhat_initd
-	dodoc ChangeLog DISCLAIMER NEWS TODO
-}
-
-# Sorry, you need to be root :-(
-#src_test () {
-#	cd ${S}/test
-#	for i in 64 4096 8192 16384 64t 4096t 8192t 16384t; do
-#		einfo "Testing mode: $i"
-#		emake -j1 run$i || die "Failed test: $ti"
-#	done
-#}
diff --git a/sys-power/powerman/powerman-2.3.ebuild b/sys-power/powerman/powerman-2.3.ebuild
new file mode 100644
index 000000000000..9f588df106e4
--- /dev/null
+++ b/sys-power/powerman/powerman-2.3.ebuild
@@ -0,0 +1,30 @@
+# 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.ebuild,v 1.1 2009/01/03 06:00:47 weaver Exp $
+
+EAPI="1"
+
+DESCRIPTION="RPC/PDU control and monitoring service for data center or compute cluster power management"
+HOMEPAGE="http://powerman.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="+httppower +genders"
+DEPEND="sys-devel/bison
+		httppower? ( net-misc/curl )"
+RDEPEND=">=sys-libs/freeipmi-0.2.3"
+
+src_compile() {
+	econf \
+		$(use_with httppower) \
+		$(use_with genders)
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install || die
+	rm -f "${D}/etc/init.d/powerman"
+	doinitd "${FILESDIR}/powerman" || die
+	dodoc AUTHORS ChangeLog DISCLAIMER NEWS TODO
+}