Removing older non-stable ebuilds, apcupsd 3.4.10-r5 keyworded for user testing

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

6 files changed, 18 insertions, 429 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index a77a4a915a43..8921330cb92e 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.89 2013/10/21 22:01:49 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.90 2013/10/22 20:24:22 mattm Exp $
+
+  22 Oct 2013; Matthew Marlowe <mattm@gentoo.org> -apcupsd-3.14.10-r1.ebuild,
+  -apcupsd-3.14.10-r2.ebuild, -apcupsd-3.14.10-r4.ebuild,
+  apcupsd-3.14.10-r5.ebuild:
+  Removing older non-stable ebuilds, apcupsd 3.4.10-r5 keyworded for user
+  testing
 
 *apcupsd-3.14.10-r5 (21 Oct 2013)
 
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 6f617de8bfda..3e0ff75173d3 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -13,22 +13,19 @@ AUX apcupsd.powerfail.init 520 SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc053
 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.8.tar.gz 1317601 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7 SHA512 07e6a15538bf1824b5063a1a93f33231639cf962e658c0dada1b244f2554af81824825d807ea81fd0388e25ed8fac0957621bfded96e3faeb7b594548fc4d418 WHIRLPOOL e5a580afc4955a373f020cb6e4ccbf07f9f020d4c15eaae59b416499c25a00b9d4bbc6af012bd2529024e8a3668a1d7c47f19f1bcb99f5ba60dc0108fa13c4f2
-EBUILD apcupsd-3.14.10-r1.ebuild 4060 SHA256 8bd603ca14f6e42a573559d8588354240f74a4eff4b4cab7d62f460320e06fd8 SHA512 6b37efe12be278bce4b6bf7a17c88641bfe13c8304c383112a3309fca33609ca9d02ede3b6c23ed325064878da6e4c8f441ad39e92e68d791fd6348c228f0ca3 WHIRLPOOL 470e178eff2d7e1dcdc19e1860396dd9ca494f10d6e15ab60a9635b763b0f60192a883bec5a5c60ccc00fc3f48aa0035117804384d03d17b8e1cc23be949d579
-EBUILD apcupsd-3.14.10-r2.ebuild 4177 SHA256 3ee47fde9a2f7be55208b2f2bbe88fe1cdf57c21783486195e7a904d476bf680 SHA512 af68e532b23719323a88e61e222eb48b5502d022d6d1ea21d56352edbe5cfeeb844b483d77c451940b6eb01c713bcc206b4365369bda7082794cdc327b2e3d0e WHIRLPOOL 54c92f7dffea8841af85867173c36cd361732a0e4ef90f3020c5e2ed7a8078eb2e1157441c2510b234cb7fdb04ee4b36b29dfb296d9227ebe8aa1bc968015599
-EBUILD apcupsd-3.14.10-r4.ebuild 4114 SHA256 5ecdb6f31dafdfed58c9b4a13d55fca0190c63e28a9441bffc013862cefc7bf7 SHA512 18d6c6e5661e1ad4f6054c7af36080d0112215d3cb38fc2d0b02aebbe30c88751798637b4d880d3214da7c70b00849d021a69ba6dd6b77bcc69e8396288bcf1c WHIRLPOOL 91f972a1f3fa5c62c705b48eb241a3fd4bfa5a9d4a5127abd4ccaf034ac351da59b2b05c06151c864eb9d9f9f6294639f13405fcaf7c9714e980a9e5ed571e4f
-EBUILD apcupsd-3.14.10-r5.ebuild 4189 SHA256 1346d8205d38a760a1b0db0745b33284f132f2f0dff2b82093c7c4c1ee09f157 SHA512 492ae965a737fd6356cee2783230fd8310f01a40bbd9d71e28332a2c3afba10123362d438a9bdc8422ff7289fb0a2872718fa92f2d7875c7f813198dcd4f71f1 WHIRLPOOL 66d66e012978737d52c723ff1a1f63713fbbe738a37d4f8268c502c53a9f46800bc77a1a7ecb01e2fa1d16d4b882ca90c971f798b53c2c86024058e0740f4f4b
+EBUILD apcupsd-3.14.10-r5.ebuild 4215 SHA256 b6e8dd0a26f5cf795cba831afd3b96adf5ad766f9492be53d568f8e3c61dddd0 SHA512 eccc90c653c95cee3640d1d3c46437ac5059763bf7bd4e4a0c8ae235836160b45698d0c9e90e65b6733dd91d6ebfdd86b62bdbadf50e4941e8794d7cc6f91a95 WHIRLPOOL 2dd731b3de058a1c3d78336430fb9de11987c292c45e7169f453b9e87ab25eff885c824535ec69310ba8c25dcd822349cc927192ff9501fc47ff4e771501d921
 EBUILD apcupsd-3.14.8-r1.ebuild 3863 SHA256 f5d984daecd4a0af67bdd5c44abeea7a4f47ed6ee94623e64e89116ff77e83b5 SHA512 5abc26eb6a258f39d7b4a617e87ee00a51c23aaeff76edd9fbc5a7b898552c5e1a270acd941d7e4d5818184d807e986da0593c239f6945c8d652867966197220 WHIRLPOOL 6ef00f538fdd0da2ac2639ece9e3209ba87190032c650cb003e7358e9f8e66f5255f58bacd0a59a7a16f17f2c393af4fb23eba14af403289444fc18d5b0140d4
 EBUILD apcupsd-3.14.8-r2.ebuild 3971 SHA256 a7af0acd9407a8cf3cc2fd63ed2cd5da9383851a4f10468172b7a36ab5c4e1a4 SHA512 3b9d84a81201082b2bb414eb636b4dffda717644bfbaf55b8a44c2e56443819396669b11d04688c0728a225b7c8fc4bac5295d885d1aa41cc5e6fbb52188019b WHIRLPOOL 0c3d429d30c668cec53617b208b1c18327e24788d0fb9ba936ba925ac2a496170c9ab0bae3570fdc8eed0c859585942f417d3c8e3064bc23e0da521c4cee4249
-MISC ChangeLog 27910 SHA256 9e6fec74f18afae908d24cd213347535475d0cdc1a075517e6b0e826b182bdf0 SHA512 db9513c45278a2852a88ffb9ee9c8861c6adf4c4acd3b94a027a9f88598745b450311461107c10db537b472234a22460f8a721389611681f2b7fe94699dd9986 WHIRLPOOL f66cffbb43b4d0ef0607113ee4d0208eeb48018817570471e4c91c85d23085faf1ad50cd2da8d856233cc07b56b665f7ab1eb7fa150fb4e2d7f208e5a85144cb
+MISC ChangeLog 28160 SHA256 c4624d0c701ddc030df8ccaf1ee2e694c14b40e28677f374e80a3b06439ed1c2 SHA512 3f48084a8f5883247931303f41956dd75ea3bef3f6b290c01d93903940dce10bd9862c6e41e7c72227e5962ede5744b22b09815e0cc17d4f40cb1e5a963ce00e WHIRLPOOL 42080a296f49b7e49cebfbf33ce3fffbc3d09288a389107361aadbf39ca2279ea99687f26303749f0e8c71bbea48be027b4e5f5fc8357b85c2a1fa01995d090b
 MISC metadata.xml 854 SHA256 ed821e0f70dad05d8ec1475d40654bb39a4d4ce0e9afb3901282dd05a3662cc5 SHA512 b3d9dbbb217711502dc36e1aca3c6efb18eb31a1f375241ed12a5e1312e19fd74e3659bb9bab3afd9eeff41de7f643a367a406bab09a1bce9d7f41b5e28da988 WHIRLPOOL 7ed63a7e8f4560fccc24d664e6d43c0a9b726b7c41cb1504753869633611968d3d4d29403b07dd0c17e40c8e368b01450d36cf44215906843ff70d505bd0fb7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSZaRVAAoJEC1LWXx4YDenHJ4IAIAFf6gvDjW2nOj+TEcgrQWK
-6yP8vdG7W3t2hH679z4S/kpj9We7pWLjZtGEMwupHZLWjvBz/FMcY8nVe2LXFhz9
-wy9QDT/1leqPMEsxg4Gdghl3+P2ZQ2dvYCaPGJ+umFJkfS/fF7Fabfnhw5cE8IBu
-zCk70udCm8mO2MUqanPFmOoKfmG3HuGgRahBuwWXPEe+bsSb/Fn3yiNadsboMqe0
-gd+g2sOVZU2O7fH4FqeEn/QHf3tqTKPCgo2JbzvPT5+SE+TTRvpsmM105He3HClm
-pW3xu70OcysRx8nVXV1C/mm4aG1Xn+Npcgnh55LPFbISUisb4U13d91pM43sUlA=
-=dCNR
+iQEcBAEBCAAGBQJSZt8AAAoJEC1LWXx4YDenH2gH/jhh+9UHOAfDHOLwOQFUuHLI
+bcXYIq/th17g9iPSs28JoFpsyDNViFA5gShCUfhTH6p57wU7rI12/X4uwjr5cOp2
+1/XwwB3BnDRBNOFJAViCcwcVaepwY5HEeQ/cy4/kxUU4uu8jw/thBfY5WTzowCUZ
+KzJZPj4n3I3435jKgsuqQbNsRsyTUvkYB5nFITpATCngcIkuA3aRWWprREid1oQe
+XYRQWs9Sc39nuonBRamyTWQ53k0q4ZiAnVto7xuX+U9xCv5m9xMoiniUI5OWMcdf
+iIkSbM8U/j0hVNXeqpQCFLO0hw7BYy5iXBohSTnzuJxWQtx3EkVvUDblWu/VOPs=
+=Ku3R
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.10-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.10-r1.ebuild
deleted file mode 100644
index 9c0fc4ebe05e..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.10-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2013 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-r1.ebuild,v 1.3 2013/03/26 14:54:47 floppym Exp $
-
-EAPI=4
-
-inherit eutils linux-info flag-o-matic 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="
-	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.3" "${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
-		udev_newrules "${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
-}
diff --git a/sys-power/apcupsd/apcupsd-3.14.10-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.10-r2.ebuild
deleted file mode 100644
index 3bf8bea57144..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.10-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2013 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-r2.ebuild,v 1.1 2013/08/31 12:46:20 pacho 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="
-	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.3" "${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
-
-	# 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 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.10-r4.ebuild b/sys-power/apcupsd/apcupsd-3.14.10-r4.ebuild
deleted file mode 100644
index e7b6c9512560..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.10-r4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 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-r4.ebuild,v 1.2 2013/10/21 21:12:15 floppym 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 systemd"
-
-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 )
-	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/run/apcupsd \
-		--with-pid-dir=/var/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
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}"/${PN}.service
-		systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
-	fi
-
-	# 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.10-r5.ebuild b/sys-power/apcupsd/apcupsd-3.14.10-r5.ebuild
index de81cb59e94f..f67054afa68b 100644
--- a/sys-power/apcupsd/apcupsd-3.14.10-r5.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.10-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r5.ebuild,v 1.1 2013/10/21 22:01:49 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.10-r5.ebuild,v 1.2 2013/10/22 20:24:22 mattm Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~ppc ~x86-fbsd"
 IUSE="snmp +usb cgi nls gnome kernel_linux systemd"
 
 DEPEND="