gentoo resync : 29.05.2018

4 files changed, 2 insertions, 127 deletions

diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 2e0fe6697d19..bd03422417d9 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,7 +1,4 @@
-AUX laptop-mode-tools-1.71-wireless-power.patch 943 BLAKE2B 6c8539037d0e6bb5808df169f95868aeff0029566be47a4fc3232f41c93a3f2763561b738b3839c8370e937ea0c81b4e5c830af22431a23bc1419313e1573f71 SHA512 cf61599d5f9240e20bd6acec8b7b200cc33cfa21712bf71c5fc2053d344d2c9336a01ba4f3772caac441144c5c40880d61209319c9e58307e0ee0504a2191f97
 AUX laptop_mode.init-1.4 1059 BLAKE2B 24dcf91d75df6cffe13cda1c8b9c85c016dae393f79f14ac0bc37c293e0d40e7e7cb34bc31b1c387c10ee74978d1c030fafad60f4e2428a8fcadf03163d5e48a SHA512 4242cda1df6b55cd0bee66dfb9137b6f63118bc31c5f703ed44c42738f47dc794d7f1ed6dd9ba5696b606c4bf624428e8f21e1683cb698d8dda249833a4c5f68
-DIST laptop-mode-tools_1.71.tar.gz 118833 BLAKE2B 21e6399d35d3f35dd75e5640eb50d679de87bf40435484e0c7cb67dcd0f2a794b5f14b48e375c302ef749efc38677b8abbdacfd3612206fb0125c52b9d67a89b SHA512 67ef4ed4c80f3a64ab9f0f9003d415f9e8759fd0ee1c7a82837d423a0e7aeb03ab95724afd89ae223f954ae0baec5830c8fa600bd6e2e351aead83a656f9b665
 DIST laptop-mode-tools_1.72.2.tar.gz 121437 BLAKE2B 1fdcdb88183156e4983b4561218164df5dde9fc91e85ab0ec1e6a401d3e5c5e70597a97e16c476949e80a674c34683eac6429e64e76c7921bd28f560e4ffe3cb SHA512 9a3960bad518aa73350b72ce30aeb80f3cbb1bf0fd6a11d5afe396b25c2b73f3b3d2fe7de0741eb94c9e3467c85a99741dc7acfd85339b9eb1daca09d3f8c56a
-EBUILD laptop-mode-tools-1.71-r1.ebuild 2599 BLAKE2B ec233f70a291a8a9d06348add2192d394c9a9ede36ad9eaffd5f9d583f81bae08681efb26eb1f587244763f7dac2b0516427fbe6299f99d43151dab50c857b4e SHA512 ba5534e5524bb4215a8a6c7ea2de896e1d3c3e6af014a96793e8706695d7fd1df87810ca8dcb05a63b4f3c973a288112c5add486d5001ea352093c91f87bc339
-EBUILD laptop-mode-tools-1.72.2.ebuild 2546 BLAKE2B d5dcca742dc8709560c99435d584e69f1f3a1191f4aa4827a277210b84a2b4a47130f43d054ceda90cb0bed1c7db4144873a76d414981c6931b42873be0b8de4 SHA512 203506c846ea9576dc587c592330db827cf7f098375a5f741260e07919b0081bd923a3b97a7828f942348d4d5120725e6054db433def3470213a31e1b44908d2
+EBUILD laptop-mode-tools-1.72.2.ebuild 2545 BLAKE2B 18236618b9cd046ab1fe0756fed68ca19894d185f9cdc90fd871f469c924b218f6b0d3f99c03df3c4eee5aa70d0df017a1f993008990c1b0e28c02b66c3aceb9 SHA512 e88adf5504a0a22a7490b84a4ff102f55771d341910e32a62e42d86a6502f38de02978c9a521361602a6629635e17ff28e80db4055aedfec4c94cde056bf223a
 MISC metadata.xml 436 BLAKE2B f89deae094b0a595dfc688ce45461a20a8b4b66191de36b3a40d01ee570c34ef59dbfae2fd14b6e4e7c76de4277907a74c21e7139d2f0c56d4eae50d4fcde32c SHA512 869ee9290fada409da987a2ecdd962591a425e43f89403046a208dee46802f3b0071c099590b486e4fe09a60dcf6de802088f153cedf44a361a58e7d9395d193
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.71-wireless-power.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.71-wireless-power.patch
deleted file mode 100644
index 6d39d31e738c..000000000000
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.71-wireless-power.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3644486a9ee4fda7887fa0ecf224e66c4d12a0d2 Mon Sep 17 00:00:00 2001
-From: Ritesh Raj Sarraf <rrs@debian.org>
-Date: Fri, 10 Mar 2017 14:37:03 +0530
-Subject: [PATCH] Fix correct program invocation
-
-Thanks: Mathias Rav
-Closes: https://github.com/rickysarraf/laptop-mode-tools/issues/93
----
- usr/share/laptop-mode-tools/modules/wireless-power | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr/share/laptop-mode-tools/modules/wireless-power b/usr/share/laptop-mode-tools/modules/wireless-power
-index bd8277d..8800a89 100755
---- a/usr/share/laptop-mode-tools/modules/wireless-power
-+++ b/usr/share/laptop-mode-tools/modules/wireless-power
-@@ -76,7 +76,7 @@ setPowerSave() {
-                 if [ $ONOFF = "ON" ]; then
-                     $IWCONFIG $IF txpower auto
-                 else
--                    $IW dev $IF txpower fixed
-+                    $IWCONFIG $IF txpower fixed
-                 fi
- 	fi
- }
--- 
-2.13.6
-
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71-r1.ebuild
deleted file mode 100644
index a3b12eff10bc..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 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"
-
-RDEPEND="sys-apps/iproute2
-	sys-apps/ethtool
-	sys-apps/which
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-wireless-power.patch"
-)
-
-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.72.2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
index 37773616daba..71d914c0703a 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.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"
 
 RDEPEND="sys-apps/iproute2