gentoo auto-resync : 02:09:2023 - 16:16:36

9 files changed, 255 insertions, 2 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index a6f28a27dd94..d31050e94111 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 7e55ee710fd7..3246d489295d 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -8,6 +8,6 @@ DIST parallel-20230822.tar.bz2 2507873 BLAKE2B cbf272623b92ad1fd1411e5f89e44855e
 DIST parallel-20230822.tar.bz2.sig 2080 BLAKE2B 3b7f4c636dd3a900bb724b75580f29a533f8785fe78048a8852e907cf92fb40d1c366a7cbc48de9e5ca1e3fd5754dd69fd3634d24ca1883d821d41089c065bcb SHA512 cc044a9890b7d37c4642d20002af7c86987badb47ce945a80b382d84a0c8ff5db21cbf8f374a5ac84132c295a8cb6e31476d59df03ad589ab0e790f874c47af8
 EBUILD parallel-20230522.ebuild 971 BLAKE2B 7b424232dba0b99cc630ddb832df6cc1e4a924e5c122dcc2f61071782aaece586c7bdd377019c801b7ef011b4e6ef2f30d6821663264fc76037be3fcbf2d8345 SHA512 5d5a353567aef275599c46a0dd1a2a5ffca82ea56dd15848117dfaabeaee609f0f88cf52982d6cd8f29597a7fd5554c3cca4ba81dcbce329a46ef0a5d7ffe3e3
 EBUILD parallel-20230622.ebuild 977 BLAKE2B ea35c4a98f837ac1f2e4ade14c703434aaf236684fc95fafd79bdb7552b83800f495b07b28bbadf126f9232bc4e0d7cc2948bf29dd9ba12beec689d6b02a30d9 SHA512 5127a55a4ef2a4982419db05d73d44ffb8ebf3c0b39edc25de5a5eb7cffd5b3b7e3520df96ed802bfccc935d38a2ceedcea0398dad6c95fe68278f17c788c929
-EBUILD parallel-20230722.ebuild 977 BLAKE2B ea35c4a98f837ac1f2e4ade14c703434aaf236684fc95fafd79bdb7552b83800f495b07b28bbadf126f9232bc4e0d7cc2948bf29dd9ba12beec689d6b02a30d9 SHA512 5127a55a4ef2a4982419db05d73d44ffb8ebf3c0b39edc25de5a5eb7cffd5b3b7e3520df96ed802bfccc935d38a2ceedcea0398dad6c95fe68278f17c788c929
+EBUILD parallel-20230722.ebuild 972 BLAKE2B 975a24315eefe603088ffb735f6fe2ac30c908f920cdc5612ce4c4ec6006401daaad5aaa5efa6f37f6971d99b9a82c336d36830297658353c5912c7f22d67cf4 SHA512 de47d1d623baf9b36f799e1217ef41dfa24e2530211dde4d9badafcd83d4d4da70d701c2df360bd309ff637ce48112bf96a0ac6c963510040ced300162142f03
 EBUILD parallel-20230822.ebuild 977 BLAKE2B ea35c4a98f837ac1f2e4ade14c703434aaf236684fc95fafd79bdb7552b83800f495b07b28bbadf126f9232bc4e0d7cc2948bf29dd9ba12beec689d6b02a30d9 SHA512 5127a55a4ef2a4982419db05d73d44ffb8ebf3c0b39edc25de5a5eb7cffd5b3b7e3520df96ed802bfccc935d38a2ceedcea0398dad6c95fe68278f17c788c929
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/parallel-20230722.ebuild b/sys-process/parallel/parallel-20230722.ebuild
index 118f6be5fb2c..db3bc41c9207 100644
--- a/sys-process/parallel/parallel-20230722.ebuild
+++ b/sys-process/parallel/parallel-20230722.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 88a156785534..e204dc0cbaa3 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,6 +1,12 @@
 AUX procps-3.3.11-sysctl-manpage.patch 941 BLAKE2B e10b6f85325d1ea23b327dffe4ba35662d5110492d0d5fcffad41edff21ddea4ea8c8bcb66582f63abd100a20d0d406e1c3fb176a8c290ba2cc6ecb02aa98248 SHA512 df8b233bde879fa675742baf8b38d43dd7c306fe52013ace715dff02c126d8c5ea12bd93087da10f5e722294eef59577b264309cbdc6f9f3727fa7111c5db313
 AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadbe5e7c54c4b0a65abad6ebe8a89f1b8f7f6bd29114b50678aa89cd0c89d26a95a10aa403d48bcc8371f16eaf34c823390 SHA512 ecc94717366a314ac4bba550b84472555f7b217be2174b68778d3364e16586ab9c21756d2041e2ac9d1449856fcd6aa691d8bd1a8558b4653d068dc1d59c2c71
 AUX procps-3.3.17-musl-fix.patch 1907 BLAKE2B 211d5512d9546592b23815bf4085447f6d07c0ac07cb03be01b520a56dc60fdfd07e9c055b0b40196efa2748f54eb5d8070cda80c5001d74fa5f261f53bd234c SHA512 5cf9852e54c307fedbf17b3a331ea992ea2c137120b6f89e4eeb7643091c09872e7e3bdcd2e80b83c46c02b2a0e0d56792afb7fe0564fa4f97e56f304b5792bd
+AUX procps-4.0.4-fix-systemd-linkage.patch 773 BLAKE2B 35eb8ad2d892cd23dc07cd5cdc888127bc31188973f44bdd5db14b174777b436fb6c3280c0084b8173e64baaea6f70f87a5645078e1fee22c829063d77739ed1 SHA512 69071bf1148df6e0696072c56a4501e50e93498b4a0092fbbbd0ed818af3d8128e81d35bcf091a827832a0261bfedd0b71d840dfd7028965bea810fbc88ae1a6
+AUX procps-4.0.4-fix-tests-multilib.patch 919 BLAKE2B aefecd115ff9f5ac64b3a9880a402b57fba65900faf80d44076ab4776894f97bbb1a8540d6627eb37134568f329142567b8c21736c7c46a9cf2ff798dc923119 SHA512 b820e9b9755278b3336fdda8df08148083e446fb89df4d91deb6d36f38546622f7cfc0ca20951f0a5ba26a62393ad05341f9d4c101727cc3aec9c8f09c8db975
+AUX procps-4.0.4-sysctl-manpage.patch 1063 BLAKE2B 47d0682ac517801a62c61c0d2486417c56e422e4f60a2bc2b42ab1c969204b820b6b2fd089f6fff04a093e9652d51782e497dd0cd5e82e0815ab8bcead0e719d SHA512 08e1001d9490eedfd54daba46e1eca0743e4e74321e79779dfadceb3f7bd91b06fe063e53559b7623ce08d1aec15dd4cee01180f5920c64844f1529f32a74c3a
+AUX procps-4.0.4-xfail-pmap-test.patch 697 BLAKE2B 22f9ebf50f0a89a804eaeaf9515a4de83762fa8467c603d7b6b1646afd8d12c01daf1e000cca23cd2e2053346a0a05a97d17c67df2e85c8915cb59fb6d4c5447 SHA512 874c0ed1625a1c7beceb5cfee1f521f1ccc7f2f5b3e799f241072334430bd00faa2d043b86d42616a09ac3f1033a8f3334d28d5f91cb64a0daefc1a921041088
 DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
+DIST procps-ng-4.0.4.tar.xz 1401540 BLAKE2B 63b972666ef9e92042be96739ffa15c787d0346b2d3ffcb0d240b0a4e999dc90024b2c5b058df683dd9d2c436ceb812abd0b115cc877a6ca1023988b86de443f SHA512 94375544e2422fefc23d7634063c49ef1be62394c46039444f85e6d2e87e45cfadc33accba5ca43c96897b4295bfb0f88d55a30204598ddb26ef66f0420cefb4
 EBUILD procps-3.3.17-r2.ebuild 2587 BLAKE2B a2f0c26b0f1da996566b2798b44789a0e7c9ed6baf7fc248a318036092e180af55da5ff6bb4fd39a907bf3aeeaf66a612350b4f695d4e85355f9e4eaf8a9da91 SHA512 d2f052ab6f3da4cbaa286c63af409c8e6de6aab304249580eb4b243f7b4f2cd6dbb31d6b0ebef2001eabb540d6933d520ec0a6244bbddc036c7e421b417cb317
+EBUILD procps-4.0.4.ebuild 2830 BLAKE2B a8f4341802b89bb26094eca83e7cceab5a2aa35d0f1abbff32f48d1fb89884977930de57f90851c1e6913b8fa6cbe1813b7328937e5f9ed0944562bb68184dd4 SHA512 2a61feedd4da15a153c00464a09f8aac62e45e57be45ba87fd4a45b529845266f3d801b8ef82ca1d5372dfeb947c5984e93f2c081ceb80a921c5e82ebffd11e9
 MISC metadata.xml 788 BLAKE2B b8352d682de7ad98344997d344783c444f326153bf5ed479d9e3032dac52b5f938c47ec83ca2d284617f98d0fbde2d9357ee7c205f74d7a2b2c586865a1de756 SHA512 cb6ebcf57a2800ae492fed52ad3de2ba7e767b121ccd6c20f8a0fd6c5fbbc97fb42d20e083ee3d3935fa6fa6e318bccd96d557c9b693507e64b22b8d3c92d1fd
diff --git a/sys-process/procps/files/procps-4.0.4-fix-systemd-linkage.patch b/sys-process/procps/files/procps-4.0.4-fix-systemd-linkage.patch
new file mode 100644
index 000000000000..32f4d6da6dc6
--- /dev/null
+++ b/sys-process/procps/files/procps-4.0.4-fix-systemd-linkage.patch
@@ -0,0 +1,27 @@
+https://gitlab.com/procps-ng/procps/-/commit/ca004d4657d5e8b468a4552ede429be53193a3a9
+
+From ca004d4657d5e8b468a4552ede429be53193a3a9 Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@dropbear.xyz>
+Date: Thu, 31 Aug 2023 22:24:23 +1000
+Subject: [PATCH] build-sys: Add systemd/elogind to w
+
+Depending on the compiler flags, w needs to be explictly linked
+to libsystemd or elogind even though libproc2 is linked to it.
+
+Signed-off-by: Craig Small <csmall@dropbear.xyz>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -149,6 +149,13 @@ endif
+ 
+ dist_man_MANS += man/w.1
+ src_w_SOURCES = src/w.c local/fileutils.c
++src_w_LDADD = $(LDADD)
++if WITH_SYSTEMD
++src_w_LDADD += @SYSTEMD_LIBS@
++endif
++if WITH_ELOGIND
++src_w_LDADD += @ELOGIND_LIBS@
++endif
+ else
+   EXTRA_DIST += man/w.1
+ endif
diff --git a/sys-process/procps/files/procps-4.0.4-fix-tests-multilib.patch b/sys-process/procps/files/procps-4.0.4-fix-tests-multilib.patch
new file mode 100644
index 000000000000..ed52af8582b9
--- /dev/null
+++ b/sys-process/procps/files/procps-4.0.4-fix-tests-multilib.patch
@@ -0,0 +1,52 @@
+https://gitlab.com/procps-ng/procps/-/merge_requests/205
+
+From 4b6b91b393c0f5d3ec26910785cb3e3a463fcb57 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 2 Sep 2023 10:46:38 +0100
+Subject: [PATCH] testsuite: skip tests where relevant binaries aren't built
+
+* With --without-ncurses, slabtop isn't built.
+* With --disable-w, w isn't built.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -14,16 +14,23 @@ if LINUX
+ # 3d807ae853b8b4264da156065b34f1447658a8ba
+ DEJATOOL += \
+ 	pmap
++
+ if !CYGWIN
+-DEJATOOL += \
+-	slabtop \
+-	sysctl
++if WITH_NCURSES
++DEJATOOL += slabtop
++endif
++
++DEJATOOL += sysctl
+ endif
+ 
+ if BUILD_KILL
+ DEJATOOL += kill
+ endif
+ 
++if BUILD_W
++DEJATOOL += w
++endif
++
+ DEJATOOL += \
+ 	free \
+ 	lib \
+@@ -31,10 +38,8 @@ DEJATOOL += \
+ 	pkill \
+ 	ps \
+ 	pwdx \
+-	slabtop \
+ 	uptime \
+-	vmstat \
+-	w
++	vmstat
+ endif
+ 
+ EXTRA_DIST = \
diff --git a/sys-process/procps/files/procps-4.0.4-sysctl-manpage.patch b/sys-process/procps/files/procps-4.0.4-sysctl-manpage.patch
new file mode 100644
index 000000000000..3582f7e79306
--- /dev/null
+++ b/sys-process/procps/files/procps-4.0.4-sysctl-manpage.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/565304
+--- a/man/sysctl.8
++++ b/man/sysctl.8
+@@ -141,21 +141,21 @@ replaced (by having a new configuration file with the same name in a
+ directory of higher priority) or partially replaced (by having a configuration
+ file that is ordered later).
+ .SH EXAMPLES
+-/sbin/sysctl \-a
++/usr/bin/sysctl \-a
+ .br
+-/sbin/sysctl \-n kernel.hostname
++/usr/bin/sysctl \-n kernel.hostname
+ .br
+-/sbin/sysctl \-w kernel.domainname="example.com"
++/usr/bin/sysctl \-w kernel.domainname="example.com"
+ .br
+-/sbin/sysctl \-p/etc/sysctl.conf
++/usr/bin/sysctl \-p/etc/sysctl.conf
+ .br
+-/sbin/sysctl \-a \-\-pattern forward
++/usr/bin/sysctl \-a \-\-pattern forward
+ .br
+-/sbin/sysctl \-a \-\-pattern forward$
++/usr/bin/sysctl \-a \-\-pattern forward$
+ .br
+-/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
++/usr/bin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
+ .br
+-/sbin/sysctl \-\-pattern '\[char94]net.ipv6' \-\-system
++/usr/bin/sysctl \-\-pattern '\[char94]net.ipv6' \-\-system
+ .SH DEPRECATED PARAMETERS
+ The
+ .B base_reachable_time
diff --git a/sys-process/procps/files/procps-4.0.4-xfail-pmap-test.patch b/sys-process/procps/files/procps-4.0.4-xfail-pmap-test.patch
new file mode 100644
index 000000000000..037fe657f4ea
--- /dev/null
+++ b/sys-process/procps/files/procps-4.0.4-xfail-pmap-test.patch
@@ -0,0 +1,25 @@
+--- a/testsuite/pmap.test/pmap.exp
++++ b/testsuite/pmap.test/pmap.exp
+@@ -87,13 +87,15 @@ proc expect_twice_total { test } {
+     }
+ }
+ 
+-set test "pmap X pid pid has same total"
+-spawn $pmap -X $mypid $mypid
+-expect_twice_total "$test"
+-
+-set test "pmap XX pid pid has same total"
+-spawn $pmap -XX $mypid $mypid
+-expect_twice_total "$test"
++# Fails in gentoo sandbox, needs investigation
++#set test "pmap X pid pid has same total"
++#spawn $pmap -X $mypid $mypid
++#expect_twice_total "$test"
++
++# Fails in gentoo sandbox, needs investigation
++#set test "pmap XX pid pid has same total"
++#spawn $pmap -XX $mypid $mypid
++#expect_twice_total "$test"
+ 
+ set test "pmap finding shm"
+ make_testshm_proc
diff --git a/sys-process/procps/procps-4.0.4.ebuild b/sys-process/procps/procps-4.0.4.ebuild
new file mode 100644
index 000000000000..58e8d0c5adb7
--- /dev/null
+++ b/sys-process/procps/procps-4.0.4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal usr-ldscript
+
+DESCRIPTION="Standard informational utilities and process-handling tools"
+HOMEPAGE="https://gitlab.com/procps-ng/procps"
+# Per e.g. https://gitlab.com/procps-ng/procps/-/releases/v4.0.4, the dist tarballs
+# are still hosted on SF.
+SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
+S="${WORKDIR}"/${PN}-ng-${PV}
+
+# See bug #913210
+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"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	elogind? ( sys-auth/elogind )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode(+)?] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	!<app-i18n/man-pages-l10n-4.2.0-r1
+	!<app-i18n/man-pages-de-2.12-r1
+	!<app-i18n/man-pages-pl-0.7-r1
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-apps/util-linux[kill]
+	)
+"
+BDEPEND="
+	elogind? ( virtual/pkgconfig )
+	ncurses? ( virtual/pkgconfig )
+	systemd? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+# https://bugs.gentoo.org/898830
+QA_CONFIG_IMPL_DECL_SKIP=( makedev )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.4-sysctl-manpage.patch # bug #565304
+	"${FILESDIR}"/${PN}-4.0.4-fix-tests-multilib.patch
+	"${FILESDIR}"/${PN}-4.0.4-xfail-pmap-test.patch
+	"${FILESDIR}"/${P}-fix-systemd-linkage.patch
+)
+
+src_prepare() {
+	default
+
+	# Only for fix-tests-multilib.patch and fix-systemd-linkage.patch
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
+	# bug #471102
+	append-lfs-flags
+
+	local myeconfargs=(
+		# No elogind multilib support
+		$(multilib_native_use_with elogind)
+		$(multilib_native_use_enable kill)
+		$(multilib_native_use_enable modern-top)
+		$(multilib_native_enable pidof)
+		$(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)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# bug #461302
+	emake check </dev/null
+}
+
+multilib_src_install() {
+	default
+
+	dodoc "${S}"/sysctl.conf
+
+	if multilib_is_native_abi ; then
+		dodir /bin
+		mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
+		if use kill ; then
+			mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
+		fi
+
+		gen_usr_ldscript -a proc2
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}