Updating liguros repo

5 files changed, 114 insertions, 1 deletions

diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 07ecf183204f..c6eae48c37a8 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,3 +1,4 @@
 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
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 7aa5e10db7e8..2bd758f16304 100644
--- a/sys-process/htop/htop-3.0.2.ebuild
+++ b/sys-process/htop/htop-3.0.2.ebuild
@@ -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..b0c8193d042c
--- /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,7,8,9,10} )
+
+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="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 39dd0116f83f..e34c6c99ecb4 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>