diff options
| author |   Jay Faulkner <jay@jvf.cc> | 2022-08-27 21:53:40 -0700 |
|---|---|---|
| committer | Jay Faulkner <jay@jvf.cc> | 2022-08-27 22:28:58 -0700 |
| commit | 01c3100ab2fbccb88ce6157b04d1855bd29f87ee (patch) | |
| tree | f4cfb6d4070a511c1a5c5ac81f3fd8c91ea8558d | |
| parent | sci-electronics/circt: fix source file path (diff) | |
| download | guru-01c3100a.tar.gz guru-01c3100a.tar.bz2 guru-01c3100a.zip | |
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 <jay@jvf.cc>
| -rw-r--r-- | sys-power/tlp/files/tlp-1.5.0-Makefile.patch | 18 | ||||
| -rw-r--r-- | 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 58667ee21b..0000000000 --- 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 d2cc2f1fee..0fc6f0d016 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 |