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.

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64

3 files changed, 24 insertions, 18 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/Manifest b/sys-power/apcupsd/Manifest
index 5bb9f20f1e9e..0fa1f65de0db 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -17,13 +17,13 @@ DIST apcupsd-3.12.4.tar.gz 4223158 RMD160 a54c2f6d71c902d7963a1c65a3850f657aabaa
 DIST apcupsd-3.14.5.tar.gz 4172931 RMD160 76dadfb241b69a9603cc6f06ef4549a1aa3ac55e SHA1 c28685a2ccd0565b4c5d9e972773b18a915562a9 SHA256 f48a75139d5701d13444128da6f9f6feea04da8524e8ba3bce2c21bdbedba49e
 EBUILD apcupsd-3.10.18-r1.ebuild 2614 RMD160 4136189b375cdd5b50fa1e98bcff757406ea8e66 SHA1 de25eb0d627ca017c4f5d27119ffaba709125735 SHA256 f5004d36d0c5a41df6c4fa9fe5e2cc3c49894a7aef927e79cfb72a1cce04ee39
 EBUILD apcupsd-3.12.4.ebuild 3028 RMD160 257a1dcc849ba616569693b7fb685c7be4a5d6f8 SHA1 41a0e20c82b02fe9158f3a45bd816fa66c4ac46a SHA256 86c0a2f5ffe869f5ea0db0220264d1109dcab7f4c395533e8dd5c87c478b59c9
-EBUILD apcupsd-3.14.5.ebuild 3133 RMD160 c2dec50ee085ac5c56c80a8700f56fede8a4b9b9 SHA1 0e6117d14140d02202bb0c9bd99c7e23521f8df6 SHA256 7a5d5afad6fe1817869efd03890b6fe3b0ea2cc7020740cfa6eab72b4a361b4c
-MISC ChangeLog 19263 RMD160 b7237e109cb19b33a65efcd908e1fe892979ff55 SHA1 09e39fddd6db927e5f3cc002058b5173061d4fe4 SHA256 37977d83be0739699b86e1a6437842b7e0254c3cb0a839912c4278faffa7b26c
+EBUILD apcupsd-3.14.5.ebuild 3188 RMD160 765faff516e179c813c993a9b9ade496481035de SHA1 dd9e55d848ab7e9371225d1403ffbed8f1db0187 SHA256 27b7b7f7adafc58ac3e820b2c91db2618bb26a2afd9bf4190e863c50c2cd235b
+MISC ChangeLog 19547 RMD160 116cd3c0a438cf198bb60da5ff9029e5f3dca515 SHA1 5a78fdf5238ffc8226f07d2eb88f5550b1e02a46 SHA256 43c86cd74441701e786ad45bb286aa13a77017a238923087d156f67ef47ec06c
 MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklvWCoACgkQAiZjviIA2XgyXQCdFcyo3iRcDssNFY/JTqB8v5hF
-lIcAoMN3yvwV6rAgOZ+SAoq7k8vRSz2E
-=Zoxz
+iEYEARECAAYFAklx2FsACgkQAiZjviIA2XiIEQCg5zBufYGDagTxRcgrAn4IXepy
+YvMAoJRV8gBoFUSmeMCKu35IFWZVYDVW
+=wt0L
 -----END PGP SIGNATURE-----
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() {