gentoo resync : 18.03.2018

5 files changed, 2 insertions, 139 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 24148f9304ab..1987eb701dda 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 96c46281da2f..35c3f8ea15e0 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -9,5 +9,4 @@ DIST apcupsd-3.14.13.tar.gz 1935043 BLAKE2B 56d8fb9c6a055b20c2d99867e43b6a2d6ebe
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f
 EBUILD apcupsd-3.14.13.ebuild 3990 BLAKE2B e611242fcc44531d17290fccdb3c15e03ae1812ec51cbbd0e1420188c038bd642368c996b88101cc72af66af37740a9f2e35174173271118724a1d5775199246 SHA512 2c93c8d8028304a348c6d0937e0629e39a894f699c2ab2089cd9d2472fb66210aeb01fbe187acf5249844fb66a0e525e66fe844bacdd89b15df700265c75a300
 EBUILD apcupsd-3.14.14-r1.ebuild 4085 BLAKE2B c8f0842bc550d8a40d5ebf1809a0a27db293a5425895df35502d77b700a5a235aa9fdb6a66c4c786670816bb14cfbaf0a4d6f968e58733f2171cd60b2cb6bee5 SHA512 b0fb1ddaa60c864cc301a9b35e8ccb455df27a3f9fd0c8f2b768b55d8a79a6329ac8d11f1d2d6e68e16502f3ca0e7db0a3b692d2fa805288e21773fe808c2609
-EBUILD apcupsd-3.14.14.ebuild 3934 BLAKE2B e52893798801b32aba0a5cf4c72d22436b700caa3f300b8fb22d85b32fd77e856cf1fdaadf2f5c927a9946943c79a5b01c4eda311e33525ee2a279643775cdb9 SHA512 954489ed80b948ccb1f0cbb480fe6a1ff87f3f1ba2643e8d6f1834e81a0c8cc46b98fae380a6f96c1b1c9824049fd000d7ff26cfe2c00fa80ea065745edd59e3
 MISC metadata.xml 1259 BLAKE2B ca28cef92e8edcea0aaeece78cadb43ad8ad836297d8e857540558877a7781922f50c05b018d1a9f7d0753ddfb0a99aff84d16051fdfe5f0d407b79509058a35 SHA512 ba5660026926c0334a47aa3f84bfc0a4ef745db2170a1d773547cf495101cf1274cc24d71d3afa46fa62ebcb49e0913e92e9a0efe4cb70a349f77538b7f60eff
diff --git a/sys-power/apcupsd/apcupsd-3.14.14.ebuild b/sys-power/apcupsd/apcupsd-3.14.14.ebuild
deleted file mode 100644
index 06483304207a..000000000000
--- a/sys-power/apcupsd/apcupsd-3.14.14.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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-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}
-	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) \
-		$(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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/etc/init.d/halt || die
-
-	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 || die
-	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 || die
-
-	# 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/nut/Manifest b/sys-power/nut/Manifest
index 5c4cb36a5a0f..84b6a952192e 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -18,6 +18,6 @@ DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf92652
 EBUILD nut-2.6.5-r1.ebuild 7233 BLAKE2B 6f3faa9fbdebcd82f778c4f025566b36cb400ca5b3b4fa8e567bd9280fe11d44e08057987264fbbd72eea68f306dd41063deb8b3374187a9397d32ac29d29518 SHA512 fc7ef6a8c701374a1e98fb61b2064bddbfb0b9195d7d54ba9a408d76c862b207d0f72f03fd1775e84c3a41ac513a780e0a97420c813b98e541842e55712203ef
 EBUILD nut-2.7.2-r2.ebuild 9349 BLAKE2B 08ce8ef7adca39dab86e2f75e21a408700dab50719d6749f8dd06ec4424ad2f3686fe4f1e248c41cd2e3fd9a70037b145b67fe63bf8882b33f81b205cd991caf SHA512 143239b51ff5db0c74b6ee7bb619c9c5c96b9c5bfa2a7883e8d004dbc5fb302462c9304f3131650b7d06fa7a10317881feba15f6279299f963a6e99d6ec81d10
 EBUILD nut-2.7.3.ebuild 9138 BLAKE2B 12c7ff977c3d28b42b42071efbf5f452a25033ce0b246564cd9ca58fae88c115bfdc6690fe1d05a8ac2487e5635cf7dcf80371b7ad6351e234a3768ca34d30cf SHA512 3123230597b9fd6ddaf25094409a20628adfb7c2ce704e32a7f082e137c3da37e28009f81d90983f759ea741eadd5672166dff7661cb432ad6ecf26303a3c4ea
-EBUILD nut-2.7.4-r1.ebuild 9158 BLAKE2B edca5d3a657ffbaa17e4bfd3929c088a2d97bce6812204e28bb624ee5a625ca3ffeee0c3ff76372c5dc028f92c239ea9d3840fa8a4f1bdb6775728cd9a90a7c6 SHA512 301a85edceea806095f47270530764535dd09246e6a58901ee96e0964561959b8486f3944f4fb778f668171174e2865d05e177220715e19eec1b617582a2580e
+EBUILD nut-2.7.4-r1.ebuild 9157 BLAKE2B 8e3c1fdb0ed7a34910e9858a914e7c43a3dfece82fa81c8af91f1fb049565361e35ae6ae93ca275ec18a60767d0b4c6427663fe7ede4c73bcce12dfd877aa3c6 SHA512 01c414e4089bd2330303f6d0f6f6d849af7c930dae82d08e52ce6f092b1bc4a6d1dd924d739ce5011e146f7c2a3e02885ce46e9f821f66f14c54e10b1304a1e3
 EBUILD nut-2.7.4.ebuild 9144 BLAKE2B 844ee3f8c0e8195a0f7b376c7d4df34de6afdcef910bca724ec0859e8586a913750cd2cf329a78b0daed1886bd5c6881a97d33ef2e0c3827cee91b84f0d44474 SHA512 21c6738218cf0160693a3459b9ae62becc6119a9b0cb87bd21eb46094b2feb135bda479acefe250abd6dfc79faa2508101e1113c86fa6ef66ce8d522d26ee924
 MISC metadata.xml 5121 BLAKE2B 480860ed22af0a86686b53a9a901e19564a6dfcb0f7f600fede42366fb10de29a53a13a5b57d70acd7f2d2af6d9887f76bb89bdbf85a54ca00075556aecce926 SHA512 3cbce8da4c3117afd38fe28f7050a82552222a120e69a22b3ed1754bd6e71091b4bb45c6232fb2767f884afc24f5cdfcd9b0c59a8d8bccaf68b12e7fb08aee80
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index c461475fce6e..ddbe49986a35 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
 
 IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
 CDEPEND="