Ebuild cleanup, use emake -j1 for doc building, use newman rather than mv+doman, die on some failure cases and most importantly remove the ncurses USE flag since powerflute is gone from upstream.

(Portage version: 2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64)

2 files changed, 19 insertions, 13 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 066b205ce0ff..aacd9a4a5684 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.39 2009/01/15 15:37:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.40 2009/01/17 13:08:17 flameeyes Exp $
+
+  17 Jan 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  apcupsd-3.14.5.ebuild:
+  Ebuild cleanup, use emake -j1 for doc building, use newman rather than
+  mv+doman, die on some failure cases and most importantly remove the
+  ncurses USE flag since powerflute is gone from upstream.
 
   15 Jan 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/3.10.15/apcupsd.in.patch, -files/3.10.15/smtp.patch,
diff --git a/sys-power/apcupsd/apcupsd-3.14.5.ebuild b/sys-power/apcupsd/apcupsd-3.14.5.ebuild
index 2099d5cb880d..34da8ea2a816 100644
--- a/sys-power/apcupsd/apcupsd-3.14.5.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.5.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/apcupsd/apcupsd-3.14.5.ebuild,v 1.2 2009/01/15 15:37:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.5.ebuild,v 1.3 2009/01/17 13:08:17 flameeyes Exp $
 
 WEBAPP_MANUAL_SLOT="yes"
 WEBAPP_OPTIONAL="yes"
@@ -13,12 +13,12 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc snmp usb cgi ncurses nls gnome"
+IUSE="doc snmp usb cgi nls gnome"
 
-DEPEND="doc? ( virtual/latex-base dev-tex/latex2html )
+DEPEND="doc? ( virtual/latex-base
+		dev-tex/latex2html )
 	cgi? ( >=media-libs/gd-1.8.4
 		${WEBAPP_DEPEND} )
-	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	snmp? ( net-analyzer/net-snmp )
 	gnome? ( >=x11-libs/gtk+-2.4.0
@@ -42,7 +42,7 @@ src_compile() {
 
 	# We force the DISTNAME to gentoo so it will use gentoo's layout also
 	# when installed on non-linux systems.
-	APCUPSD_MAIL=/bin/mail econf \
+	econf \
 		--sbindir=/sbin \
 		--sysconfdir=/etc/apcupsd \
 		--with-pwrfail-dir=/etc/apcupsd \
@@ -52,17 +52,17 @@ src_compile() {
 		--with-nis-port=3551 \
 		--enable-net \
 		--with-distname=gentoo \
-		$(use_enable ncurses powerflute) \
 		$(use_enable snmp net-snmp) \
 		$(use_enable gnome gapcmon) \
 		${myconf} \
-		|| die
+		APCUPSD_MAIL=/bin/mail \
+		|| die "econf failed"
 	emake || die "emake failed"
 
 	if use doc; then
 		einfo "Building full documentation..."
 		cd "${S}"/doc/latex
-		make texcheck tex web pdf
+		emake -j1 texcheck tex web pdf || die "doc build failed"
 	fi
 }
 
@@ -76,12 +76,12 @@ src_install() {
 	newins examples/safe.apccontrol safe.apccontrol
 
 	dodoc ChangeLog* ReleaseNotes
-	mv doc/apctest.man doc/apctest.8; doman doc/apctest.8
+	newman doc/apctest.man apctest.8 || die "newman failed"
 
 	if use doc; then
 		einfo "Installing full documentation..."
-		newdoc doc/latex/apcupsd.pdf manual.pdf
-		dohtml -r doc/latex/apcupsd/*
+		newdoc doc/latex/apcupsd.pdf manual.pdf || die "pdf doc failed"
+		dohtml -r doc/latex/apcupsd/* || die "doc install failed"
 	fi
 
 	if use cgi; then
@@ -90,7 +90,7 @@ src_install() {
 	fi
 
 	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.2" "${PN}"
+	newinitd "${FILESDIR}/${PN}.init.2" "${PN}" || die "newinitd failed"
 }
 
 pkg_postinst() {