gentoo resync : 14.12.2020

5 files changed, 119 insertions, 4 deletions

diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index a948144a3c90..e2f868006c72 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,8 +1,11 @@
 AUX htop-2.2.0-gcc-10.patch 535 BLAKE2B 19342dbf6c2cab4c73ebd0aac664b706867e24c7f7934779fbc940fee953bfdab06396b31e419a4b308abb8bdcb1b95648b13786234848833bc11a57d12f8776 SHA512 a1f436e2ea7ef40dc403877c51a58b0af7bd252db2471479a08f1a95dd03501df77406e1171d1e3848aa308dc5c2b46ba038d53336e56b4d1d2da6e6d7a23cc5
+AUX htop-3.0.3-tinfo.patch 1643 BLAKE2B d3aadf6f244fda024cf4d129a9972fa864f24768a9e6bd5858af1964832064669d034f86a63163568e3c982efc11ce6593a81d108fbbbe8a0c507b39241cfe16 SHA512 9fc5763418f3a380d1841febf2f09ef795a012ca91454f4f36c763d9c74660806a1cfc527d3a686cdfe94e7d6efafaef79ad2d312fd1f8431da24ddbf7f7cb6e
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
 DIST htop-3.0.1.tar.gz 179925 BLAKE2B d722bc49d7b546aec1359a5dc838e0f6cc4b17f8d2d2c59fd7fbeaf827233f658ea819f4c69832af5cfd4f836d3d66c223a9580037cf8d6d2ae28c6a6b3499b5 SHA512 0d6a1b0839a94f01429c85a459b0c6439051d1b6e69bf77c6b3bb31c81902a3127936ab9adc5bf1807f4b3d7b10a177a89fb9b883931f8dcf828ed06727d6945
 DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013abce972be4370b9b35d92661fcb4521fa715bc779c1c9b56bc3c0eeb5375c0df8ec7585df3774ac67ca504 SHA512 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868
+DIST htop-3.0.3.tar.gz 292925 BLAKE2B 7e227188e3954c0cb273b4bc95eaf2e11237daca3d929d4674dcdfc987c4af26e4b08da2b0f184d6d3e06952dee5704e468bf4b7bc03dfa0b6602c058beac495 SHA512 208eff95a0df3ab38f5e3175bb34420c8833ad630c797825a3fb188a1111476a3287aa5f53511c83da90d181afc3e6ea246ea01fbc3227466c5c928a5d70badc
 EBUILD htop-2.2.0.ebuild 1477 BLAKE2B 1a5421e1dae65c14cd719070206158989e73879ef4bc5413254aaf9b04184d35838d12704e134c16414395f491393b8660683e51e40dcc5f7e9fdb7dcd3565e7 SHA512 4acfb07731fc5bb398fb77ebadbb7131768999b4a948f9941cf9db4f3554b623e11d6ad80195a668341c16d5dc095d65b3d16c310c64a36ac85ff69c0b10551b
 EBUILD htop-3.0.1.ebuild 1471 BLAKE2B 61e570d83bfc55421ddeeddf7511f0fc165494c620e9eb80b51a92fff1810247d846aecaf94646f56a0a632622e7bf129e04af2ca2254a85e0274c9bcea4f3c5 SHA512 892925343c1526eaee61f1e21c559e91433dffb23191d45ae95b28cf236b0c93665eb277c39526fd8f4b2fe60346e592f46553c0a2ba1bcefc5760e78dcfaa8d
-EBUILD htop-3.0.2.ebuild 1471 BLAKE2B 61e570d83bfc55421ddeeddf7511f0fc165494c620e9eb80b51a92fff1810247d846aecaf94646f56a0a632622e7bf129e04af2ca2254a85e0274c9bcea4f3c5 SHA512 892925343c1526eaee61f1e21c559e91433dffb23191d45ae95b28cf236b0c93665eb277c39526fd8f4b2fe60346e592f46553c0a2ba1bcefc5760e78dcfaa8d
-MISC metadata.xml 828 BLAKE2B a116a06ab632e104c2278bc9470e0a4cf5a7e36cab7f56db58cdb1aa84fd8dd14fbfb8aac61656b9942d6829cf43e4e692599d1be245121dcb091aea901a3a7d SHA512 18b1fd3c0794745117b16d717036b9b469a29b7befd910378fc62feea4ddb3d85a2c4c77dadb735d498826375ee652f70d7594552640ebaa9066316df9cdde4b
+EBUILD htop-3.0.2.ebuild 1513 BLAKE2B 839da109f4f9ad36e4369e840c5046d66b9805bf496c8b2411284290d75092b3bd82f0f8e03ae04159df257f08a7d761843a00dd4563e8a768f8889bface84d8 SHA512 1dd5b45f1099584515d40dab89cba85e64754c3523d36be934ca1b3330ea63ebdfdd6ccc1aecb50f2f87c22bd929ce470a9d1baec4f8142411a4cb56e1c85e73
+EBUILD htop-3.0.3.ebuild 1687 BLAKE2B f5f32ebffb159df027c4b85d3e8f7499b8b1169afa7ede0b1d8af439f8dab8fdca10eea7dfb8ae17029ec168e8518fe0451103b4cc1ead085b879d9337cf0efc SHA512 0d6ab37677a4081b4a76dad83159cbcceba98767b667376fd48da9e506ea2580ddd0fdf6d03eff807a86a3bff82066bb3cb3def555b49b0916e1dd3a80f87b86
+MISC metadata.xml 911 BLAKE2B e92af64c9d4ead9348cecca14425e8778d3d69e63cd45063e76c1a8052610e6155299c01606aa3a3540ec3b432629d074cda74130ad86f1d31bb09957fb51a75 SHA512 686e8459e279182fcba99f65d67491c11ed144149207e2ac952797b6d66f145ef7b2ea19a5116e9e9a70d6a6ad6d4ecbf106c8f3734e45019f7e274311437ece
diff --git a/sys-process/htop/files/htop-3.0.3-tinfo.patch b/sys-process/htop/files/htop-3.0.3-tinfo.patch
new file mode 100644
index 000000000000..ea65a799ed7a
--- /dev/null
+++ b/sys-process/htop/files/htop-3.0.3-tinfo.patch
@@ -0,0 +1,38 @@
+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/htop-3.0.2.ebuild b/sys-process/htop/htop-3.0.2.ebuild
index eacb7a88db21..9a0da288eaf7 100644
--- a/sys-process/htop/htop-3.0.2.ebuild
+++ b/sys-process/htop/htop-3.0.2.ebuild
@@ -10,7 +10,7 @@ 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"
+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"
@@ -25,7 +25,9 @@ DOCS=( ChangeLog README )
 
 CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
 
-PATCHES=()
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840
+)
 
 pkg_setup() {
 	if ! has_version sys-process/lsof; then
diff --git a/sys-process/htop/htop-3.0.3.ebuild b/sys-process/htop/htop-3.0.3.ebuild
new file mode 100644
index 000000000000..2dae7a50f93f
--- /dev/null
+++ b/sys-process/htop/htop-3.0.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+	hwloc? ( sys-apps/hwloc )
+	lm-sensors? ( sys-apps/lm-sensors )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+S="${WORKDIR}/${P/_}"
+
+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=(
+		$(use_enable debug)
+		$(use_enable hwloc)
+		$(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 )
+	else
+		myeconfargs+=( --disable-linux-affinity )
+	fi
+
+	econf ${myeconfargs[@]}
+}
diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml
index 0101007448c6..ffeb36553655 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="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>
 	</use>