From 50507cc94f2a2b4536c742b7b183daf8b6e55231 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 15 Dec 2021 03:27:57 +0000 Subject: sys-process/htop: fix automagic libunwind dependency Maintainer timeout. Note that while libunwind is conditional, the functionality isn't: for musl, we're going to have to force USE=unwind (use libunwind or llvm-libunwind), while on glibc, it's fine to fallback to backtrace.h/execinfo (doesn't exist on musl). Closes: https://bugs.gentoo.org/818208 Signed-off-by: Sam James --- sys-process/htop/htop-3.1.2-r1.ebuild | 104 ++++++++++++++++++++++++++++++++++ sys-process/htop/htop-3.1.2.ebuild | 99 -------------------------------- 2 files changed, 104 insertions(+), 99 deletions(-) create mode 100644 sys-process/htop/htop-3.1.2-r1.ebuild delete mode 100644 sys-process/htop/htop-3.1.2.ebuild (limited to 'sys-process') diff --git a/sys-process/htop/htop-3.1.2-r1.ebuild b/sys-process/htop/htop-3.1.2-r1.ebuild new file mode 100644 index 000000000000..138f07eb7bd5 --- /dev/null +++ b/sys-process/htop/htop-3.1.2-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +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="caps debug delayacct hwloc kernel_FreeBSD kernel_linux 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 ) + 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=( + --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 +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/sys-process/htop/htop-3.1.2.ebuild b/sys-process/htop/htop-3.1.2.ebuild deleted file mode 100644 index c11394f6a76a..000000000000 --- a/sys-process/htop/htop-3.1.2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -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="caps debug delayacct hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - sys-libs/ncurses:=[unicode(+)?] - hwloc? ( sys-apps/hwloc:= ) - kernel_linux? ( - caps? ( sys-libs/libcap ) - delayacct? ( dev-libs/libnl:3 ) - 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=( - --enable-unicode - $(use_enable debug) - $(use_enable hwloc) - $(use_enable !hwloc affinity) - $(use_enable openvz) - $(use_enable unicode) - $(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 -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} -- cgit v1.2.3-65-gdbad