From 4d33d6e63d5add27f56f5334cd7d72f63ac9a356 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Fri, 22 Dec 2017 12:32:41 +0200 Subject: app-laptop/laptop-mode-tools: fix power-wireless iwconfig invocation Package-Manager: Portage-2.3.13, Repoman-2.3.3 RepoMan-Options: --force --- .../laptop-mode-tools-1.71-wireless-power.patch | 27 ++++++ .../laptop-mode-tools-1.71-r1.ebuild | 98 ++++++++++++++++++++++ .../laptop-mode-tools-1.71.ebuild | 94 --------------------- 3 files changed, 125 insertions(+), 94 deletions(-) create mode 100644 app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.71-wireless-power.patch create mode 100644 app-laptop/laptop-mode-tools/laptop-mode-tools-1.71-r1.ebuild delete mode 100644 app-laptop/laptop-mode-tools/laptop-mode-tools-1.71.ebuild 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 new file mode 100644 index 000000000000..6d39d31e738c --- /dev/null +++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.71-wireless-power.patch @@ -0,0 +1,27 @@ +From 3644486a9ee4fda7887fa0ecf224e66c4d12a0d2 Mon Sep 17 00:00:00 2001 +From: Ritesh Raj Sarraf +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 new file mode 100644 index 000000000000..61e9fa4c5dbd --- /dev/null +++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71-r1.ebuild @@ -0,0 +1,98 @@ +# 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}" + +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.71.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71.ebuild deleted file mode 100644 index 76f2e8092a24..000000000000 --- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.71.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 -} -- cgit v1.2.3-65-gdbad