Bump 3.14.12 which will after extensive testing will hopefully become new stable.

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

4 files changed, 162 insertions, 8 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 176c48e741b8..e32b894fee14 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.98 2014/01/16 17:28:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.99 2014/06/06 01:34:13 mattm Exp $
+
+*apcupsd-3.14.12 (06 Jun 2014)
+
+  06 Jun 2014; Matthew Marlowe <mattm@gentoo.org> +apcupsd-3.14.12.ebuild,
+  apcupsd-3.14.8-r2.ebuild:
+  Bump 3.14.12 which will after extensive testing will hopefully become new
+  stable.
 
   16 Jan 2014; Jeroen Roovers <jer@gentoo.org> files/apcupsd.conf:
   Spelling.
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index a77fd40a34ee..1061fda21f2a 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -12,16 +12,22 @@ AUX apcupsd.init.4 1037 SHA256 65a29b842a99fe9751a3391bb705d881f989bbcf0da6e363e
 AUX apcupsd.powerfail.init 520 SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35 SHA512 d946d9b3427e0269d87aba1d6048cc4c73d767b1f5bc7d112718b82ec60076123e302dc0a73a4e5bbb7d1137ff78fc87a61983622a765341cfd7a79dcd0817ad WHIRLPOOL 1639496c976c6b654c20b953d675916636e44e7e3097696850bd202c91a9ffb713b398a86a2777b93472bccd3179aa83fb63ce43a1bbbe47e99f320ba8282a9c
 AUX apcupsd.service 111 SHA256 fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d SHA512 011e3e52e7909f36fb73b6064277a69e5db41263cfc72bda07e326172396d5318cd2b050f1fb84c4cc6da7a247c0035c36c55322ffb234a1cfa7bf13ba492889 WHIRLPOOL 940b6eb812c010f32b4bf54fd3e1b8d0a47890fd88acd8451bccbf6d17ab894915b179c110dda561c120e346ed20ca481f47761b9a5bac1e3b323457fbbc6f5a
 DIST apcupsd-3.14.10.tar.gz 1336852 SHA256 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032 SHA512 f95918bff783cb60fa40b03a532ee7447293b0542f44f2f9ecf36ee028df3aa414f01e2b834a28fc319d88ec2e84c81314cd546b5628554176f2ca47fdc66bbc WHIRLPOOL 1fb40a5199eb8dfcd287bab08c2bbf51f02a3657ba615e16395d5f377bc9a5b6144db24b83ef5e9172ff970a715f87f685118a035c00372c34702984fac02d38
+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 4212 SHA256 cd39e432002f22f29917201a3e90ca2e158dfe427c6d86183860c8a47b7793f5 SHA512 5d7886110c603fae736dc248453322535ba6925b8f3f706ed514ea59f0d2e9917eb24bf5a1f523657dba38bd2b49808591156b5db19237cf4c2f69dea74a8cdb WHIRLPOOL 97e4afb6646949cb03eb56972970e908789f99c0492c5492098213bbdf82baf2182f48a4b9849aa1b98b7bd0493637778d04b9727d82b2bfe05e4085a6068e21
+EBUILD apcupsd-3.14.12.ebuild 4142 SHA256 9514126a0ff6a9099fe1e649622478c24709853748271679bbbcbae4d24a428e SHA512 ea0f88ce9122bab6a8c0727197babd0710eca89abddb00f4730702a31a23fee76d09d4eb0126439de7aeef25446a7a835e99b56297d1bff0c88938f5d4e2a726 WHIRLPOOL 15709ad5997032abeed712c6800d6e91db504f3a3c99a6dfc610cac2b510bd0dcfec656595cbf84471e046aa26735842c5677577c64c641bcb2e2909ca259a11
 EBUILD apcupsd-3.14.8-r1.ebuild 3863 SHA256 f5d984daecd4a0af67bdd5c44abeea7a4f47ed6ee94623e64e89116ff77e83b5 SHA512 5abc26eb6a258f39d7b4a617e87ee00a51c23aaeff76edd9fbc5a7b898552c5e1a270acd941d7e4d5818184d807e986da0593c239f6945c8d652867966197220 WHIRLPOOL 6ef00f538fdd0da2ac2639ece9e3209ba87190032c650cb003e7358e9f8e66f5255f58bacd0a59a7a16f17f2c393af4fb23eba14af403289444fc18d5b0140d4
-EBUILD apcupsd-3.14.8-r2.ebuild 3967 SHA256 265246e7c590645e3063edd4ff626414e81399877334d3971ccd721a62ab5118 SHA512 5312cbd2bb3cd5c5e3df3ce1a966948f4d7ae6f114dc4f5552b964f82efc3811a2db97ff1380c31ea35ad25e90a795b1d835b071ae6ddf000bd8f87d5ea79607 WHIRLPOOL b99fa7a61786c697874d00c9220bedc9c7baadbc2be56e51c710accb10f953b71b5c8f7225db1276d4db558bb7acb07e771ef10c0a3a976de74b445a47bbc2d6
-MISC ChangeLog 29300 SHA256 47ee011b7415bc14cfa62ccadd597b30fccc9551f2e1e66620d4f21794b49435 SHA512 bf324f406d0f6c7b52e3536c859d7f56a4a80f0c357ef14788e94b96467da1821c964fa46256930db6fa518d9987090193481875ca61b095e97fce54439af3d5 WHIRLPOOL 3cb679d4961176a8a9a341f63549038aeff5ccf3cd4881d89595d36a5cc70ac528a9276d0933c1cab332d1cd78c4ffa1ff4055530249018bbfe2e94f32d94f35
+EBUILD apcupsd-3.14.8-r2.ebuild 3969 SHA256 795492e6dee97418e7a01a5ae4d639448a99a847a0c0ffbb2a79dca07628d95b SHA512 63f3857ea48a05ea42d66fe64b818ed35d5b1ec9c0b123b0cb73c572843e456238a78f3e476be83efeac509a450c3363803bdc3fc3888d11a4d02ccd028640df WHIRLPOOL 73dc1114911e07727e4a6f373d3e37fecd5d6e47ff37f78d179d6459d42c52e9c78910137c1f69c741e6e094c1bbd96d0be2aea4b764eae5ec45c9e379888a4a
+MISC ChangeLog 29524 SHA256 b233a4f3971f0771709a47177bd594c3aaadd1d9f7491557b1d1d73689825838 SHA512 947b00eed2757754dd0b93dbcb16af51102432aa3798de68510d4970d830cc37cb37087048169b083647f37aad244f71ba97ab98082bc3cf6b383b41ede90825 WHIRLPOOL 0be41c8aa611dc7f8bf6fbcdb38c93aca71f0bb2c811744ed3e03123a588ddc75fffe9d9c0e720085828057878a20a6fea4d3ac7b0655d66c574803033c3d199
 MISC metadata.xml 854 SHA256 ed821e0f70dad05d8ec1475d40654bb39a4d4ce0e9afb3901282dd05a3662cc5 SHA512 b3d9dbbb217711502dc36e1aca3c6efb18eb31a1f375241ed12a5e1312e19fd74e3659bb9bab3afd9eeff41de7f643a367a406bab09a1bce9d7f41b5e28da988 WHIRLPOOL 7ed63a7e8f4560fccc24d664e6d43c0a9b726b7c41cb1504753869633611968d3d4d29403b07dd0c17e40c8e368b01450d36cf44215906843ff70d505bd0fb7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLYFrgACgkQVWmRsqeSphPcCgCfXpv5ohuOrze7seYa7xP347It
-VMsAn2flmEjqYe1CUHxh2ijyAb0VrOyP
-=dqqK
+iQEcBAEBCAAGBQJTkRqeAAoJEC1LWXx4YDensQsH/0gJDq7ZPOVgIzjLKbaQ4hy9
+7QdOox+bvblG1CtXgFJFJpR4rP/jrA77eGftVi4Y228ihgHQ6UUD11dMEDqhSUMn
+aT6UJN1quQPHYGbISnhD0OFpKz5CZBNkiJvkEfgu38EJQtAQEPillHdsg6e09ckD
+T0/ClqimdpwNqwYbSYmmoq/J+n8nUv5lsqdf2kb5ME8AfrCZiTI5ZN546DZYFs7T
+DpdOsAjAQ003bDiEwHmk1OGDfPubhIgwj6VWW7jW4YIyO408Fiuxbe6I3SEyvx0u
+ifRqLRaIEdQmZts6bcDNVsGjwufEdPTb6a+wEvObeab3Q99Wa2yLSlxr6/s/7NQ=
+=YP5E
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.12.ebuild b/sys-power/apcupsd/apcupsd-3.14.12.ebuild
new file mode 100644
index 000000000000..979140b43be2
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.12.ebuild
@@ -0,0 +1,141 @@
+# 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.ebuild,v 1.1 2014/06/06 01:34:13 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=""
+IUSE="snmp +usb cgi nls gnome kernel_linux"
+
+DEPEND="
+	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
+		  <=sys-apps/sysvinit-2.88-r4
+		)
+	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"
+	if use snmp; then
+		epatch "${FILESDIR}/${PN}-snmp-5.7.2.patch"
+	fi
+}
+
+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
+}
diff --git a/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild
index 37d180eee2bb..80f81541a677 100644
--- a/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.8-r2.ebuild,v 1.4 2013/12/21 17:22:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild,v 1.5 2014/06/06 01:34:13 mattm Exp $
 
 EAPI=3