Fix bugs 515504, 515502

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

3 files changed, 154 insertions, 9 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 50baf309c9ce..620032390af6 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.101 2014/06/25 21:44:21 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.102 2014/07/03 21:28:45 mattm Exp $
+
+*apcupsd-3.14.12-r1 (03 Jul 2014)
+
+  03 Jul 2014; Matthew Marlowe <mattm@gentoo.org> +apcupsd-3.14.12-r1.ebuild:
+  Fix bugs 515504, 515502
 
   25 Jun 2014; Matthew Marlowe <mattm@gentoo.org> apcupsd-3.14.12.ebuild:
   Unmask apcupsd-3.14.12 for general testing, several weeks w/o bug reports -
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 32211e6703b5..4ab2ef3fe4f1 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -15,19 +15,20 @@ DIST apcupsd-3.14.10.tar.gz 1336852 SHA256 0707b5ec9916fbde9e44eb8d18037c8d8f75d
 DIST apcupsd-3.14.12.tar.gz 2014699 SHA256 1b4f703cb19cfdf44daf173dc8394cafd30fee0b30a0c75a7d19db622454a440 SHA512 2ed409ce4c7c7af667cecf0c73c47315d7516c696383c811945ead720afc146fe2ceda0efef722c3208a1b41a7d4661c9544bc4fe37a36ca4779a5dc1621f3d4 WHIRLPOOL 13a2491e4ad5446ba91a075f7408e48e94a35885288c9ee6108891d89412be5c81f69f4ab5064f86b8bece8c0de44357e4c378d05aad5d9d27bd85f0d95a83d5
 DIST apcupsd-3.14.8.tar.gz 1317601 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7 SHA512 07e6a15538bf1824b5063a1a93f33231639cf962e658c0dada1b244f2554af81824825d807ea81fd0388e25ed8fac0957621bfded96e3faeb7b594548fc4d418 WHIRLPOOL e5a580afc4955a373f020cb6e4ccbf07f9f020d4c15eaae59b416499c25a00b9d4bbc6af012bd2529024e8a3668a1d7c47f19f1bcb99f5ba60dc0108fa13c4f2
 EBUILD apcupsd-3.14.10-r6.ebuild 4244 SHA256 6d5865b612f1b8ee6f1cbb02b146c915e465c0ea1f9183e9eb081b941059de2a SHA512 3308a48a957fee3553af6129f3a6420f66980090edcd1aaa055e1f1e07c76a44c808ac5ecf0227457f035434e6d8b9c28b870152861e6780f874784bc0bb21b3 WHIRLPOOL a402630d880ea9f38bd0a365202677cfe7f5b6a630c5516aedb766a8e7b2972040a8c5424a4bb34018df9b970a13d3e2ea2d7d6da42e79eed9c44aaf91fbdea6
+EBUILD apcupsd-3.14.12-r1.ebuild 4136 SHA256 d5bafb2cf84d5a381f4d2e75aa172265e25fc1f9f56158e2bac693b3b8d8ba7c SHA512 04cb307cfeee88952936607a64e61edba5682887cb3e981719dba9da2c03d72dd5ba55ce492b54cb096149510d0a2e599aafedb3e0be2163e5ed583ef6aaf265 WHIRLPOOL 7c248c9c28b5250356508b11307058ba70d49ae230485decc42e0d2032c7491986edc7771841bd54dc6ca368763f5e5b9f23cdf187a754eb988cb887470c964f
 EBUILD apcupsd-3.14.12.ebuild 4202 SHA256 672c0a0ada37f9ba296a11963d2f50937442c530b41c402d513dad2fdb337059 SHA512 6fdfcbcdd3c26fad42176a663ddf5a2f727dcec55c364bd3dbdf89a41b525471df520110a42073d653464864821b23c5c33f20b00a006d45335301a3c6c64a08 WHIRLPOOL c31e09ed7de6b4fe2a342c2fa608e5b3779c52895c850b0d521c61a238dcc805894345113b53c64dcb116d99d9d4e6bf5c1b8968de99937d938f748251306f48
 EBUILD apcupsd-3.14.8-r1.ebuild 3863 SHA256 f5d984daecd4a0af67bdd5c44abeea7a4f47ed6ee94623e64e89116ff77e83b5 SHA512 5abc26eb6a258f39d7b4a617e87ee00a51c23aaeff76edd9fbc5a7b898552c5e1a270acd941d7e4d5818184d807e986da0593c239f6945c8d652867966197220 WHIRLPOOL 6ef00f538fdd0da2ac2639ece9e3209ba87190032c650cb003e7358e9f8e66f5255f58bacd0a59a7a16f17f2c393af4fb23eba14af403289444fc18d5b0140d4
 EBUILD apcupsd-3.14.8-r2.ebuild 4083 SHA256 0aeb575b8acfe8d51510a0b52b6c3aa4e22cdf7668949a5a3ba6591d6372f448 SHA512 d5d53f3de737241393362785e47380434ead0510e35f3fb47e4ca38d50b69024cd3bd8c8a35c3f519dfbddfd33cb12479f31f40af804e362e9e84e432d0f8882 WHIRLPOOL 01509edfd223ce2e524d1abdc63b9a3df401376229e533a0a5a0de5616623cc00aa562bc62cd072594f1f3e58ff924f959b7902698c79caa6cc4924223defcec
-MISC ChangeLog 29995 SHA256 87f78f3859281ea5bf7375027832cb3d8411fbbabbf85181b494015b588ae08c SHA512 65c23e69ca0dddae76054d3c74c9d3bdd0f7ceea173e1ab30f525675e62dd1dbb65f1ae637fae2d93ffc6a4aa9330975d486e5477bce769c19631f10fa417f4f WHIRLPOOL a09c798f9dace3706056f6fd3290f020b27d9388be9ad34b9ac518f9b96310f66778a8a052229c694aebc6472f8e326478d1e4874aab50167928039315244718
+MISC ChangeLog 30135 SHA256 6fba779680ddeb3dc44849c0156d162167b0c87becd447e132ab102a271523ce SHA512 06ff3f8e71fbbe334e805cc469c50735f3bd440e1769562dfffe93738b9c8073c3d40b725f7ee073c2eab858a0f3bb1176758495355cfc90e42cde6b2c4f51be WHIRLPOOL c2f451e139af32cc12ff2410ea6127c002008f240967eaf0c6ec97b32b890a6a78e3743032ef489bc35b491c1b8536191c1485dd87a35d6d62dff108edf2157e
 MISC metadata.xml 854 SHA256 ed821e0f70dad05d8ec1475d40654bb39a4d4ce0e9afb3901282dd05a3662cc5 SHA512 b3d9dbbb217711502dc36e1aca3c6efb18eb31a1f375241ed12a5e1312e19fd74e3659bb9bab3afd9eeff41de7f643a367a406bab09a1bce9d7f41b5e28da988 WHIRLPOOL 7ed63a7e8f4560fccc24d664e6d43c0a9b726b7c41cb1504753869633611968d3d4d29403b07dd0c17e40c8e368b01450d36cf44215906843ff70d505bd0fb7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTq0K8AAoJEC1LWXx4YDensxUH/1xRbSwHWNKmYF8OiysjKlO5
-6OtqpV1jW/TMtdkPJgEhCxHJxB8FXCjMcYQQKPOS81SPOmuQX3rMbdiwxsaVsxB1
-h1J5rRB8JPfpRDVLTXnnx1UR225AO4XzlEgi8cd8GX8o7p1ScVRufzkoz5SpIxP1
-UawRvIcForETVCK45ZLCgBMKv8m1GUwTdzD8/NhgZ7aNyhnERLcbibTO0vq0r4em
-ZD4eYVct9m83s9QM7HVxa+hWnVRr1CMRu1WO0+pthZRfB4EBI7SblGEjS4HorS6t
-0bGA0gwWHwCHk/fWukj6FbnK3vtDYvrSDSyxciNE1bE+aYMpSQewd9BMmuj/LE8=
-=myRI
+iQEcBAEBCAAGBQJTtcsfAAoJEC1LWXx4YDenCqQH/04Z5UwjvWdoXX7Via3Zlvxy
+SRWkzIKbDGKWcVgfTUUnoc9WzBIkMyj9Zp6u5LcoU8+zEkETIHyWdgUczwrf7ETB
+AqAOkyAb+SGWzznbS0UZxYBSw2L7MeiujufR4WqHPE5cza7+2zNrkZ7s9HdS13Aa
+k+IG6Ml4JAX6Q8N9b3TpFpdiHAex5Qmpe65JZMM0dnRgkacCaiM+af7ZKEojoAnL
+KHtlN/s/UnkDD483NBeXrVwPl1hCLHslBGVDu/lwGEqqM359bWg4COqFL3Dc7t59
+OW+6PXYMi4gPX8r+LahiZzrx7UdSjzCOYpb/zJp1gRx6dPnle1hkV4gWx23KqZg=
+=BHni
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild
new file mode 100644
index 000000000000..7b8107fa3723
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild,v 1.1 2014/07/03 21:28:45 mattm Exp $
+
+EAPI=4
+
+inherit eutils linux-info flag-o-matic systemd udev
+
+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 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE="snmp +usb cgi nls gnome kernel_linux"
+
+DEPEND="
+	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
+		  <=sys-apps/sysvinit-2.88-r4
+		  sys-freebsd/freebsd-ubin
+		)
+	cgi? ( >=media-libs/gd-1.8.4 )
+	nls? ( sys-devel/gettext )
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	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=/run/apcupsd \
+		--with-pid-dir=/run/apcupsd \
+		--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
+	doins "${FILESDIR}"/apcupsd.conf
+
+	dodoc ChangeLog* ReleaseNotes
+	doman doc/*.8 doc/*.5
+
+	dohtml -r doc/manual/*
+
+	rm "${D}"/etc/init.d/apcupsd
+	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
+	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
+
+	# 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
+		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
+	fi
+
+}
+
+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 with openRC."
+	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
+}