gentoo resync : 12.05.2022

3 files changed, 12 insertions, 84 deletions

diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index f72c76a714d2..16cdc05118db 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,7 +1,5 @@
-DIST htop-3.0.5.tar.gz 297931 BLAKE2B a6e62f99ef349809d11bb14b4d515036601aa457507b34a96354607f136cc4e0d3d40a715f1576c70833db051d989fa55142b4f8bba0f5f432ea3676364d9575 SHA512 7dae83ceff6b3f30e69c30c9559dbb3bf69281df006c6a26e4e2c49dd5a147e05ed7bafeeac8ec5bedc8ba670470100cc128209a92654858f98df09a9394594f
-DIST htop-3.1.1.tar.gz 381277 BLAKE2B 4383991e8821e4c27a4f5cb002b198fa7915465c03d9fb83324fa2df732d8553be4061c2c559b92de934b0c214bb4445b068795050e1bee2afb803d7f32b9a67 SHA512 5e4ec9b5fdf4583c8a345dcc2fe9395737e3a6e8dd8e6547800b959be084b9d57ae30bf891f79a25f6bf99ec0b6eb7eaba8bc851072c5a550de70df4178dc07d
 DIST htop-3.1.2.tar.gz 387656 BLAKE2B a9682b6f3475fbae6ab7fd57330271190ec32267c5a8f2aac845cd18c566eaa9beed642c1e67fbc9606f120df600c27ed2ef0480a29ef304875a99898c1f10e4 SHA512 7e08b820042e480ca61137ff24b468804b49b95c1bbedaf82029dd79d29c2c541c5211284ec075692203788bbb868a9d4326ffd24c68419e22eec13ae5012700
-EBUILD htop-3.0.5-r2.ebuild 1751 BLAKE2B e617fad73f84c1206d9ca4a1766d8f927326c36f0a02e92d9cff5d2c6dccf3f30b837e7778911c6d711fd63b4fc6a72da12f3a69e88825fada3cc1c2f0990f6c SHA512 8fd8c6dfee36705e9d5b32123ce3d7a92d828e5dd2f4b91eda9a0248bba7050fa19de129ae92ecce2edd16b051a68a956053d0190d3c5f1524329d7a8f99e8dd
-EBUILD htop-3.1.1-r1.ebuild 2210 BLAKE2B 26a2201e82823512199b490a329564c22c402f7f8982a52e11ce04597a606401603dfe0fdb0f4ba05e8be3149f189350f1851f6c182ae930517942aaddf14043 SHA512 c685c228048de916cfa7495b8e11257bc0ffafc38d1c448eaab1c9f9e335ec4b99a7e752a7934ff5bcce5252a1b62850f1da40795b5de0d3f28cde5d637928c2
+DIST htop-3.2.0.tar.gz 393712 BLAKE2B fff50fce1dd58d5738ca4a75a8b4078aa34e9544798c81bb18a2674823ab13a93ecec8c00d034704ecaab6a871efa2b021550dc1f0a03aa86f638c28e84f769e SHA512 174eaa7333fa60e40f67148560c53125e7aaf46a48e7f3ecfa2daa68553c94b3d076d03320afd479dcee07e739c0ff286a81b67cbc994782c33e798d3ed4605c
 EBUILD htop-3.1.2-r1.ebuild 2353 BLAKE2B 074164ad17160d7324d39272b7dbe4b8cc6dad247b3da1d8cd5ef386afbf436ca6ab7da3928c2224ceeb7e0c9717617911320338c1e7370e70c52a310d84653b SHA512 f4402d62ef39064d06c5d2475f7aa5df2df67c1bf35488e796ab66a1dbfc8a33aa858adcef8373039711dab5b0b658cd52f003946508e3c039d623783d58616b
+EBUILD htop-3.2.0.ebuild 2375 BLAKE2B 058d14d45f380c6f4f9f47630812216caf736f65578f6875f83443f5d4580218ba5cbd0110de5525b41f2021b9bb9fb0dedceb6a07906e3592a88cab9b2f25cb SHA512 b4a8ca60c7b97964a653172e3dee34c01d27b276aeedc62a3bb36511a87089c94039ef6961448f71c4a744dd97bd7d26def75ed72c46a73009b0fa802d3180f2
 MISC metadata.xml 902 BLAKE2B 77d3f3ee5c6fb6e0c34c16837364ed701b75073c05e68770be251a2cd3bfb10cd2dd4383d86975d4823c3a2d0d0b64b7d6b3b2e7902da86e8e82806c941bdd17 SHA512 74eb7eb68bd8d11fe1f870977ba9f79bd62dce3eaf4b948371aada7f579e81623bae84224a0c789497ace1331639c8e5b8f47f56a2383f0bf381c24489a9e6b6
diff --git a/sys-process/htop/htop-3.0.5-r2.ebuild b/sys-process/htop/htop-3.0.5-r2.ebuild
deleted file mode 100644
index 6249887e7d60..000000000000
--- a/sys-process/htop/htop-3.0.5-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools linux-info python-any-r1 xdg-utils
-
-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 lm-sensors openvz unicode vserver"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:=[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/_}"
-
-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[@]}
-}
-
-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/htop-3.1.1-r1.ebuild b/sys-process/htop/htop-3.2.0.ebuild
index 807d51af35fe..028834776fc9 100644
--- a/sys-process/htop/htop-3.1.1-r1.ebuild
+++ b/sys-process/htop/htop-3.2.0.ebuild
@@ -14,12 +14,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-IUSE="caps debug delayacct hwloc lm-sensors openvz unicode vserver"
+IUSE="caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	sys-libs/ncurses:=[unicode(+)?]
 	hwloc? ( sys-apps/hwloc:= )
+	unwind? (
+		!llvm-libunwind? ( sys-libs/libunwind:= )
+		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	)
 	kernel_linux? (
 		caps? ( sys-libs/libcap )
 		delayacct? ( dev-libs/libnl:3 )
@@ -36,7 +40,7 @@ CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
 S="${WORKDIR}/${P/_}"
 
 pkg_setup() {
-	if ! has_version sys-process/lsof; then
+	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
@@ -52,7 +56,9 @@ src_prepare() {
 }
 
 src_configure() {
-	[[ ${CBUILD} != ${CHOST} ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+	if [[ ${CBUILD} != ${CHOST} ]] ; then
+		export ac_cv_file__proc_{meminfo,stat}=yes #328971
+	fi
 
 	local myeconfargs=(
 		--enable-unicode
@@ -61,6 +67,7 @@ src_configure() {
 		$(use_enable !hwloc affinity)
 		$(use_enable openvz)
 		$(use_enable unicode)
+		$(use_enable unwind)
 		$(use_enable vserver)
 	)