From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6AD6D158094 for ; Sun, 28 Aug 2022 05:29:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC355E0876; Sun, 28 Aug 2022 05:29:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92577E0876 for ; Sun, 28 Aug 2022 05:29:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D1D834106A for ; Sun, 28 Aug 2022 05:29:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E652556 for ; Sun, 28 Aug 2022 05:29:29 +0000 (UTC) From: "Jay Faulkner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jay Faulkner" Message-ID: <1661664538.01c3100ab2fbccb88ce6157b04d1855bd29f87ee.jayf@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-power/tlp/, sys-power/tlp/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-power/tlp/files/tlp-1.5.0-Makefile.patch sys-power/tlp/tlp-1.5.0.ebuild X-VCS-Directories: sys-power/tlp/ sys-power/tlp/files/ X-VCS-Committer: jayf X-VCS-Committer-Name: Jay Faulkner X-VCS-Revision: 01c3100ab2fbccb88ce6157b04d1855bd29f87ee X-VCS-Branch: dev Date: Sun, 28 Aug 2022 05:29:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d8d4e4f8-8c96-418a-8f70-2de4877ee1ff X-Archives-Hash: 1e81abbd73149473a7a51e0bf96f6b6a commit: 01c3100ab2fbccb88ce6157b04d1855bd29f87ee Author: Jay Faulkner jvf cc> AuthorDate: Sun Aug 28 04:53:40 2022 +0000 Commit: Jay Faulkner jvf cc> CommitDate: Sun Aug 28 05:28:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=01c3100a sys-power/tlp: Fix systemd support Prior to this change, systemd units were not properly installed. Additional style and simplification fixes as needed. Signed-off-by: Jay Faulkner jvf.cc> sys-power/tlp/files/tlp-1.5.0-Makefile.patch | 18 ------------------ sys-power/tlp/tlp-1.5.0.ebuild | 21 +++------------------ 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/sys-power/tlp/files/tlp-1.5.0-Makefile.patch b/sys-power/tlp/files/tlp-1.5.0-Makefile.patch deleted file mode 100644 index 58667ee21..000000000 --- a/sys-power/tlp/files/tlp-1.5.0-Makefile.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Makefile b/Makefile -index b81451c..d154b6b 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,10 +14,10 @@ TLP_CONFDIR ?= /etc/tlp.d - TLP_CONFDEF ?= /usr/share/tlp/defaults.conf - TLP_CONFREN ?= /usr/share/tlp/rename.conf - TLP_CONF ?= /etc/default/tlp --TLP_SYSD ?= /lib/systemd/system --TLP_SDSL ?= /lib/systemd/system-sleep -+TLP_SYSD ?= /@LIBDIR@/systemd/system -+TLP_SDSL ?= /@LIBDIR@/systemd/system-sleep - TLP_SYSV ?= /etc/init.d --TLP_ELOD ?= /lib/elogind/system-sleep -+TLP_ELOD ?= /@LIBDIR@/elogind/system-sleep - TLP_SHCPL ?= /usr/share/bash-completion/completions - TLP_MAN ?= /usr/share/man - TLP_META ?= /usr/share/metainfo diff --git a/sys-power/tlp/tlp-1.5.0.ebuild b/sys-power/tlp/tlp-1.5.0.ebuild index d2cc2f1fe..0fc6f0d01 100644 --- a/sys-power/tlp/tlp-1.5.0.ebuild +++ b/sys-power/tlp/tlp-1.5.0.ebuild @@ -20,29 +20,14 @@ RDEPEND="virtual/udev systemd? ( sys-apps/systemd )" DEPEND="${RDEPEND}" REQUIRED_USE="?? ( elogind systemd )" -PATCHES="${FILESDIR}/${PN}-1.5.0-Makefile.patch" -CONFIG_PROTECT="/etc/tlp.conf /etc/tlp.d" - -src_prepare() { - default - sed -i "s/@LIBDIR@/$(get_libdir)/g" "${S}/Makefile" -} - -src_compile() { - emake -} src_install() { - if use bash-completion; then export bashcomp=0; else export bashcomp=1; fi - if use elogind; then export elogind=1; else export elogind=0; fi - if use systemd; then export systemd=1; else export systemd=0; fi - emake \ DESTDIR="${D}" \ TLP_NO_INIT=1 \ - TLP_NO_BASHCOMP=$bashcomp \ - TLP_WITH_ELOGIND=$elogind \ - TLP_WITH_SYSTEMD=$systemd \ + TLP_NO_BASHCOMP=$(usex bash-completion 0 1) \ + TLP_WITH_ELOGIND=$(usex elogind 1 0) \ + TLP_WITH_SYSTEMD=$(usex systemd 1 0) \ install install-man chmod 444 "${D}/usr/share/tlp/defaults.conf" # manpage says this file should not be edited