From 1eccac538162f3c4dc9b85a07dd0f029607ee269 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 8 Apr 2024 07:18:27 +0000 Subject: [PATCH] sys-process/procps: Sync with Gentoo It's from Gentoo commit e04245bf04088e9f3e035496d648141313e5a57b. --- .../sys-process/procps/procps-4.0.4-r1.ebuild | 7 +++++-- .../sys-process/procps/procps-4.0.4.ebuild | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-4.0.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-4.0.4-r1.ebuild index f522ae5f96..0534445b36 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-4.0.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-4.0.4-r1.ebuild @@ -17,7 +17,6 @@ LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/0-ng" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode" -REQUIRED_USE="unicode? ( ncurses )" RESTRICT="!test? ( test )" DEPEND=" @@ -74,13 +73,17 @@ multilib_src_configure() { $(multilib_native_use_with ncurses) # bug #794997 $(multilib_native_use_enable !elibc_musl w) - $(multilib_native_use_enable unicode watch8bit) $(use_enable nls) $(use_enable selinux libselinux) $(use_enable static-libs static) $(use_with systemd) ) + if use ncurses; then + # Only pass whis when we are building the 'watch' command + myeconfargs+=( $(multilib_native_use_enable unicode watch8bit) ) + fi + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } diff --git a/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-4.0.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-4.0.4.ebuild index 2ddcefdad3..4e85c2be48 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-4.0.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-4.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,6 @@ LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/0-ng" KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode" -REQUIRED_USE="unicode? ( ncurses )" RESTRICT="!test? ( test )" DEPEND=" @@ -74,13 +73,17 @@ multilib_src_configure() { $(multilib_native_use_with ncurses) # bug #794997 $(multilib_native_use_enable !elibc_musl w) - $(multilib_native_use_enable unicode watch8bit) $(use_enable nls) $(use_enable selinux libselinux) $(use_enable static-libs static) $(use_with systemd) ) + if use ncurses; then + # Only pass whis when we are building the 'watch' command + myeconfargs+=( $(multilib_native_use_enable unicode watch8bit) ) + fi + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" }