Version bump.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

3 files changed, 150 insertions, 5 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index c5951000871e..c25a00992b9d 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.74 2011/08/29 13:38:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.75 2011/09/29 13:45:58 flameeyes Exp $
+
+*apcupsd-3.14.10 (29 Sep 2011)
+
+  29 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +apcupsd-3.14.10.ebuild:
+  Version bump.
 
   29 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> apcupsd-3.14.7.ebuild,
   apcupsd-3.14.8-r1.ebuild, +files/apcupsd.init.2a:
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index eef090ae2aad..1b174d066fa0 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -6,18 +6,20 @@ AUX apcupsd-udev.rules 328 RMD160 359a2b9e275cdf16b9177224599791c786f93c98 SHA1
 AUX apcupsd.init.2 859 RMD160 81cd9edda39ec6f9cf048811df80d4f9dcd7055d SHA1 25c8134f09c362d6e82c5aa32e77a5f89c5eea1a SHA256 7007a2484547e46da2264d9f817a96387885e91a38407ec30e122ba4b637a030
 AUX apcupsd.init.2a 844 RMD160 13d0f7862c2a1d93a2349e7099f90216f8fe1056 SHA1 70e90bb3e3c1c3dd599a457efc0549627388322d SHA256 86be1bafb0cf72db61def444361c659e5c36d0e44b1a007772b3f49aa0e95bcb
 AUX apcupsd.powerfail.init 520 RMD160 24f766871652220523a18885f41f6608f29ab670 SHA1 0c5f97e556504904ffd6d72ff27ef792ac70e18c SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35
+DIST apcupsd-3.14.10.tar.gz 1336852 RMD160 bb01535232ee96045ee058ade70ddd39c04b5457 SHA1 4a3d5591672121f5d761d33307b56f10d33f5b67 SHA256 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032
 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
 DIST apcupsd-3.14.9.tar.gz 1334762 RMD160 be1a33b85c790fc3bc62bab370a62d014dbf0a57 SHA1 1e9e8a054f17c554c047ec1d7b363d35553058bc SHA256 0041f00b2e628056e668db7298d0af0ad501fe127e0c5c344eec9873a0988a92
+EBUILD apcupsd-3.14.10.ebuild 4070 RMD160 e50e826c9b4ac56f7e44f1787c9006b5e9c24cb6 SHA1 82634fa6ecc8bc892c52e6b995ae7efbcf68b1aa SHA256 fff8d4bb5152fdfc2d5ffb3efff8fd258fa4f177cf29974ff45bc09d2c9bec5b
 EBUILD apcupsd-3.14.7.ebuild 4054 RMD160 95babcf8551ca20746ac11ce3a77d32164c264d0 SHA1 11b79f99dd5e3549eaf2f208489db433d1acd2da SHA256 2271394fd3be4da222814cb4432824c94893139b888d23415642e08b8a99ae78
 EBUILD apcupsd-3.14.8-r1.ebuild 3867 RMD160 14e28cbf5f7fd5e22d67bcada9b8782bcc23c3c8 SHA1 6cd0248ce91c11ce9c2bc745e334b50b668ab5cc SHA256 6793b388e1fa30f52938caf4f37e326daa61790de3afe33bc402b325671b3dea
 EBUILD apcupsd-3.14.9-r1.ebuild 4064 RMD160 2a8a4819781c85ce821a0dce9a5a724ac0e21ceb SHA1 a9914ebae05b47899a56756e69b595ef58857ae1 SHA256 ac4d9701ea5eddf422f6771a8ece4f37966eb8db66fb60b14de01861a4bfb771
-MISC ChangeLog 25539 RMD160 7bef28e61f62086ed9efceeebf87615a4b16d6ea SHA1 c2748087804a36ea1c5ec0ef91602266ecb74360 SHA256 f4772aca44fc4b82fadd7b188f61504b106ae8460285df434be57d6c4f1a4ab6
+MISC ChangeLog 25671 RMD160 32d9c9a29f059416a509827f417af6ae3359cd05 SHA1 995ea2794714d5ebb7504f1f1f8d2ed2b6b4f360 SHA256 dc65d83e8227cd420b4c3c5b9221d241fcb9a91bd124d3e87f9c9ad709bfe8fe
 MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5blmYACgkQAiZjviIA2XjINgCgnmW/gOSDZBKQFUblYDS3hDvD
-QG8An0pysQm6QCK0cHv+IbQeih2xJ98H
-=OtNK
+iEYEARECAAYFAk6Edq8ACgkQAiZjviIA2XgFtwCcDQn4CQd28gfinAoTnAoGKzc6
+6qoAniL4hvMGdTt+p92DuiCMP3LZfee9
+=8ep7
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.10.ebuild b/sys-power/apcupsd/apcupsd-3.14.10.ebuild
new file mode 100644
index 000000000000..e984905745ec
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.10.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.10.ebuild,v 1.1 2011/09/29 13:45:58 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils linux-info flag-o-matic
+
+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="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="snmp +usb cgi nls gnome kernel_linux"
+
+DEPEND="
+	cgi? ( >=media-libs/gd-1.8.4 )
+	nls? ( sys-devel/gettext )
+	snmp? ( net-analyzer/net-snmp )
+	gnome? ( >=x11-libs/gtk+-2.4.0:2
+		dev-libs/glib:2
+		>=gnome-base/gconf-2.0 )"
+RDEPEND="${DEPEND}
+	sys-apps/openrc
+	virtual/mailx"
+
+CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
+ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
+ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
+
+pkg_setup() {
+	if use kernel_linux && use usb && linux_config_exists; then
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
+}
+
+src_configure() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
+	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
+}
+
+src_compile() {
+	# 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() {
+	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
+
+	dohtml -r doc/manual/*
+
+	rm "${D}"/etc/init.d/apcupsd
+	newinitd "${FILESDIR}/${PN}.init.2" "${PN}"
+	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
+
+	# remove hal settings, we don't really want to have it around still.
+	rm -r "${D}"/usr/share/hal
+
+	# replace it with our udev rules if we're in Linux
+	if use kernel_linux; then
+		insinto /lib/udev/rules.d
+		newins "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
+	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 "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
+		elog "Set up your ScriptAlias or symbolic links accordingly."
+	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 ""
+
+	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 ''
+
+	if use kernel_linux; then
+		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
+		elog "for persistent device naming. If you have multiple UPS"
+		elog "connected to the machine, you can point them to the devices"
+		elog "in /dev/apcups/by-id directory."
+	fi
+}