13 files changed, 36 insertions, 193 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 039dc9d1129d..fc5063b8e3e6 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index 36f3184501e9..3482d9eca4c6 100644
--- a/sys-process/at/Manifest
+++ b/sys-process/at/Manifest
@@ -11,5 +11,5 @@ AUX atd.service 215 BLAKE2B cf87d9dec0b5a24c5c94b41f2c7aae52c369b9f05ea77a09d285
 DIST at_3.1.23.orig.tar.gz 126284 BLAKE2B b2af9dfa4ed87ee93489b98acae6b7eb005d6db7e2401ec7d4d21353af636b232d57e92e4cd6e81f52115aa9d29fadf440809a9d77cb1eb5d40d42ec7fe640b0 SHA512 ee5cf5abf32cf1e89746e427d1cc20005ef49fad47db55512c90042a77e86b2c15f5de029c79573bc86ce4aead6ed2d561b89812510aadbc5763f9288b467cfd
 DIST at_3.2.1.orig.tar.gz 127577 BLAKE2B 4e8f4aa889075dcede894062b2926afd7892ef15d4ca5bf855b699d1dab9f49a56fd5bd8da376b178032e70cdef72eba2a7d9d6da577982773351633ce85d003 SHA512 8109b2acf220ffc14ea78e7d5671507e8cad41a163c1d7f96de18aae05c8617071c6306e04446450190f492a65ca31f51ed040fba5719b67625a58f738fc9c9e
 EBUILD at-3.1.23.ebuild 2327 BLAKE2B 80b85137bca7d88c845853eb3183acd8a4a147c8ed94863d19ebea95cb5c27440fc7e2b9ef3be821dcec68d25aeb2fef3d6e309cf38f76cca6384fa0d9925183 SHA512 0264bc3b9e4e61e9218f78de994559a1c25e514b0ae677ad622803cf343c6bdee5b08bef2f29f39ac6fafc4bb95a7ad5bd560b9839da1c9f819b96b62d4ad875
-EBUILD at-3.2.1.ebuild 2495 BLAKE2B ce4be01df09ba6b1e95e91bdfe317a100197a24b56cf7bae6e219d6c592aaa9d4ad638d72fc0182f4d4fe3b7eeb32f479bccb6642c7af8407a3f4fc3efd12f08 SHA512 037ab070b3af1136c5e3fa21003c146714509321cbc1ddfbf87fd0d49d54d2210a2c3deeef0fc71ef0bac177c1029d2396a701a48ff8d621e2681f334ab33b2c
+EBUILD at-3.2.1.ebuild 2502 BLAKE2B 2431cd1dca607e079f1cbdfe4b5f653f1d73d78b63dd290b66be8959fd1192c74f14d6db296f5d2421dacaa16a7b30ddca809e5509194dc7e8a3aca7c511402a SHA512 f48f24fb8798ec1ffe1e16d6e424414b5d331c979d5821a56329096c324475b5f58fe13c4689ee855ef62e1007a4b567419b5fe89cd4aa1ae71a89a14ab10e82
 MISC metadata.xml 364 BLAKE2B d51cc643a5646e05725088bafb99711097593b9c7e6c78207dd6668c8c4c2830964dcceb5c66cb60b8cde463ad14e968c4d2950326e86c931e84199a3efb909a SHA512 5c5d603a57b16255de5c049c237206242c440c61ee03237b85f7909e434f877fe84082f2989d6b70646c106a4b97ef380f6fbc87ead1fbca0a3886c38d65c57d
diff --git a/sys-process/at/at-3.2.1.ebuild b/sys-process/at/at-3.2.1.ebuild
index b084bde037b0..e24c9589dfec 100644
--- a/sys-process/at/at-3.2.1.ebuild
+++ b/sys-process/at/at-3.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://software.calhariz.com/at/${MY_P}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="pam selinux"
 
 DEPEND="virtual/mta
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 9a3cc2e265b5..4bcc514ab588 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,8 +1,6 @@
 AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d198fcf9abffd15ad60f1c7c43f1e9a3103ebb5f2f743c83cc9d09cdf610c4e5d5caea89523f9ed37f3a4801e774 SHA512 02b06b01f8e3782da632677aa84b9131cb33dae3270677a1a4b0af3c139d100fa54c90c412d1e608e08859facb31e04768927e4862cfc4d9cfcbd061020a5dac
-DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5188c7d6cbd55d2999be9321a1affda351094b8614d206e640e5a1338266b5c77629ec53bb280b9166f7b6a996e2 SHA512 99adccff7d1531760834b76f9a9525df0bf9a8f6f57dbd1f7c3c0515ba3b5c94f26172e19bbc7c93cecbe4bdebcca87ab3a11dd592259509eff85346780ef43a
-DIST glances-3.1.0.tar.gz 6688798 BLAKE2B 9ae2e6a4944d1af871b88ea325bc23cad24f11e70ff4871eeb6e4a510eb3a1e6f03fa5fa2cfde30d8b9aa0c32137aacb51d2dcb335c7ee6729e8d5913ec4e999 SHA512 a888cafa5987ab7a88caa0248e0cb3d9f65466d71ee8f1ca63565c5a8a59282be77c14f29afb2302fba0e79294c39e96384791cd89d23aa7727bfd4f20e2814d
 DIST glances-3.1.4.1.tar.gz 6802041 BLAKE2B 7e27811e4721f9089e88bb2375f5b58104bdcb9a890bff4cb207800f49eaf320fa1bd777a2de1a7ce50744df2b4b79973823f9aee52a291e1af6788c95c359b0 SHA512 8e15149bde87d14d8176fe247e911a04b24900a95917e5711dfc8764ecec3238f696eea08c36bc59f68a4702e028909150e3318907f11fc53c5cc56441870ff3
-EBUILD glances-2.11.1.ebuild 2412 BLAKE2B a28fd1db66dfe73a828b4484a5bf29343ac94e52c3bcd0f3638c6527607d88f1b102102e8dd5bc7c26162050741fef337137772f456d5bea86d45cf6adfba6c1 SHA512 ef0e0bda136272a4f464b143f8ab78f5f2ef7d10ce7888847256a4f780ba4e14cfec9b0f927b400f43804323f12a32a755cd0efda8d218a546702ad572a3d58e
-EBUILD glances-3.1.0.ebuild 2685 BLAKE2B 24e18aa057e732fd6dbe5bb8f7a8e19b55a17d20f1c627fa52d353db1b4a2fca4a2f1d9ab957ac0658dc01cf253831b8801e15342da665072f459b85a575802f SHA512 d47d0700de1cbf4b2ba32e9b72f2dea4792d1bcaea7efb5869d9a0d39211845917712123c377767a4164194b9c9689806cb74123bac7d168345678656878a5ff
+DIST glances-3.1.5.tar.gz 6804549 BLAKE2B a3bc71205110b0bfc285f009bbf1dea95f93a8621ca5b3c7768a1eee2af939a3605b2ec43b07da7abde079f89f4ebfe06dbaac2433de7e0379749bb001ac6d34 SHA512 20a2bc446f482506b847dd252c52edc9dcce501361742acde92d3f8a6e30e9386c8bc8c28387e981c5767e9c1fb88eba1858e243c2732e9fc4b5d64f643febd6
 EBUILD glances-3.1.4.1-r1.ebuild 2676 BLAKE2B 13c938510e7d7daab5c07184ba64cdf1a7f5507eab3551c5ce151328a6a2ac9b3379c43122d945f698f578ebf3f1e8b53f11033c1fd552a89ed95a0330bc9711 SHA512 aae1b61a2152234744f50c2c012ddcbdec3268b8851953db59db4374c5b90bd6f39a755e1893752c8ab8945dba0b36828283510a25148720935bee02b2d8226e
+EBUILD glances-3.1.5.ebuild 2682 BLAKE2B a6ddb09aaa59a3aed2f4693a35ff13789a299a2845987bacf022c6c8179fc286d349b877bd2df630fdba374ef8d5060658bdffbbd93586964e0a370e655d1997 SHA512 80d42c466bcbf771938dc64653c99a381260891839b3187cf3c486b25359c543a9b12ca364db474799de08ce29943e92d3fa4ef69e7e1eb731eb931371b9f3e0
 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73
diff --git a/sys-process/glances/glances-2.11.1.ebuild b/sys-process/glances/glances-2.11.1.ebuild
deleted file mode 100644
index 05a6e6d5793e..000000000000
--- a/sys-process/glances/glances-2.11.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	>=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${P^}"
-
-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
-
-	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 )
-	# build docs
-	if use doc; then
-		pushd docs
-		make html
-		popd
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Action script feature" dev-python/pystache
-	optfeature "Autodiscover mode" dev-python/zeroconf
-	optfeature "Battery monitoring support" dev-python/batinfo
-	optfeature "Docker monitoring support" dev-python/docker-py
-	optfeature "Graphical/chart support" dev-python/matplotlib
-	# https://bitbucket.org/gleb_zhulik/py3sensors
-	# optfeature "Hardware monitoring support" dev-python/py3sensors
-	optfeature "IP plugin" dev-python/netifaces
-	optfeature "InfluxDB export module" dev-python/influxdb
-	optfeature "Hard drive temperature monitoring" app-admin/hddtemp
-	optfeature "Quicklook CPU info" dev-python/py-cpuinfo
-	optfeature "RAID support" dev-python/pymdstat
-	optfeature "RabbitMQ/ActiveMQ export module" dev-python/pika
-	# https://github.com/banjiewen/bernhard
-	# optfeature "Riemann export" dev-python/bernhard
-	optfeature "SNMP support" dev-python/pysnmp
-	optfeature "StatsD export module" dev-python/statsd
-	optfeature "Web server mode" dev-python/bottle
-}
diff --git a/sys-process/glances/glances-3.1.0.ebuild b/sys-process/glances/glances-3.1.5.ebuild
index 8d44d6e568d8..ddac31590a0d 100644
--- a/sys-process/glances/glances-3.1.0.ebuild
+++ b/sys-process/glances/glances-3.1.5.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 eutils linux-info
 
@@ -14,22 +15,24 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
 
-RDEPEND=">=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? ( ${RDEPEND} )
-"
+# 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
 }
@@ -42,29 +45,18 @@ python_prepare_all() {
 		-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 )
-	# build docs
-	if use doc; then
-		pushd docs
-		make html
-		popd
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
 	distutils-r1_python_install_all
 }
 
-python_test() {
-	esetup.py test
-}
-
 pkg_postinst() {
-	optfeature "Action script feature" dev-python/pystache
+	#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
@@ -82,7 +74,6 @@ pkg_postinst() {
 	#	dev-python/prometheus_client \
 	#	dev-python/pyzmq \
 	#	dev-python/statsd
-	optfeature "Folder monitoring" dev-python/scandir
 	#optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3
 	optfeature "SVG graph support" dev-python/pygal
 	optfeature "IP plugin" dev-python/netifaces
@@ -90,6 +81,7 @@ pkg_postinst() {
 	#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/htop/Manifest b/sys-process/htop/Manifest
index 4dda9257788a..bcfe9c6a38e6 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,8 +1,7 @@
 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
-AUX htop-3.0.0_beta5-gcc-10.patch 1251 BLAKE2B bb9f107c9cffe7ce16d74faeb29da22a4a327e16dc763657edd14b36720392fc31fa69575a44aa26c1d1a313405259750685d72fad60b96459f495701a573242 SHA512 455e1209fd5ada557acb841046cdd2895e9ca230e576cc54cef23a2889d8c2ac048b30d34d24f47bde3bb28e30dfcaab2877ad0e2f9f1f2d450deda7c4a80ed0
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
-DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344
+DIST htop-3.0.0.tar.gz 179371 BLAKE2B 7501d8277eb97e39f7a8e2e9191bdde97deca6f3240a3e497ce55e71b0659122223356d4ff03086f9303b82ea4de0fa4e7909baca6de063ac6b22d7b6530f9be SHA512 36dc37b416b9917005007448fe73fdd6475a3f7f8442a083923d3f5dfb706d0f1731255522a99b67cc547b239acb1c68b144f8d600e243eeba160b2a43e8339a
 EBUILD htop-2.2.0.ebuild 1477 BLAKE2B 1a5421e1dae65c14cd719070206158989e73879ef4bc5413254aaf9b04184d35838d12704e134c16414395f491393b8660683e51e40dcc5f7e9fdb7dcd3565e7 SHA512 4acfb07731fc5bb398fb77ebadbb7131768999b4a948f9941cf9db4f3554b623e11d6ad80195a668341c16d5dc095d65b3d16c310c64a36ac85ff69c0b10551b
-EBUILD htop-3.0.0_beta5.ebuild 1841 BLAKE2B 06b26b534608850061d60eb145fcc7d011ac8ea6fb9b8f1a7bbbfaf0a5fbe4197b832a23fae5903e021ecff34f70ea015b321738101bdfdfb5f6f1b2f43b8be5 SHA512 3bad978129dfa7d1a0d8af52417464df5414e7437fed6df0f900b7d5fd70a1dd43916f06028a9c6af6f98a6f2a574e311b196c5a5d6765d60ce5904400a6d0da
+EBUILD htop-3.0.0.ebuild 1471 BLAKE2B 61e570d83bfc55421ddeeddf7511f0fc165494c620e9eb80b51a92fff1810247d846aecaf94646f56a0a632622e7bf129e04af2ca2254a85e0274c9bcea4f3c5 SHA512 892925343c1526eaee61f1e21c559e91433dffb23191d45ae95b28cf236b0c93665eb277c39526fd8f4b2fe60346e592f46553c0a2ba1bcefc5760e78dcfaa8d
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch
deleted file mode 100644
index 6a2004b3cf77..000000000000
--- a/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Thu, 23 Jan 2020 17:27:10 +0100
-Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default
-
----
- CRT.h                | 6 +++---
- linux/LinuxProcess.h | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CRT.h b/CRT.h
-index 933fe068..65998ac6 100644
---- 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/linux/LinuxProcess.h b/linux/LinuxProcess.h
-index 6ce3037d..cbd77be9 100644
---- a/linux/LinuxProcess.h
-+++ b/linux/LinuxProcess.h
-@@ -144,7 +144,7 @@ typedef struct LinuxProcess_ {
- #endif
- 
- 
--long long btime; /* semi-global */
-+extern long long btime; /* semi-global */
- 
- extern ProcessFieldData Process_fields[];
- 
diff --git a/sys-process/htop/htop-3.0.0_beta5.ebuild b/sys-process/htop/htop-3.0.0.ebuild
index 241e898507e0..eacb7a88db21 100644
--- a/sys-process/htop/htop-3.0.0_beta5.ebuild
+++ b/sys-process/htop/htop-3.0.0.ebuild
@@ -8,32 +8,24 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools linux-info python-any-r1
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://hisham.hm/htop/"
-if [[ "${PV}" = *_beta* ]] ; then
-	SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/_}"
-else
-	SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
+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"
+
 LICENSE="BSD GPL-2"
 SLOT="0"
 IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="sys-libs/ncurses:0=[unicode?]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
-BDEPEND="virtual/pkgconfig"
 
 DOCS=( ChangeLog README )
 
 CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
 
-PATCHES=(
-	# Fixes from upstream (can usually be removed with next version bump)
-	"${FILESDIR}"/${PN}-2.1.0-header_updates.patch
-	"${FILESDIR}"/${PN}-3.0.0_beta5-gcc-10.patch
-)
+PATCHES=()
 
 pkg_setup() {
 	if ! has_version sys-process/lsof; then
@@ -46,13 +38,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [[ "${PV}" != *_beta* ]] ; then
-		rm missing || die
-	fi
-
 	default
+
 	eautoreconf
-	python_fix_shebang scripts/MakeHeader.py
 }
 
 src_configure() {
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index d37e938af757..766a534d436b 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -2,6 +2,6 @@ DIST parallel-20200622.tar.bz2 2101840 BLAKE2B 6c9c7dfd5453df91830a8bcf5110f3215
 DIST parallel-20200722.tar.bz2 2101118 BLAKE2B 989b0fbf6d359ddb4fc86d1509ccc9d92af36f7f622cebf660ccdf216d61c99f66464dabbb65d16773bb23216c3b6b4b296ed4abbcb708b954993eaf21b01531 SHA512 acffc0a08ef599275f54f710244fde45efd85d15b8b98bff6df2ad113c06334de9ffe641c61a55da51e62025f8bfe66d1318959f08c6cffe1ab2292c7cdb8cd1
 DIST parallel-20200822.tar.bz2 2102303 BLAKE2B c910b2b7e7631f07962d97e4953e26b3134a6ecbb42e64eb862eeeeff1b2707d95ca6d28d651f051bf32b62d0013f7e64f116a7bd87bd892da9debccfa700cfe SHA512 f723163b430e1932a8d5282ea4b6376cf0e65c04feaf1a7ce35d838328d26f5dba5d63a004b0652e733595cb82cca475e479b2111c423c1977aa1a0d1d59b5ff
 EBUILD parallel-20200622.ebuild 634 BLAKE2B 3937842c027464703f2aa2fc03407cd349174ac4f8286004ce4a91d008803a113e4ef014df6b4f93c44b0fd415f535cb2f6817b1bac3fa76f5e52730b6ab8876 SHA512 dd9271c6b3ae7a78d9917f3d19f4c97244c5cf6a51f95a16bda46e42387f334e4c135ab962664c9ac7d7d29c07f93f06ac9e52b72a656dcd4b1392cd36a48d82
-EBUILD parallel-20200722.ebuild 638 BLAKE2B b9dbb07e6bd05e6fd839db8684e3e00f833ef4d3070c8e6f2ceae9726b6d382eb312c56abdeaa53294853fd3b6f4ff149983d83a318d37270e4f6e8e29f6eeb1 SHA512 174793db3e189d3f35e92bdc4cd6b32c98a36adebc0e7b68cfacea6f8b1ed137075049483e60b8882b50dedd88af6b276ffb6c63d4f65683e31f5e2200902251
+EBUILD parallel-20200722.ebuild 635 BLAKE2B a10cc73325ce748d300360fd3c3f200d395e9f50ea380466aca20cb9a4c19053cb39a0a4570810fd9a652930001c74e99e10a75ef6e874fd17b2e767d828f02c SHA512 53908576cf756ac9272d4238543efb7f7fff2c42b4f9ba45ebf1656bac262d7e7e674e25ba88c91fca8cd308160c572fdfa7e3a894d34e4e9f216cbb661b49d5
 EBUILD parallel-20200822.ebuild 638 BLAKE2B b9dbb07e6bd05e6fd839db8684e3e00f833ef4d3070c8e6f2ceae9726b6d382eb312c56abdeaa53294853fd3b6f4ff149983d83a318d37270e4f6e8e29f6eeb1 SHA512 174793db3e189d3f35e92bdc4cd6b32c98a36adebc0e7b68cfacea6f8b1ed137075049483e60b8882b50dedd88af6b276ffb6c63d4f65683e31f5e2200902251
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20200722.ebuild b/sys-process/parallel/parallel-20200722.ebuild
index b26f0ef3040a..c68ca32399af 100644
--- a/sys-process/parallel/parallel-20200722.ebuild
+++ b/sys-process/parallel/parallel-20200722.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index c6e2b08a27d9..b7e6bd370af4 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -7,5 +7,5 @@ DIST time-1.7.tar.gz 103066 BLAKE2B 900df9031f90fbdab5b778c8ec61b3fe5efb2cb6a218
 DIST time-1.9.tar.gz 596779 BLAKE2B b48c2def2f7aaa79ddb8838ed9e103dd7b1b573b6084d1481838cac86eb7930b3a231469936ad23d5096e576ea728e821defb27fc8b3f9187809e3f5c01b7c57 SHA512 5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406
 EBUILD time-1.7-r3.ebuild 638 BLAKE2B bf1381babaf464d09fe99c2f1577565b374cca972f31b6b34a98524dc9f76485861f71baadc0eabfa17a15cb46b790af87feceaf91a17829c24afed726e918bd SHA512 dd2cf88943c95bdba7f31fad429066d9e504fba7a316fe0eef65619c86cf1432143959858f7bcd966d216dd2882766ac88d1b92c47cd6744fc04c2542589c399
 EBUILD time-1.7.2.ebuild 674 BLAKE2B 24f454bc3ee5130e678caa72baad791b2a985917e1da0d5905a5ae984f2f338034c9df52b606612d6f551c9c3005c6d618d42c6327e0b35be72655a75aac1e07 SHA512 76c9c4acf06313d0396cdc852da052132602bef8a863b753474145b5df924f32ceba0cf43fedcb8d2fe1e16e0bff8f2612e6657e0817a92c18cedb8a9790a1b0
-EBUILD time-1.9.ebuild 452 BLAKE2B 27d697ad072191b6dcc3955de96eef67d0e918a883fc72ba67e6cf5e83db9d3d9a83d78b14780058f9cf79bfdae66d3c69132a9ec417a99bccd86e32f1c4c1ed SHA512 c397c0dfd74e4841607de2d89d524da26793330211ead93384cf665b9a93ee0618d71d8129bf9554649a35a7f491211fbf97e015c97b85a6caa33b9c419118dc
+EBUILD time-1.9.ebuild 451 BLAKE2B 831fbf0fdb8674fc2d7d02ae8035bd8dc3f2b2c66f28e09dc32129d8dcc9f4882e6ddeaa37868ceae85d0193cbe20706e4ccca4520b1a7529b1882eed0adf1bd SHA512 4a6d1ee298926e1ca45256cd1098a6e1a2a0b72bf8a93c97344b50d738846339f0039b462e5318574d549ef18450a8b62ef844f940083938f3fae37b642ba7d7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/time/time-1.9.ebuild b/sys-process/time/time-1.9.ebuild
index 4c67c7a0d09f..7b7dc9121c15 100644
--- a/sys-process/time/time-1.9.ebuild
+++ b/sys-process/time/time-1.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"