gentoo (valentine's day) resync : 14.02.2021

15 files changed, 197 insertions, 228 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 5d96c13ec94e..1175296d1292 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index bb310bfefd6d..def1b1a3f715 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -9,5 +9,5 @@ DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 60d8b813f5
 DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4 SHA512 7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a
 DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88
 EBUILD audit-2.8.5-r2.ebuild 6394 BLAKE2B 67680357d0352fee8c240953f89921860f41e1689b9217bc3b2ca275022c40282d6034682bed9ee3f98be586d03f7bc62ccff59f7e554ffacde6c275207ebd0a SHA512 f82d378a722426f1997f9696c0ece61100da192577981a9f9ada1a94b8c50eea12ddf0c036d3b88b1f0effbdc4389e9bbb1977867e5290850fd9bf32e337f699
-EBUILD audit-3.0.ebuild 4192 BLAKE2B 8990d5a7840cd3c8b1aaa2a69573df6096d0b73248304e474271846b4a0c99c4501bcece7b21176c099b28658e528f57636c4340f8be590378b4fcf57e95e315 SHA512 728237e668ce0c13c1961d2dc24578c3f14e8b2bbf1dbe74244299139be456a195ab5a6f063532b77f06157b1f9124b3b67398c19c76a3dd7ca6a6e6392574a2
+EBUILD audit-3.0.ebuild 4186 BLAKE2B 6edb8c1bbc19fd5d340a940b2248ec6dacc151b33b85d0d1c0287754875c4d8d73517866f64e4dbc496e477f477aa3175cfb2949df47878ee37260de4105cc0a SHA512 43acbc45faf67617d1969f9194abb49b7ddf2fbf358c4dbca5edb35395834d34fe38803c0342fde320fadb66c306ae0e731fd56439a329662244e798da1b2598
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-3.0.ebuild b/sys-process/audit/audit-3.0.ebuild
index bc901e6325be..4d219cafe03f 100644
--- a/sys-process/audit/audit-3.0.ebuild
+++ b/sys-process/audit/audit-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc x86"
 IUSE="gssapi ldap python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
index 2a3846765cee..6b8b5de2afd3 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,5 +1,5 @@
-DIST evisum-0.5.8.tar.xz 6900320 BLAKE2B ea0a9ff248e502c2517b5350c598b413a3d0d4fbedf7b36ffe3d0269ef66b458b803cfe36077b42bb0aea6f66e70321028931e7c819c9378d0c2fa3f38e2a9ce SHA512 26f3404c95bdda85b2c4e33da5026e99fd326c5a9dd4b6357e2552507f851a12b451a0d47a521b71695e0e4812f7e4d81c09e2c50eda364597c0c083ea5e5dd1
+DIST evisum-0.5.11.tar.xz 4363660 BLAKE2B 229acde8f8559bb6570236a511bf7685c5f47c33d39ae967fac693510bc1e164ddf1318a7c491f3bfc563f3ee51e541896480161e1e0e9e47742be0f9fa33a28 SHA512 d6d7c7d17ad231a68650e27718d578b698d48db0bbb796758fc6202b6928f02d1fe171570ebb46d527873d11cad221c568eabc2cdcdb3ebeca210c92f19d82ea
 DIST evisum-0.5.9.tar.xz 6928640 BLAKE2B 38c4f0c40fa4747004a891522be2744793bd8c8a6f28ed22961737f17aaf5ebe178c24ef1e19bb31e834c8cb3bd35c95499e1ce3e41371716c558a4596374153 SHA512 6fcea6f2a7a7cfdfc8eccf7cccb10bdf7abe4990f420fa1947d45a5e3f49411b0b37ccef8f53b57d5db4ec9bf0cb9f92369b8c2aaa9a545469b5f3316db609cc
-EBUILD evisum-0.5.8.ebuild 433 BLAKE2B 9c197ea2f644647eaab47a78f54a10c2d4cc2b5012fb468c79780d2b1ffaee80d6592b97fdf29a86976edec01ecd3a004cb9f2d40ed8e23d1c09a76111ee0349 SHA512 b75523e2eca5b20e2261512acda9b23bda9f433a27669e198225755a93c92914076854b4349d63e575946eb853be71ac6df1736b12337f56bf74cde07fdc711b
-EBUILD evisum-0.5.9.ebuild 435 BLAKE2B 562103ca6a8ea69c2953b7fab3ac496e263e74ba86d417a209854393e4bc578c8ea8a64ee23328a76ecb5b7a2f57467486df12e0058e48a00324d9a60d7b2307 SHA512 1bba29edc8b7f6356e1e6f5a10daa85f6a5d76777d9817b95f47bca81448ac10e62bfcc4d006f5823f2b0cb2439b4908bb62236754f0876d67f84be08412b1bd
+EBUILD evisum-0.5.11.ebuild 435 BLAKE2B 562103ca6a8ea69c2953b7fab3ac496e263e74ba86d417a209854393e4bc578c8ea8a64ee23328a76ecb5b7a2f57467486df12e0058e48a00324d9a60d7b2307 SHA512 1bba29edc8b7f6356e1e6f5a10daa85f6a5d76777d9817b95f47bca81448ac10e62bfcc4d006f5823f2b0cb2439b4908bb62236754f0876d67f84be08412b1bd
+EBUILD evisum-0.5.9.ebuild 433 BLAKE2B 9c197ea2f644647eaab47a78f54a10c2d4cc2b5012fb468c79780d2b1ffaee80d6592b97fdf29a86976edec01ecd3a004cb9f2d40ed8e23d1c09a76111ee0349 SHA512 b75523e2eca5b20e2261512acda9b23bda9f433a27669e198225755a93c92914076854b4349d63e575946eb853be71ac6df1736b12337f56bf74cde07fdc711b
 MISC metadata.xml 815 BLAKE2B d969cde79150c0cd2977017520a7ac95713b1c43aad52645f4d354f5a3ef3320638f5da097f0b7999689135036f1f8594b5331d2ca3420af93a2c3bfc726569e SHA512 c1b2c28863e8572ddfb79f8159e9ffc0defb4dc9c7b02c3ad7b1a4804ddcad06034471d9774f4e09bda1c84a8ce72393172f194c30cb5e5fda0a1177db842c3e
diff --git a/sys-process/evisum/evisum-0.5.8.ebuild b/sys-process/evisum/evisum-0.5.11.ebuild
index 4a7b1c25a1ec..27f90bd1e8dd 100644
--- a/sys-process/evisum/evisum-0.5.8.ebuild
+++ b/sys-process/evisum/evisum-0.5.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 ISC"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-libs/efl"
 RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
diff --git a/sys-process/evisum/evisum-0.5.9.ebuild b/sys-process/evisum/evisum-0.5.9.ebuild
index 27f90bd1e8dd..4a7b1c25a1ec 100644
--- a/sys-process/evisum/evisum-0.5.9.ebuild
+++ b/sys-process/evisum/evisum-0.5.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/efl"
 RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index abeb8a3ac87a..b7c5b67b5e64 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,6 +1,8 @@
 AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d198fcf9abffd15ad60f1c7c43f1e9a3103ebb5f2f743c83cc9d09cdf610c4e5d5caea89523f9ed37f3a4801e774 SHA512 02b06b01f8e3782da632677aa84b9131cb33dae3270677a1a4b0af3c139d100fa54c90c412d1e608e08859facb31e04768927e4862cfc4d9cfcbd061020a5dac
 DIST glances-3.1.4.1.tar.gz 6802041 BLAKE2B 7e27811e4721f9089e88bb2375f5b58104bdcb9a890bff4cb207800f49eaf320fa1bd777a2de1a7ce50744df2b4b79973823f9aee52a291e1af6788c95c359b0 SHA512 8e15149bde87d14d8176fe247e911a04b24900a95917e5711dfc8764ecec3238f696eea08c36bc59f68a4702e028909150e3318907f11fc53c5cc56441870ff3
 DIST glances-3.1.5.tar.gz 6804549 BLAKE2B a3bc71205110b0bfc285f009bbf1dea95f93a8621ca5b3c7768a1eee2af939a3605b2ec43b07da7abde079f89f4ebfe06dbaac2433de7e0379749bb001ac6d34 SHA512 20a2bc446f482506b847dd252c52edc9dcce501361742acde92d3f8a6e30e9386c8bc8c28387e981c5767e9c1fb88eba1858e243c2732e9fc4b5d64f643febd6
+DIST glances-3.1.6.2.tar.gz 6775046 BLAKE2B 3f65acbb69f8fc4323cbfbd30e79a0d30a9e38e9ff52ea0dc2286213daa66929e6abfccec34e94704fb87f6931f2a17fb30205c14da91f36b37617431bf58363 SHA512 2c62a82ebbc0d562d65f6e1ab39bac14a4b13d13e5fcbb1e98c119d6ea375387ef33b78cd911804504e3fdaa94260de27c211ed1132aae61f10fef8ff8a80fec
 EBUILD glances-3.1.4.1-r1.ebuild 2678 BLAKE2B 84f34bedf578fd74b26ce95a603f82539a86846b86d569d7bb5bfdbdca9b1aa96ba859306ab91e9b2bf00688535c2ad24d7a7a3b56f2720d6703d02845b38de8 SHA512 058ed3f001bc19eb00d69c5355c25cd96d74d6e925484f0cc6af569df07671a20303f99764ba631fabfd4d3d34df75ec5f3ecaa2dfca6f354a4943613526a75e
 EBUILD glances-3.1.5.ebuild 2684 BLAKE2B 985567744017b06177898cba10ee08a9a0c699da3244fca686e27af6f58bdaaf441410d308898ab556cc34a4aa8c803fb400213e6817c43524cade5036f561ce SHA512 f6f891a1b51b9830b19a184bd745ce061253815b389959f0aa9da81c1b14c3009ac422717872b6c244d708a1681fac842313d0457e5e852c126a423b0a4b9373
+EBUILD glances-3.1.6.2.ebuild 2684 BLAKE2B 4149b84de9317bc794cbe7779e48db4e5d758df289c2fd30de0ba123551f29e94c3babe9946df79f997092fafe4afea02e437161390d7cee822d536384f66a3f SHA512 97f553fff95bf7aca16f481b20b7cb62949d3e44bad8c58af3b71581f4ff116f1d181347a983be23a339601aee2c1a77a52cf8ee9d0c3b846454a0a9642d1339
 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73
diff --git a/sys-process/glances/glances-3.1.6.2.ebuild b/sys-process/glances/glances-3.1.6.2.ebuild
new file mode 100644
index 000000000000..06f3d2283a4d
--- /dev/null
+++ b/sys-process/glances/glances-3.1.6.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 linux-info optfeature
+
+DESCRIPTION="CLI curses based monitoring tool"
+HOMEPAGE="https://github.com/nicolargo/glances"
+SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
+
+# PYTHON_USEDEP omitted on purpose
+BDEPEND="doc? ( dev-python/sphinx_rtd_theme )"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+PATCHES=(
+	"${FILESDIR}/disable-update-check.patch"
+)
+
+distutils_enable_tests setup.py
+distutils_enable_sphinx docs --no-autodoc
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+python_prepare_all() {
+	# Remove duplicate entries of a prebuilt doc build and
+	# ensure install of the file glances.conf in /etc/${PN}
+	sed \
+		-e '/share\/doc\/glances/d' \
+		-e "s/'CONTRIBUTING.md',//" \
+		-e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \
+		-i setup.py || die
+	sed -i "s/, 'irq']/]/" unitest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	# add an intended file from original data set from setup.py to DOCS
+	local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	#optfeature "Action script feature" dev-python/pystache
+	optfeature "Autodiscover mode" dev-python/zeroconf
+	optfeature "Cloud support" dev-python/requests
+	optfeature "Quicklook CPU info" dev-python/py-cpuinfo
+	optfeature "Docker monitoring support" dev-python/docker-py
+	#optfeature "Export module" \
+	#	unpackaged/bernhard \
+	#	unpackaged/cassandra-driver \
+	#	unpackaged/potsdb \
+	#	dev-python/couchdb-python \
+	#	dev-python/elasticsearch-py \
+	#	dev-python/influxdb \
+	#	dev-python/kafka-python \
+	#	dev-python/pika \
+	#	dev-python/paho-mqtt \
+	#	dev-python/prometheus_client \
+	#	dev-python/pyzmq \
+	#	dev-python/statsd
+	#optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3
+	optfeature "SVG graph support" dev-python/pygal
+	optfeature "IP plugin" dev-python/netifaces
+	optfeature "RAID monitoring" dev-python/pymdstat
+	#optfeature "SMART support" unpackaged/pySMART.smartx
+	optfeature "RAID support" dev-python/pymdstat
+	optfeature "SNMP support" dev-python/pysnmp
+	#optfeature "sparklines plugin" unpackaged/sparklines
+	optfeature "Web server mode" dev-python/bottle dev-python/requests
+	optfeature "WIFI plugin" net-wireless/python-wifi
+}
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 06fa8499936f..27f234818f17 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -3,6 +3,8 @@ AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadb
 AUX procps-3.3.16-SC_ARG_MAX_sanity_check.patch 1724 BLAKE2B b49f804ed9b2cd6aef84e805f5d21e0585a8649963331497ee426e96e59460d8a549372523943991f9addc9096aea6a8ba7a94d9adb1bc70daa282a601bb8c04 SHA512 2e73679ed42acef9fd5916f17b2913c1e38507fb310713010952c32971fe13577320d42219a94b36820e4fd8208faa791dbb9fa7892bd0bbf71deccb35f0b2c6
 AUX procps-3.3.16-toprc_backwards_compatibility.patch 2926 BLAKE2B e7c84ba19c41db1284b5d8bf12201385b99c689117894c8bd7d4a6c6dae446bc20d71259a7ff3ca863d01522920394d29c5dbdecc3ff6cca0c3c511d4f6d2bea SHA512 0fd42746206ed25b8be3460a1c078ab7f7669ab15905e473c75bd07a2fa94ed3db8253882806ad9994eaa53c324b81204dc3d1c2a7d0ee6798d8ccd37302b725
 DIST procps-ng-3.3.16.tar.xz 859736 BLAKE2B fbacc1edb0711cda0fecbf5f589c8cc18bd74f0430866e946f7c4612b78f383b9299840ab7fa5bbc65c581cc9484dbb37b111c493cf88f55ba247a343fd0c80d SHA512 d83da472df256b188c32082632202e7f8ebd1b161082387760876ae34d50221b3682299a2816a7d6a29afb40322743c31b87d92ca299c2944a6b55e50736d367
+DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
 EBUILD procps-3.3.16-r2.ebuild 2364 BLAKE2B 5e0dcb4405c0d39f0800203ac5bab770a6140af3e6ce51778b629b511759010d98704682801b3b86b27821a2209cfb56e92404db52bdff76c0053e5f6f10c5af SHA512 a04c75b2ef1b69aca34f5d501e09dcb9a280d90c467768726ec8b3418c0cee3b0f1fbc3d2dba4800a69f7f545e1f7ee81c45aed51de7ceb591967cec08ba5ef4
 EBUILD procps-3.3.16-r3.ebuild 2432 BLAKE2B ed90d540ec89cb746384578dc8d813c79bb5ae4313b808197bd69168ffc48e77ed7adedda3c7313b120b712bc04636366711a2805297e6772f3843934410e606 SHA512 18e7e1eedf2ac685a6893b38107403706f798283a9b464c18906f66d9cadc98e6ac81dab9b7d056202baba5f2df362f145aef4f26ad489f97bbb9e06dae44c93
+EBUILD procps-3.3.17.ebuild 2353 BLAKE2B 2a53597afa6b1ce18ff453163a4140bf4c73596de6c167d2f17d9e07af07abbe9d492107f7985ba213e76361d3842687dca8a91fc7b51ae107518290b5250465 SHA512 92667c926d37f92cbc2b3b5b8a9cb3f4025a55145982bab7ea7b2f7bb3f48c1d51f09c9df2d7ada5ef2c822d2472c510348b4e2549d990fcbb1da79b9f32fd49
 MISC metadata.xml 717 BLAKE2B caae5760de6bc3dbb19fef321255f8951a8ca70139511121dc6d497c8eac4a19ea1d08032e0b6538c74bb34242c8b394360e1fcbf65bd15ef3554e318fa2d4e3 SHA512 3a6a2fcf2dad8784e270bde8e6bc8b183e3dec14abe8c51a17316debac0b599a4f95dabd5e3e05344f500e8eb60b901062d17d644201bf4596e4580ba4d9494b
diff --git a/sys-process/procps/procps-3.3.17.ebuild b/sys-process/procps/procps-3.3.17.ebuild
new file mode 100644
index 000000000000..21a01cc6422b
--- /dev/null
+++ b/sys-process/procps/procps-3.3.17.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs 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"
+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"
+IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
+RESTRICT="!test? ( test )"
+
+COMMON_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}] )
+"
+DEPEND="${COMMON_DEPEND}
+	elogind? ( virtual/pkgconfig )
+	ncurses? ( virtual/pkgconfig )
+	systemd? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )"
+RDEPEND="
+	${COMMON_DEPEND}
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-apps/util-linux[kill]
+	)
+	!<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
+"
+
+#S="${WORKDIR}/${PN}-ng-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
+	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
+
+	# Upstream fixes
+)
+
+multilib_src_configure() {
+	# 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)
+		$(multilib_native_use_enable modern-top)
+		$(multilib_native_use_with ncurses)
+		$(use_enable nls)
+		$(use_enable selinux libselinux)
+		$(use_enable static-libs static)
+		$(use_with systemd)
+		$(use_enable unicode watch8bit)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	emake check </dev/null #461302
+}
+
+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 procps
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index d71d573a8f3e..9ffe46dcb284 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,9 +1,5 @@
-AUX psmisc-23.2-killall_check_truncated_16_char.patch 4440 BLAKE2B d04ab70003cb9de27c918ff72a283fbbfc087760a11ff4fad9cf587ff2aa4e3e22bafe94d615d192f33c0d7e0868efd03949e6f1b60acbeaba475600d2e546ee SHA512 ec9247957426865f009b5bd22bb518c229a52e5f26908e304fd6b3a891204bc53cf6cb2974d9b38741a5afb9b6f9ebfd622a7911412a53b90ec20366f3b3f4ca
-AUX psmisc-23.2-old_comm_len.patch 602 BLAKE2B ebcf12e6debdef6a708594f2193103f41c36babd2b5b6ae2027c17364102fc906bf88cd275e2a9183bde62d94da6106fa2eb36cdc62af4a77ca0623be2cc8d01 SHA512 fea4df7b9cabfc5e02628a7876a032027c738f1515b049caf5ccdc376cc6a64eacd1c232d006ab102c5c5aed9e0b40c3cbd23c9e698312dc853b06abd2809c8a
-DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
-DIST psmisc-23.2.tar.xz 303820 BLAKE2B 6c63a54b91e1e31f812bc47c10937e8767fa2990bef66ee779bf44887625719e7342da05137222a6636df7a0e520c39318faba3e7a1022c54fd9f3f172ecc851 SHA512 a8d4e91443b66de1c4418fd74b5eb6dd42caddc937e75dfb35a4e49b9b35236db779e2a480c1693bcc7feaf0957b1028850134040685e88e6ff7ffcb572e20e8
 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
+DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471
 EBUILD psmisc-23.3-r1.ebuild 1150 BLAKE2B b3ef07952efb80a7e13a5683e23949e06db15ee298e029bae355438fc7a49a4fbc1a30c8bde47502715062d36181dcbbdb9f830af41a1afb11889f013faaf186 SHA512 bc76d36a24722841f9078fb5a72e41e5e0df3e9489524cba257ef02d1aecf50c281cc883c008834eff0b859f2841ee9f60b7661c64c390d7bc32525816f656d4
+EBUILD psmisc-23.4.ebuild 1195 BLAKE2B 5924989ee1655fb9439e4718847c9171a8e011c0707db01519215f7c919d0c241a3e0e887d0fc6f5ecebfece77ae748430fd9379315ad02c6115ecd866fa33a1 SHA512 71f721429c81332cac93cd1ee5f3c7d0abc7bed54cd47c031056aff302f3eeee2ae937aa894bea76aa8da96409bf5d3a8cf79d9e9974598ff6bc8d668b087453
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch b/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch
deleted file mode 100644
index bfc2a24d5de9..000000000000
--- a/sys-process/psmisc/files/psmisc-23.2-killall_check_truncated_16_char.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 1188315cd037d73bf946a0003b70c6423cc330d2 Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Wed, 7 Nov 2018 20:13:09 +1100
-Subject: [PATCH] killall: match on 16 character commlen too
-
-The comm length increase meant killall could accomodate the
-larger comm name given out by newer kernels but it meant that
-if a user relied on the previous 16 character truncation then
-processes that used to match would fail.
-
-killall now checks to see if the the comm is the old COMM_LEN
-length and the given name is longer than old COMM_LEN and does
-a truncated match as well.
-
-References:
- https://bugs.debian.org/912748
----
- ChangeLog     |  3 +++
- src/killall.c | 69 +++++++++++++++++++++++++++++++++++----------------
- 2 files changed, 50 insertions(+), 22 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 7fd2abd..37962cb 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+Changes in 23.4
-+===============
-+	* killall: check also truncated 16 char comm names Debian #912748
- Changes in 23.2
- ===============
- 	* misc: Command names increased from 16 to 64 characters
-diff --git a/src/killall.c b/src/killall.c
-index 2715515..09212a4 100644
---- a/src/killall.c
-+++ b/src/killall.c
-@@ -492,6 +492,49 @@ create_pid_table(int *max_pids, int *pids)
-     return pid_table;
- }
- 
-+#define strcmp2(A,B,I) (I? strcasecmp((A),(B)):strcmp((A),(B)))
-+#define strncmp2(A,B,L,I) (I? strncasecmp((A),(B),(L)):strncmp((A),(B),(L)))
-+static int match_process_name(
-+    const char *proc_comm,
-+    const int comm_len,
-+    const char *proc_cmdline,
-+    const char *match_name,
-+    const int match_len,
-+    const int got_long
-+                         )
-+{
-+    /* process is old length but matching longer */
-+    if (comm_len == OLD_COMM_LEN - 1 && match_len >= OLD_COMM_LEN - 1)
-+    {
-+        if (got_long)
-+        {
-+            return (0 == strncmp2 (match_name, proc_cmdline, OLD_COMM_LEN - 1,
-+                                   ignore_case));
-+        } else {
-+            return (0 == strncmp2 (match_name, proc_comm, OLD_COMM_LEN - 1,
-+                                   ignore_case));
-+        }
-+    }
-+
-+    if (comm_len == COMM_LEN - 1 && match_len >= COMM_LEN - 1)
-+    {
-+        if (got_long)
-+        {
-+            return (0 == strncmp2 (match_name, proc_cmdline, COMM_LEN - 1,
-+                                   ignore_case));
-+        } else {
-+            return (0 == strncmp2 (match_name, proc_comm, COMM_LEN - 1,
-+                                   ignore_case));
-+        }
-+    }
-+    /* Not old new COMM_LEN so we match all of it */
-+    if (got_long)
-+    {
-+        return (0 == strcmp2 (match_name, proc_cmdline, ignore_case));
-+    }
-+    return (0 == strcmp2 (match_name, proc_comm, ignore_case));
-+}
-+
- #ifdef WITH_SELINUX
- static int
- kill_all(int signal, int name_count, char **namelist, struct passwd *pwent, 
-@@ -599,28 +642,10 @@ kill_all (int signal, int name_count, char **namelist, struct passwd *pwent)
-             {
-                 if (!name_info[j].st.st_dev)
-                 {
--                    if (length != COMM_LEN - 1 || name_info[j].name_length < COMM_LEN - 1)
--                    {
--                        if (ignore_case == 1)
--                        {
--                            if (strcasecmp (namelist[j], comm))
--                                continue;
--                        } else {
--                            if (strcmp(namelist[j], comm))
--                                continue;
--                        }
--                    } else {
--                        if (ignore_case == 1)
--                        {
--                            if (got_long ? strcasecmp (namelist[j], command) :
--                                strncasecmp (namelist[j], comm, COMM_LEN - 1))
--                                continue;
--                        } else {
--                            if (got_long ? strcmp (namelist[j], command) :
--                                strncmp (namelist[j], comm, COMM_LEN - 1))
--                                continue;
--                        }
--                    }
-+                    if (!match_process_name(comm, length, command, namelist[j],
-+                                            name_info[j].name_length, got_long))
-+                        continue;
-+
-                 } else {
-                     int ok = 1; 
-                     if (asprintf (&path, PROC_BASE "/%d/exe", pid_table[i]) < 0)
--- 
-2.18.1
-
diff --git a/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch b/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch
deleted file mode 100644
index ae237e691099..000000000000
--- a/sys-process/psmisc/files/psmisc-23.2-old_comm_len.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e2cf9f3e83e0fc0278ff39a4dfc8e3f2730eebca Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@enc.com.au>
-Date: Wed, 7 Nov 2018 20:19:38 +1100
-Subject: [PATCH] misc: Remember to add comm.h too
-
-The previous commit should have included comm.h too
----
- src/comm.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/comm.h b/src/comm.h
-index b54b998..b10eb36 100644
---- a/src/comm.h
-+++ b/src/comm.h
-@@ -33,4 +33,10 @@
-  */
- #define COMM_LEN 64
- 
-+/*
-+ * Older kernels had only 16 characters, which means we may have to check this
-+ * too
-+ */
-+#define OLD_COMM_LEN 16
-+
- #endif
--- 
-2.18.1
-
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
deleted file mode 100644
index 1f826b2f6c36..000000000000
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable selinux)
-		--disable-harden-flags
-		$(use_enable ipv6)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# peekfd is a fragile crap hack #330631
-	nonfatal emake -C src peekfd || touch src/peekfd{.o,}
-	emake
-}
-
-src_install() {
-	default
-
-	use X || rm -f "${ED%/}"/usr/bin/pstree.x11
-
-	[[ -s ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/bin/peekfd
-	[[ -e ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/share/man/man1/peekfd.1
-
-	# fuser is needed by init.d scripts; use * wildcard for #458250
-	dodir /bin
-	mv "${ED%/}"/usr/bin/*fuser "${ED%/}"/bin || die
-}
diff --git a/sys-process/psmisc/psmisc-23.2-r2.ebuild b/sys-process/psmisc/psmisc-23.4.ebuild
index c06e9f526a80..70bf7153aa56 100644
--- a/sys-process/psmisc/psmisc-23.2-r2.ebuild
+++ b/sys-process/psmisc/psmisc-23.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A set of tools that use the proc filesystem"
 HOMEPAGE="http://psmisc.sourceforge.net/"
@@ -12,20 +12,16 @@ SLOT="0"
 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=
+RDEPEND="!=app-i18n/man-pages-l10n-4.0.0-r0
+	>=sys-libs/ncurses-5.7-r7:0=
 	nls? ( virtual/libintl )
 	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.6b
+DEPEND="${RDEPEND}"
+BDEPEND=">=sys-devel/libtool-2.2.6b
 	nls? ( sys-devel/gettext )"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-PATCHES=(
-	"${FILESDIR}/${P}-old_comm_len.patch"
-	"${FILESDIR}/${P}-killall_check_truncated_16_char.patch"
-)
-
 src_configure() {
 	local myeconfargs=(
 		--disable-harden-flags
@@ -39,12 +35,12 @@ src_configure() {
 src_install() {
 	default
 
-	use X || rm -f "${ED%/}"/usr/bin/pstree.x11
+	use X || rm -f "${ED}"/usr/bin/pstree.x11
 
-	[[ -s ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/bin/peekfd
-	[[ -e ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/share/man/man1/peekfd.1
+	[[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
+	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
 
 	# fuser is needed by init.d scripts; use * wildcard for #458250
 	dodir /bin
-	mv "${ED%/}"/usr/bin/*fuser "${ED%/}"/bin || die
+	mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
 }