commit: 58add48e410d51ebe5acc6a30c3dbdabdcddf51c Author: Jay Faulkner <jayf <AT> gentoo <DOT> org> AuthorDate: Wed Dec 24 18:15:57 2025 +0000 Commit: Jay Faulkner <jayf <AT> gentoo <DOT> org> CommitDate: Wed Dec 24 18:19:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58add48e
sys-power/tlp: re-add some blockers; add changelog This resolves two bugs in tlp's ebuild: - https://bugs.gentoo.org/967823 was filed after my last update removing all hard blockers. This change now limits blockers to direct file blockers. I believe we may need a more comprehensive solution to manage the now-three implementations of the ppd dbus service. - https://bugs.gentoo.org/965488 was fixed by publishing the changelog and readme.rst files as docs as requested. Closes: https://bugs.gentoo.org/967823 Closes: https://bugs.gentoo.org/965488 Signed-off-by: Jay Faulkner <jayf <AT> gentoo.org> .../tlp/{tlp-1.9.0-r1.ebuild => tlp-1.9.0-r2.ebuild} | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys-power/tlp/tlp-1.9.0-r1.ebuild b/sys-power/tlp/tlp-1.9.0-r2.ebuild similarity index 85% rename from sys-power/tlp/tlp-1.9.0-r1.ebuild rename to sys-power/tlp/tlp-1.9.0-r2.ebuild index 20f2ee056aec..1393f2541ed0 100644 --- a/sys-power/tlp/tlp-1.9.0-r1.ebuild +++ b/sys-power/tlp/tlp-1.9.0-r2.ebuild @@ -24,6 +24,11 @@ IUSE=" # NOTE(JayF): Upstream dep list in human-readable format: # https://linrunner.de/tlp/developers/dependencies.html +# NOTE(JayF): Blockers for these are not ideal, however all three +# of these packages implement the same service on dbus +# and have conflicting files as a result. Long-term +# there likely needs to be a better solution. See +# https://bugs.gentoo.org/967823. RDEPEND=" dev-lang/perl net-wireless/iw @@ -32,6 +37,8 @@ RDEPEND=" sys-apps/usbutils virtual/udev ppd? ( + !sys-apps/tuned[ppd] + !sys-power/power-profiles-daemon $(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]') $(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]') ${PYTHON_DEPS} @@ -39,6 +46,7 @@ RDEPEND=" rdw? ( net-misc/networkmanager ) " DEPEND="${RDEPEND}" +DOCS=( changelog README.rst ) src_install() { # NOTE(JayF): TLP_WITH_ELOGIND/TLP_WITH_SYSTEMD are both only installing @@ -67,6 +75,7 @@ src_install() { newinitd "${FILESDIR}/tlp.init" tlp newinitd "${FILESDIR}/tlp-pd.init" tlp-pd keepdir /var/lib/tlp # created by Makefile, probably important + einstalldocs } pkg_postinst() { @@ -77,14 +86,6 @@ pkg_postinst() { 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 "
