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 3E79E158094 for ; Tue, 9 Aug 2022 20:06:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED5A2E0BC3; Tue, 9 Aug 2022 20:06:32 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA300E0BC3 for ; Tue, 9 Aug 2022 20:06:32 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9680A340DF9 for ; Tue, 9 Aug 2022 20:06:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3A07566 for ; Tue, 9 Aug 2022 20:06:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1660075544.6410deb61fa2ebd7adf5c82d7e9be941ab78a6d9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/htop/htop-3.2.1-r2.ebuild sys-process/htop/htop-9999.ebuild X-VCS-Directories: sys-process/htop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6410deb61fa2ebd7adf5c82d7e9be941ab78a6d9 X-VCS-Branch: master Date: Tue, 9 Aug 2022 20:06: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: 9c994348-49e1-47a1-9c0f-1cad148178ef X-Archives-Hash: 55d9ee3140ef1fd3013e8d0473144026 commit: 6410deb61fa2ebd7adf5c82d7e9be941ab78a6d9 Author: Sam James gentoo org> AuthorDate: Tue Aug 9 03:12:29 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 9 20:05:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6410deb6 sys-process/htop: drop back to xdg-utils.eclass My own fault -- I didn't add a comment when I originally inherited xdg-utils instead of xdg, and I broke it myself later when changing to release tarballs! See original commit for rationale. Bug: https://bugs.gentoo.org/787470 Bug: https://bugs.gentoo.org/849422 Fixes: 20d5319d31378762c32b0b2344e24f37ffbaccd2 See: 1bf94ee45ca93a214be3fa2dda29b1d9fd90e0a9 Signed-off-by: Sam James gentoo.org> sys-process/htop/{htop-9999.ebuild => htop-3.2.1-r2.ebuild} | 12 ++++++++++-- sys-process/htop/htop-9999.ebuild | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/sys-process/htop/htop-9999.ebuild b/sys-process/htop/htop-3.2.1-r2.ebuild similarity index 87% copy from sys-process/htop/htop-9999.ebuild copy to sys-process/htop/htop-3.2.1-r2.ebuild index 76b7ce3cb327..7d41590b84b1 100644 --- a/sys-process/htop/htop-9999.ebuild +++ b/sys-process/htop/htop-3.2.1-r2.ebuild @@ -5,7 +5,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit linux-info optfeature python-any-r1 xdg +# We avoid xdg.eclass here because it'll pull in glib, desktop utils on +# htop which is often used on headless machines. bug #787470 +inherit linux-info optfeature python-any-r1 xdg-utils DESCRIPTION="interactive process viewer" HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" @@ -99,7 +101,13 @@ src_configure() { } pkg_postinst() { - xdg_pkg_postinst + xdg_desktop_database_update + xdg_icon_cache_update optfeature "Viewing processes accessing certain files" sys-process/lsof } + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/sys-process/htop/htop-9999.ebuild b/sys-process/htop/htop-9999.ebuild index 76b7ce3cb327..7d41590b84b1 100644 --- a/sys-process/htop/htop-9999.ebuild +++ b/sys-process/htop/htop-9999.ebuild @@ -5,7 +5,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit linux-info optfeature python-any-r1 xdg +# We avoid xdg.eclass here because it'll pull in glib, desktop utils on +# htop which is often used on headless machines. bug #787470 +inherit linux-info optfeature python-any-r1 xdg-utils DESCRIPTION="interactive process viewer" HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" @@ -99,7 +101,13 @@ src_configure() { } pkg_postinst() { - xdg_pkg_postinst + xdg_desktop_database_update + xdg_icon_cache_update optfeature "Viewing processes accessing certain files" sys-process/lsof } + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +}