gentoo resync : 31.08.2021

6 files changed, 38 insertions, 273 deletions

diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index a0bda6cccb2b..1d694e548a10 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,9 +1,5 @@
-AUX htop-3.0.3-tinfo.patch 1643 BLAKE2B d3aadf6f244fda024cf4d129a9972fa864f24768a9e6bd5858af1964832064669d034f86a63163568e3c982efc11ce6593a81d108fbbbe8a0c507b39241cfe16 SHA512 9fc5763418f3a380d1841febf2f09ef795a012ca91454f4f36c763d9c74660806a1cfc527d3a686cdfe94e7d6efafaef79ad2d312fd1f8431da24ddbf7f7cb6e
-AUX htop-3.0.4-sort_column_header_highlight.patch 5294 BLAKE2B f046ca56c10151d534b533af9e76a84311283729a9f1c145833354f184593ae6b4a18e4b007904e00746524cdf07a6756bfea7137516fd12f7fa4be1bafe9645 SHA512 e04046dde72ae3ba0b9ff89160ba3fa1d6c3f45ed3ef98ff5fda61746f26d304b5e2b157589375f781d2a298437a8e554a332bc913ead915b37cda43701796c3
-DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013abce972be4370b9b35d92661fcb4521fa715bc779c1c9b56bc3c0eeb5375c0df8ec7585df3774ac67ca504 SHA512 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868
-DIST htop-3.0.4.tar.gz 296224 BLAKE2B b8fc4fe7c595f0a22b253f1eeea24d571c87401a426b8f6dba0ce15d98ea77ca94bc286428386cbf478f0e7ea4afde0e86e5e6b93bb88af616ba474e45e745f5 SHA512 d57e4fd326791bd2306f4a6ce2c4f4bf0499a0050efbaeb71a211148fa52993f707d8afdf0292dc26234cffdcba84a97e1d4422bc61aec40ba3ef9ebd91ebf6c
 DIST htop-3.0.5.tar.gz 297931 BLAKE2B a6e62f99ef349809d11bb14b4d515036601aa457507b34a96354607f136cc4e0d3d40a715f1576c70833db051d989fa55142b4f8bba0f5f432ea3676364d9575 SHA512 7dae83ceff6b3f30e69c30c9559dbb3bf69281df006c6a26e4e2c49dd5a147e05ed7bafeeac8ec5bedc8ba670470100cc128209a92654858f98df09a9394594f
-EBUILD htop-3.0.2-r1.ebuild 1516 BLAKE2B fe9bbfd4beefe5b298e3a314034d3311687d6aaac92c08ccb4ac0d0f36240d61f7cb7f232cdffc1e01597123d8ae43ddfb375843b6ca098ff22fedf3fd06ac0f SHA512 8bd0acf1647cbad6e7c9f153adde078d8d4e9532cd5bcc1ea57b69419d88f504b8fde95822d1ea636740430349e279df7b544bfae588140f3e09b7c5b990dcbe
-EBUILD htop-3.0.4-r2.ebuild 1701 BLAKE2B b7b42f6d53516ee41e3121c0b3b8aa806b777b44ac7363884e9a4d9c55a561b9237929687e5eaf4ef59c7d1f0da0205cd4986daa648c4836db4f358b88af2bce SHA512 ac7b7d938bf10a7bd1879d804b91570bd0b431844ebd354490a46b7fd1cce99027d5f991529a746f42ffd9d94a76ef66d9c5072a636941bd36c79589967f2986
+DIST htop-3.1.0_rc1.tar.gz 378045 BLAKE2B 65d5f2bdb6e41fb0a4edd76c62a36e951bd86a67ebb9908ca712b2ee7b5f9714c3fe5cd4193885b869b96dcd73bbf945ab22fcd31aa11d90598f9d9953ed4b0e SHA512 f917dbb8ba0de1a9f703423c13cec19f0f69da765df320739eeabf0e928495ec70cdd8eb0cca2871226cd6b472a713ee5ebc43aefa02b2ffbd6c29b1208f5cad
 EBUILD htop-3.0.5-r1.ebuild 1778 BLAKE2B 7019c1a5668339b8e9efe626e01d8c44d6d802659cf8283069dad92943912d34d40f77e75bfd7834e35e07c129edcd71681fe621a3f61731d3f35aa85b72668c SHA512 1d3af3d7c65d6808eee5083f95a865715a7302da4d2b90f91c84b2fb6ba355cf474eb8f89946704af006d33dc5ad44f4cae430175193af5a65cfac0b8650788b
-MISC metadata.xml 911 BLAKE2B e92af64c9d4ead9348cecca14425e8778d3d69e63cd45063e76c1a8052610e6155299c01606aa3a3540ec3b432629d074cda74130ad86f1d31bb09957fb51a75 SHA512 686e8459e279182fcba99f65d67491c11ed144149207e2ac952797b6d66f145ef7b2ea19a5116e9e9a70d6a6ad6d4ecbf106c8f3734e45019f7e274311437ece
+EBUILD htop-3.1.0_rc1.ebuild 2012 BLAKE2B 3a61c733c911ee1941cf015857f97ba204fa347ecbbd62af5f77580981d8a69d2e7885b833ed7e32c2b45d387601fe1284dd80dd8bdea3de60a965c656218a33 SHA512 e900adff6e53f58da94986ea81d59f9b6cc33314ac91976d4c18436ba416b76977a0d2f7035403443dc6ffc6b690269add0b683465e88918689f6be01dd4adf1
+MISC metadata.xml 1011 BLAKE2B 9986489fee7883f5b6619255ed00835d169d6cfcde7bb4d8cbeecc2670a623ad8f6f0aa1195dad8fa8a1cc6c77e327a2ae87c027ce47417255401abb68cbee48 SHA512 8ae67f87cbb4ab8e8875a530da7e3a8efe1b3d7f351161114c2077095fe05adcad60b5d4e0728f60ed9bec416dfd09530d8416df13bd6154d31809b73b5415b1
diff --git a/sys-process/htop/files/htop-3.0.3-tinfo.patch b/sys-process/htop/files/htop-3.0.3-tinfo.patch
deleted file mode 100644
index ea65a799ed7a..000000000000
--- a/sys-process/htop/files/htop-3.0.3-tinfo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ead978bce6236a55d75b72e059686766fa708db4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
-Date: Mon, 7 Dec 2020 15:30:56 +0100
-Subject: [PATCH] configure: check for additional linker flags for keypad(3)
-
-Gentoo requires an explicit addition of -ltinfo
-
-Resolves: https://bugs.gentoo.org/show_bug.cgi?id=690840
----
- configure.ac | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 460b16aa..f91d8e92 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -217,6 +217,10 @@ if test "x$enable_unicode" = xyes; then
-       [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-          [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-             [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+
-+   # check if additional linker flags are needed for keypad(3)
-+   # (at this point we already link against a working ncurses library with wide character support)
-+   AC_SEARCH_LIBS([keypad], [tinfow tinfo])
- else
-    HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-     HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-@@ -229,6 +233,10 @@ else
-       [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-          [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-             [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+
-+   # check if additional linker flags are needed for keypad(3)
-+   # (at this point we already link against a working ncurses library)
-+   AC_SEARCH_LIBS([keypad], [tinfo])
- fi
- 
- if test "$my_htop_platform" = "freebsd"; then
diff --git a/sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch b/sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch
deleted file mode 100644
index a2b6a0d4259a..000000000000
--- a/sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 86d293125565a15bbd94683080dbc755c5d7edee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
-Date: Tue, 22 Dec 2020 17:12:38 +0100
-Subject: [PATCH] Restore highlighted header of current sorted process column
-
----
- MainPanel.c     | 10 ++++++++--
- Panel.c         | 22 ++++++++++------------
- Panel.h         |  6 ++++--
- ScreenManager.c |  2 +-
- htop.c          |  2 --
- 5 files changed, 23 insertions(+), 19 deletions(-)
-
-diff --git a/MainPanel.c b/MainPanel.c
-index 949138dc..c8a4c059 100644
---- a/MainPanel.c
-+++ b/MainPanel.c
-@@ -102,7 +102,7 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
-       MainPanel_updateTreeFunctions(this, this->state->settings->treeView);
-    }
-    if (reaction & HTOP_UPDATE_PANELHDR) {
--      ProcessList_printHeader(this->state->pl, Panel_getHeader(super));
-+      result |= REDRAW;
-    }
-    if (reaction & HTOP_REFRESH) {
-       result |= REFRESH;
-@@ -168,13 +168,19 @@ static void MainPanel_drawFunctionBar(Panel* super) {
-    }
- }
- 
-+static void MainPanel_printHeader(Panel* super) {
-+   MainPanel* this = (MainPanel*) super;
-+   ProcessList_printHeader(this->state->pl, &super->header);
-+}
-+
- const PanelClass MainPanel_class = {
-    .super = {
-       .extends = Class(Panel),
-       .delete = MainPanel_delete
-    },
-    .eventHandler = MainPanel_eventHandler,
--   .drawFunctionBar = MainPanel_drawFunctionBar
-+   .drawFunctionBar = MainPanel_drawFunctionBar,
-+   .printHeader = MainPanel_printHeader
- };
- 
- MainPanel* MainPanel_new() {
-diff --git a/Panel.c b/Panel.c
-index b36f1efc..26a0c0ec 100644
---- a/Panel.c
-+++ b/Panel.c
-@@ -76,13 +76,6 @@ void Panel_setSelectionColor(Panel* this, ColorElements colorId) {
-    this->selectionColorId = colorId;
- }
- 
--RichString* Panel_getHeader(Panel* this) {
--   assert (this != NULL);
--
--   this->needsRedraw = true;
--   return &(this->header);
--}
--
- inline void Panel_setHeader(Panel* this, const char* header) {
-    RichString_writeWide(&(this->header), CRT_colors[PANEL_HEADER_FOCUS], header);
-    this->needsRedraw = true;
-@@ -228,15 +221,20 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
-    int x = this->x;
-    int h = this->h;
- 
-+   const int header_attr = focus
-+                         ? CRT_colors[PANEL_HEADER_FOCUS]
-+                         : CRT_colors[PANEL_HEADER_UNFOCUS];
-+   if (force_redraw) {
-+      if (Panel_printHeaderFn(this))
-+         Panel_printHeader(this);
-+      else
-+         RichString_setAttr(&this->header, header_attr);
-+   }
-    int headerLen = RichString_sizeVal(this->header);
-    if (headerLen > 0) {
--      int attr = focus
--               ? CRT_colors[PANEL_HEADER_FOCUS]
--               : CRT_colors[PANEL_HEADER_UNFOCUS];
--      attrset(attr);
-+      attrset(header_attr);
-       mvhline(y, x, ' ', this->w);
-       if (scrollH < headerLen) {
--         RichString_setAttr(&this->header, attr);
-          RichString_printoffnVal(this->header, y, x, scrollH,
-             MINIMUM(headerLen - scrollH, this->w));
-       }
-diff --git a/Panel.h b/Panel.h
-index 959c0b78..63659e3c 100644
---- a/Panel.h
-+++ b/Panel.h
-@@ -37,11 +37,13 @@ typedef enum HandlerResult_ {
- 
- typedef HandlerResult (*Panel_EventHandler)(Panel*, int);
- typedef void (*Panel_DrawFunctionBar)(Panel*);
-+typedef void (*Panel_PrintHeader)(Panel*);
- 
- typedef struct PanelClass_ {
-    const ObjectClass super;
-    const Panel_EventHandler eventHandler;
-    const Panel_DrawFunctionBar drawFunctionBar;
-+   const Panel_PrintHeader printHeader;
- } PanelClass;
- 
- #define As_Panel(this_)                 ((const PanelClass*)((this_)->super.klass))
-@@ -49,6 +51,8 @@ typedef struct PanelClass_ {
- #define Panel_eventHandler(this_, ev_)  (assert(As_Panel(this_)->eventHandler), As_Panel(this_)->eventHandler((Panel*)(this_), ev_))
- #define Panel_drawFunctionBarFn(this_)  As_Panel(this_)->drawFunctionBar
- #define Panel_drawFunctionBar(this_)    (assert(As_Panel(this_)->drawFunctionBar), As_Panel(this_)->drawFunctionBar((Panel*)(this_)))
-+#define Panel_printHeaderFn(this_)      As_Panel(this_)->printHeader
-+#define Panel_printHeader(this_)        (assert(As_Panel(this_)->printHeader), As_Panel(this_)->printHeader((Panel*)(this_)))
- 
- struct Panel_ {
-    Object super;
-@@ -84,8 +88,6 @@ void Panel_done(Panel* this);
- 
- void Panel_setSelectionColor(Panel* this, ColorElements colorId);
- 
--RichString* Panel_getHeader(Panel* this);
--
- void Panel_setHeader(Panel* this, const char* header);
- 
- void Panel_move(Panel* this, int x, int y);
-diff --git a/ScreenManager.c b/ScreenManager.c
-index 57cb564d..4c74e477 100644
---- a/ScreenManager.c
-+++ b/ScreenManager.c
-@@ -141,7 +141,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
- 
-    bool timedOut = true;
-    bool redraw = true;
--   bool force_redraw = false;
-+   bool force_redraw = true;
-    bool rescan = false;
-    int sortTimeout = 0;
-    int resetSortTimeout = 5;
-diff --git a/htop.c b/htop.c
-index 4b43ed2a..aa6d9147 100644
---- a/htop.c
-+++ b/htop.c
-@@ -313,8 +313,6 @@ int main(int argc, char** argv) {
- 
-    MainPanel_updateTreeFunctions(panel, settings->treeView);
- 
--   ProcessList_printHeader(pl, Panel_getHeader((Panel*)panel));
--
-    State state = {
-       .settings = settings,
-       .ut = ut,
diff --git a/sys-process/htop/htop-3.0.2-r1.ebuild b/sys-process/htop/htop-3.0.2-r1.ebuild
deleted file mode 100644
index 13b5c03ad252..000000000000
--- a/sys-process/htop/htop-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools linux-info python-any-r1
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840
-)
-
-pkg_setup() {
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop (what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${CBUILD} != ${CHOST} ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	local myeconfargs=(
-		# fails to build against recent hwloc versions
-		--disable-hwloc
-		--enable-taskstats
-		$(use_enable kernel_linux cgroup)
-		$(use_enable kernel_linux linux-affinity)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable vserver)
-	)
-	econf ${myeconfargs[@]}
-}
diff --git a/sys-process/htop/htop-3.0.4-r2.ebuild b/sys-process/htop/htop-3.1.0_rc1.ebuild
index 65e53029fa21..97f75eb53fee 100644
--- a/sys-process/htop/htop-3.0.4-r2.ebuild
+++ b/sys-process/htop/htop-3.1.0_rc1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools linux-info python-any-r1
+inherit autotools linux-info python-any-r1 xdg-utils
 
 DESCRIPTION="interactive process viewer"
 HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
@@ -14,12 +14,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
+IUSE="caps debug delayacct hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
 
 BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:=[unicode(+)?]
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
 	hwloc? ( sys-apps/hwloc )
-	lm-sensors? ( sys-apps/lm-sensors )"
+	kernel_linux? (
+		caps? ( sys-libs/libcap )
+		delayacct? ( dev-libs/libnl:3 )
+		lm-sensors? ( sys-apps/lm-sensors )
+	)
+"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
@@ -29,10 +35,6 @@ CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
 
 S="${WORKDIR}/${P/_}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-sort_column_header_highlight.patch"
-)
-
 pkg_setup() {
 	if ! has_version sys-process/lsof; then
 		ewarn "To use lsof features in htop (what processes are accessing"
@@ -53,19 +55,38 @@ src_configure() {
 	[[ ${CBUILD} != ${CHOST} ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
 
 	local myeconfargs=(
+		--enable-unicode
 		$(use_enable debug)
 		$(use_enable hwloc)
+		$(use_enable !hwloc affinity)
 		$(use_enable openvz)
 		$(use_enable unicode)
 		$(use_enable vserver)
-		$(use_with lm-sensors sensors)
 	)
 
-	if ! use hwloc && use kernel_linux ; then
-		myeconfargs+=( --enable-linux-affinity )
+	if use kernel_linux ; then
+		myeconfargs+=(
+			$(use_enable caps capabilities)
+			$(use_enable delayacct)
+			$(use_enable lm-sensors sensors)
+		)
 	else
-		myeconfargs+=( --disable-linux-affinity )
+		myeconfargs+=(
+			--disable-capabilities
+			--disable-delayacct
+			--disable-sensors
+		)
 	fi
 
 	econf ${myeconfargs[@]}
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml
index ffeb36553655..a2e53594d437 100644
--- a/sys-process/htop/metadata.xml
+++ b/sys-process/htop/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Lars Wendler</name>
 	</maintainer>
 	<use>
+		<flag name="delayacct">Enable Linux delay accounting support via <pkg>dev-libs/libnl</pkg></flag>
 		<flag name="hwloc">Use <pkg>sys-apps/hwloc</pkg> for CPU affinity support</flag>
 		<flag name="openvz">Enable openvz support</flag>
 		<flag name="vserver">Enable vserver support</flag>