Version bump, add warnings for USB support on Linux (bug #278532).

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

3 files changed, 138 insertions, 5 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index cc5acbb28ba1..2f7f819c1cb8 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.49 2009/06/16 14:05:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.50 2009/08/04 11:36:02 flameeyes Exp $
+
+*apcupsd-3.14.7 (04 Aug 2009)
+
+  04 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +apcupsd-3.14.7.ebuild:
+  Version bump, add warnings for USB support on Linux (bug #278532).
 
   16 Jun 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 757b34d0d6ac..7dbd128a1824 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -17,16 +17,18 @@ DIST apcupsd-3.10.18.tar.gz 5698299 RMD160 ebaf99e097d836ff8858cf653a825928058f5
 DIST apcupsd-3.12.4.tar.gz 4223158 RMD160 a54c2f6d71c902d7963a1c65a3850f657aabaa88 SHA1 a36212d9634d36beda2318d85b882209763f2473 SHA256 e2c789089a71f8bafc2812a5e20b73f5420e4c234961afb53a30f6ff891640ba
 DIST apcupsd-3.14.5.tar.gz 4172931 RMD160 76dadfb241b69a9603cc6f06ef4549a1aa3ac55e SHA1 c28685a2ccd0565b4c5d9e972773b18a915562a9 SHA256 f48a75139d5701d13444128da6f9f6feea04da8524e8ba3bce2c21bdbedba49e
 DIST apcupsd-3.14.6.tar.gz 4269348 RMD160 67ff929e10373661545c588a7fba630ffdfe3ab9 SHA1 19d33626a7002f86ede5d1784697b08dacb3fc6c SHA256 ddfeb4dd90a5c6d4cc8a487492efeb75f8c3ce1c955948bde97cebad51e8d1a3
+DIST apcupsd-3.14.7.tar.gz 4272089 RMD160 cb3db3e6e123f39666eef3c5ccfdec65c57a1571 SHA1 9561eb5cf8e0c627215b987dbb97d026a2b2e9b8 SHA256 7e3df3b5552394206f4b8aaac2bd85ac69df540495557676a3df63f84972823c
 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-r2.ebuild 3617 RMD160 dc84a19b8477dcd42f27a8687c6cca09c012e057 SHA1 7bc8fb4ba7bd67fe7a19581dc7699c2508bf8467 SHA256 f4fff08cbab19b0006944258e5f57411c6117a3503791ecb060fc23421f269a3
 EBUILD apcupsd-3.14.6.ebuild 3291 RMD160 d0ebc2f2e1013f30f076c2045a20119a11f198cb SHA1 76e466e9ceac0f7afaac5486061110314f6ac8f5 SHA256 6c1690b5317b12921dc7181fdd17aea12d4bf64a64782d51fe1a7c7b75b973e3
-MISC ChangeLog 21092 RMD160 180a6a8979d1f2331f760afab33008a5a2635baf SHA1 23cf3fc9b94a3c4705ed5455821940e4eb9a53ae SHA256 d6e28265d586dcf23f8c537fe4f131e9c8d6fc1254eaccf3c34f6cc38525c7fa
+EBUILD apcupsd-3.14.7.ebuild 3677 RMD160 a49a156e1a9ae603ece9d206bf12c02269da0f85 SHA1 6b877c640ccdd3b3a3646111c4089913194d5b4b SHA256 8761011cdeb87fcbe3075e951a505563b2dc5028c7694186d2df501a95972ecf
+MISC ChangeLog 21275 RMD160 b78e853c7140950254982a7e3d29cd843ba0b971 SHA1 18abfb54b5c90b1d34bdeb2e0c5f866355253302 SHA256 4ff5d03e8bc463e7341cc0009234a191e4363b255f4b5d1e2d28f5b583019892
 MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko3prYACgkQAiZjviIA2Xh7PACfXQi8dKzuOGMWPvUwQaq0thtY
-CEIAoI6y1i0OHgexadxr6vZquvOg9+B0
-=k43G
+iEYEARECAAYFAkp4HSgACgkQAiZjviIA2XjPrwCdFkE7Aej4j/sy3IxNI2Ckgy3i
+pdsAoIYBWyuzagDQd31hj7v6SIh05Y/Y
+=CSZb
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.7.ebuild b/sys-power/apcupsd/apcupsd-3.14.7.ebuild
new file mode 100644
index 000000000000..05ee14bf4c00
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.7.ebuild
@@ -0,0 +1,125 @@
+# 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.7.ebuild,v 1.1 2009/08/04 11:36:02 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"
+	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
+}
+
+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
+}