Merge branch 'edge' into next

27 files changed, 143 insertions, 346 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 481639c5e11e..28ca12d7a19d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index c7ed753369ca..94140c772321 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -6,10 +6,11 @@ AUX 2.4/criu-2.4-makefile.patch 2497 BLAKE2B c9ea525b59aba01f6418ede5cd68fe02878
 AUX 2.5/criu-2.5-automagic-libbsd.patch 516 BLAKE2B d7d1f929dade8247b1d4999aab073cc27cb2f0e3823c589e2313df5d1bd55162e3c3a7cc6eadfe0929fe8e51a774017acbb4b1f1582c7f72221d1c3f354aaa60 SHA512 01f1a6ac36c8c40b2f0d4cecafb2783d7bf7be51af042710615aa79318ef7914cef063b437428c4c2c8b2dd02434abbec7affd3983b4da74aabe429b1ce947b6
 AUX criu-2.8-automagic-libbsd.patch 511 BLAKE2B afcda80c50a2ea0a74f3578c56b2dcfe1bbb3ff17dc88bb0ea7da16fa8db21e1adb5e2f85479459d079991f7d9f2b443881d9a8d07cae1b1b541ac5a691f37ac SHA512 d43280f988965dc6c7932767a896fa252234aefee99b85651d2d3ea0ffac7dd3fce60c067d9eb7c847ad941cb20eca68a118f77246d56831d083ba01aa8f037a
 AUX criu-3.12-automagic-libbsd.patch 457 BLAKE2B bd16c9e84ba67d0968371844c7b8121d1defea93371b17124130685c1d55969e3f472349f4e4f5ac211cd659980bfdecaa06b38a2fc6037d486d15dee6850884 SHA512 b535792caf39c9e8c21ed313551b9fc0f8675c494586c66d5caba17c67bb432c27c9ff3cbf5a7d2248c99fc438174c0daea355d89ef9d4ce1a8a26e688fdf7c3
+AUX criu-3.12-gcc-10.patch 2059 BLAKE2B 6a541cc5350297b082bfb8d0535dee7e266b1d87a19b8e06ecaebdd00fd69eab0c318d4928e42dda0a0b95791125b67fe1507e2cb16055910bc58dcc155e7087 SHA512 69153aefa50ef8dc45e0bded4b6a3e4bcabc8fef6e37fd2f77fae4b1b75b98ad236d00f297b9df5010aed34ef6e811affcf812b4fc1bb167c6ca0dd9ace5ef88
 DIST criu-3.11.tar.bz2 809858 BLAKE2B 873502887a66ab5c9017b55d55ec2b391d0576e4c97f391bcd896041ac4f12f55ba40e9a9190e2a9cc802aa3c3280d68d26e9440507a5201194cbe6b1ff3661e SHA512 d201ca54b20512a4ad890c5081bbee5d1621e65bdf0a672a7a9b74a67cfdb8d451e566c32502eb8ed53c83826f8d5976a77ec451bdf667d89f8fa77c82663d1a
 DIST criu-3.12.tar.bz2 820168 BLAKE2B ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca SHA512 bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
 EBUILD criu-3.11.ebuild 2900 BLAKE2B b8589a947a4672aaf53f341ddf590910c5e29eba5cec10da0a4a49e8fee7f2dfbe874790e0cd6531bb6fea9c04df36c0884384491e6fcca5805dee7243351ac7 SHA512 b60f26c2fd42745681c4cebb90a7345d2dc8653ffb9a346830b220361a676200813efa3ab1fa7f86a9509badd187811b7c60450185a6531e09be69f9e26e5518
-EBUILD criu-3.12.ebuild 2858 BLAKE2B 60bf73a978c8269d13c2246ffe6ad96e9a695af10d4142872047f1b138a4288c85e2f3f1b000d602e9f72b96a50653600e3ba170938833d02ef3f8455108fe07 SHA512 3a7ae106745a40bc7a2d97a339dc6dfc698cdc4575708dcfe017206284dfbab33bc44169cb859496f78f6c787c34675a97a98cf03c48e6943d9051369754846a
+EBUILD criu-3.12.ebuild 2908 BLAKE2B e2302e92541f7877fe7dacf4f6cfb6b900b1fc470a63c6146ac82b3510bcff8bc77459bd4ca00be0aba98d4b9543121ec3e62a88d219cec58ceecaf7be16b241 SHA512 ad077cf2ce8f40e7a35042dd4468677ec1e301c2ef472ce6158810408ba3b4c44352cd27e4f7941d86d7c5fb1b66fdc507a1ad173b5d050045be4d3a255c2bea
 EBUILD criu-3.6.ebuild 2530 BLAKE2B fa1a972b8f6c15296ac8bf9519e2e4e0758fd2aad6582014b84ec72b12384385c80f0b9477301f333745ab8d1833c7521d77fa6218b1f7a3de7a4f90cdd3886b SHA512 979baf7eca6befc56c951f063ec8775d35401136f4783009829229698ae9ed8b598737f8869c016fd5a266985df4be15048ea7e8aed550160f5281348954ed73
 MISC metadata.xml 379 BLAKE2B dab824549f773238cce7faf9e016b1b49c6215902f8d59c6518067874b80a4eb922c5e57e2db1815b1d761ab299c93b269b8f6628d3fc8e83ccf85c66e26f530 SHA512 d0dfe8190ed96ba069d4e932fa599752803a9560d62425cd1275cec6c309b88ce14218d7be0ff6e841c052228a421070abc9ffd5a66cb9dd59dbb80e920b95df
diff --git a/sys-process/criu/criu-3.12.ebuild b/sys-process/criu/criu-3.12.ebuild
index 9321be89fc07..7b5158f5f9b0 100644
--- a/sys-process/criu/criu-3.12.ebuild
+++ b/sys-process/criu/criu-3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
 	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
 	"${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
+	"${FILESDIR}"/${PN}-3.12-gcc-10.patch # backport
 )
 
 criu_arch() {
diff --git a/sys-process/criu/files/criu-3.12-gcc-10.patch b/sys-process/criu/files/criu-3.12-gcc-10.patch
new file mode 100644
index 000000000000..ff277b5b22df
--- /dev/null
+++ b/sys-process/criu/files/criu-3.12-gcc-10.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/707942
+
+From 10d9dcdb6e2fbe4646ff3f27cd35376ebaeeb0f9 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 2 Feb 2020 18:45:59 +0000
+Subject: [PATCH] criu: fix build failure against gcc-10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+ld: criu/arch/x86/crtools.o:criu/include/cr_options.h:159:
+  multiple definition of `rpc_cfg_file'; criu/arch/x86/cpu.o:criu/include/cr_options.h:159: first defined here
+make[2]: *** [scripts/nmk/scripts/build.mk:164: criu/arch/x86/crtools.built-in.o] Error 1
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/707942
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ criu/config.c             | 1 +
+ criu/include/cr_options.h | 2 +-
+ criu/include/pstree.h     | 2 +-
+ criu/include/tun.h        | 2 +-
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+
+--- a/criu/config.c
++++ b/criu/config.c
+@@ -30,6 +30,7 @@
+ #include "common/xmalloc.h"
+ 
+ struct cr_options opts;
++char *rpc_cfg_file;
+ 
+ static int count_elements(char **to_count)
+ {
+--- a/criu/include/cr_options.h
++++ b/criu/include/cr_options.h
+@@ -156,7 +156,7 @@ struct cr_options {
+ };
+ 
+ extern struct cr_options opts;
+-char *rpc_cfg_file;
++extern char *rpc_cfg_file;
+ 
+ extern int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state);
+ extern int check_options(void);
+--- a/criu/include/pstree.h
++++ b/criu/include/pstree.h
+@@ -42,7 +42,7 @@ enum {
+ };
+ #define FDS_EVENT (1 << FDS_EVENT_BIT)
+ 
+-struct pstree_item *current;
++extern struct pstree_item *current;
+ 
+ struct rst_info;
+ /* See alloc_pstree_item() for details */
+--- a/criu/include/tun.h
++++ b/criu/include/tun.h
+@@ -5,7 +5,7 @@
+ #define TUN_MINOR	200
+ #endif
+ 
+-struct ns_id *ns;
++extern struct ns_id *ns;
+ 
+ #include <linux/netlink.h>
+ 
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
index 09e061c7f64d..d7c3dcacfa4d 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,5 +1,5 @@
-DIST evisum-0.3.0.tar.xz 83620 BLAKE2B 9b9646670a7b313246537dbd78f47f5db14f3dd22436cd7e60e902df4b07fa28596d80edac5f3c0ee68c5bb7dfaffd3bf8a6d77d342e4aa32f4bfe97de3eb148 SHA512 a36c931bbb4534fb9201cbc09883311c3552d7ef48d504a86fc722222af64fc80083b81aab3dea99c926394613e7fe78f5477ae7c73dc19ae95df17e78dcd6ee
 DIST evisum-0.3.2.tar.xz 107300 BLAKE2B a30ddbdc33bee32c8110f887d986c39a8153f56e2a9660622b779dacf88c01141cb7192d041aa15318c86e83e372e064ccfd197362cc8447c78aecf75fd9909e SHA512 b0a5b3b033e2856cd92b2fd2db52ddb8e8956c4d1db45cf1c29353b3de74dedf2dea86dd1382dbef2a2326a4b60b395a9c7b12839fa93eb23ed34045a8dc213c
-EBUILD evisum-0.3.0.ebuild 427 BLAKE2B 0e1d8883811dfe580e0b63736dd767d1139c4e356d3bc87951834f432538cdb88252ddb6959943ca16a51152d7cf112639da23be33fcd1fd4b3e50ff3c26c84b SHA512 5a94d0f49651355dfc55765328a10eb6b35563dc330abbaf1c6d8db995a55a53187edb25c7996a168e079701490c17bbe7d311edce583780de0b09113ccc939d
-EBUILD evisum-0.3.2.ebuild 429 BLAKE2B abe7493dc7a4ab32955b463ee6c7584fb3ba41f28a6706ae2680a4c9121d6fc88896d0ed31ed64a43b9c615497defc0d03d8b0143b47d326a1db3313f5e86695 SHA512 97cf334f0e4f320f8db1bb5cc33853c7ea34b05baae14d6114ab06c0048a9f598877e68ab115c5f8a6edca8e50658106775943b7a3b64dda571c23bf80ce6156
+DIST evisum-0.4.1.tar.xz 158032 BLAKE2B bb2ec2cd79d8abd5e9f8c11eb47481b8a4e5feff30daf975e00949b08c58cd44988590f390bc7502801932485b070a44f9ac162e1a57daa37528c0f67043fa32 SHA512 4dd16bb5079ead296384640bcaaa316c60c842f9fd19cac6b2e30aba0eacc82550ba442c52a616376ed61799319c363c9ef7da2c3261ea8032e27108da31656b
+EBUILD evisum-0.3.2.ebuild 427 BLAKE2B 0e1d8883811dfe580e0b63736dd767d1139c4e356d3bc87951834f432538cdb88252ddb6959943ca16a51152d7cf112639da23be33fcd1fd4b3e50ff3c26c84b SHA512 5a94d0f49651355dfc55765328a10eb6b35563dc330abbaf1c6d8db995a55a53187edb25c7996a168e079701490c17bbe7d311edce583780de0b09113ccc939d
+EBUILD evisum-0.4.1.ebuild 435 BLAKE2B cbed3d9995bb7be5a2475d7c33e7dc65dc328a6cef8101afc0abf7706455eb227ea5d81acf4b3d73c8f5b4edbae2d824e786be33d97532166a802ed157f63b0a SHA512 2a1114e19bbdd0ec4edf8f955c16af6fc72201195d9e71999880e7e42ea32761b5b0e40681c989ee04e59d8b0b1bb2399911f960182707db632ca7b5c9eb7e3e
 MISC metadata.xml 815 BLAKE2B d969cde79150c0cd2977017520a7ac95713b1c43aad52645f4d354f5a3ef3320638f5da097f0b7999689135036f1f8594b5331d2ca3420af93a2c3bfc726569e SHA512 c1b2c28863e8572ddfb79f8159e9ffc0defb4dc9c7b02c3ad7b1a4804ddcad06034471d9774f4e09bda1c84a8ce72393172f194c30cb5e5fda0a1177db842c3e
diff --git a/sys-process/evisum/evisum-0.3.2.ebuild b/sys-process/evisum/evisum-0.3.2.ebuild
index 654b61b88255..c2a345f2db72 100644
--- a/sys-process/evisum/evisum-0.3.2.ebuild
+++ b/sys-process/evisum/evisum-0.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="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.3.0.ebuild b/sys-process/evisum/evisum-0.4.1.ebuild
index c2a345f2db72..34be85ce9ccf 100644
--- a/sys-process/evisum/evisum-0.3.0.ebuild
+++ b/sys-process/evisum/evisum-0.4.1.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="System and process monitor written with EFL"
 HOMEPAGE="https://www.enlightenment.org/"
 SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
-LICENSE="ISC"
+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 a9a107be669d..0f19390c6e7c 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,15 +1,8 @@
-AUX 3.1.3-fix-test.patch 1179 BLAKE2B b77a278b764bc03e2ba3ff7d8562b1b4e160e3825872e565549e7de56e72d9f9d8bc9edc5c1c5949b3af31c8982132430e7e97e5c2eae863c1aad4884036a5a8 SHA512 a9973b1635cde6f5de406497e2c6921011fff502d46f43be4fef25f6ad20ecc0538e3a03b06eb3da8f897d212bd9ec0f967ded7e806cad9c92d3ee61ebb03477
 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.1.tar.gz 6737781 BLAKE2B ffd20d6ee994428dccb9b4aea481c9c3f618f0f7895098ff9be3cda206c1dc82b924eef002d13d9a93b53c28ba4faa8d88cfdb5f0691097cf31d89b7e3237d50 SHA512 d42ced74c9dc5150ff7242b61aaba94fd6009e150f637cadd4b6c9a7fc7b8028ea2e8835ae0ecf66bd12321cbc3f68e75cd526c97f5aecad6cf6df578e1b222f
-DIST glances-3.1.2.tar.gz 6740649 BLAKE2B 109ce18d045aafd921ccfff64aaab12a8106fbf44bb8a1ca352d544244d5fcf911f85158964c84142e279112e8add3f7bbcc1eff22fb5b3e05b40c94d13e960e SHA512 f9b839532d2b53edb9dfeac9abe8f5a9e314b7bdf34e54083614c02262bb15f0db745762f06b609071d2a6fead8b52eed16b6f5a569904ef56dafb41b85b991b
-DIST glances-3.1.3.tar.gz 6759527 BLAKE2B 6f164dde0c67d58d32495b7b9b331255b3c599784518c92e3a2a456a1de9ddece8342e846923a7d6d3b6965ce5dd283f3f8eae5351bdfd8b1eda1b7969609c6e SHA512 7fcbfff9e94721de2dba5ce2e7a2899fab877283819dedd8e1d8c868f4fd6cb584887979379f7b7a50c0f3b2fec1e147db06afff267a8e8fa40ba189246beb79
 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
-EBUILD glances-3.1.1.ebuild 2778 BLAKE2B 3648c511ac03c01a8210571b3678811e45bc3baaff1567946ee22ede33b717f12fd24d673db5af2b1f0b32cd2dc51dd36e734cf3815656babc791fbb7378a5fc SHA512 dcbf7a9c7ef3159f87cb46113f9aae1a6b6a888ef52d719c63550d8b01b075227c52d56e6503aae161fa69ec3d66e696a1503a0895f087904749310e0e533003
-EBUILD glances-3.1.2.ebuild 2785 BLAKE2B 3684fd69f5c4fa4fa735114d37f1fb40b4e9704e66bf5d1e110cd488a31e9e08ea888b72e218b9573fd8c03447ce690e9b021dd749b7b54579537fff5b71e944 SHA512 08aff29c4db4b77706119f76a095813c246f15ef08539f4c87449f045e962a10748e0db83849faf63742fbdd87d687c433df23d855e56285a2e809373abd914c
-EBUILD glances-3.1.3-r1.ebuild 2634 BLAKE2B b21c93090dab1d65a847af970ef31aa1171a3081123b6c138e1a0e97c4debda283709163d6914669af106e41d9b5ac3599cb2483d502677e3c480e40681d8360 SHA512 da2a6f3c71e95520ac19153dd175939a088e23758df495cf9f85f8c0d36991d4938bd4cac48939225aca7b2e409f03bf8246af12d3f87731e15f19756944f7c6
-EBUILD glances-3.1.4.1.ebuild 2582 BLAKE2B 42ca9218aa8ebed23a81c395e92ed59bb1f3016fbac168e819aa7ebc3fb0eb647c292c707a6556b3c82d28c4aee3682cb7d2bddd6b3e6022e8af8f9f6a227f4c SHA512 08a6bc049bb8e9e9bbc0d7735d4cdd616f1b8e97defeaa2b0f95fcdb438d9535bce90c174d2ca7ae5a0ae21ffd90f8070772fb436524f4716d79d07b34b3c4ac
+EBUILD glances-3.1.4.1.ebuild 2596 BLAKE2B 7462115949d0b632e3f877cbbb3ed20c3271190c9f93c40547ba4341d8fdd86d9837c67a4f220d10b38a004f1a338ae79ac3fd457b6bc40acceef42d58680c89 SHA512 f2cdca28a6995ee65d32c5262e4b8e85b9f44ca47e791ed7b963263d43fac5472e3983325ed811c3ba58de0f21a948e5c882047c260272814b017a6f6a2ac904
 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73
diff --git a/sys-process/glances/files/3.1.3-fix-test.patch b/sys-process/glances/files/3.1.3-fix-test.patch
deleted file mode 100644
index 5e087ce96ba1..000000000000
--- a/sys-process/glances/files/3.1.3-fix-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From abf64ffde31113f5f46ef286703ff061fc57395f Mon Sep 17 00:00:00 2001
-From: nicolargo <nicolas@nicolargo.com>
-Date: Sat, 12 Oct 2019 11:45:36 +0200
-Subject: [PATCH] Correct unitest
-
----
- glances/plugins/glances_plugin.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py
-index 6a1c8606..23a76f80 100644
---- a/glances/plugins/glances_plugin.py
-+++ b/glances/plugins/glances_plugin.py
-@@ -86,10 +86,11 @@ def __init__(self,
-         self.stats_history = self.init_stats_history()
- 
-         # Init the limits (configuration keys) dictionnary
--        logger.debug('Load section {} in {}'.format(self.plugin_name,
--                                                    config.config_file_paths()))
-         self._limits = dict()
--        self.load_limits(config=config)
-+        if config is not None:
-+            logger.debug('Load section {} in {}'.format(self.plugin_name,
-+                                                        config.config_file_paths()))
-+            self.load_limits(config=config)
- 
-         # Init the actions
-         self.actions = GlancesActions(args=args)
diff --git a/sys-process/glances/glances-3.1.1.ebuild b/sys-process/glances/glances-3.1.1.ebuild
deleted file mode 100644
index 62bac630f411..000000000000
--- a/sys-process/glances/glances-3.1.1.ebuild
+++ /dev/null
@@ -1,97 +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} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-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} )
-"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-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
-}
-
-python_test() {
-	esetup.py test
-}
-
-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 "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
-	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/glances/glances-3.1.2.ebuild b/sys-process/glances/glances-3.1.2.ebuild
deleted file mode 100644
index a1f55c2e4112..000000000000
--- a/sys-process/glances/glances-3.1.2.ebuild
+++ /dev/null
@@ -1,97 +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} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-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 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-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} )
-"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-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
-}
-
-python_test() {
-	esetup.py test
-}
-
-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 "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
-	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/glances/glances-3.1.3-r1.ebuild b/sys-process/glances/glances-3.1.3-r1.ebuild
deleted file mode 100644
index d2dc37e71e99..000000000000
--- a/sys-process/glances/glances-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-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 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-PATCHES=(
-	"${FILESDIR}/disable-update-check.patch"
-	"${FILESDIR}/${PV}-fix-test.patch"
-)
-
-distutils_enable_tests setup.py
-distutils_enable_sphinx docs --no-autodoc
-
-pkg_setup() {
-	echo $DISTUTILS_USE_SETUPTOOLS
-	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 )
-	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 "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
-	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/glances/glances-3.1.4.1.ebuild b/sys-process/glances/glances-3.1.4.1.ebuild
index 1c5db5097fcf..0f363179037f 100644
--- a/sys-process/glances/glances-3.1.4.1.ebuild
+++ b/sys-process/glances/glances-3.1.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/future[${PYTHON_USEDEP}]
@@ -31,7 +31,6 @@ distutils_enable_tests setup.py
 distutils_enable_sphinx docs --no-autodoc
 
 pkg_setup() {
-	echo $DISTUTILS_USE_SETUPTOOLS
 	linux-info_pkg_setup
 }
 
@@ -43,7 +42,7 @@ 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
 }
 
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index de764ded65d5..703224fc3632 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,5 +1,7 @@
 DIST parallel-20191022.tar.bz2 2080361 BLAKE2B 591d7de578aa93a07c17f9fbc47e36f7397e4c844273fc37161ca0dbc16f1fa37da8936bde2fa6f700cc2701128553620a6bd3c42f6d2506403728ec5c30f778 SHA512 062f63eb7bb996cbf2c4cf0dfe82f301947be3b94b89a316d8fc44f8d79ab5c187c1765a4b4d3d61044ade9de2950ebe8f5ac64e1b9944d5305925e69d788bf6
 DIST parallel-20200122.tar.bz2 1986536 BLAKE2B 18966f921c468b15b30c1771259e96e469901b923423a63b24c1f0acce969f1a9ae84b609bf3cb6ef117bb5410a5850b0607bf48c362f56efa4b676870599b08 SHA512 09bd03dc29dea911490a9edc882256da5e5ecce04f25283c058e34f360bd2aa801d4e876fa8024aac7cc12d0b5f0d24a9c9f7c184a95bb9cd06bb92313e46855
-EBUILD parallel-20191022.ebuild 875 BLAKE2B c22ec2804f33f41c738157db7390846ba92d1022ab56633f483526e4cb7e984d251c356974d6872c88cfeebe039320af704e732f9676817cdcbde6274d67d520 SHA512 6130a65b8c45a3d0bcbc05dbc099fcd4ada667161a32c44f581a6dd5b101060164520f79428eef16f0ee34868f84731b136d2f9fba4446876f67a61637cc454d
-EBUILD parallel-20200122.ebuild 877 BLAKE2B fa59d5aec2f52c1b1825289b067bf86524f15c86f1737343a192896aef43fa5964c95a5addc4b49c0d69eff555d2d151b84d962898bd5d009ad27757066adf6e SHA512 2babfcbf9ceafb2fffd70ce1bf814e790c27cae94b358cb56af1cd898f43e2e8295a9aa355fa1730d6b95516ecf5b50e8c6078b9d1b88f8227cbfdb3fcecb67d
-MISC metadata.xml 924 BLAKE2B 64a76bbc9e38fcf493d58b86055a0517f1f5599c8a5d134357fe6bf5f1a659925b8d365e285e371a8e4b83cd33b71750c7885395f5c16a389a120fc76d938f48 SHA512 b7088c4c76ff9d4b806f87984389ad4169816c78565a12c043628aa2cd64c38bb2d6ccc2ac138f8d7df925d248b9a8fa9785b2e826edeeea249a7a4fe960e475
+DIST parallel-20200422.tar.bz2 2089965 BLAKE2B fe149236c9d05103699195b85902d3dacf73cc3b2512c6aaf24cc9f4804e2d0099ddf0a5e9439347cafdc89847bb7c5e934c9e688500d45abf4ce337a0d925b0 SHA512 77d011a946496252b1974bd3cd32dd6a0e79c81613a8d1b372717c98230bbb0bd6775b67b220e838c9fe274367fe9b9d415e4060f72a8c810a7710405b18b634
+EBUILD parallel-20191022.ebuild 876 BLAKE2B 10f4fc9bffdad7f1f685d4be3c0a2ffc378a940942ba8059d6da4ca75a73f666d22dde6f36d2e6feb0e0a36bb981cd5009b508d2f31d978b6d2cea06847726ea SHA512 b1e71041464d6c5f6484f1ef7e6cb28b03c21dc36f884a2fd96093e4ec77e808acbe14ae80c6a3dff31658dd0a2adcece1e210cb09da5d7931bdde98133073d4
+EBUILD parallel-20200122.ebuild 876 BLAKE2B 10f4fc9bffdad7f1f685d4be3c0a2ffc378a940942ba8059d6da4ca75a73f666d22dde6f36d2e6feb0e0a36bb981cd5009b508d2f31d978b6d2cea06847726ea SHA512 b1e71041464d6c5f6484f1ef7e6cb28b03c21dc36f884a2fd96093e4ec77e808acbe14ae80c6a3dff31658dd0a2adcece1e210cb09da5d7931bdde98133073d4
+EBUILD parallel-20200422.ebuild 584 BLAKE2B 97cbdaaab62f336161a569c847f65e1ed259b44bbc9dbb960d265ff1a2d52fd79f09eeaf33a1e214f2a1c4d3d4f48d15c14cbdae18f05f54067a53926398d532 SHA512 07131c34ad6c9d234561de6896692d87ed5eb2ac26882b0e9683b7a482ff5f8929131bdc4c1f7e396c31e36dbfeff23f42ac3441e3daf2154e2a89476d79f19b
+MISC metadata.xml 1113 BLAKE2B d3f2a34de2e32fc037ae3fe97736a6e9c2d8b31a1ffbd0fb381380c4e6cbfd5d99b5c911b19f655efd0f561e99980a523eb58c58f2731b78ef31af01a903f9b1 SHA512 58640ac496b4bc6d58b8ee46fda96373ba54a1063078358b7c74f6acd18166d6277d82b0fe9fabac71e908a9be020e29d65bc765541a4941b49af251a0147584
diff --git a/sys-process/parallel/metadata.xml b/sys-process/parallel/metadata.xml
index a3e2d78a4926..9c6c64a4e721 100644
--- a/sys-process/parallel/metadata.xml
+++ b/sys-process/parallel/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@cmpct.info</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	GNU parallel is a shell tool for executing jobs in parallel locally or
 	using remote machines. A job is typically a single command or a small
diff --git a/sys-process/parallel/parallel-20191022.ebuild b/sys-process/parallel/parallel-20191022.ebuild
index 0d91915cb4a6..486660319637 100644
--- a/sys-process/parallel/parallel-20191022.ebuild
+++ b/sys-process/parallel/parallel-20191022.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote ma
 HOMEPAGE="https://www.gnu.org/software/parallel/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/sys-process/parallel/parallel-20200122.ebuild b/sys-process/parallel/parallel-20200122.ebuild
index 8ec61c639516..486660319637 100644
--- a/sys-process/parallel/parallel-20200122.ebuild
+++ b/sys-process/parallel/parallel-20200122.ebuild
@@ -7,9 +7,9 @@ DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote ma
 HOMEPAGE="https://www.gnu.org/software/parallel/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-lang/perl:=
diff --git a/sys-process/parallel/parallel-20200422.ebuild b/sys-process/parallel/parallel-20200422.ebuild
new file mode 100644
index 000000000000..cde1e29d551d
--- /dev/null
+++ b/sys-process/parallel/parallel-20200422.ebuild
@@ -0,0 +1,23 @@
+# 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/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~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/procps/Manifest b/sys-process/procps/Manifest
index 6552d129cdac..184c2f90e0c1 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -5,4 +5,4 @@ DIST procps-ng-3.3.15.tar.xz 904416 BLAKE2B 9fc1384df1d51a13bdf3aaad173160a11c5a
 DIST procps-ng-3.3.16.tar.xz 859736 BLAKE2B fbacc1edb0711cda0fecbf5f589c8cc18bd74f0430866e946f7c4612b78f383b9299840ab7fa5bbc65c581cc9484dbb37b111c493cf88f55ba247a343fd0c80d SHA512 d83da472df256b188c32082632202e7f8ebd1b161082387760876ae34d50221b3682299a2816a7d6a29afb40322743c31b87d92ca299c2944a6b55e50736d367
 EBUILD procps-3.3.15-r1.ebuild 1987 BLAKE2B 0f3ae787ca2c22d9eacbf88bcc4354cd20307ee2f6f7f4de7b80690503705abb79175de9ef8f1d9bdd2c313dcb16cb6bcaefe53f1432d272182de44f84dea28b SHA512 46e31e2b1be497e67a5a68bfb6f0b87d140c9afac5713a0ae46e1728bf4de1d0687a16523031ce86490a4ef18a3956d5cae01f92088cd3ecc79d5c1ebe346ec3
 EBUILD procps-3.3.16-r2.ebuild 2373 BLAKE2B 503a77ecdcb66c72ae9d8fb5ed1371fbbc542bff3a1e0b90e35d58c27d7151c3da6ddd98f851c036991843680bffc0b77aa4409fa82ac8d2e16bd458baca5ed4 SHA512 4eee6d3fdf5e4f48f9b2667712ee745dc3116c8838a67362eefeb777fb78529bc2f0a117bd518133ae4649858b0ff017004e8bfab4617545d6f8e65cc5ee62b6
-MISC metadata.xml 653 BLAKE2B de137950217a24b13838a10e3dddacd94898c4d4be18c9080e31d666fe74d6f8e5fe3edfb4f3caf369fde1c82858e4c8828883c21f3ed32867a5f35d0771dc89 SHA512 d98bc7ed5e5437134c30db0a2ecbe4f430143aad2b91775e128fe735ddc39801e8d8fe62905cabbd8a41c4d07698110605b74056296282a74ac7622a09272703
+MISC metadata.xml 717 BLAKE2B caae5760de6bc3dbb19fef321255f8951a8ca70139511121dc6d497c8eac4a19ea1d08032e0b6538c74bb34242c8b394360e1fcbf65bd15ef3554e318fa2d4e3 SHA512 3a6a2fcf2dad8784e270bde8e6bc8b183e3dec14abe8c51a17316debac0b599a4f95dabd5e3e05344f500e8eb60b901062d17d644201bf4596e4580ba4d9494b
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
index 263e639ef30e..c0aa0de0b05f 100644
--- a/sys-process/procps/metadata.xml
+++ b/sys-process/procps/metadata.xml
@@ -13,5 +13,6 @@
 </use>
 <upstream>
 	<remote-id type="sourceforge">procps</remote-id>
+	<remote-id type="cpe">cpe:/a:procps_project:procps</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index 81db1adf75ed..44398825da37 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -2,5 +2,5 @@ AUX 1.5.12-generatordir.patch 2452 BLAKE2B 43b6dacabd148b3aebc41bcf4f9430b72632f
 DIST systemd-cron-1.5.12.tar.gz 31417 BLAKE2B d0776d2c4aa2d86289dd8ab5dade47f083ee7abc16f54c9527130f587049064d6100eaccd4a3a0a461d21ac8286910d3cb0590db14ea1d3a32e591b7ede0a59e SHA512 6f85cef0870cde5ff6b397fb640a30a8a567e09e3cac48456498f1f102395f12f174731ca9cc8e826bb6c49a0d3a6dd49a9aec63e7b75648b7dccfaa499dcea4
 DIST systemd-cron-1.5.14.tar.gz 31634 BLAKE2B 59394128145dbd04a2b1bb10a6ac8821a97a465e3c0d43f3ca8fdfe60db273352d46b1200c966adaf772272835269c5c553b040cb0e0340ec56340181c9b7245 SHA512 772a4f8181a0f8039a8138fdc43bfe0f2bd89222fe19fa971727be265036f86435334d6230e116440f6969425fc6d59dc26e9cf230c00d030ea5d62ba351713c
 EBUILD systemd-cron-1.5.12-r1.ebuild 2060 BLAKE2B 0c58e169ee919044a1897f2cfd8e039d8bec693ef2bbfb4bba0ca26ba52232d06cf7646a15ed355b83cd4825e11caa5928c49cb665226ffe3170c988f463675f SHA512 09f08c2b926cbc60c9b83adb9347b5b67d41ca70b4eeb112176ccb43161a2fc22a52592a80c6f1026a3969cf39e791dd61c15ed85c4b3b2bf621dc6925ec0b0d
-EBUILD systemd-cron-1.5.14.ebuild 2000 BLAKE2B 6697ad1ab040d7f7cc506fdd591b52dcd49455c98c8441abadbf9bc7d1e19de4a0affb348512a79306bd7dda652c107485612364d5fc97d6618aa63f19870b78 SHA512 3789e0e3f93e55944c3597533ba13ca7ff2c28831d82beeacee2a387cb845528fa0552124841073e97194cc99982c89ead029c8aa147205ba8e5d2d0acff82e9
+EBUILD systemd-cron-1.5.14.ebuild 1997 BLAKE2B 41d069e3455b08206bb2480fc8b1a78642413e914a59a9d5ea959ecb67626ded27685ba867edd79b3b410ba23be9cd01c7ed64be72c26d27c84074502657dd32 SHA512 a4d38fbad7ce7d7f1c91e36d22d23532d22e0943cb8516c73998014e21b0fe864e5b349749d7690ddcb954534cbfa3c2e674f0d1797e436841d63e537df9617a
 MISC metadata.xml 696 BLAKE2B 9487789802e271bb95d8c44c5f279f8c850b928e8a2547ce7a1b47e2db3aef119265c0d8e36b8dfba3c62e3b7d4ccc040ba7983dec6c6328fc11e10e7ffd4ecc SHA512 54efb7e34c7e83c0ac3e964e300705b3b33c2dd93dc711c6e71b9d93d83a627f0318ce757b01feb6d6e1edd228f94ab180394617803dcc23c5e73aece9c9f7c1
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
index b9d3d63b2562..4da8f8119ff8 100644
--- a/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index 52499bbb05ff..653ad459b209 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -1,3 +1,3 @@
 DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1
 EBUILD tini-0.18.0.ebuild 1428 BLAKE2B 4f7195c9cf60d8dfb2602bbcd3143143018e2cc3fb2da82e7b966a7fcf69703ab043d62d8b34ff96dcae0eb8022ded7c01a96bb01b8a680d5910d7adf3b87cb5 SHA512 8e2e0851d898a9c71c29efc35eb1cb7dcf6723f0fa9e41ea35ccba9c8dfba0d0c4c54cfe23c45e2940b7f83a486c3422ef8ad5ee77cf81420d66f911177158a5
-MISC metadata.xml 497 BLAKE2B 356a1e1535fb2669a6b563c42b01d269203aa1608e0bb37e5083d9144afc857e6db12c47113dd75fdc19fe105b291e990cef49b74b2c07fbfe650de9c3862fac SHA512 11f6842f3a4de7f003995288098e0f97c231b74fc6bbad41faea51662b9f62386db978f543a9db62b6e5a0d92c52e28b6c8e15ac79dcfc8c215cad9fb631e723
+MISC metadata.xml 558 BLAKE2B 7fd719d731c968125776805299e964567907ca7cae8a94c717218fdf8caa73d6f333a8bb22c36e0bec273f48504a55f91081e09474abc90440b50bcd760f53aa SHA512 dfbadc5994b3c7b4d8a27fd207c9f1836a21633218dee0252f938448f3c14f3c41d1f35c0604aecbc9f14117b27cd995451800c61dd41875be3becffb53d33f3
diff --git a/sys-process/tini/metadata.xml b/sys-process/tini/metadata.xml
index 131a33101546..7d1b420712d6 100644
--- a/sys-process/tini/metadata.xml
+++ b/sys-process/tini/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<upstream>
 		<remote-id type="github">krallin/tini</remote-id>
+		<remote-id type="cpe">cpe:/a:tini_project:tini</remote-id>
 	</upstream>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
diff --git a/sys-process/uksmd/Manifest b/sys-process/uksmd/Manifest
index e0c9bc053f70..16d769629beb 100644
--- a/sys-process/uksmd/Manifest
+++ b/sys-process/uksmd/Manifest
@@ -1,5 +1,5 @@
-AUX uksmd-0_pre20190726-respect-cflags-ldflags.patch 417 BLAKE2B a443e794da9452b5577bf3a96c4eac5d860516e9b29bffef9ee1b53755f2e2c2a91d518c4c3d07895e892d5cf002634f5d3e00dd48e7ce9bdd01098ac515c4b5 SHA512 f6b4667dd72c3310c3fb40ba6ceb8b285306a71b6cebf9254669716f03387a1fb8cb0650004daf64abeb5113aa3b83aa6287a6444f4521d942b195d94b46fdd6
+AUX uksmd-0_pre20200504-respect-cflags-ldflags.patch 435 BLAKE2B ca387ab901fd49f3c909a31135afd67b55a07f8e3d2f40b1deee6761510bd33cb281f684f0cd9e841a80cd12c15e83a6ba04a57bd6186d83c9d0f52bdf870772 SHA512 3e9923e6b382dfad13afb91d706998231f556341b7e36caaccdc7aa9cab05a758423eb0accea9c81c85d0ee78f7eddfc21951d2a65c6fb6d996e0e6c01ab92bf
 AUX uksmd.init 208 BLAKE2B f76e207c3e97750d31bf6b6d867f7f82abed8d19984408e78cb77e8d9c8ee22ae071aa880494748a955cb75d904e8cbe08c211cf24e2a048543d884d173c1a0c SHA512 404c5c6fdbd60d5c5f25d6cccdfa4efb35b0d3d8ec7da8162a3d8e59cb32327227ea165ee3561b3630df6e6b36c75c937b93cf6250a2227b92ac1be2843e300f
-DIST uksmd-0_pre20190726.tar.bz2 13445 BLAKE2B 4d16b9e7dff80269561c61cf8ea4177e6ceaa2540a3ee5bb3a36684e8364d0a4abdfb494fd0dbb3e6d5d2c074601a0c39f9f0570448e3d5769e50184c8ef7975 SHA512 812217a067c2fe70a17a321b507071f369efa38ca12d566cde66b1fc6e2e3ffa7e4d3fd3904f2f3cf409e313d03ab06829cef23fffadd785282cb602dbd5f06e
-EBUILD uksmd-0_pre20190726-r2.ebuild 740 BLAKE2B 8ec3fdf2f81694cc08d9eb3eb2f9278ca14e8db6d710536f094c8c9e49b7e567181770701bdc16964513c45fdd25c27f04b58d0e57addf8e18d834ff5e626102 SHA512 7609010bb7c48a22219c8428c0969ac9fd78163109b9f1440e15bffc527b8616537af68738e6d64a5bcfdc627f886497c0e80092462343b6872134b8c12126bb
+DIST uksmd-0_pre20200504.tar.bz2 13919 BLAKE2B abda5df86a2592f2e1299f23a94389c7c4af36a37e38e9f618860b5ce0b7fc796eb3b0f248bda7e3522643f5d3a3219fd5d1c66e5a21f32f8bda2a6942f6339b SHA512 9b69b3fea603aab2af27a3542e6b217de31c227581779602ae67d352917e79626530fd6ad769a8a7c147f2883926458757fbca7502b4034550292c7e6e14f2f0
+EBUILD uksmd-0_pre20200504.ebuild 775 BLAKE2B 78dcda7eb65ceb4339dd8c70db418cd304ffa1f15cbcb78f9c5604189aab571041365b98e0f94eb572301382d020323d53fd2fc59a7f4e73ba6598ef26780f12 SHA512 292bf21e8c9d25c47308c8eb20897beef2a695a18ff11f4174dee9de877141e45f2bcdfcd1f6115afec5c19eaddba0ed494cb99797a2fc55d9f3b784b6dec116
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/sys-process/uksmd/files/uksmd-0_pre20190726-respect-cflags-ldflags.patch b/sys-process/uksmd/files/uksmd-0_pre20200504-respect-cflags-ldflags.patch
index 7e92204d4037..407198d5aba6 100644
--- a/sys-process/uksmd/files/uksmd-0_pre20190726-respect-cflags-ldflags.patch
+++ b/sys-process/uksmd/files/uksmd-0_pre20200504-respect-cflags-ldflags.patch
@@ -6,10 +6,10 @@ diff -Naur a/Makefile b/Makefile
  OBJS = uksmd.o
 -PREFIX ?= /usr/local
 -CFLAGS = -O3 -Wall -Wextra -pedantic -pipe -fstack-protector-strong -fno-plt
--LDFLAGS = -lprocps
+-LDFLAGS = -lprocps -lcap-ng
 +PREFIX ?= /usr
 +CFLAGS += -Wextra -pedantic -fstack-protector-strong -fno-plt
-+LDFLAGS += -lprocps
++LDFLAGS += -lprocps -lcap-ng
  
  all: build
  
diff --git a/sys-process/uksmd/uksmd-0_pre20190726-r2.ebuild b/sys-process/uksmd/uksmd-0_pre20200504.ebuild
index 91de2f16cdb5..4b451363e718 100644
--- a/sys-process/uksmd/uksmd-0_pre20190726-r2.ebuild
+++ b/sys-process/uksmd/uksmd-0_pre20200504.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit linux-info systemd
 
-MY_COMMIT="42f4ff8eb09011bf1a199938aa2afe23040d7faf"
+MY_COMMIT="5325ae51733ebb010862365c5a474f0d68f1ca1f"
 MY_P="${PN}-${MY_COMMIT}"
 
 DESCRIPTION="Userspace KSM helper daemon"
@@ -16,14 +16,15 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="sys-process/procps:="
+DEPEND="sys-libs/libcap-ng
+	sys-process/procps:="
 RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~KSM"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${P}-respect-cflags-ldflags.patch" )
+PATCHES=( "${FILESDIR}/uksmd-0_pre20200504-respect-cflags-ldflags.patch" )
 
 src_install() {
 	default