Version bump.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 150 insertions, 6 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 049e33dead81..d94d0d8f6fdf 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.62 2009/12/29 18:47:52 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.63 2010/01/17 23:35:10 flameeyes Exp $
+
+*apcupsd-3.14.8 (17 Jan 2010)
+
+  17 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +apcupsd-3.14.8.ebuild:
+  Version bump.
 
   29 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   -apcupsd-3.14.6.ebuild:
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 38faa7a51677..e85561eb7f99 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -4,13 +4,15 @@ Hash: SHA1
 AUX apcupsd.init.2 838 RMD160 fdca4e15d5f475c43147ce65624a4355e6ed9279 SHA1 b34596c601f368ed5028d661f7dd79630bfef4a9 SHA256 9c60e920d5946ff581b38c33087ec6a1ed7d8885bc2c9c5621932f5e7c8571d3
 AUX apcupsd.powerfail.init 520 RMD160 24f766871652220523a18885f41f6608f29ab670 SHA1 0c5f97e556504904ffd6d72ff27ef792ac70e18c SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35
 DIST apcupsd-3.14.7.tar.gz 4272089 RMD160 cb3db3e6e123f39666eef3c5ccfdec65c57a1571 SHA1 9561eb5cf8e0c627215b987dbb97d026a2b2e9b8 SHA256 7e3df3b5552394206f4b8aaac2bd85ac69df540495557676a3df63f84972823c
+DIST apcupsd-3.14.8.tar.gz 1317601 RMD160 f642582e01506ebb986c16df01429e6bb08c7e8b SHA1 cb7a7b401797e129c92a6b8dc2bf7b193b1d6c72 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7
 EBUILD apcupsd-3.14.7.ebuild 4069 RMD160 10b51601cd82cb40f45e2a109e721d2d62f21288 SHA1 ade2461ea230b0e103f93e3bc123f95f3546b7b1 SHA256 d9c7823f9f355b95885be3892fd1d687737627451e766eb84afa76a09812c4c7
-MISC ChangeLog 23137 RMD160 22e46f5bfda0f79c81cd1613fe6e23bc9c96f432 SHA1 7493c556e8fc75ec8ade7c6279c45e90063d0c48 SHA256 4518e23a8cfbf5297bd451c414cd5d08f791528b2fa0e9d369eb8f745234e200
+EBUILD apcupsd-3.14.8.ebuild 4075 RMD160 4db4d3e7bf2e9883cf969614e35d3747a33f7cdd SHA1 abe975929de8ce7aa05eb837f400032622dd0d8b SHA256 d3bf0f7f303860e00a805f3697103833a43ca62f0fb84164c60997374c94e173
+MISC ChangeLog 23267 RMD160 867ae72bb7b3198c3dad178b42689b5d6e34a70c SHA1 4d0ce22b2d4d5a5bc489856bc501d887a8aa507c SHA256 6cde11ef5eabafde0cde19a9f621aab00848e274bc725c8b5bcb61e2a4d22fa4
 MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAks6TuMACgkQAiZjviIA2XgVSgCgvopSj/7rIgsR63+CKKW4VoHY
-ehoAn1LMBxq2+paWZtJXnBMOr1EMgrCD
-=1/eb
+iEYEARECAAYFAktTnm8ACgkQAiZjviIA2XikpACfbfjV1DO7QMvio/Lqt/PxZTlt
+NzsAnRb1IF+HRPFua2huqq80Zq11Fl3R
+=IgdK
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.8.ebuild b/sys-power/apcupsd/apcupsd-3.14.8.ebuild
new file mode 100644
index 000000000000..2a3ce99fa824
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.8.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.8.ebuild,v 1.1 2010/01/17 23:35:10 flameeyes Exp $
+
+WEBAPP_MANUAL_SLOT="yes"
+WEBAPP_OPTIONAL="yes"
+inherit eutils webapp linux-info
+
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.apcupsd.org/"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="snmp usb cgi nls gnome kernel_linux"
+
+DEPEND="
+	cgi? ( >=media-libs/gd-1.8.4
+		${WEBAPP_DEPEND} )
+	nls? ( sys-devel/gettext )
+	snmp? ( net-analyzer/net-snmp )
+	gnome? ( >=x11-libs/gtk+-2.4.0
+		>=dev-libs/glib-2.0
+		>=gnome-base/gconf-2.0 )"
+RDEPEND="${DEPEND}
+	virtual/mailx"
+
+pkg_setup() {
+	use cgi && webapp_pkg_setup
+
+	if use kernel_linux &&
+		use usb &&
+		linux_config_exists &&
+		!linux_chkconfig_present USB_HIDDEV; then
+		ewarn "Note: to be able to use the USB support for ${PN} you're going to need"
+		ewarn "the CONFIG_USB_HIDDEV option enabled in your kernel."
+		ewarn "The option hasn't been found enabled, do so before trying to use"
+		ewarn "${PN} with USB UPSes."
+	fi
+}
+
+src_compile() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=${MY_CGIBINDIR}"
+	if use usb; then
+		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
+	else
+		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
+	fi
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	econf \
+		--sbindir=/sbin \
+		--sysconfdir=/etc/apcupsd \
+		--with-pwrfail-dir=/etc/apcupsd \
+		--with-lock-dir=/var/lock \
+		--with-pid-dir=/var/run \
+		--with-log-dir=/var/log \
+		--with-nis-port=3551 \
+		--enable-net --enable-pcnet \
+		--with-distname=gentoo \
+		$(use_enable snmp net-snmp) \
+		$(use_enable gnome gapcmon) \
+		${myconf} \
+		APCUPSD_MAIL=/bin/mail \
+		|| die "econf failed"
+
+	# Workaround for bug #280674; upstream should really just provide
+	# the text files in the distribution, but I wouldn't count on them
+	# doing that anytime soon.
+	MANPAGER=$(type -p cat) \
+		emake || die "emake failed"
+}
+
+src_install() {
+	use cgi && webapp_src_preinst
+
+	emake DESTDIR="${D}" install || die "installed failed"
+	rm -f "${D}"/etc/init.d/halt
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+
+	dodoc ChangeLog* ReleaseNotes
+	doman doc/*.8 doc/*.5 || die "doman failed"
+
+	dohtml -r doc/manual/* || die "dodoc failed"
+
+	use cgi && webapp_src_install
+
+	rm "${D}"/etc/init.d/apcupsd
+	newinitd "${FILESDIR}/${PN}.init.2" "${PN}" || die "newinitd failed"
+
+	if has_version sys-apps/openrc; then
+		newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed"
+	fi
+
+	# Without this it'll crash at startup. When merging in ROOT= this
+	# won't be created by default, so we want to make sure we got it!
+	keepdir /var/lock
+	fowners root:uucp /var/lock
+	fperms 0775 /var/lock
+}
+
+pkg_postinst() {
+	if use cgi; then
+		elog "If you are upgrading from a previous version, please note"
+		elog "that the CGI interface is now installed using webapp-config."
+		elog "/var/www/apcupsd is no longer present."
+		webapp_pkg_postinst
+	fi
+
+	elog ""
+	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
+	elog "control more than one UPS in a single box."
+	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
+	elog "/etc/init.d/apcupsd.something, and it will then load the"
+	elog "configuration file at /etc/apcupsd/something.conf."
+	elog ""
+
+	if [ -d "${ROOT}"/etc/runlevels/shutdown -a \
+			! -e "${ROOT}"/etc/runlevels/shutdown/"${PN}".powerfail ] ; then
+		elog 'If you want apcupsd to power off your UPS when it'
+		elog 'shuts down your system in a power failure, you must'
+		elog 'add apcupsd.powerfail to your shutdown runlevel:'
+		elog ''
+		elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
+		elog ''
+	fi
+}
+
+pkg_prerm() {
+	use cgi && webapp_pkg_prerm
+}