gentoo resync : 23.09.2020

14 files changed, 109 insertions, 134 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 79ad1c76f807..40badf40cee5 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index d65af4d0bde6..cfe7a58f8143 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -13,6 +13,6 @@ DIST criu-3.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
 EBUILD criu-3.11.ebuild 2900 BLAKE2B b8589a947a4672aaf53f341ddf590910c5e29eba5cec10da0a4a49e8fee7f2dfbe874790e0cd6531bb6fea9c04df36c0884384491e6fcca5805dee7243351ac7 SHA512 b60f26c2fd42745681c4cebb90a7345d2dc8653ffb9a346830b220361a676200813efa3ab1fa7f86a9509badd187811b7c60450185a6531e09be69f9e26e5518
 EBUILD criu-3.12.ebuild 2908 BLAKE2B e2302e92541f7877fe7dacf4f6cfb6b900b1fc470a63c6146ac82b3510bcff8bc77459bd4ca00be0aba98d4b9543121ec3e62a88d219cec58ceecaf7be16b241 SHA512 ad077cf2ce8f40e7a35042dd4468677ec1e301c2ef472ce6158810408ba3b4c44352cd27e4f7941d86d7c5fb1b66fdc507a1ad173b5d050045be4d3a255c2bea
-EBUILD criu-3.14-r1.ebuild 3086 BLAKE2B a69dd1a87670b31ea37a9c0a9ec393d168757f9c258b623d8eab48be5a9cd159b901c63c3fcd569b25722359b221416cc153bbb7b98243a1575c7d14559c84bc SHA512 45ceacbdba851207560a9d7b2b7b007af49b820d119d0944bd99c90d9e291a7f800e3c6e6fd44901e4cfd052da7fe3359bf3cbbc9ac72709445a08233e679844
+EBUILD criu-3.14-r2.ebuild 3059 BLAKE2B 0bdc0af5e6aaffb1a9f9a81db5dcfa5ff00da9b7190455d6f869f1dc0bcb9afe71665c63b6f97e8a8cdf0da7cbc373029f01162d7a2a7682d613a1928726c5c5 SHA512 d9b64a37e3a11e9f5dc9315254ea811452ea078f58cb7e19118a43624a168023005b90713904a90641a6fd11ba6a939a4d5849470cf03473df403334d63eb53d
 EBUILD criu-3.6.ebuild 2530 BLAKE2B fa1a972b8f6c15296ac8bf9519e2e4e0758fd2aad6582014b84ec72b12384385c80f0b9477301f333745ab8d1833c7521d77fa6218b1f7a3de7a4f90cdd3886b SHA512 979baf7eca6befc56c951f063ec8775d35401136f4783009829229698ae9ed8b598737f8869c016fd5a266985df4be15048ea7e8aed550160f5281348954ed73
 MISC metadata.xml 489 BLAKE2B b147e18ffae358f6ea0c3ca2cc8addaa039d77fc845092758a258943852daa0bc674f9f2a5a94ba7094d2e6c65a179271304e2b0b4a01f1cff6d4ac20696dce8 SHA512 aebc8636c880916beff94bb80e4a9fda5eef6ef935c9e0305bbcab038e26e69a5947640e05d74978a034ca5b36d5096e177d9485c036314eaada010f16f144d4
diff --git a/sys-process/criu/criu-3.14-r1.ebuild b/sys-process/criu/criu-3.14-r2.ebuild
index c9f8ef9a81c2..0cab02a87743 100644
--- a/sys-process/criu/criu-3.14-r1.ebuild
+++ b/sys-process/criu/criu-3.14-r2.ebuild
@@ -13,17 +13,17 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="doc python selinux setproctitle static-libs"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="doc selinux setproctitle static-libs"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/protobuf-c
 	dev-libs/libnl:3
 	net-libs/libnet:1.1
 	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
 	selinux? ( sys-libs/libselinux )
 	setproctitle? ( dev-libs/libbsd )"
 DEPEND="${RDEPEND}
@@ -32,14 +32,12 @@ DEPEND="${RDEPEND}
 		app-text/xmlto
 	)"
 RDEPEND="${RDEPEND}
-	python? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+"
 
 CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN
-	~NETFILTER_XT_MARK"
+	~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN ~NETFILTER_XT_MARK"
 
 # root access required for tests
 RESTRICT="test"
@@ -55,10 +53,16 @@ criu_arch() {
 	case ${ARCH} in
 		amd64) echo "x86";;
 		arm64) echo "aarch64";;
+		ppc64*) echo "ppc64";;
 		*)     echo "${ARCH}";;
 	esac
 }
 
+pkg_setup() {
+	use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+	linux-info_pkg_setup
+}
+
 src_prepare() {
 	default
 
@@ -80,7 +84,7 @@ src_configure() {
 
 src_compile() {
 	local target="all $(usex doc 'docs' '')"
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
+	emake \
 		HOSTCC="$(tc-getBUILD_CC)" \
 		CC="$(tc-getCC)" \
 		LD="$(tc-getLD)" \
@@ -92,7 +96,6 @@ src_compile() {
 		ARCH="$(criu_arch)" \
 		V=1 WERROR=0 DEBUG=0 \
 		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
 		${target}
 }
 
@@ -122,9 +125,7 @@ src_install() {
 
 	use doc && dodoc CREDITS README.md
 
-	if use python ; then
-		python_foreach_impl install_crit
-	fi
+	python_foreach_impl install_crit
 
 	if ! use static-libs; then
 		find "${D}" -name "*.a" -delete || die
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 5557462e0dec..a948144a3c90 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,4 +1,3 @@
-AUX htop-2.1.0-header_updates.patch 1213 BLAKE2B 4bf06329ee553b29c40c46b8dd0a267d19d17c0b19e8f7938b9276cfced5ba734924c2228408e7e2bee8088250c85d9cfa1cee508c1f3b4f8554d4be8e47cd2b SHA512 63644982da6a92a5477286df4c2cc16097aee8b6f8fcee6c37448d36074770b2f5f8f5a1dbac32728db79dbfb4a094fdd31128cec1ba322ada0b6a0968e53f98
 AUX htop-2.2.0-gcc-10.patch 535 BLAKE2B 19342dbf6c2cab4c73ebd0aac664b706867e24c7f7934779fbc940fee953bfdab06396b31e419a4b308abb8bdcb1b95648b13786234848833bc11a57d12f8776 SHA512 a1f436e2ea7ef40dc403877c51a58b0af7bd252db2471479a08f1a95dd03501df77406e1171d1e3848aa308dc5c2b46ba038d53336e56b4d1d2da6e6d7a23cc5
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
 DIST htop-3.0.1.tar.gz 179925 BLAKE2B d722bc49d7b546aec1359a5dc838e0f6cc4b17f8d2d2c59fd7fbeaf827233f658ea819f4c69832af5cfd4f836d3d66c223a9580037cf8d6d2ae28c6a6b3499b5 SHA512 0d6a1b0839a94f01429c85a459b0c6439051d1b6e69bf77c6b3bb31c81902a3127936ab9adc5bf1807f4b3d7b10a177a89fb9b883931f8dcf828ed06727d6945
diff --git a/sys-process/htop/files/htop-2.1.0-header_updates.patch b/sys-process/htop/files/htop-2.1.0-header_updates.patch
deleted file mode 100644
index 5c36d8b337e4..000000000000
--- a/sys-process/htop/files/htop-2.1.0-header_updates.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ccd156f8ba68c3c82f9a3afef46e414b2af16613 Mon Sep 17 00:00:00 2001
-From: Hisham Muhammad <hisham@gobolinux.org>
-Date: Mon, 26 Feb 2018 11:44:00 -0300
-Subject: [PATCH] Updates to generated header files
-
----
- Process.h                | 5 +++++
- linux/LinuxProcessList.h | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/Process.h b/Process.h
-index 6c41edc2..fda8480a 100644
---- a/Process.h
-+++ b/Process.h
-@@ -9,6 +9,11 @@ Released under the GNU GPL, see the COPYING file
- in the source distribution for its full text.
- */
- 
-+#ifdef MAJOR_IN_MKDEV
-+#elif defined(MAJOR_IN_SYSMACROS) || \
-+   (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
-+#endif
-+
- #ifdef __ANDROID__
- #define SYS_ioprio_get __NR_ioprio_get
- #define SYS_ioprio_set __NR_ioprio_set
-diff --git a/linux/LinuxProcessList.h b/linux/LinuxProcessList.h
-index 5005220a..0851a102 100644
---- a/linux/LinuxProcessList.h
-+++ b/linux/LinuxProcessList.h
-@@ -9,6 +9,11 @@ Released under the GNU GPL, see the COPYING file
- in the source distribution for its full text.
- */
- 
-+#ifdef MAJOR_IN_MKDEV
-+#elif defined(MAJOR_IN_SYSMACROS) || \
-+   (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
-+#endif
-+
- #ifdef HAVE_DELAYACCT
- #endif
- 
diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index d43822399f11..9302a229941c 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,7 +1,10 @@
 AUX numactl-2.0.10-numademo-cflags.patch 504 BLAKE2B f2346a298b86b9c667d0d9550af881f09fed1d56e507379f59f480cb8b6da8a57ad406273bec044eb8a95f9bb6b6a0f80fcb3288ba9da113725c6b8e2ed0748c SHA512 15266d98c375241fd84146a010f329265644666ab90d517865675618a8f793ea6bdc39e7c8b64836fa5b393afad1cd3c89452e838d751adbb315668a2cd29b78
+AUX numactl-2.0.14-numademo-cflags.patch 501 BLAKE2B 23eb5a93f07edcd67d3b964bd3b48469ec4316e64a9b1641b3dc92e299f03b4f5ec4a31154236fb811fc613da5e8bdd9b401238f6da883f1818f67ab1800ebec SHA512 0d58314ee1454add2d4d35114c5dca0d4785ecd09700f041ad312e7aa0b2d23aa1c3bc0ae01a33db901252081509de45abce690acb3c6ae3f0d9393903739386
 DIST numactl-2.0.12.tar.gz 423020 BLAKE2B 39d33612591df805715c51280bf34b8328ba6fc49bdaf9dd3bd67e076f9d319c9622ef72766c12e319f4be27ee9ec7f5ecb054a6e8c7c3cf568a69aea624d511 SHA512 316b10f50e6eee4cee9cf191f19381ec4a61980354eec3f9fe43fef21465bee28a82adeb9c235d4877e82950ccd14c9473b79fd1e2f5a7f598ec2fac230780ff
 DIST numactl-2.0.13.tar.gz 438096 BLAKE2B f615fafdb366930c6cdee1e4ef3d1e1d5e21f8f1c09aa904c0ebfa56972a99144991c6907127ef35794ca19d711e41b54488c5bfaeca8a0149ab9697d8c1ef75 SHA512 f7b747eb8f3ded9f3661cb0fc7b65b5ed490677f881f8fe6a000baf714747515853b4e5c8781b014241180bf16e9f0bfdf2c6f758725e34b4938696ba496b72a
+DIST numactl-2.0.14.tar.gz 439000 BLAKE2B 5f2abe25061ac29ecad8a6b24fe800d72c3538d9a155358f4b329ed1140053c7dbd93f01891904f76db94ed01113a34b4ebcbbf40e4060caf747958785ac9590 SHA512 28b95985d6b2f26c5f6f15fe235224c998c86f534adf5fdaa355a292cf2fd65515c91ba2a76c899d552d439b18ea1209a1712bd6755f8ee3a442f3935993b2e6
 EBUILD numactl-2.0.12.ebuild 1790 BLAKE2B 46c237d310776fb3a70e85543bc16b1fc71b6668eff6500ba570e39e29142ee886d4edb2a5f39d6690454aa1bf68d0173c721de61eb14b81d6f12adc9fab1461 SHA512 17967f9d2abac1d89225335be048571ccd1a10c537969c99ddf99d026d0b19243cc3abba21e47e62ac2c8a6c9cb44200e983f3c60f215c9a03c6dc26c80717c9
 EBUILD numactl-2.0.13.ebuild 1809 BLAKE2B 3fc1f99379f02e4f7ee84f3c9f0a90df757dc6a27f2347a72c37e5c25437f3c8a8d55bc78ae99501feba65a9ec52b1361446990c59e26a4fae3ba68faf0298fe SHA512 1f966aee92116f74b29e98f83f406956a8bd21d8ce738f5088bbbea6b97da6e44b334a97044c48facf29e6b55949053606ef9f9f41c0cae6e16cfac8cbe965f4
+EBUILD numactl-2.0.14.ebuild 1809 BLAKE2B e1d86c74eae548b19006463a31765f51a8c1182e100bc18fa546f6054f12c5583bfc03a3ecca57face6f7af98f026fbac0dd9a8f0a4f7d70225c55436d73c03d SHA512 05508b95626b826995b6b91692dcc8d030ec782d6bdfafbb0679d6a6a80fd5323001dcfbb012a15b6600515573cdde1fd9c2468e9c3a4749bcf900362464351d
 EBUILD numactl-9999.ebuild 1802 BLAKE2B 1ec41a7684cc2855cc69a543650228cb972f27502f7b8de0cd7174f76585c996aa091080dc70ffd35a8ee45abf5aa07c71f998177cba49655bf0d6656751fe3b SHA512 f11f804d514bc934715728f3e695814cdd1ac5b4664b7c5233c6f119df42ed7efb97c2e5545fd5b785078f076e3ee0c0ca2ccd29a1e44841ea7e2e07323f30b9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/numactl/files/numactl-2.0.14-numademo-cflags.patch b/sys-process/numactl/files/numactl-2.0.14-numademo-cflags.patch
new file mode 100644
index 000000000000..de7ad2894ddc
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.14-numademo-cflags.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/540856
+
+respect user CFLAGS
+
+--- numactl-2.0.14/Makefile.am
++++ numactl-2.0.14/Makefile.am
+@@ -24,7 +24,7 @@
+ 
+ numademo_SOURCES = numademo.c stream_lib.c stream_lib.h mt.c mt.h clearcache.c clearcache.h
+ numademo_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_STREAM_LIB -DHAVE_MT -DHAVE_CLEAR_CACHE
+-numademo_CFLAGS = $(AM_CFLAGS) -O3 -ffast-math -funroll-loops
++numademo_CFLAGS = $(AM_CFLAGS) -ffast-math -funroll-loops
+ if HAVE_TREE_VECTORIZE
+ numademo_CFLAGS += -ftree-vectorize
+ endif
diff --git a/sys-process/numactl/numactl-2.0.14.ebuild b/sys-process/numactl/numactl-2.0.14.ebuild
new file mode 100644
index 000000000000..10a7d7f07962
--- /dev/null
+++ b/sys-process/numactl/numactl-2.0.14.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Utilities and libraries for NUMA systems"
+HOMEPAGE="https://github.com/numactl/numactl"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
+else
+	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
+	# ARM lacks the __NR_migrate_pages syscall.
+	KEYWORDS="~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.14-numademo-cflags.patch #540856
+)
+
+src_prepare() {
+	default
+
+	# lto not supported yet
+	# gcc-9 with -flto leads to link failures: #692254
+	filter-flags -flto*
+
+	eautoreconf
+	# We need to copy the sources or else tests will fail
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	multilib_is_native_abi && default || emake libnuma.la
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		if [[ -d /sys/devices/system/node ]] ; then
+			einfo "The only generically safe test is regress2."
+			einfo "The other test cases require 2 NUMA nodes."
+			emake regress2
+		else
+			ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
+	find "${ED}"/usr/ -type f -name libnuma.la -delete || die
+}
+
+multilib_src_install_all() {
+	local DOCS=( README.md )
+	einstalldocs
+	# delete man pages provided by the man-pages package #238805
+	rm -r "${ED}"/usr/share/man/man[25] || die
+}
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 8fbbf0ccc605..3f31e5670f88 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -5,5 +5,5 @@ DIST psmisc-23.2.tar.xz 303820 BLAKE2B 6c63a54b91e1e31f812bc47c10937e8767fa2990b
 DIST psmisc-23.3.tar.xz 311896 BLAKE2B f38360dfb037a758633a8ff25af1de70be83ae5b2f2afe856ce237ade7bd2720f7c270c5af884313177022aa70f408dfce0c39e5d847057a6fdba98e3363561c SHA512 791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58
 EBUILD psmisc-23.1-r1.ebuild 1270 BLAKE2B 372ee0848e1201eb5718481b8c6ae0ed80acf3c9c94957b6b64c768f610687ce285a775324a6b76c23de3d309b35c88dd2e96f2c752ad6db145f4191721c0755 SHA512 982c57baaa9985aa9ac140b7bbb65718c88d8aa8b79e2e5b07267f0aa1eeae52aed5d1e7e338f054758d444a8eb04b4866d75042a4a32c1877bcb2a3c0794cb2
 EBUILD psmisc-23.2-r2.ebuild 1274 BLAKE2B 653aaf23f8fbc371338cd0639877bd467ff87987648d0d68838bfa6094f0ef2f29b372c89df171a3ab38ddfa5500de104bab650f0fca5aabed2ccfddd016a7af SHA512 31e2681b481e2f7a2b4da2b86d980a7a6789090c9ea89efe04e48ed595d4464ac55cebeae56899aacb30717d74efe49728796416fa7a8eafeb1fc33d4c1fc7a2
-EBUILD psmisc-23.3-r1.ebuild 1159 BLAKE2B 6d1a36de0fac8c509159d81c446cfb00c778c64fda1473edfd4267cd96ee67f3ce31f9c8cf4fbe2d9c8295305b037f94b211e8ed49bec98ab8bbd1bfde5b3c31 SHA512 61cded3f7cacc1b08afbe46725a04eafaea320ec66ba93902fbe22d449460332bdc45b302fa21cb86a56a23bd189013ef957ebe8e3e4c844c1ebd963817b5a99
+EBUILD psmisc-23.3-r1.ebuild 1157 BLAKE2B 4c44aef184cd221bbfd9318144d1b3b1db2cc5f49f01011bd1be11e4c9e9b5bd5f94b5b75df52a8cd14ca1b6d9d9e200e77f0b1166032e214ad578db1290f845 SHA512 144af64487e5dafeac279e97c978b7ac693558c42080455575bc9cdbcbc5acb8bc01c1fa8a9bf228d3d9484f2686c0b903c60a26c3e57a3944926fccbfb5dc85
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/psmisc-23.3-r1.ebuild b/sys-process/psmisc/psmisc-23.3-r1.ebuild
index 4593158bd0c6..615cdc684e59 100644
--- a/sys-process/psmisc/psmisc-23.3-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 nls selinux X"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
diff --git a/sys-process/xjobs/Manifest b/sys-process/xjobs/Manifest
index 95999c3b1a04..8b77ced757da 100644
--- a/sys-process/xjobs/Manifest
+++ b/sys-process/xjobs/Manifest
@@ -1,8 +1,5 @@
-AUX search-libtinfo-for-tigetstr-and-tparm.patch 833 BLAKE2B 26c96c1769272fe9c1f0da72083d7878a8cc59c5319d0d3c03b3e20bc9bdfd5b24970b5f50774faee1b0a25a25fcac7ea3c5e5dbb54dedc77943d924951fcb80 SHA512 38fdb82a721f7baded31bc8aaeff0093485d8bd5afd2ffe6c9c800b74236e50b41dccca062ce83861a0c9fb1ab1075302c82c073a20e74c5ff77421faf2ef58d
 AUX xjobs-20200726-command-v.patch 1342 BLAKE2B 82559a13cdca89177e5550753bed0790a605d80e919ae16a7a043e8c53b6d9c24373013e75b4cd06c254dacb9db7e5d6cc1473e951a82126a96567940bcb1b34 SHA512 afbeac6db7edf8ee0c90249c8fda783989a8427a4d966d202d15902c1662e91983d51b3e912b3a6e70311bf0467d34478f5e59a90a47e41f129d91a67560d9c3
 AUX xjobs-20200726-dont-page-tests.patch 759 BLAKE2B 7f0fb1885df69eea19155f94be71202e8477addd7ccfc232047e7e463cc73cac51f69507583352ee3cbf644588f7309a383a57535a83383d1750380a8090569a SHA512 4825b86e27d5f52908320a04bf5c49b04c8f5aa6ec11d4c8467a2793f3deee8f562a6ce58af43e15ec33a859c6b405c6877a9ea60c02c1ef573ace116d6e8a8a
-DIST xjobs-20190725.tgz 113216 BLAKE2B 079b6e104bb160101b2c4ef11e73ff040a8efa30839a39f9c91121b4928ddeefaefa43c3a94e18c9359fb6f66862ad7554598561a4e0c7f36b8f622d9a394340 SHA512 23ead9d33ebacb1b3d7a03c72c40dfb34b6254add81b0fde9e458a4be54f6298d2ce6a0b65742ac050685212eea8c5f83d48ea98b09c3928b16e36c7447a9551
 DIST xjobs-20200726.tgz 113795 BLAKE2B 4a6bfa405c6abf507ea9d0fce066b1547f1900687b04cf5797ced4862052596b4a32c2b24a89a7665e2253fe322ae83948d367c0ffc176bb322a0df9df0023a0 SHA512 52d84a957f53e894897770512271709bdfb1c45e51e1765cc16d96d9dc54901451d3f6ed16ed3a8ff4718e96b149fb2b53ee205d6ff1e1463f1de8b02b345705
-EBUILD xjobs-20190725.ebuild 854 BLAKE2B 11547a4ac882fbe6147f21f0928b25b329f7578d7ae425ae993e05430d1a340a63e7d40e0fa0ad632fe3946180f4401bd2f4b6e9cf630c3a9d42f62ac88df90f SHA512 00b38eef16fd6261950ba6bae0f937449adaa9f8bedf0c8959f8a9f6855dbf6813f381f4cad0d09e007b40601b5497586696c1a7581a0d76dc31c37584e40beb
-EBUILD xjobs-20200726.ebuild 837 BLAKE2B bc74a506c167aca0c65c337d4a678d87ae0ded12cf71cabeae318e11e834396a68f2d43f2892874997a7a7402f2b23b68f7543ccce5581826a1c989f85e0a84d SHA512 4ac393dccea01e917eee7e34c63139c6b3da73557b391b37aea03b1b15842c541c90ceb963fd0b1a9b8c63ee6f384c9e31abfe2f0657fb6a15261342297f63c3
+EBUILD xjobs-20200726.ebuild 835 BLAKE2B b699d81c4b35c6602feee91527cf0e1ef7e02ce1f5d6e24d30fa4af5be3fd671328fe160dce99b99e76416c199b0339e663e7ef3794f4cdd6f25caf7cd9d988e SHA512 27c7bc2d3c6a1f30f512525672acc555e6d60664987affd4b5f58ee2dfa0f8d001906cd62c6ca9dce4be24c21bed01ba88cc3e671e3349df88267b86e4681403
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/sys-process/xjobs/files/search-libtinfo-for-tigetstr-and-tparm.patch b/sys-process/xjobs/files/search-libtinfo-for-tigetstr-and-tparm.patch
deleted file mode 100644
index e0600b0b7dc8..000000000000
--- a/sys-process/xjobs/files/search-libtinfo-for-tigetstr-and-tparm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8272978e3f90aec42101a6f254af779e20cfc0eb Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 14 Aug 2019 20:19:24 -0400
-Subject: [PATCH 1/1] Rename configure.in to configure.ac and search libtinfo
- for tigetstr/tparm.
-
----
- configure.in => configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
- rename configure.in => configure.ac (95%)
-
-diff --git a/configure.in b/configure.ac
-similarity index 95%
-rename from configure.in
-rename to configure.ac
-index 21fc034..0baa3cc 100644
---- a/configure.in
-+++ b/configure.ac
-@@ -72,8 +72,8 @@ AC_CHECK_HEADER([term.h],
- 	AC_INCLUDES_DEFAULT
- 	)
- 
--AC_SEARCH_LIBS(tigetstr,ncurses,)
--AC_SEARCH_LIBS(tparm,curses,)
-+AC_SEARCH_LIBS(tigetstr,ncurses tinfo)
-+AC_SEARCH_LIBS(tparm,curses tinfo)
- 
- AC_SUBST(DEBUG)
- AC_SUBST(AUTOCONF)
--- 
-2.21.0
-
diff --git a/sys-process/xjobs/xjobs-20190725.ebuild b/sys-process/xjobs/xjobs-20190725.ebuild
deleted file mode 100644
index b42479647a0c..000000000000
--- a/sys-process/xjobs/xjobs-20190725.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Reads commands line by line and executes them in parallel"
-HOMEPAGE="http://www.maier-komor.de/xjobs.html"
-SRC_URI="http://www.maier-komor.de/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="sys-devel/flex"
-
-# The ncurses/terminfo libraries are used to provide color and status
-# support; but, they're detected and enabled automagically by the build
-# system. Thus it would do no good to hide them behind a USE flag that
-# can't be turned off.
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/search-libtinfo-for-tigetstr-and-tparm.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	use examples && dodoc -r examples
-}
diff --git a/sys-process/xjobs/xjobs-20200726.ebuild b/sys-process/xjobs/xjobs-20200726.ebuild
index ce8701c8d06e..47d4a515e810 100644
--- a/sys-process/xjobs/xjobs-20200726.ebuild
+++ b/sys-process/xjobs/xjobs-20200726.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.maier-komor.de/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="sys-devel/flex"