diff --git a/sys-power/tlp/metadata.xml b/sys-power/tlp/metadata.xml index 6103ff627ceb6..67faef85edd86 100644 --- a/sys-power/tlp/metadata.xml +++ b/sys-power/tlp/metadata.xml @@ -10,7 +10,7 @@ kernel settings that affect power consumption. - TLP Profiles Daemon that replaces power-profiles-daemon by using the same D-Bus API. + TLP Profiles Daemon that replaces power-profiles-daemon by using the same D-Bus API. Enables TLP Radio Device Wizard feature diff --git a/sys-power/tlp/tlp-1.9.0.ebuild b/sys-power/tlp/tlp-1.9.0-r1.ebuild similarity index 58% rename from sys-power/tlp/tlp-1.9.0.ebuild rename to sys-power/tlp/tlp-1.9.0-r1.ebuild index fbac4f688f066..20f2ee056aec2 100644 --- a/sys-power/tlp/tlp-1.9.0.ebuild +++ b/sys-power/tlp/tlp-1.9.0-r1.ebuild @@ -15,27 +15,27 @@ S="${WORKDIR}/TLP-${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -REQUIRED_USE="pd? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="ppd? ( ${PYTHON_REQUIRED_USE} )" IUSE=" - +pd + +ppd +rdw " +# NOTE(JayF): Upstream dep list in human-readable format: +# https://linrunner.de/tlp/developers/dependencies.html RDEPEND=" dev-lang/perl - virtual/udev - sys-apps/hdparm net-wireless/iw - !app-laptop/laptop-mode-tools + sys-apps/hdparm sys-apps/pciutils - !sys-apps/tuned sys-apps/usbutils - pd? ( dev-python/dbus-python ) - pd? ( !sys-power/power-profiles-daemon ) - pd? ( dev-python/pygobject ) - pd? ( ${PYTHON_DEPS} ) - pd? ( !sys-apps/tuned ) + virtual/udev + ppd? ( + $(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]') + $(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]') + ${PYTHON_DEPS} + ) rdw? ( net-misc/networkmanager ) " DEPEND="${RDEPEND}" @@ -51,7 +51,7 @@ src_install() { install-tlp install-man-tlp ) - use pd && myemakeargs+=( + use ppd && myemakeargs+=( install-pd install-man-pd ) @@ -76,6 +76,30 @@ pkg_postinst() { optfeature "see disk drive health info in tlp-stat" sys-apps/smartmontools optfeature "Sleep hooks" sys-auth/elogind sys-apps/systemd optfeature "Battery functions for ThinkPads prior to the Sandy Bridge generation (2011)" app-laptop/tp_smapi + + if has_version "sys-power/power-profiles-daemon" && use ppd; then + ewarn + ewarn "sys-power/power-profiles-daemon is installed, but is " + ewarn "incompatible with tlp-pd daemon. For best results, " + ewarn "uninstall one of these packages or set use tlp[-ppd]." + ewarn + fi + + if has_version "sys-apps/tuned"; then + ewarn + ewarn "sys-apps/tuned is installed, but is " + ewarn "documented by upstream sys-power/tlp to be conficting. " + ewarn "For best results, uninstall one of these packages." + ewarn + fi + + if has_version "app-laptop/laptop-mode-tools"; then + ewarn + ewarn "app-laptop/laptop-mode-tools is installed, but is " + ewarn "documented by upstream sys-power/tlp to be conficting. " + ewarn "For best results, uninstall one of these packages." + ewarn + fi } pkg_postrm() {