From b790e39e8c852df7b0e126ee22d82dcf891fc80d Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Fri, 28 Jul 2023 12:53:59 +0200
Subject: [PATCH] sys-process/procps: Sync with Gentoo

It's from Gentoo commit 183c2d9cd8833a95f22bc4dd7a90d7fe09c2c0ab.
---
 .../sys-process/procps/metadata.xml           | 29 ++++++++++---------
 ...3.17-r1.ebuild => procps-3.3.17-r2.ebuild} | 22 ++++++--------
 2 files changed, 24 insertions(+), 27 deletions(-)
 rename sdk_container/src/third_party/portage-stable/sys-process/procps/{procps-3.3.17-r1.ebuild => procps-3.3.17-r2.ebuild} (77%)

diff --git a/sdk_container/src/third_party/portage-stable/sys-process/procps/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-process/procps/metadata.xml
index 0c2045c8c7..7994767907 100644
--- a/sdk_container/src/third_party/portage-stable/sys-process/procps/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-process/procps/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
-	<flag name="kill">Build the kill program</flag>
-	<flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
-	<flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
-</use>
-<upstream>
-	<remote-id type="sourceforge">procps</remote-id>
-	<remote-id type="cpe">cpe:/a:procps_project:procps</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
+		<flag name="kill">Build the kill program</flag>
+		<flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
+		<flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:procps_project:procps</remote-id>
+		<remote-id type="gitlab">procps-ng/procps</remote-id>
+		<remote-id type="sourceforge">procps</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-3.3.17-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-3.3.17-r2.ebuild
similarity index 77%
rename from sdk_container/src/third_party/portage-stable/sys-process/procps/procps-3.3.17-r1.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-process/procps/procps-3.3.17-r2.ebuild
index 7045b992c8..e7a872a1c7 100644
--- a/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-3.3.17-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-process/procps/procps-3.3.17-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
+# See https://bugs.gentoo.org/835813 before bumping to 4.x!
+
+inherit flag-o-matic multilib-minimal usr-ldscript
 
 DESCRIPTION="Standard informational utilities and process-handling tools"
 HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
@@ -11,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/8" # libprocps.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+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"
 RESTRICT="!test? ( test )"
 
@@ -37,6 +39,9 @@ RDEPEND="${DEPEND}
 	!<app-i18n/man-pages-pl-0.7-r1
 "
 
+# https://bugs.gentoo.org/898830
+QA_CONFIG_IMPL_DECL_SKIP=( makedev )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
 	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
@@ -51,18 +56,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	if tc-is-cross-compiler ; then
-		# This isn't ideal but upstream don't provide a placement
-		# when malloc is missing anyway, leading to errors like:
-		# pslog.c:(.text.startup+0x108): undefined reference to `rpl_malloc'
-		# See https://sourceforge.net/p/psmisc/bugs/71/
-		# (and https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html)
-		export ac_cv_func_malloc_0_nonnull=yes \
-			ac_cv_func_realloc_0_nonnull=yes
-	fi
-
 	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
 	append-lfs-flags #471102
+
 	local myeconfargs=(
 		$(multilib_native_use_with elogind) # No elogind multilib support
 		$(multilib_native_use_enable kill)