gentoo christmass resync : 25.12.2020

27 files changed, 219 insertions, 146 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index ba2947640d6c..60bc33587b76 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/anacron/Manifest b/sys-process/anacron/Manifest
index eee9e19a7dc8..432865167e79 100644
--- a/sys-process/anacron/Manifest
+++ b/sys-process/anacron/Manifest
@@ -1,6 +1,6 @@
 AUX anacron-2.3-compile-fix-from-debian.patch 315 BLAKE2B 3a88cae2b348c3392ff2278da5e7e42ca6835acc508eeae06f0307fdb6cceb4815a7ca321f0eb71b1d10e4e16a516220b9bafcf5d72fc4b80fa21f7900ea88c7 SHA512 8faff19a8dc86da255b4c905ff5e91fd488b75df21f7a8b8eb2717232ab8174a22421f6930fd65a8972029b77852d5435f110a37c0faa593457628d45af1ff9e
 AUX anacron-2.3-headers.patch 895 BLAKE2B dbc3880c572b988570a2b53ccb50cdc4be38543c61b81d99483e437db5ce740e6e7f6008c92e4a634becbe3d53d6eed3cf21753a6acac840ac4a7f479f83bfa7 SHA512 33c5f3274e50e3156b407aec6f0fb882b80ea8d134a71a789dc2ad39effe322c36c579725cde71ec34e801a0d52efe06d159b4a6d423137c31e14b82e732dd3b
-AUX anacron.rc6 252 BLAKE2B 5237dbe878e9d5393f05b2671b6ee81461cd478cde37a2bf35277bdca7628b0818fbc5e555fb01d2d22ffe1c6d809167f5e05c256ff92dec7e2fbce4e309fe1c SHA512 5578e8bff57387131fe2cb8d176e8a8cc4f2e736e6b6e4e8ef9bbb2aec201fe3893b2c3763652ee78a5b3f665a99e2aa3c22226cd3a53f4e0a76bfbcca50cd6a
+AUX anacron.rc6 249 BLAKE2B f5bcbd2ef69c776d2eb79095cdac4c2bd3a8890c8812a6e2d85b1a9f066504d09c927aea3c8fffbc243448ae5510e34ac9157d5329b2581587862bc2f2ac337c SHA512 b8c095e2fc9c8bd9b3f926f5d2d780576bcbc4e4824a9a06d649c8468024201936f798edd7567bb6fd76cc73f9fec4c7793e01c7311827bed29e5314227bc136
 AUX anacrontab 468 BLAKE2B 4f77a6759934e0e2693f3abeb9fe208de059d019906dc6c09160ac8b12e0c311d5f3414092c1cb6e62c947d950bf5fdf7990a6c351f4218f366ab2aaa4280c08 SHA512 f04850d22b459fe95bf5ccf594143f6fb02a1d29fc9cf36d2965a8b846920bc36b0d2d5665c5d6ac9828b904a4f30da49f62f6bedd51c75f548b981e056f097e
 DIST anacron-2.3.tar.gz 24140 BLAKE2B 70fa2c716172a538b6810b65a4b80d8d8b70e8de7569856236f6386e30a3a77acc6b7aa11dfc3ce06aa432bc74009aa6dd44fd8d3b70f8585b979d0c5c596b98 SHA512 27bbbfad5bc35ddc68e4345c3a3acefd0a6f794aaba890f7c75ec42b2e4c4200fbb1667e75b2e344afb7722bdc9ba3dc5a7db66d3369808bc9f483ea3509849c
 EBUILD anacron-2.3-r4.ebuild 1437 BLAKE2B b72e4b22a63088e1f008f5237463a70bbaafe5ce824989f3195de11235702058c276b1ffbb3967c70a9f388039899a281ed17cb9ac37cbf988655b3fc8dad411 SHA512 9972688c76279e81938320e9da7be2ee45077aaf41563c9d74e993faaafb7164d7f06fc3233865042b658f8d1e1c0180deeae7b64222a11fa9454d843194f249
diff --git a/sys-process/anacron/files/anacron.rc6 b/sys-process/anacron/files/anacron.rc6
index 645eedf988f9..02dccb5dbf13 100644
--- a/sys-process/anacron/files/anacron.rc6
+++ b/sys-process/anacron/files/anacron.rc6
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index bc21ed18e8cb..4ee67d5f6c27 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -2,6 +2,7 @@ AUX atop-2.2-build.patch 898 BLAKE2B 41be74ee6676a0cfeda2b42274618568e156b6bb56b
 AUX atop-2.2-sysmacros.patch 283 BLAKE2B 175d69f6c8d0fe6ce909ab95375cd5f23aef2bb9cf86a80c94e6002e5268cbea2d37f64a159f0d1db9d2ff8288115712f9544129f4a4eedb9b94569e5155f54e SHA512 8dd708193a57abad2e53625278ab60cfc74bca7ae2851d54584542257dd16161f8262eb7f3f26a9c2e274f8c481012850a5a30c193353b506e4d1e7a43e1565a
 AUX atop-2.4.0-build.patch 704 BLAKE2B 76b19a4a7926d9d9e737e529cba0aa03ab4331f91b2a30ef6ebbc5a7f03004e9c9e953eb7f3119c30bd9bf150fde146b17148fdba088e67ce5d5739ddf9d00e9 SHA512 77e125d8bc0a7e798b0d1f00cbdbe03c29842336aa178231a1b667759ebbbfe39ec14627c2a9185c2fc33a5f4b0a2d03c6309e5f60098ce0eeb6438c60b29211
 AUX atop-2.5.0-install_fix.patch 1031 BLAKE2B ebb92dc150b2827d6d4beaec367a425fe0a40cff272a1c10980c924692d75a2b824006f9738afbde23afc71d9289bf41187e86a5bfd6b1e0ef1311f48f90dcb2 SHA512 0085b9dfee310e7bb204e55867b7bf27f61ef654ae978e3315f27307528fded3bda87376f3a8726164806094c2d0b0ded81f3bb48440a77c029817e91c32a87a
+AUX atop-2.6.0-build.patch 911 BLAKE2B d67b53d297d2e05ce098eca6e2f99ee2314652755d01671a72bc2501913419461bbafd7f054a58ff62dc90434960cdcbb335e397e6c7316670aca902fcd504d7 SHA512 9798131103ed5d34210a00d0e7fc82f4a50bd5a2c6bc12dc67d6a34192a0bb8bcc38777311d5a6562af9434766b26ad9fc2c4452a8da1b28316a816c3316761d
 AUX atop.rc-r2 268 BLAKE2B d0673e73ee13d7ac5f1c31544f8f9ba8aefe14c2ebf4e90b090d5a64a308bdd2e42b4131ea5c931e9e2f2386139343cfceb7c04c1378ebd3a260a5d55d0dd5b6 SHA512 07699f1190faa3a8343314b5c8419e7ea49280fef664334f03558907eb5654bc33c7f4baa3fa54cc6f07866c378c984ff81e020e69f0b146c68b8503ab010d0c
 AUX atop.service 190 BLAKE2B 905a7b42d38b3ab25916c90d7b50c52721f9b061c99e8ce5b9d8cc6c452d1dfeba5478389471778e2a988fd058301bae001139c1396bd9c4a76f2b7f79968377 SHA512 194e9703f34b6a1c749ed5bae3e8708dc625d30e174e285a0998c8aa0d2b1b34da70a3d1db86380abc40615b28a5bdb37b2d511be983da5fd7f154b9686ba343
 AUX atopacct.rc 1054 BLAKE2B 80f301506d805ae54552f088c53bf18cab1ee52b76a37387500176e61eba317059b10c9955d13ac5718547253401ec21f0add4b189e5d04ff724af43c8c50b73 SHA512 ddb026c4ebf63dccc6f49b2b7db829d7ba0388da080a65562bac3f2d7ebacc95093099a0fc9d636af5462ace4a9e118eacfe3eb626a70245e7c5c1e874866f02
@@ -12,7 +13,9 @@ DIST atop-2.3.0-version_h.patch 748 BLAKE2B 95aa0e819d35498436ddb2554f457e9bf74a
 DIST atop-2.3.0.tar.gz 190560 BLAKE2B 4c7a8f33f7e32fb6107275c21db54af91ffdb06cea14039ba85c6e844efc05e5c64708dae48eb3a7b8e075378838937ddd4756a954e6a040d4b3e8c4e7dd9e93 SHA512 8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621
 DIST atop-2.4.0.tar.gz 230066 BLAKE2B 75070f0a87f9745f0e018ef5aac7e71060acea77e2043d43594a492875126945ef4c5bfe15f69b300ce6ac25c38f54360ba761ad7fc510016a91b71dc3377957 SHA512 8872626db447b2b7265fa257bc78795c3a5bc2f0dfffae94d01df4090de75feeb092e5a33421877aa12563dde3df18734b5db947c828cec6949284fbeb9dbc8d
 DIST atop-2.5.0.tar.gz 233835 BLAKE2B e40ae26cb1f8ddecbf6ea8f8f83d09bf9d62003a54e0679d5eefdf7c6fdaaff1940ba5f097fc1fc181ddb6aedcb8e1482feeb451cce5905b98c929c786db147d SHA512 8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489
+DIST atop-2.6.0.tar.gz 242323 BLAKE2B 8cf39c4b18994de26188ad5e19e282bc3ef7693eeff4853386f6b254d1115dbd2308eaa4c6e7620e6081d44037e6ce01356ad72ba25bcf4b1c3e7674768e5c24 SHA512 46cbc1c67ee6683be8dca79bf68d85962a119469ddce4947519cf4fe178b14d54b69451cfaa2b5c0a3f8c9bf8769de619aa5a7768eae34422688c7fc26fe0a58
 EBUILD atop-2.3.0-r1.ebuild 1835 BLAKE2B 8508bba0c31f2fc5f73a708b464d45e0603178a23966cd8e9bd0fc1968f02f036664d5ec2f3f917a51b2ed303bd845bc370258ac9e6fb569e97a57306c78eb7e SHA512 a83ace4dcab3d628151cd5f976f4d10baf4c23ff48b0b814e75f1cab90a9553575bb71b4744d5ed4cecc6fac0a3708d0c316fc66d94bf65cf7818ae0393e8838
 EBUILD atop-2.4.0.ebuild 1287 BLAKE2B 88b75183ccc9516e64fd0ec7eb68a822384fc3ab8d5d78e06c38a5cc1c4447785533d862aac711e830853d3c0e2a480d1899db9d16e2175c8d0c3c2ec1a0e6a4 SHA512 b90c22b77398e513b3ce0c17e599264615142254a11240039dc83592a3e066f1fd176ec608e204d6b466c26b6f79970d5a78379618442033afdbd300f940e278
 EBUILD atop-2.5.0-r1.ebuild 1465 BLAKE2B 5c5948ad87d288110204181693ee8c239c5f68c8cf446709b1b6bb605ee6a570817ea7dfaef760540e28f519cab3a7f3cf32b859aee22992dcb6d0d3ac59a36a SHA512 7c245add0f96e276d7ba288e899d23ec29f2e0f2e2a817971848cf41838168febaf40abc69c7514e5697187f5fdf4ef7515b04b771bc9d8637426e7dcea6c446
+EBUILD atop-2.6.0.ebuild 1395 BLAKE2B f1958d5a978267bb318e33ab555678f6ac2bb16f8508763519ca6c46e2046ac64b866ce12381dce400f8598057e1227cd5815670b3e9ccf3fc95bd6c743a76c9 SHA512 00516d70996deb6b0c87b4a43d4c3a521b07823f252b7c614aa4fd9920cb43a5b6aa71d4272f903c765ebff8e81c75ffe504770760a7178be1950b50cf265cee
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/atop/atop-2.6.0.ebuild b/sys-process/atop/atop-2.6.0.ebuild
new file mode 100644
index 000000000000..a5c018ec8bc6
--- /dev/null
+++ b/sys-process/atop/atop-2.6.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Resource-specific view of processes"
+HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
+SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	>=sys-process/acct-6.6.4-r1
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-build.patch
+)
+
+pkg_pretend() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~BSD_PROCESS_ACCT"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	default
+	tc-export CC PKG_CONFIG
+	sed -i 's: root : :' atop.cronsysv || die #191926
+	# prefixify
+	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" genericinstall
+
+	# useless -${PV} copies ?
+	rm "${ED}"/usr/bin/atop*-${PV} || die
+
+	newinitd "${FILESDIR}"/${PN}.rc-r2 ${PN}
+	newinitd "${FILESDIR}"/atopacct.rc atopacct
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dounit "${FILESDIR}"/atopacct.service
+
+	dodoc atop.cronsysv AUTHOR README
+
+	exeinto /usr/share/${PN}
+	doexe ${PN}.daily
+
+	insinto /etc/default
+	newins ${PN}{.default,}
+
+	keepdir /var/log/${PN}
+}
diff --git a/sys-process/atop/files/atop-2.6.0-build.patch b/sys-process/atop/files/atop-2.6.0-build.patch
new file mode 100644
index 000000000000..b675a16ee360
--- /dev/null
+++ b/sys-process/atop/files/atop-2.6.0-build.patch
@@ -0,0 +1,27 @@
+--- a/Makefile
++++ b/Makefile
+@@ -33,19 +33,19 @@ VERS     = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]* //' -e 's/ .*//')
+ all: 		atop atopsar atopacctd atopconvert atopcat
+ 
+ atop:		atop.o    $(ALLMODS) Makefile
+-		$(CC) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
++		$(CC) $(CFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt $(LDFLAGS)
+ 
+ atopsar:	atop
+ 		ln -sf atop atopsar
+ 
+ atopacctd:	atopacctd.o netlink.o
+-		$(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
++		$(CC) $(CFLAGS) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
+ 
+ atopconvert:	atopconvert.o
+-		$(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
++		$(CC) $(CFLAGS) atopconvert.o -o atopconvert -lz $(LDFLAGS)
+ 
+ atopcat:	atopcat.o
+-		$(CC) atopcat.o -o atopcat $(LDFLAGS)
++		$(CC) $(CFLAGS) atopcat.o -o atopcat $(LDFLAGS)
+ 
+ clean:
+ 		rm -f *.o atop atopacctd atopconvert atopcat
+ 
diff --git a/sys-process/bpytop/Manifest b/sys-process/bpytop/Manifest
new file mode 100644
index 000000000000..3dc95ea25b11
--- /dev/null
+++ b/sys-process/bpytop/Manifest
@@ -0,0 +1,4 @@
+AUX bpytop-1.0.51-tests.patch 1376 BLAKE2B a66b87bd725b699bbf603215abda7e4fe30d043784666206c7e73b4304d2cc73bbacae4194ec1a09f7393ee1a02291db39d72e87384dab25a5270545dfb5132d SHA512 d045a28c577a06b851dd3fdb8619bb831ebe9a9b9c70ed1398879873516254817f29db385fb112fbd2626b23d48ad860996fe1845ef991b8f993e8c017748a78
+DIST bpytop-1.0.52.tar.gz 616111 BLAKE2B f586189f1ae2067b1873a41235ac05f116aae5a6a965372d0ee778d714f80e6a41c163288ad1829313c0bef68f0f07235989d11351c48f4c78b953ceb4a4cb81 SHA512 68189c87890b637b9b3ff40ec4b0518a45023d3af0966cf0556c9dcc884d28660c42af37c69c06bbd03b514e198e5313fce143974ef11b67b95132070a77bfd4
+EBUILD bpytop-1.0.52.ebuild 596 BLAKE2B c2ee81820f150f7c9ab9011cb7cb7f1a2f9feae156a44d1b5a96b395786ead328003b7f8931b4cd3a3a3de439e2aa345bf33551c0047fd75021398b618637c39 SHA512 e36c4f4c35ca76f94eb3491c09c3e880e29f40dce5b6ab3ab256a67a2dc5fe327f7a59c71ae1afc6cb0b6ddf7ad060f1baca8e5d441b835c90c4bb75a75267ff
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/sys-process/bpytop/bpytop-1.0.52.ebuild b/sys-process/bpytop/bpytop-1.0.52.ebuild
new file mode 100644
index 000000000000..0621a07dc62f
--- /dev/null
+++ b/sys-process/bpytop/bpytop-1.0.52.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Linux/OSX/FreeBSD resource monitor"
+HOMEPAGE="https://github.com/aristocratos/bpytop"
+SRC_URI="https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/psutil-5.7.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/bpytop-1.0.51-tests.patch"
+)
diff --git a/sys-process/bpytop/files/bpytop-1.0.51-tests.patch b/sys-process/bpytop/files/bpytop-1.0.51-tests.patch
new file mode 100644
index 000000000000..3e5de4751fd9
--- /dev/null
+++ b/sys-process/bpytop/files/bpytop-1.0.51-tests.patch
@@ -0,0 +1,45 @@
+diff --git a/bpytop.py b/bpytop.py
+index a1c2b3a..b1cc28e 100755
+--- a/bpytop.py
++++ b/bpytop.py
+@@ -64,23 +64,27 @@ args.add_argument("-p" , "--proc"		,action="store_true" ,help ="Start in minimal
+ args.add_argument("-s" , "--stat"		,action="store_true" ,help ="Start in minimal mode without process box")
+ args.add_argument("-v" , "--version"	,action="store_true" ,help ="Show version info and exit")
+ args.add_argument("--debug"				,action="store_true" ,help ="Start with loglevel set to DEBUG overriding value set in config")
+-stdargs = args.parse_args()
+-
+-if stdargs.version:
+-	print(f'bpytop version: {VERSION}\n'
+-		f'psutil version: {".".join(str(x) for x in psutil.version_info)}')
+-	raise SystemExit(0)
+ 
+ ARG_MODE: str = ""
+ 
+-if stdargs.full:
+-	ARG_MODE = "full"
+-elif stdargs.proc:
+-	ARG_MODE = "proc"
+-elif stdargs.stat:
+-	ARG_MODE = "stat"
++if __name__ == "__main__":
++	stdargs = args.parse_args()
++
++	if stdargs.version:
++		print(f'bpytop version: {VERSION}\n'
++			f'psutil version: {".".join(str(x) for x in psutil.version_info)}')
++		raise SystemExit(0)
+ 
+-DEBUG = stdargs.debug
++	if stdargs.full:
++		ARG_MODE = "full"
++	elif stdargs.proc:
++		ARG_MODE = "proc"
++	elif stdargs.stat:
++		ARG_MODE = "stat"
++
++	DEBUG = stdargs.debug
++else:
++	DEBUG = False
+ 
+ #? Variables ------------------------------------------------------------------------------------->
+ 
diff --git a/sys-process/bpytop/metadata.xml b/sys-process/bpytop/metadata.xml
new file mode 100644
index 000000000000..cee379b15409
--- /dev/null
+++ b/sys-process/bpytop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-process/ctop/Manifest b/sys-process/ctop/Manifest
index 5254c93e1197..b176be0770d6 100644
--- a/sys-process/ctop/Manifest
+++ b/sys-process/ctop/Manifest
@@ -102,5 +102,5 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLA
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
-EBUILD ctop-0.7.3.ebuild 6685 BLAKE2B e2866d671615e9cfb6aaa6f7711eacd33abb10a8a802a71d434ff50707638637daff986c5bbe7994889c0fc71a52a26a078758764cda628ea8161a9319998c42 SHA512 30fdba056e6642e80e119e29241fc3d5b13bfe2b190adc617599f007953b863dde388569766f0097603102d36adefaf81b95abbd69df01f8e07a8760eaa0a875
+EBUILD ctop-0.7.3.ebuild 6682 BLAKE2B c13a10fecc40e8eaf3175d60258a14f0ea468ea62aa21f15e563a7776b03f0d0c94c817e7ecd5c86dc7d38283901368a091515652d18a31c7a3be36b5b780b23 SHA512 1e3063f2a26f524665c5517b5ff17dbca3c259af86bb880430b05451ec52b502c63783534bc8f5cde9258e9cb3ef675e5c38fead21c82f1093b9af339be3634b
 MISC metadata.xml 248 BLAKE2B b5441b270b247a88ffc1cadfe3d4e19e34f7c3358992ac6fefb9b72e922c4719e31552f176214d28a7d085f103e377223860030b33e640386888299dec175284 SHA512 51dbeeb69e8bc7545264821619fcdcc32e2643e14b43339f33e7b315a6f9c4671b71e01eee0e62d1c96d67763a823b6a46fb4501300c0dfa68bb87de79e3ff7e
diff --git a/sys-process/ctop/ctop-0.7.3.ebuild b/sys-process/ctop/ctop-0.7.3.ebuild
index 158ec7d4412f..fe76e1d1e287 100644
--- a/sys-process/ctop/ctop-0.7.3.ebuild
+++ b/sys-process/ctop/ctop-0.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-process/dcron/Manifest b/sys-process/dcron/Manifest
index 6491a77efea2..802636e6f452 100644
--- a/sys-process/dcron/Manifest
+++ b/sys-process/dcron/Manifest
@@ -2,7 +2,7 @@ AUX crontab 622 BLAKE2B f5f180769b37e8a12e2990c80c85d70093c662d3c2a1ddae417d6722
 AUX dcron-4.5-ldflags.patch 1110 BLAKE2B a6c5a967bb687671b493c54a0abda0fdcbbd64e6d737a968801eaaf395167ae5a83ce5b9a87851cf2449946a2925b3fee98074cf0d0aded54cebca1356a82fe9 SHA512 8a07ccfae80468a555e8f5ea60f88dd444a3aacb6baa6f747a6a02bcdce78baaa8aaf799ae9d2684a518bfff537dc0cdcf0b53bb6fc0017fa52228f1f0a16e49
 AUX dcron-4.5-pidfile.patch 1097 BLAKE2B 06b4c1870d8698e465bbb5c9cfe43baccd11ab58e3e2b53493845c6582ed6c3b9c4120f2488cbf9552feca4182b1b229b9e2848a60d9bac3fa963d419f539bf7 SHA512 08bd8d7445b597a5c7d66d3e768c943388db44e0ae43a0cec2be3b0c83c510f00f808b02d52b86cb663e79ea66584b16f92eaa02d40489e5f4124206ae17378d
 AUX dcron.confd 131 BLAKE2B 97b9d62f5a5f8798a5f85517a69807e137e552ecb2d287d02a4167dc12b0d8963f887b6aa8ccad719821b19835b83abde90457b333c58d48ab5f0000a5113e97 SHA512 05b4a7aeb9d994aa3a37a0f2efa0f560a4eb6dd1fc77d67c85be3397f077bc92a0d647140164a96d48e49b486eef021aef5c3410704d457eda5eb894b46d26fb
-AUX dcron.init 449 BLAKE2B 2c2ff6e7e39282dd17b9d64705a96aebfda589f7276b0047c5ebb10748557c8c703835169b0493d2692889d0d5477bb25ea881b47fcda1d19d7c9f87fff721fe SHA512 d76461855567a07cef4bc448da92dfb95f72e0eed1628e73cd1b5f2f5ba51a4cab4a4b58966b7919e1474c99614a960ecf1da9c7f8c8db925c46fd26a270c976
+AUX dcron.init 446 BLAKE2B 1b7646859045b5b9b3db558c40960029fbbe2e9442aa0788cb3920f71aaf7137b86b074f98dcd094bc6ff110c0d56c44baa7f42058f357bb3f28f80cf80320d1 SHA512 9a6d625713a96490dea7c05717f5bae0271a297a28bd3f08c45d913d09b2b8bda259e7f6f772666f2312b4a2fa60477139efba389c8940bf55f6dcae73ebd588
 AUX dcron.service 151 BLAKE2B b8e3fa583592f6a3719356ed4d7b7429ba0cfaec2a6398af398df3a3b959b74659b6b89b7899c1bfb1c9ce048c00be6790aae650a88b5cfb5cc7ea51020e9fce SHA512 7249396786f5fc3b52981d0344c52bd56151d8ead161111a90a5b30c2985a39486aea3e263a6ddbefcb53d88a67277038bd88cc6480ce3d788093bac16835d1c
 DIST dcron-4.5.tar.gz 44978 BLAKE2B c77cea026b074eed11200bb335cc2f58f7346410f88ae50685db137583beddab14e50394233b8e0f27ae7e3bf30c7875b539db84c32236f78f52bf91862b3272 SHA512 08521391d16ba5adf80278ec2a734319c26c48841fd94b119c0b27d744c2cfb3562b1a3630135a03d1c43b1668d49262713abb20ff5f7ecd397a2a19a2f6105a
 EBUILD dcron-4.5-r2.ebuild 1155 BLAKE2B d8608fc6ef9ed58ebe31696f573cf2c478acbf854ce9d533342d6bcb34976940c68db5b2f8160cb76fcdca73593b2c14030bd8b651577b719197ef4513042b7f SHA512 86878515abb2ec3cb0af589c6e07ce40d20361553224101c8a5413f05264396f9320ed16ac1f081abcf63a72207f5f0cf78996971b042f8db54a52134bf2b800
diff --git a/sys-process/dcron/files/dcron.init b/sys-process/dcron/files/dcron.init
index eccff493b369..25ebade66c58 100644
--- a/sys-process/dcron/files/dcron.init
+++ b/sys-process/dcron/files/dcron.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index edeea8f37308..18daecfe365a 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -9,6 +9,6 @@ AUX fcrontab.2 226 BLAKE2B 4fc55d14c44797b1dcc34000de1a9ffa43b1a52037db5dcec7685
 DIST fcron-3.2.1.src.tar.gz 601142 BLAKE2B 184b74f9d64186b7d3aae87d48ed0107525fd0c73bb8db86408bd246592ff4fbcbc04f8ca0064868a8555d7c6be2f183172d62daeed75275cd836517da504d0f SHA512 ddfd3e3a297b843c924aacccffaa5c1c6b300497f39daa1cdb90dc4cf4bc757042b0b2c1f055c119c8128c64d830ee0e8757091610432f5ffcacca25d369e5cd
 DIST fcron-3.3.0_beta.tar.gz 592481 BLAKE2B b862dac8e70621e299ec2fbbc75a0e8843e7a085190fa7a18f9444f6f41f28cf55ef0dcd7234a388b9b3e6689f25019a581ded2ae6002643bb3dc472a59207bb SHA512 e5b76e23af774997d9ee1ef58d17009cea95d10b19a2d22b550b178a39bb7c439c055b440eb99c4286db6622901e5deb029318e4425e8cd098766452ffc15bc6
 EBUILD fcron-3.2.1-r1.ebuild 6941 BLAKE2B 9347288e8e9c399631ba9554b33a5faf93840bbb9baf94dacc53947f405e2abd117a4f95349591fb177ee2ded60a8582566f6a28ce0ccb38849b05954375a83d SHA512 00a5dc9417472d2fbbd6a62e6252307d5e972de8225c8a588339a118f2da97eee35d8c0b52db69373dc098c080f7dcb654c920d80f3434114457d32d33b541e9
-EBUILD fcron-3.2.1-r3.ebuild 7050 BLAKE2B 7350d90a1ab94016bbececb91029eae14d90545ff75a4f7a1ef9229bd44e57b9207b4b9b9d690ffd1dff005a6bdc875f9b0230587a1166dd4dde14f1551f7a93 SHA512 29430c773d963a0e5f042e7abcf78d2becbee6f3b6768bc53734f9565008af8b7b6f620cdd57c0342bdc9c615b67268e06269c2f012bb00407acf4a7b057cc5f
+EBUILD fcron-3.2.1-r3.ebuild 7043 BLAKE2B dbcb3b715235847c915f886f59e998a20d102ebf2d1141c24901739aff92335f7810ecd60256c3cca1422665bdea7e2876e5942d62435f13dba4ca2c02a76d54 SHA512 7ecc46834938fb03b4d5dc57f24a526539a8c826b28540773c75f1fd9872bf86fefc91990d6fb355e11b07a1dc6db22d92e50ae245a0b27753afc53623fea95b
 EBUILD fcron-3.3.0_beta-r1.ebuild 7072 BLAKE2B 5f2eb64ec051660e1fa70a124037add45ee37b883ad55574eca0e2a107b0c972eae0c7ae0bf11cc99a4977c92a4835765b924aecc5d84c0ec30abb2c71600483 SHA512 78d2c25f0dcc90e14fb5afcdd3da370b047d23d4b0dea4c82b6e2bb112b8b3eb370c6e766342e82c466be18df268d1a178991d4d0f4ce2d46cba1824e5a98f7b
 MISC metadata.xml 1159 BLAKE2B d2b071b31dca97b30377fbf9c5f07c7d80c4734f0c45fa37f14729e82337cbbc5075f0cc77d566d1fda6acfc9667eb6fb54f239286ce5f19808e0c118f3a5fe3 SHA512 0eb673fcb2652f766929c44d47d8d47be8cb094398dc394816196988cd08b04ce9cb658ce4457ca1b60e49d44a222cc608025364c72de277ba1a6d575a503f04
diff --git a/sys-process/fcron/fcron-3.2.1-r3.ebuild b/sys-process/fcron/fcron-3.2.1-r3.ebuild
index 8ca7c91051c4..58691340016a 100644
--- a/sys-process/fcron/fcron-3.2.1-r3.ebuild
+++ b/sys-process/fcron/fcron-3.2.1-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://fcron.free.fr/"
 SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
 
 DEPEND="audit? ( sys-process/audit )
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index aa44d6ef6fa4..a0c86fa39e74 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,11 +1,8 @@
-AUX htop-2.2.0-gcc-10.patch 535 BLAKE2B 19342dbf6c2cab4c73ebd0aac664b706867e24c7f7934779fbc940fee953bfdab06396b31e419a4b308abb8bdcb1b95648b13786234848833bc11a57d12f8776 SHA512 a1f436e2ea7ef40dc403877c51a58b0af7bd252db2471479a08f1a95dd03501df77406e1171d1e3848aa308dc5c2b46ba038d53336e56b4d1d2da6e6d7a23cc5
 AUX htop-3.0.3-tinfo.patch 1643 BLAKE2B d3aadf6f244fda024cf4d129a9972fa864f24768a9e6bd5858af1964832064669d034f86a63163568e3c982efc11ce6593a81d108fbbbe8a0c507b39241cfe16 SHA512 9fc5763418f3a380d1841febf2f09ef795a012ca91454f4f36c763d9c74660806a1cfc527d3a686cdfe94e7d6efafaef79ad2d312fd1f8431da24ddbf7f7cb6e
-DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
-DIST htop-3.0.1.tar.gz 179925 BLAKE2B d722bc49d7b546aec1359a5dc838e0f6cc4b17f8d2d2c59fd7fbeaf827233f658ea819f4c69832af5cfd4f836d3d66c223a9580037cf8d6d2ae28c6a6b3499b5 SHA512 0d6a1b0839a94f01429c85a459b0c6439051d1b6e69bf77c6b3bb31c81902a3127936ab9adc5bf1807f4b3d7b10a177a89fb9b883931f8dcf828ed06727d6945
 DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013abce972be4370b9b35d92661fcb4521fa715bc779c1c9b56bc3c0eeb5375c0df8ec7585df3774ac67ca504 SHA512 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868
 DIST htop-3.0.3.tar.gz 292925 BLAKE2B 7e227188e3954c0cb273b4bc95eaf2e11237daca3d929d4674dcdfc987c4af26e4b08da2b0f184d6d3e06952dee5704e468bf4b7bc03dfa0b6602c058beac495 SHA512 208eff95a0df3ab38f5e3175bb34420c8833ad630c797825a3fb188a1111476a3287aa5f53511c83da90d181afc3e6ea246ea01fbc3227466c5c928a5d70badc
-EBUILD htop-2.2.0.ebuild 1477 BLAKE2B 1a5421e1dae65c14cd719070206158989e73879ef4bc5413254aaf9b04184d35838d12704e134c16414395f491393b8660683e51e40dcc5f7e9fdb7dcd3565e7 SHA512 4acfb07731fc5bb398fb77ebadbb7131768999b4a948f9941cf9db4f3554b623e11d6ad80195a668341c16d5dc095d65b3d16c310c64a36ac85ff69c0b10551b
-EBUILD htop-3.0.1.ebuild 1471 BLAKE2B 61e570d83bfc55421ddeeddf7511f0fc165494c620e9eb80b51a92fff1810247d846aecaf94646f56a0a632622e7bf129e04af2ca2254a85e0274c9bcea4f3c5 SHA512 892925343c1526eaee61f1e21c559e91433dffb23191d45ae95b28cf236b0c93665eb277c39526fd8f4b2fe60346e592f46553c0a2ba1bcefc5760e78dcfaa8d
-EBUILD htop-3.0.2.ebuild 1512 BLAKE2B 0dc8a28aef689f7982bbdb07aa7f281c54dd464fb7ca96f591bffcad8f5869ce98b47754f1f6fd448abd2e30a2dc9b7df5e5bccbb2eee9130f8d020e2c6484a7 SHA512 d6b37c6261d5bf3a39d5aab53a325e6b3d6a7f36d8de03245732b3b256edddcc61a39869187610b031d582d71d15bc7f5a8892539c958865c49fdd8b8f5fb068
+DIST htop-3.0.4.tar.gz 296224 BLAKE2B b8fc4fe7c595f0a22b253f1eeea24d571c87401a426b8f6dba0ce15d98ea77ca94bc286428386cbf478f0e7ea4afde0e86e5e6b93bb88af616ba474e45e745f5 SHA512 d57e4fd326791bd2306f4a6ce2c4f4bf0499a0050efbaeb71a211148fa52993f707d8afdf0292dc26234cffdcba84a97e1d4422bc61aec40ba3ef9ebd91ebf6c
+EBUILD htop-3.0.2.ebuild 1511 BLAKE2B a1b6eaf69aabdb450abde79d4b22cc76c7ce1bedec581f6a567495e8102c920f50e86a748c5b1d525d372b9fd1bf239004311e58d84f7f6f645ca3af864e16da SHA512 948286f10b37d29ed2ae9115c8fdbf813399ba30ef301014220019b0329671c6e5bef93b43c9f406497250ec1f7eb091dcb803e3b2b54dae595ec94834e943eb
 EBUILD htop-3.0.3.ebuild 1687 BLAKE2B f5f32ebffb159df027c4b85d3e8f7499b8b1169afa7ede0b1d8af439f8dab8fdca10eea7dfb8ae17029ec168e8518fe0451103b4cc1ead085b879d9337cf0efc SHA512 0d6ab37677a4081b4a76dad83159cbcceba98767b667376fd48da9e506ea2580ddd0fdf6d03eff807a86a3bff82066bb3cb3def555b49b0916e1dd3a80f87b86
+EBUILD htop-3.0.4.ebuild 1627 BLAKE2B 7130531eb4b7ed77b4fc0a47f4bb72a562e6fd641cd13ad669bc244d1e718cd7b609070964014c657a3be20d444822d99b973780fd13eabf61f7ad9e86b267a6 SHA512 3d8b757b2e88e5e94168f7fff0ab4d3a690a2edcddabd2a93f6eb3a2c3250f1660fbbc0fdc6ac3e04e2a242135b30d47b6c0f29994bdc37ec457a4ef24950e07
 MISC metadata.xml 911 BLAKE2B e92af64c9d4ead9348cecca14425e8778d3d69e63cd45063e76c1a8052610e6155299c01606aa3a3540ec3b432629d074cda74130ad86f1d31bb09957fb51a75 SHA512 686e8459e279182fcba99f65d67491c11ed144149207e2ac952797b6d66f145ef7b2ea19a5116e9e9a70d6a6ad6d4ecbf106c8f3734e45019f7e274311437ece
diff --git a/sys-process/htop/files/htop-2.2.0-gcc-10.patch b/sys-process/htop/files/htop-2.2.0-gcc-10.patch
deleted file mode 100644
index dc49b0bb8508..000000000000
--- a/sys-process/htop/files/htop-2.2.0-gcc-10.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/CRT.h
-+++ b/CRT.h
-@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
- 
- extern int CRT_delay;
- 
--int* CRT_colors;
-+extern int* CRT_colors;
- 
- extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
- 
-@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
- 
- extern int CRT_scrollWheelVAmount;
- 
--char* CRT_termType;
-+extern char* CRT_termType;
- 
- // TODO move color scheme to Settings, perhaps?
- 
- extern int CRT_colorScheme;
- 
--void *backtraceArray[128];
-+extern void *backtraceArray[128];
- 
- #if HAVE_SETUID_ENABLED
- 
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
deleted file mode 100644
index fa7b79e33e20..000000000000
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit linux-info python-any-r1
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://hisham.hm/htop/"
-SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-pkg_setup() {
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	rm missing || die
-
-	default
-
-	python_fix_shebang scripts/MakeHeader.py
-}
-
-src_configure() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	local myeconfargs=(
-		# fails to build against recent hwloc versions
-		--disable-hwloc
-		--enable-taskstats
-		$(use_enable kernel_linux cgroup)
-		$(use_enable kernel_linux linux-affinity)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable vserver)
-	)
-	econf ${myeconfargs[@]}
-}
diff --git a/sys-process/htop/htop-3.0.2.ebuild b/sys-process/htop/htop-3.0.2.ebuild
index 334cec5e4ece..e046b0cceb60 100644
--- a/sys-process/htop/htop-3.0.2.ebuild
+++ b/sys-process/htop/htop-3.0.2.ebuild
@@ -10,7 +10,7 @@ inherit autotools linux-info python-any-r1
 DESCRIPTION="interactive process viewer"
 HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
 SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/sys-process/htop/htop-3.0.1.ebuild b/sys-process/htop/htop-3.0.4.ebuild
index eacb7a88db21..1e6c67cacd04 100644
--- a/sys-process/htop/htop-3.0.1.ebuild
+++ b/sys-process/htop/htop-3.0.4.ebuild
@@ -3,21 +3,23 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit autotools linux-info python-any-r1
 
 DESCRIPTION="interactive process viewer"
 HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
+IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
 
 BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+	hwloc? ( sys-apps/hwloc )
+	lm-sensors? ( sys-apps/lm-sensors )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
@@ -25,7 +27,7 @@ DOCS=( ChangeLog README )
 
 CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
 
-PATCHES=()
+S="${WORKDIR}/${P/_}"
 
 pkg_setup() {
 	if ! has_version sys-process/lsof; then
@@ -47,14 +49,19 @@ src_configure() {
 	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
 
 	local myeconfargs=(
-		# fails to build against recent hwloc versions
-		--disable-hwloc
-		--enable-taskstats
-		$(use_enable kernel_linux cgroup)
-		$(use_enable kernel_linux linux-affinity)
+		$(use_enable debug)
+		$(use_enable hwloc)
 		$(use_enable openvz)
 		$(use_enable unicode)
 		$(use_enable vserver)
+		$(use_with lm-sensors sensors)
 	)
+
+	if ! use hwloc && use kernel_linux ; then
+		myeconfargs+=( --enable-linux-affinity )
+	else
+		myeconfargs+=( --disable-linux-affinity )
+	fi
+
 	econf ${myeconfargs[@]}
 }
diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest
index 711d35494798..422d4ed6a478 100644
--- a/sys-process/nmon/Manifest
+++ b/sys-process/nmon/Manifest
@@ -2,7 +2,7 @@ DIST lmon16g.c 267681 BLAKE2B ff7484b7853418e679720fcc76257fb7fe0208f8cf43806c76
 DIST lmon16i.c 269804 BLAKE2B 9ff75d7f9f54d6ea3d4c9bec611343c2a28f2cff44d0e2a972bce61326befd4ae455941dba406d052c4cdd820ffeae48894131c8d8b746eedbd1bb58582594d8 SHA512 7c2d60b1558c01cfbcfe040eb68652d3a6c5717efb5495563f774ff20384a6cc4532e756d49b8634a022e4681503b7738998a5dbd77e4ca37c114a94a03893cb
 DIST lmon16j.c 268464 BLAKE2B bec697a4db2f16958b8505fafa0d215a41e2149a16a033ccc361f797cec954b43cf0856fb5b670b4741cafeada1dd2ac07df95d6bd5466ee805be406e79f6560 SHA512 e3a5be0e56f634f2e054a0ab39c92c2ca4e345017da976f891a5ece8cf67d57eb3b749f529394163f8269db829af56f394db5c666151b6c1e6a5505a6235869c
 DIST lmon16m.c 268614 BLAKE2B 8705a890cfc5f02079d70ab9de8e1462552342a16e5760964906f21a236bbef037e36c7d0f3af9fea7b4c1e86485620cef27fac16af33faa32d5e88afdde3358 SHA512 391d4703f5d052fd44a3c623155028e28649ea41a88c0fe8df81c7a7dc1f845e044f25e63352c1a7ea607c76c9afb0f82ff2841c8e789d88a9f1cf3c9e035f2e
-EBUILD nmon-16g.ebuild 961 BLAKE2B 87e844ac0c902fe0ef07a75d5483dfbfb46c189cd82a279d63253896c0ed28b5e4a80d5b3cfb0696e9a57866f3caffbc0b6685e82eadbd5d512bbb5424e5b813 SHA512 592dee8c488c08c7787ec43dcc3de799d53b1966b634c96f45be327893189af6f9c7c155b0ee6ef625e55a9550f14418e3d1056d6b8524af57df0103891d099e
+EBUILD nmon-16g.ebuild 958 BLAKE2B 5086bd2d5d81c935022974c242b9de9fcb5126bb5f5d3dcd623ab3ae8908b02db09fe624fc5bfe7a566cec1eb8e0eb03c9c973615180705a7b5896bb558bf22a SHA512 996feff8baa7889310cc148de7401416aecedbeee6f445afb873aee96435e00f5dbcfdb69580882da58dbc7184a6990c92d6910610fc6e981a360587c728f8e3
 EBUILD nmon-16i.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415
 EBUILD nmon-16j.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415
 EBUILD nmon-16m.ebuild 982 BLAKE2B d88ef3baa7bfc7830aa188d666af5da401603d6d1843c46c09e37b05bd7625a4825d8cd82dfa43c1d8c8ee34e1bf535d08d1dacf5deaaea9786b3a566d2b6484 SHA512 5fe6863a6dbf54b616d4515af9fba21955a48790498d83e3548a47d005450b55eafc2a4b442e03912e4964b305bd479d9a26572704e52e7753e1222c14968b0f
diff --git a/sys-process/nmon/nmon-16g.ebuild b/sys-process/nmon/nmon-16g.ebuild
index fad46aabe826..5c6ae6d5c7ef 100644
--- a/sys-process/nmon/nmon-16g.ebuild
+++ b/sys-process/nmon/nmon-16g.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 9979052b127e..1067f49abe84 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,7 +1,5 @@
-DIST parallel-20200922.tar.bz2 2101918 BLAKE2B 51446bbe0ab34166db2b088dc96b18cfc26027312b16a8a98a6d68bf50ae247ba3b8654689760a53020bb5d8826ea8bd498bf4e6fbd9e26ab0e49dcc2214b68c SHA512 150e067025ba46dcd3f5319524890c383a5ba662999a355a1c44357e2bc57e4d23f0a164684aff12c96798dd637b44c3c8582769f5858a86e30dc66c9c3fca88
-DIST parallel-20201022.tar.bz2 2103301 BLAKE2B fa4b9f02e5de8e876d42c1673ded472131cc45ee081fc774a1040f6b5c260dd783d6b4890d17047badca176dd7d6be1d6466eaad4c5c12bdf30a152c30b88c0f SHA512 5c5131e8b65ca1a100b577347ecbe39b7ab32cbbf709d4eac7a3ef81b423a3b369772712b404d806dfb8b674dfabe91b9a4e94359d7532bee69cdd6203962f78
 DIST parallel-20201122.tar.bz2 2108900 BLAKE2B 97c49d5a17732db25307bf6f2e74451e8364c19e5253e4bb03736234397126f89809447b3cb6b343b315b512c2d2b578e7d2bbe2d5aa3e39f7eaf2cf40df0372 SHA512 58d6d41294418522db2d143ddbbf4d8cc47a3ae8a66f9f36d77396c230098386de9952a3b4d7db9e14470e36834be7d1995c5dda219ae21a72ea959f27d84e64
-EBUILD parallel-20200922.ebuild 641 BLAKE2B 2859b0f6f674b6d5140c041dc5c45f60258b026d6f46289585ea8b35b68f2cd43dfbcdc6982fb04a487ff2fa9efb09bd7afb5b643801b0bf950d426cbfb17357 SHA512 5d9c1bd8ebffea2705f61df62a8ad0ad8d498b1fc73e625734f99aec15306fc26b878d84770f5ee9e472876e41a61827b3e1b0fe43f65fe826e327175f2f5495
-EBUILD parallel-20201022.ebuild 641 BLAKE2B 2859b0f6f674b6d5140c041dc5c45f60258b026d6f46289585ea8b35b68f2cd43dfbcdc6982fb04a487ff2fa9efb09bd7afb5b643801b0bf950d426cbfb17357 SHA512 5d9c1bd8ebffea2705f61df62a8ad0ad8d498b1fc73e625734f99aec15306fc26b878d84770f5ee9e472876e41a61827b3e1b0fe43f65fe826e327175f2f5495
-EBUILD parallel-20201122.ebuild 656 BLAKE2B 77f738e23c46c022e67ba8c7eea3607950930e1c2e9c7041e5d6870232a83e87e56d9e31b73a3a0f144e54405117035d0c58f356f349b16184e93a6644841c19 SHA512 335eacb025371ecb9025f1251a23e6de4fd247a774ad320fd1461e197f086ef52a104b6e5d0f7634f3502308c39e012d4a0a0e56e61246bdfb45b6d7e6c7ad8d
+DIST parallel-20201222.tar.bz2 2115156 BLAKE2B 5e7194a1b0e8b14b9d1b866534eb2d96c40b1d7a4679ce094348f0a9670a9ceb6453de9cbf3e2b39077f9b4bb6034ef41e2c21e4225bc6af391ab6cc21588b58 SHA512 88359a211c0caf31a356a2095c31fea65e768880b82d9d9c820ae51b127928b0e5038d15355874cda3f7788cd0195b345f81c611cdfffd91697e075e9fa97e60
+EBUILD parallel-20201122.ebuild 652 BLAKE2B 87b97957ccf1af775d3691a461fe9cacedd9ad69948cb37de172df9c78a2931c35c58cb5ccac16f7548aa9be75759c1a79b4147ad0b0bbcde4ab46a4354ae16b SHA512 1401b9919056d32497b6effb449e7a4a60a77cb4cdfdc25b57d10a2e441efcccb9545e89d04fb60efe59e5ab4c93e0954df73c17f1703a39643c244e1bcd940d
+EBUILD parallel-20201222.ebuild 656 BLAKE2B 77f738e23c46c022e67ba8c7eea3607950930e1c2e9c7041e5d6870232a83e87e56d9e31b73a3a0f144e54405117035d0c58f356f349b16184e93a6644841c19 SHA512 335eacb025371ecb9025f1251a23e6de4fd247a774ad320fd1461e197f086ef52a104b6e5d0f7634f3502308c39e012d4a0a0e56e61246bdfb45b6d7e6c7ad8d
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20200922.ebuild b/sys-process/parallel/parallel-20200922.ebuild
deleted file mode 100644
index 6b36d87b1979..000000000000
--- a/sys-process/parallel/parallel-20200922.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/sys-process/parallel/parallel-20201122.ebuild b/sys-process/parallel/parallel-20201122.ebuild
index f34ceb2c2293..54a0c2f8069d 100644
--- a/sys-process/parallel/parallel-20201122.ebuild
+++ b/sys-process/parallel/parallel-20201122.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/sys-process/parallel/parallel-20201022.ebuild b/sys-process/parallel/parallel-20201222.ebuild
index 6b36d87b1979..f34ceb2c2293 100644
--- a/sys-process/parallel/parallel-20201022.ebuild
+++ b/sys-process/parallel/parallel-20201222.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size