gentoo resync : 13.10.2017

3 files changed, 2 insertions, 98 deletions

diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index fae0509e30c2..0b9eae9afc1a 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,8 +1,6 @@
 AUX laptop_mode.init-1.4 1059 SHA256 6bb07bd94b50ad559c3cd23b57dbb928ff0449d356d973ba281baa232435d9c6 SHA512 4242cda1df6b55cd0bee66dfb9137b6f63118bc31c5f703ed44c42738f47dc794d7f1ed6dd9ba5696b606c4bf624428e8f21e1683cb698d8dda249833a4c5f68 WHIRLPOOL 60044854fbf2d9e9a972e73d4d527444b463f194c0e01f5d6a561111fc3f35b44a69430625238e53b228b575a89f202171a3bf950020c59a444dabe2fefba8e3
-DIST laptop-mode-tools_1.70.tar.gz 116624 SHA256 12cde7dbec8c35201efab96187be75ec84e0a2424494852413f21be1b7bc6a11 SHA512 755e2d94b63bb2a6e5362365f11181374c5fe159b508076f5def91c4df93983fa3e2553bbd94ae0b5bb4690aa7fb0881eafe3f4dcc7c8e77a8b72de23f6a21c5 WHIRLPOOL a70b0e3353877ffedd87ed3f72f1239addd34e8fecfd0e54b98c328a1f4a48a87a2f278fa4afa227452eb5f874bd58912a1ddf8ae2f385636c6bb3a552ce7b3a
 DIST laptop-mode-tools_1.71.tar.gz 118833 SHA256 3aa122f876ef191e2501f550363724e30d20646637cff0de7147124c867166f9 SHA512 67ef4ed4c80f3a64ab9f0f9003d415f9e8759fd0ee1c7a82837d423a0e7aeb03ab95724afd89ae223f954ae0baec5830c8fa600bd6e2e351aead83a656f9b665 WHIRLPOOL 9c26c546f75f45b46b9b9e34a5ac435f58952e4d70b8db02c86170b4026b00112fb4044e41130dbc4f74326e22b39e0b78eeee2ba935179150441e9b5d41c884
-EBUILD laptop-mode-tools-1.70.ebuild 2623 SHA256 aac444cbde8d16e3913f3a3bc60cd37a5354c557ae24cc24f27fa47a1c43da3c SHA512 78188704549597533ceb667af7cf2970846020a0f2e1bc4a5133063a4e7a7d6774b03628d9d35917235716ba90b3b0f565e6043195b08b1c0da8409d4dae3ea4 WHIRLPOOL d0d33392d8475db04274e96f133d0a54c8bfa9c2fda48b96334c5fe8eb24593d067cfcdc0ecad3140d1d272038dae6dbc2cbcb2b5607122b38ee1ccc54de3bd3
-EBUILD laptop-mode-tools-1.71.ebuild 2624 SHA256 9775a858dbc7b1cb9bafb70b9d306bc63ba3d9dfc7f2d68f5681ae93875df018 SHA512 267ce04d76325b624cd0de1a482cdb54164913a6c527106e30bc66e6ef9082089d01d4077bd017afbedf0ae81dbdc6ed112203c1e6f0465995e3da7e9f118eb8 WHIRLPOOL a88ce1f67952909666ef2d73b36f1746e5f69cb8d9b85e580a82e14e03f7743d17b0d9776f67873edc1eab7a6614473dbef60caec5d203cdfb62abfce1ce3273
+EBUILD laptop-mode-tools-1.71.ebuild 2623 SHA256 aac444cbde8d16e3913f3a3bc60cd37a5354c557ae24cc24f27fa47a1c43da3c SHA512 78188704549597533ceb667af7cf2970846020a0f2e1bc4a5133063a4e7a7d6774b03628d9d35917235716ba90b3b0f565e6043195b08b1c0da8409d4dae3ea4 WHIRLPOOL d0d33392d8475db04274e96f133d0a54c8bfa9c2fda48b96334c5fe8eb24593d067cfcdc0ecad3140d1d272038dae6dbc2cbcb2b5607122b38ee1ccc54de3bd3
 MISC ChangeLog 4267 SHA256 31664ca1d19caa8611bbd78d2516ca7549e3060629d6ae54670bd5d88e08df67 SHA512 60e04444b3ed47353fc5ac9c609169bf092859a1ca7546fe622fb5f9366299922adcf94ba58a6e578840a6cedb6e6fab84527d0a63b28fe4c2608201b8a58017 WHIRLPOOL cd20166e391b9626022c91df8c4e621ecb32396fcd876689b5308da830256f3f5e551817773810631485a56dfa243981a46c755c1601855702b911aa41567641
 MISC ChangeLog-2015 20290 SHA256 4374d8d676d332d3d936c1458572438e8ec440d8d71f56870cd7d70c89de9e91 SHA512 61c4a0421786bcc17d4a3dc695eb7b043a6eb6b50eaedcd2972129f41a1bab6e89a5e0208408299d736de8bef3ce7aca4cecd1be1b7ccd3a737f38674a03e842 WHIRLPOOL 9f0b7344e6316c53cef43364e4eec170306ef40b0704726d54bb87e8a2e92c2b8c8a854e103c4918b9f5f4981d038dab546de2c2174085f7e9d3030b62fedc3c
 MISC metadata.xml 537 SHA256 2bf80794bbc877b42a3c8e45834d3dd92713eba9464855e1a3b93010ac9db725 SHA512 7231612300dd7c106a48422f444edf3208807653e9f55675008c693f7d053e7f6e8f3ea3df2642f221c34509a70d1adf59db14163466f18fd3a6fc714b45bd4e WHIRLPOOL fcb248d2d55f374212084c652892bb3a2a4939ede51cc5063056467208118aef83a0de774a55a5410cd5ba49a215c287c3c66624f40e462a3e2f83ecb1d57615
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.70.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.70.ebuild
deleted file mode 100644
index 76f2e8092a24..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.70.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd udev
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools/wiki"
-SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
-	sys-apps/iproute2
-	sys-apps/ethtool
-	sys-apps/hdparm
-	sys-apps/which
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_systemunitdir)" \
-		TMPFILES_D="/usr/lib/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README.md
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71.ebuild
index 32250ae7f474..76f2e8092a24 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+acpi apm bluetooth scsi"
 
 RDEPEND="net-wireless/wireless-tools