gentoo auto-resync : 10:08:2022 - 02:17:07

4 files changed, 125 insertions, 3 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index e6cb616f0722..2f7e7ead6501 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 9b3f45f12729..c7b178a0d8ce 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -5,6 +5,7 @@ DIST htop-3.2.1.tar.xz 406048 BLAKE2B 7addefca7de8f0867220e6415f4585f7e6ecf655d6
 EBUILD htop-3.1.2-r1.ebuild 2353 BLAKE2B 074164ad17160d7324d39272b7dbe4b8cc6dad247b3da1d8cd5ef386afbf436ca6ab7da3928c2224ceeb7e0c9717617911320338c1e7370e70c52a310d84653b SHA512 f4402d62ef39064d06c5d2475f7aa5df2df67c1bf35488e796ab66a1dbfc8a33aa858adcef8373039711dab5b0b658cd52f003946508e3c039d623783d58616b
 EBUILD htop-3.2.0.ebuild 2382 BLAKE2B ae617312ca6a78bbcc283a1a40746f1e26cd53972b2908af63d090057b478ab3c689501cc2fffefff0e2962073321629100b66374c1eb1fec9dfa1bfb351a52e SHA512 ad3bcbd477a29d29778107031280049de5a11926a7617f1df2c7d72a86a8c7430641653eff8db4200c8ff9418727122e1f8030dc3f36597a7f8708543e584f70
 EBUILD htop-3.2.1-r1.ebuild 2322 BLAKE2B 1f53e9b17bc0168095ebdc6ccc44c960aa343dcd251b0b07916e9334264fec09223c5a037c7506ba4b6630df96fd11264cc796bd6a43a411b2ac7daacf9d8d80 SHA512 b8e2c71af7baebd2a49cf0af769c5e79b7a01b8d583b523e7793bb8691f2513510fb8b3a75097e45e56dc070dedd0403ce73f8d92beaa2e119e46474ceaa862b
+EBUILD htop-3.2.1-r2.ebuild 2573 BLAKE2B 4c6bdc685014fd0a22a101ce58bb2fc7e3167b5840905a96c51481e780fd6d67119b727cad077ee278b6382d7d044418ceb2ef3ada99e263d2d9cc8bc440e0ea SHA512 b984d6f0be3805792f73a0edbb42a3d5f38089c908abcc81757f892acc75ee4398e54aeb70d151c3ae1d5901d425d3ee7b8be2a84b241d81759f3a9b1cd8d948
 EBUILD htop-3.2.1.ebuild 2382 BLAKE2B ae617312ca6a78bbcc283a1a40746f1e26cd53972b2908af63d090057b478ab3c689501cc2fffefff0e2962073321629100b66374c1eb1fec9dfa1bfb351a52e SHA512 ad3bcbd477a29d29778107031280049de5a11926a7617f1df2c7d72a86a8c7430641653eff8db4200c8ff9418727122e1f8030dc3f36597a7f8708543e584f70
-EBUILD htop-9999.ebuild 2330 BLAKE2B ce47da168fde1e6afe56a47c8bea16b69e808406054cde28a9b04aafe4096df0eca6d84dc20095c92190e5790fc805d0b55773094c84b6cf3969e2eaf4c2149e SHA512 b49f75dced245369cc35b044d2f2b5815f6fa8b88ae8c732baf53b4d21bbe5e34a10d36cceb716c6dfb07180e21fc65384c86aecba0cc79425157ddbb322479b
+EBUILD htop-9999.ebuild 2573 BLAKE2B 4c6bdc685014fd0a22a101ce58bb2fc7e3167b5840905a96c51481e780fd6d67119b727cad077ee278b6382d7d044418ceb2ef3ada99e263d2d9cc8bc440e0ea SHA512 b984d6f0be3805792f73a0edbb42a3d5f38089c908abcc81757f892acc75ee4398e54aeb70d151c3ae1d5901d425d3ee7b8be2a84b241d81759f3a9b1cd8d948
 MISC metadata.xml 908 BLAKE2B ef2166ceae63ee1545ac919278b3c0e2bcbba9612d7ff6e6cac20c3d1b5981b49bb13894b8177caafcc844395ae373415a07726ad89dabc4328274eec39ae90a SHA512 8f13f80bc6bdbfbf23e7172e1872681d7f063094a68a8e773a9258e364bb947d16325cf26e5091b3b75c80b0f3b8444394535bbe409e95d7e97a733e09d5537e
diff --git a/sys-process/htop/htop-3.2.1-r2.ebuild b/sys-process/htop/htop-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..7d41590b84b1
--- /dev/null
+++ b/sys-process/htop/htop-3.2.1-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+# 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"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/htop-dev/htop.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/htop-dev/htop/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+S="${WORKDIR}/${P/_}"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+IUSE="caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver"
+
+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 )
+		lm-sensors? ( sys-apps/lm-sensors )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if [[ ${CBUILD} != ${CHOST} ]] ; then
+		# bug #328971
+		export ac_cv_file__proc_{meminfo,stat}=yes
+	fi
+
+	local myeconfargs=(
+		--enable-unicode
+		$(use_enable debug)
+		$(use_enable hwloc)
+		$(use_enable !hwloc affinity)
+		$(use_enable openvz)
+		$(use_enable unicode)
+		$(use_enable unwind)
+		$(use_enable vserver)
+	)
+
+	if use kernel_linux ; then
+		myeconfargs+=(
+			$(use_enable caps capabilities)
+			$(use_enable delayacct)
+			$(use_enable lm-sensors sensors)
+		)
+	else
+		if use kernel_Darwin ; then
+			# Upstream default to checking but --enable-affinity
+			# overrides this. Simplest to just disable on Darwin
+			# given it works on BSD anyway.
+			myeconfargs+=( --disable-affinity )
+		fi
+
+		myeconfargs+=(
+			--disable-capabilities
+			--disable-delayacct
+			--disable-sensors
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+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
+}