gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-misc
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
299 files changed, 1866 insertions, 2888 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 04effb833239..64f5c45ac3ad 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/actkbd/Manifest b/app-misc/actkbd/Manifest
index e8726d6ec790..8406e2100186 100644
--- a/app-misc/actkbd/Manifest
+++ b/app-misc/actkbd/Manifest
@@ -1,6 +1,6 @@
-AUX actkbd-0.2.7-amd64.patch 1188 BLAKE2B b9dc0dac0241038a70e1bb4c3e7b0105326bd18bb5c3af55221a039879eb0cf8171b8ebe6b6819dc25bbd51476fd012d9db2f21ff0ad34580366df60f3c5bbd8 SHA512 921b5f654aabe06eb0589cf1b22bf44e3c7c662b088104dff8d439929ffa05fc6f658619bc54f5b0fa813a396ae740f05a121515af8f546395250a55a722dab0
+AUX actkbd-0.2.7-amd64.patch 874 BLAKE2B 76cb88058d55162175aa813cf05f5f7d7aaf333d0956b9eb71fe666ac00222764be56d6f91b5fb689504ef168cda5b81ed012d0fad46b5604837a9b505ab0829 SHA512 b409bc2d70cd699a9cfb6a27ac18c6c8853e51e63e9d8e75fcf9c01ff86ba127de353671ee8ef7c15617331f75c222e184c85884ec2a8663bb5db35cc68cf4fd
 AUX actkbd.confd 276 BLAKE2B d06f7e45cbe94b042384186b2b47b69e2e657e2a9b5845d2427b8bfe0c09d2c319e53c78e6576b8b6dbbba8dd60325c2e92e6e88d5cd231cffda38b075d795ae SHA512 2128c4c3e1754014e7e1e446ce6d8753045d517c500a957ceb0e761d60c0141c6fc26f427891d2937c5cb56c60759b9045ba21418d2f57bd8dca11c10ade18bf
 AUX actkbd.initd 782 BLAKE2B a5c95e50da4c0ecd20ddd6d1426b19a8ea47e1b1495d7b5cf8e61bb8d26072acf2d07aacc4714b1b000ba63c1233c9d007ab32d5c4e12b7ea323d2e0d078f8a2 SHA512 1d5d0e62a09562d7274807f18d8a34735b4ddb47bc2cb99374a8b62ffef8d5e553a682e273b57ef99460b1850730520e9f12b1ffeab8c39ddaec50595e100b8e
 DIST actkbd-0.2.8.tar.bz2 23192 BLAKE2B dd756023de258f95354d91b521343311648937af82f65fa03748a2924711ae6d1a78cb58be44b0fe01fa5d706bcc575e68afa2663798fa776a1af3dedbc81974 SHA512 307d97b2854be801f1a4a8a8fbc408d3c83efd40f5bb35ea463b154fc0c9761fcb83a99905cd2730a24122ff222f60f31c4ac0163600ba463d4713846de2bf72
-EBUILD actkbd-0.2.8-r2.ebuild 1197 BLAKE2B ee60d4cc240d951d8a573e01666266064ad9cd8645ebd3175a52843af3bc080d25e6e838b2948416e8ea484208824af001e9325e17574408d54133f8fbb5dad4 SHA512 3971370b2d2b9cafb4d9570ef65a233fa392a95d8378429dacc57f78e1f89fc8aab8413466d163fce84d071929f219abb0ae886e7cfa20071113171fc982f0c1
+EBUILD actkbd-0.2.8-r2.ebuild 1146 BLAKE2B 9ea309c56afda98f921dfa822f62e1f9861b533ab6326d9d724843fd90b5f7449b75677c95a062b73d4b41e2e15a0d342d197a061396d4a3037df372a02dc71c SHA512 bdde4d2507c4f57fe914a7304ac55306f7beb85e1830522266e1dad64fe31b34172637b7a7aaf68904e58770f92266b00c3955add017932dea8e0cbadc6cce56
 MISC metadata.xml 351 BLAKE2B 9dcf03875f2de0000bb108421dc815047ffdf17244bacbb7ec36e5186a4e65cc19f1d2bce281867034c12dff082c4402039e00f863d29012618f799481e24dc9 SHA512 f40d5dc16d267d0bf0171d927157805a4b31a3e2816eb128d3b9e6f0aded5b45b1865c1e06ceccf56618f68a15682fc3f416e7af49af007073b50fdb383359cd
diff --git a/app-misc/actkbd/actkbd-0.2.8-r2.ebuild b/app-misc/actkbd/actkbd-0.2.8-r2.ebuild
index 0b926c6873fa..28ba133c9bdf 100644
--- a/app-misc/actkbd/actkbd-0.2.8-r2.ebuild
+++ b/app-misc/actkbd/actkbd-0.2.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit linux-info eutils toolchain-funcs
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="A keyboard shortcut daemon"
 HOMEPAGE="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/"
@@ -12,16 +12,12 @@ SRC_URI="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${P}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 CONFIG_CHECK="~INPUT_EVDEV"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.7-amd64.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7-amd64.patch
+)
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
@@ -30,10 +26,12 @@ src_compile() {
 src_install() {
 	dobin actkbd
 	dodoc AUTHORS ChangeLog FAQ README TODO
+
 	docinto samples
 	dodoc samples/actkbd.conf
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 }
 
 pkg_postinst() {
diff --git a/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch b/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch
index b962d7e861a7..574e341b5c79 100644
--- a/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch
+++ b/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch
@@ -1,8 +1,7 @@
 # Try to fix pointer assigned to int and vice-versa problems.  Written by Joe Pelkey.
 
-diff -ru actkbd-0.2.7.orig/actkbd.h actkbd-0.2.7/actkbd.h
---- actkbd-0.2.7.orig/actkbd.h	2006-05-02 13:24:01.000000000 -0400
-+++ actkbd-0.2.7/actkbd.h	2006-10-27 03:37:37.000000000 -0400
+--- a/actkbd.h
++++ b/actkbd.h
 @@ -122,7 +122,7 @@
  typedef struct _attr_t attr_t;
  struct _attr_t {
@@ -12,9 +11,8 @@ diff -ru actkbd-0.2.7.orig/actkbd.h actkbd-0.2.7/actkbd.h
      attr_t *next;		/* The next node */
  };
  
-diff -ru actkbd-0.2.7.orig/config.c actkbd-0.2.7/config.c
---- actkbd-0.2.7.orig/config.c	2006-08-20 07:05:36.000000000 -0400
-+++ actkbd-0.2.7/config.c	2006-10-27 03:55:21.000000000 -0400
+--- a/config.c
++++ b/config.c
 @@ -107,7 +107,7 @@
      strtolower(attrs);
      while ((tmp = strsep(&attrs, ", \t")) != NULL) {
diff --git a/app-misc/aldo/Manifest b/app-misc/aldo/Manifest
index 9592acfa624b..2a9943d3bd90 100644
--- a/app-misc/aldo/Manifest
+++ b/app-misc/aldo/Manifest
@@ -1,3 +1,3 @@
 DIST aldo-0.7.7.tar.bz2 112000 BLAKE2B fec22761f49bccc91f47a224576f1a0faffcb9680826872470392a7c4ebe5018691fcd031462ebe220239e6384a46366fd7611ea10efe20216477bdd102c6693 SHA512 b68f9bd96210f17b6a37bc49f114bba70b75357967580cb4644454789b70285439f15bedb55fb93aa1bc0e5027c46a65679fcefb6a66332ca37d866d9c169e0b
-EBUILD aldo-0.7.7.ebuild 441 BLAKE2B 5d8133de4e4df6f4d15355e4ba874f7154a56426a9d80f81789df8309ae48e84583a92773b470b0e10947b93ea0b3ae5ef00771596d4c28aa1c19cbc4dfcc23d SHA512 7a1b00464559b42c632d05dc74e176f17763cbb73541c41d0331fba7b089c5b77a2b418dfdf186ed91c88ec7f9f3ec385c77be66030201bb9d9535ee165f68ca
+EBUILD aldo-0.7.7.ebuild 383 BLAKE2B 3b04e952925ef75e47143ae8828b80f3b5b0994ed7e1f613044fa652ec9dfe600e929d3ff712a0ce6731cb9d0755331062bcb28a097f19352572015a320961e9 SHA512 56f4ce1d8071c9afca4450ef980118d5469a49e79d384f5ca43432e8a2f42f3170bdfd2791591981effee5259a6fd6efe1de71fcde81030cd5c14be235c3a61c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/aldo/aldo-0.7.7.ebuild b/app-misc/aldo/aldo-0.7.7.ebuild
index d4a4f66971ce..9aab66cb2ca6 100644
--- a/app-misc/aldo/aldo-0.7.7.ebuild
+++ b/app-misc/aldo/aldo-0.7.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="A morse tutor"
 HOMEPAGE="https://www.nongnu.org/aldo/"
@@ -10,13 +10,10 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND=">=media-libs/libao-0.8.5"
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
 src_compile() {
 	emake LDFLAGS="${LDFLAGS}"
 }
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index d93ccb1ab181..6b32eb8d6b3d 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,5 +1,5 @@
 AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428f9512d1304bd7fd5aa9380a301d92f10ca126a1a319c2ec831d1d5be99c6941c4307a2b674f0a15d2d554b1443fdf053421 SHA512 779806afd6c0eaaac149c89bbe8da2394630aa5a611001307808339f29237b4d7f3db7e1f66241ef67e179a5ab96d64371e1b198044cd9f88389d03a5c9d8478
 AUX anki-2.1.15-mpv-args.patch 856 BLAKE2B 02c80c096ee3971cb781ea57ba8ebd63037c37668d57bef8d63f7c551544cd1eec04d134a835af5c918992172493a3b2933b6652e6872da2fe6bd6acb1bf6886 SHA512 ed44a965978dcb2ce85eab99adff59610c51614673415c7e34d1acdc77fa46e05c6b5eba6a4c3fda07ef5b3d3d5d1c9d844276377daff2189cbdf808168dd402
 DIST anki-2.1.15.tgz 4269571 BLAKE2B 00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e SHA512 f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3
-EBUILD anki-2.1.15.ebuild 2457 BLAKE2B c51071cb2410c942151aeffb04f498b28e1dc6b3f374484666d83fb762a17fe0f0348cdb4f060e89e4264a6ece122016f32197664f0505d489082193e5685b2b SHA512 2062b2838acf885efc66def7d51dca61c8991de4d319bb3de18ce89bbc7159c99f5a4674b31e03fba7688f372250ee2b2eb703cbbe84dc96fafc24640828afba
+EBUILD anki-2.1.15.ebuild 2457 BLAKE2B f2507d15bfb47a71350ff5e0201b61f9e84d6812949c7ed4286730125850014da4c3cff6220330c7f6a3a812191589c8322befaa99a65d7f3fe8ce778187fd34 SHA512 2d6767a0237ae0b3ab56d6c2eebd74a895fe7b532ca659bee75f7b758ae588c681250ca0b9d4f604392992c00a7b227d503bd5d36f0407aa86a37cf5754d029c
 MISC metadata.xml 533 BLAKE2B 25491ed8623750ad197813d9504620f588e2df815a844711f057b544cde1e7622df46018ad32f994c689984dd301049caadf481d67737e94714f3fe57ba7863b SHA512 cc621ffca18afc64c6c1f758d919d950a39d5f447ae7740abe21f5b140fec8e2b8cbcfcfa4422fb5cf55f68c1068686344a8d9020e0aa477b3687ad84bbf9bf0
diff --git a/app-misc/anki/anki-2.1.15.ebuild b/app-misc/anki/anki-2.1.15.ebuild
index ed52486d34ac..7acb0a519044 100644
--- a/app-misc/anki/anki-2.1.15.ebuild
+++ b/app-misc/anki/anki-2.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,11 +57,11 @@ src_compile() {
 }
 
 src_test() {
-	sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${EROOT}/usr/bin/nosetests\":" \
+	sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${BROOT}/usr/bin/nosetests\":" \
 		-i tools/tests.sh || die
-	sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${EROOT}/usr/bin/nosetests3\":" \
+	sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${BROOT}/usr/bin/nosetests3\":" \
 		-i tools/tests.sh || die
-	sed -e "s:which nosetests3:which ${EROOT}/usr/bin/nosetests3:" \
+	sed -e "s:which nosetests3:which ${BROOT}/usr/bin/nosetests3:" \
 		-i tools/tests.sh || die
 	./tools/tests.sh || die
 }
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index fe0a1c9b97aa..0a401dfc33a9 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -4,6 +4,6 @@ AUX init 477 BLAKE2B 9f0ce8f2c5c17e526f49d25e744d00f3784e672ef06e30fd3033e7b76a5
 AUX init-1.9 511 BLAKE2B 8651a6f023f99f183bb7092a79f5a7d5d7d56f3321c18ceb0fcf8199f3217505a1e1238fa584d0ab9c7276d04abd9c5527ed2f732a44f39a6044310a20399b58 SHA512 7e16023709e72724f411953b2d042c6bb369be7c0a9c891d3e03ea12d4c175ce82e57466c8b2c2bf8611cb1f5aee9c76ae5adad0ad38e99c93525d732715546a
 DIST beanstalkd-1.10.tar.gz 66243 BLAKE2B ff9c37b82073435523e0bc98169026ba9c1f8e8963100f35f63c4bdcb35e9dc512f726e06b91931ac44e20f7d3c8a0b80e8be3675f924ff4339a5495b10f7c91 SHA512 db85e4a32c686330e50d64d497a39bb9806de42a2c2d2c84eb260ae8cfad91b4c99eef6a8f0ab3e62d0ca71a31837778ec68a4299899ac5a9d94a5a4403d673b
 DIST beanstalkd-1.11.tar.gz 73386 BLAKE2B 345873711b4d40c17044dddfec02a03a95cb42b274fa2a3459227aba585678c1b3e192947c4c82e9b6688050e1add5623c38ed75040a1135d523c888706d519e SHA512 322e6400c36fb3d7b06b7feb3e7dde5e64137382fb81ca1f11e3b9f72b4246ba719d139a571efcde9fe1738ba0e9e05a6ce3ac2d49a9628f6d455c81ec2a033e
-EBUILD beanstalkd-1.10.ebuild 1038 BLAKE2B dc7a92b192b03db76c7396f59883ea2d55da496d7c423398173df19ed2502c666e956f85b03fa5385f806d14e3d031503fae965480bab4ff4a4911a0628900df SHA512 1cff28a9f33fecbbc114868dfc71dbf0c70dd8369cca4e1da9a057628d4fd1d26f17736f1318440b11e08b0c9391f0e86da2a814ae27965af203fe8b0d3f674e
-EBUILD beanstalkd-1.11.ebuild 974 BLAKE2B 52b6e21108b4b2e89079fbf40061a2d2a96b9ca890c95880c8b24a7078e8c505d099cd51a4a3a9b66c330fa147484e709c16d2a157f21c305b0bcc3c8b466d32 SHA512 91185a606cfeb7efc532baf9cfabcb8041023759c0acbe9b2587d1a361ec494ba6adb5eda705e91ecbdc65edbcdf4e453d5914bd8624d0b47be795a3a7e860a1
+EBUILD beanstalkd-1.10.ebuild 1031 BLAKE2B 4f2acac9f9b39efab62fcfb505954c077215dfdb7ef1c26371c3e8129bda91ebf55507dc9e2edfad0ecb9077f93a5a4193a5b89252b07465be66ebbf8ad7e0a7 SHA512 121e35a3c4423c7323dbae112e4609a3b16b1c82b0f380f54133275fcef27dc74085949d55176ecb8ec49ee6a1684af12f821a1b7df590296f8a1c22d9adcf4f
+EBUILD beanstalkd-1.11.ebuild 967 BLAKE2B de995db0b67689a1bcfe0fe26782c1816516f0681bc03cd617db80966e7a7def2b90e3deac21d8289b753fc298a13b97cda23b70a0ad42e89f9680025a834527 SHA512 363223dc266de41d6ea04b6f8b67f480fee20e3cf55658c1182e3211b89d98e250c8c75570aefcf87f615961c4ed779a036184ec14a14fe25c5d67683a1298df
 MISC metadata.xml 335 BLAKE2B 4e07d8ed52588274c004754f8d1e379057a081091f2d4d7fdb21c8b0cd07a6f0b8ca2ecf447686051a60a969179bd5401c9117c50d5317c5667296678ce6f1f3 SHA512 ef75a50ccb4db0c6c8423aa8527e25b23bfbe88db0d1c2461c0921bdd859b2dc823227642d91e420e81c26fd08729ae51b38ca8b6b3ccddfa90e7ca75fe7c7f1
diff --git a/app-misc/beanstalkd/beanstalkd-1.10.ebuild b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
index 3d7f2e0b9f7a..0207e6355a88 100644
--- a/app-misc/beanstalkd/beanstalkd-1.10.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils systemd toolchain-funcs user
+inherit systemd toolchain-funcs user
 
 DESCRIPTION="A simple, fast work queue"
 HOMEPAGE="http://kr.github.io/beanstalkd/"
diff --git a/app-misc/beanstalkd/beanstalkd-1.11.ebuild b/app-misc/beanstalkd/beanstalkd-1.11.ebuild
index 776d6dc48611..3f10665d8ffc 100644
--- a/app-misc/beanstalkd/beanstalkd-1.11.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils systemd toolchain-funcs user
+inherit systemd toolchain-funcs user
 
 DESCRIPTION="A simple, fast work queue"
 HOMEPAGE="http://kr.github.io/beanstalkd/"
diff --git a/app-misc/bfr/Manifest b/app-misc/bfr/Manifest
index 955144ac090e..d55bce841db0 100644
--- a/app-misc/bfr/Manifest
+++ b/app-misc/bfr/Manifest
@@ -1,4 +1,4 @@
 AUX bfr-1.6-perl.patch 326 BLAKE2B b5e5273b8cd5e198d5c3dd76740d7d3e8588571e29822095ffe3b0eb50a85d6422163aca0774d8de955c64bf066ffc445d3e140eb5dcb4d06e39274c07e8e6fe SHA512 8f65f5113b60a6cbe692b9b2cbf02a7a7b3f046a6a5203cc05cae7a08e1344afd5ababa41608d334d5d1f04afb0eb2bf705622056c5620626805eec41351ffc3
 DIST bfr-1.6.tar.bz2 81002 BLAKE2B 24339eb7e882ca319b29a2a5e033ccfd6a0abe920572d4f023b4ad0321e2e9ce3096c3aba317bada297f9d17bbe368edf08cddd903377e99f5cc2a1dda7261ea SHA512 19939218029219cc328e3efb8e799bb8c755ccff7b8cb81ba0c735d499a48f581aa42322045fdbd153dcfdb8792e84d9fddbfba9e9c5d94675e2830163936762
-EBUILD bfr-1.6-r3.ebuild 479 BLAKE2B 0d0c8fd7d21988f96454d26bed93a3a87e30befb7a50b7d5ee1b547bb371d0febe8512f47d60fb87d428986fea66c41d452310a91c1f1f7a9c8c0a48977b241b SHA512 e4578e964f849da1f5469c28345ea13d7cd13af2965432fad4e467f69e0de73e34aa21aa1b62ec2784c6ba1427212e35f8d38dbf6e2fd5d9f55ea2460a4cbee6
+EBUILD bfr-1.6-r3.ebuild 472 BLAKE2B 69448e3a3679eda1132337a9266cea69104d86e99e1a011a3b4a9063eeb60feacfa87de4fdc1e257e6dbf1d53fc007a8c068cfdfa2d5f338ba6ca1a7854d4452 SHA512 24963a3e7643e5fc836aba516036a0c8490f69c8d0d259b93f5f9637f4ff041ec9b5cd81e73df16390c86a78b825e5d5ea8651ee9c8a87157c3ffa4994190f00
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/bfr/bfr-1.6-r3.ebuild b/app-misc/bfr/bfr-1.6-r3.ebuild
index b9381a4178cb..686e7fe594b8 100644
--- a/app-misc/bfr/bfr-1.6-r3.ebuild
+++ b/app-misc/bfr/bfr-1.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="General-purpose command-line pipe buffer"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 4bd1e31c7b32..18c22d3e704c 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,3 +1,5 @@
 DIST bijiben-3.36.3.tar.xz 528772 BLAKE2B 2445f0b3b40aa9c556635d25e85b31f620a83a4be4ed4c6d3091d3f3c5f19d5b8fc13769ed56bea6a731184b9dfdd2f604a3f29ad8dbde9c019a1f58f4c41447 SHA512 dba2d9da6ae62dd10a75662b9b04475e0ba64f50065d1dab8da8601b6a4dc44cb4f2b6129dec1f4a415844bee80ff534704e703118838a993a4ffe3ebbe2d254
+DIST bijiben-40.0.tar.xz 642760 BLAKE2B 9c0f9f1d103e9775ce1369b16844828c11c2c43ba9808a5978d7090fe131d9dd54a25cd4fd06cb565b2d7936c6298a87f4a774cc5c30aa0cd6a86ae012b45043 SHA512 3fef381014109fe716d05b4b150f80778196c29af588e3a476b663aac5b113659f8ddfed82417811292bf9039a3d0982591503f72550130179ed1a7fef39edcd
 EBUILD bijiben-3.36.3.ebuild 1055 BLAKE2B 71f215d69edb0bc91637bd0361ac38d4c80900d9a04015a3df6354573cde3e368afd74e4b6b26cd704773267be6321b2068f4cb870deeb92c5512d1df396d83c SHA512 71f6b947acb39badc539d3f20b21a87ed20c7502b1a937de5a714836c9bd3782239d082d7f51dc3acad5bd128d8d828958fb2559222cf956f08181e15dd9205b
+EBUILD bijiben-40.0.ebuild 1106 BLAKE2B f2138107d53d7501984492309c87da72ccc7e318d3e7ce3b145316a4bfffa11ef4ab6ea057c9d5ba23117415f047ce647d352d96c2fbf63a781044ccf4adf4f7 SHA512 f525c1cdf291885dd5234a517811846f2108cc557aca493e72899559a0d0c1e96e155a1c6bf2fba2bf0963cd618fbd934f81bbc6b0b5d3a6467073bf17267429
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-40.0.ebuild b/app-misc/bijiben/bijiben-40.0.ebuild
new file mode 100644
index 000000000000..6748c33e46a8
--- /dev/null
+++ b/app-misc/bijiben/bijiben-40.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-misc/tracker:3=
+	>=dev-libs/glib-2.53.4:2
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.19.3:3
+	dev-libs/json-glib
+	>=gnome-extra/evolution-data-server-3.33.2:=
+	>=gui-libs/libhandy-1.0.0:1=
+	dev-libs/libxml2:2
+	sys-apps/util-linux
+	>=net-libs/webkit-gtk-2.26:4
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dupdate_mimedb=false
+		-Dprivate_store=false # private store is mainly meant for flatpak builds
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index ac3eb6ee99e4..74d1013aaec2 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,7 +1,7 @@
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
-DIST binwalk-2.3.0.tar.gz 39603727 BLAKE2B abdb9909cf92a6cb35035c98467162dab2b009f5eab4bf255bba14ce82c2748cbd648977a54f276f2c141897b4e7a592d0adbde77a3c0f4164b04b7c328bc7e5 SHA512 74c25858eccaeff1bbf238cdff92df4cbec37dfff77204739bd82c35e4fd2329a8d0b13850b8b05900f756a99b898ebbbfb8ac44a26f37ca3ffb16c72402f9d6
+DIST binwalk-2.3.1.tar.gz 39603558 BLAKE2B c3de5baaec18242d3db2b9492edadb3607a45fbc1237185223bf7bb04afcf0f8936607f9e0f4a99bd1796f5c7acfaef318855fe2c3ff05ae0676961bf60cc6c9 SHA512 3c9057c6f56d4bb1d604d3a361b0e682622a93d6d36c67a9f831ae7b17139c4684f52e96ce204d1d1256b79c4a3b806e7a78e2069b6c62eec188fa1586839670
 EBUILD binwalk-2.2.0.ebuild 1102 BLAKE2B c24cbc2f774b5c56bbe5b6cec8f4b0e31a2befd87824586436c9668fa21fb891597aadb84e7c8fb404b72f5ecece719966d7ed3f3f1bf18acb037460e7ff3c3d SHA512 28108b09384d868909f2bd842554f39a34b68af4274dcae3c1dc7dac934ca47231e19dfa765d4180a1c08cbefc66e406045bc6843758a53cac9a3cbaf427887f
-EBUILD binwalk-2.3.0.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
+EBUILD binwalk-2.3.1.ebuild 1017 BLAKE2B f7d4cc3be7f3c0831d38cae2886a3b7bdeede846c60ba2708e6b3503802352d9916b5b396eb04e71888221b434854d861d2326fa11cdbb123e7a10de7c22dc8d SHA512 1683871aba7147e332e1681a870a5bb6f02092ef644b256c6bf75128ae235fd849e1d6bf35e64bfe2128013b24e52689d0c0315fb12b856252b8ab10a4e9667c
 EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
 MISC metadata.xml 910 BLAKE2B 2be4408e8546fec32d55527a3cda95fe5d2dba9a08db3700155b317a6a3c634d20ab9862e0459efc0a0bc4563a026b600d50d6a058bbb404c8edee83b73e3e84 SHA512 b080a492253731e1048dc6e263b257b601a6e20851e1399ae6e95b8794433ae7b8fd304f00d276582b2b1fd6ff605b45d3c370130293bc3488d57d557f2aad9a
diff --git a/app-misc/binwalk/binwalk-2.3.0.ebuild b/app-misc/binwalk/binwalk-2.3.1.ebuild
index d819647e95dc..8d08a674a9ba 100644
--- a/app-misc/binwalk/binwalk-2.3.0.ebuild
+++ b/app-misc/binwalk/binwalk-2.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 1f663a0e779e..7e0f1dc0d677 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,5 +1,5 @@
 DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
 DIST byobu_5.133.orig.tar.gz 761655 BLAKE2B 796cfe22ba60a8cfe41ca6570e4c7f265dd249e7767086341903da7862037f39b1f49434b6dae36d12d82df1ee34306b815ff3f8e703eeedab79cf02e8d86a7d SHA512 4c0ef7a3b483e48c57f3e97dae1c7c77084797016efb677b201f2b56c6b9f4b771739d9a6d9a4fb612203a22e9fa460db80fde30c837b102ad830b1b2919db6c
 EBUILD byobu-5.130-r1.ebuild 990 BLAKE2B e6aef7019900baea377c940b63563e67b78c13c6c13593c5d18cc2c501e20f46fa1bf10144a16ea420939e28d9524857fd8edc6e4defabf5b92ca54636e60e3a SHA512 86124d66f9fb03d4c9639e2e7f37f2d2b3660d0fd13a5f6e4cd02819289712e51e8a25632a043ace598bd8bd309ec0a82262a3caf2203e41fb2a81a4ed6ab578
-EBUILD byobu-5.133.ebuild 1140 BLAKE2B 0c2671aec5654735d3f0fa811203ba8e3bbddc7b716971847b8ee94c572532992b199a4bbab87b413e9be1307d6a031596c46ccd704bbc578308213307e2550d SHA512 48c5aea909c3c8597b31eb99b0dfbba974d3abdb286474b8e39551f2cc022cfb1e5103db81cc5440325e4b1ef9c3c9e544f3149a1e7e81d6623efb4b46d5f537
+EBUILD byobu-5.133.ebuild 1138 BLAKE2B 6068cbd0bcced68e975352e100fb3ffd80f9108d50ae0b67af86209a9704c37b2a482ad20cb6332151953c3c843519be32c15acac2710b237707c92482a6ef48 SHA512 a2d43819a12e62b693e89187627a5d543b9e1f8309319e5404f8fe4724ab89ef434e53bf47cc4f3ca5f736fe3080eacf2afa6ee862de8e5513e3d6cd38f1e4b0
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.133.ebuild b/app-misc/byobu/byobu-5.133.ebuild
index e957a9a98818..6b46ae0973b0 100644
--- a/app-misc/byobu/byobu-5.133.ebuild
+++ b/app-misc/byobu/byobu-5.133.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index 6a9ea0688776..74fd06769ee4 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,3 +1,3 @@
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
-EBUILD c_rehash-1.7-r1.ebuild 920 BLAKE2B 8d368dbd32d0c910b4a3ec3d103374e0aab051d7005d84c5fd44ec695dde01ee02c3fb5d48b13d8b243a6adfce9bfb9d4c3b71cae4c431af520cf4d5507083d4 SHA512 61bfd4d0c49c047e5dd93b37e52ec509c8c2701c421297e7c9412facdaef7e779a8232ae506ef793f88782e0dbe98c9934e7bfa5023d034d8a718d1c6352bc08
+EBUILD c_rehash-1.7-r1.ebuild 921 BLAKE2B d0cbefa0e9d5c8056932b82e514c04f4cf522f526116bdeed8aee947d5decb82aedf06e24c2a72b0b265befdcf8a6da897fd5aa06e61f1949b99daf516107299 SHA512 7216bc8fc3562f7839dfed1fe66b7d8143b7b0eaa1820a9ba8ceccdfc721a378935f38715445bc5a78940696ba49d3408c857fa927fd20269ed97598f030ab4b
 MISC metadata.xml 339 BLAKE2B b8e32c0f0f6147fc8e3ef5842ee8d375648506528f60de787d132be280d480d2c4e6680df6f4e78d8ba8a906ea3e768bbf124d84a23800b0476db37d6c4d0730 SHA512 c66dbcf2f2ef7d99dc059e69c162237e9f3a233058ed05702d1a6b4e17d97e91fcffeca021f22558905669f65a3224f8a38a8dd0fa4107f74c53d5ca5bdd38c0
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 5ad7624ea5b6..1aecc57e1922 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
 DEPEND="${RDEPEND}"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 9f8fda7d4095..50ad53406873 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,12 +1,6 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
-DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
 DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 593352912d2b490e3f46ea032ac1ddf1c87a7ac93859d475461cbba490918cdec853b0bb30bb253a634d8d597ca6f0304bc81122b4b31b5b31fd6a80e1faaf33 SHA512 a824209fa0ff0865872a07d8e6b901d8407f599243810fd5c820e1f69226e05b0b4f1e25e5ff3d8d398ff952529084442f026e32220961f359f6323f6bf03373
-DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
-DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
-DIST nss-3.62.tar.gz 82159506 BLAKE2B 9abd7504766fb57214a16608a7299f8cf6d25c9a4e285665eabd812bce536ba244b698de31fd53796148f3856e4bee6c8a03ce5b6c5234a9337d7af8f300f007 SHA512 7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
+DIST nss-3.64.tar.gz 82173054 BLAKE2B 4786a1ff6f4e47dbb6bfef6a2bc47ffeac51aa37f12168872d23799b8d6ca440578acf512e9ec7563ef64331d3fd84c387f17e41afa2ee30d8623c6f66207631 SHA512 0a85e1f64f97670f70596d8a479693939ca454025a4b3bbd557a54ed683ffed625c670fef6a6e3440365af9aa472384f84464942381b1c093659f6a6a222ba04
 DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
-DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20200601.3.53.ebuild 5591 BLAKE2B caeca6b6ef04f9cffcd09f71a71e60f5a0bb83e2a17d250b7c70509d7b7c5a0157ca73551b3195f8e896967ca7693c286d654924a7e928a32588b4548169f0b5 SHA512 50173d5d27dea6a7425d59f05f7d6739a0c247ec171e641af26197746f28257fbdbe1e84ed2596a44bbf5ff2417e9e8526271cc6f552ba960ce95b30b6406f94
-EBUILD ca-certificates-20200601.3.60.ebuild 5736 BLAKE2B 676fdc86a69b8154d0cfe00d003d9ccc69092d62c2434ea641a10a2783562ece7662c9bf59789127acf6cca6870eb3f6388eeaeb3fc06d8978e091aac8ca92bb SHA512 f9ee82f49030ebdf44d4e399bdc8988e2bf4ebbe80a9dde88c192bd986ffd6305008d360f9a8ebe0795bf34af57e49ef451666f14cfd890f299e1d1ca867dad4
-EBUILD ca-certificates-20210119.3.62.ebuild 5727 BLAKE2B 5b7df2f363391a7c8b42e153533a8d0c3e00a61e5fa494348d0e45059e677fdcf85c5fbddc232e9b78d51de937708f027b9e91ff27df8e726b5c6e4f844f0c96 SHA512 2ede38f7742f442d3a61c192d552f3f35891a531fca69301bbc28bb881311976a5ef3164119506fa815a79cdf7a4f9142de7166c655ab053fdc4398b6cc783ca
+EBUILD ca-certificates-20210119.3.64.ebuild 5728 BLAKE2B 323aaef8860d5274ed1f0bdeee8908b6a33459bea6104a3ae9e184b680354f10825fab8c5caa285ca4546fe58f66f9e9f52f8ce7272a649ef80633855d65097f SHA512 c2799ca417533ef987df370055d920555cb7fde7c57a540cb05b7314f951803b0782ab01cd9015493301489ab54818b10d0aef0070a44ab244f07b10892ef760
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
deleted file mode 100644
index db37dd8ef656..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging user reports, refer to our wiki for tips:
-# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit eapi7-ver
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	if ! ${PRECOMPILED}; then
-		default
-		# Initial 20200601 deb release had bad naming inside the debian source tarball.
-		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
-		DEB_BAD_S="${WORKDIR}/work"
-		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]]; then
-			mv "${DEB_BAD_S}" "${DEB_S}"
-		fi
-	fi
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}" || die
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin || die
-		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
-			usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null || die
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs \
-			etc/ca-certificates/update.d \
-			"${c}"/mozilla \
-			|| die
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CAcert_Inc..crt \
-				"${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-		echo "# Automatically generated by ${CATEGORY}/${PF}"
-		echo "# $(date -u)"
-		echo "# Do not edit."
-		cd "${c}" || die
-		find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ${PN}-${DEB_VER} || die
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
deleted file mode 100644
index 2f777c592fc7..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging user reports, refer to our wiki for tips:
-# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-CDEPEND="app-misc/c_rehash
-	sys-apps/debianutils"
-
-BDEPEND="${CDEPEND}"
-if ! ${PRECOMPILED} ; then
-	BDEPEND+=" ${PYTHON_DEPS}"
-fi
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-
-RDEPEND="${CDEPEND}
-	${DEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	if ! ${PRECOMPILED} ; then
-		default
-		# Initial 20200601 deb release had bad naming inside the debian source tarball.
-		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
-		DEB_BAD_S="${WORKDIR}/work"
-		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
-			mv "${DEB_BAD_S}" "${DEB_S}"
-		fi
-	fi
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}" || die
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin || die
-		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
-			usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
-			popd >/dev/null || die
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs \
-			etc/ca-certificates/update.d \
-			"${c}"/mozilla \
-			|| die
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CA_Cert_Signing_Authority.crt \
-				"${c}"/cacert.org/cacert.org_class1.crt || die
-			mv "${d}"/CAcert_Class_3_Root.crt \
-				"${c}"/cacert.org/cacert.org_class3.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-		echo "# Automatically generated by ${CATEGORY}/${PF}"
-		echo "# $(date -u)"
-		echo "# Do not edit."
-		cd "${c}" || die
-		find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ${PN}-${DEB_VER} || die
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.64.ebuild
index f49a7923491d..267df1da9ccf 100644
--- a/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.64.ebuild
@@ -50,7 +50,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/cdargs/Manifest b/app-misc/cdargs/Manifest
index aa17b1c9a552..6f5e200a2da7 100644
--- a/app-misc/cdargs/Manifest
+++ b/app-misc/cdargs/Manifest
@@ -1,6 +1,6 @@
 AUX 50cdargs-gentoo.el 270 BLAKE2B d39eb5ffd0e910aae99706b6e802621180a090d6ee221b5fad300b37c3a337bfa6f7aa0e0673e6776b8090bad9e8ded919d242e2d47c293dd102a64b01238ba7 SHA512 ee6765ea4222102678d482a3728e2ba3aac0b0709b6148b7d7755421e00125be0b15a41bce2d8fce4340865a10863f519d5c87729aa66ec9216e9618cf059f75
-AUX cdargs-1.35-format_security.patch 4482 BLAKE2B bf7eb8cde3061bee105ca5f16fafa65fa43a0f600f80998e4d0e4244e277f4a0c557fade1a3a384642a75494a5cf1f94d4b678bb2d3322c128cf995eda495213 SHA512 379d220d9d257af5e260a4234653520d08078c2a89d30216f9d6c1b77e6aa18ff82d1c609203ceebd78ba238077acf0eda34d2a1e00fb059db6ba7a9fedfe3ff
-AUX cdargs-1.35-tinfo.patch 624 BLAKE2B 82a3210fbed0fd4f5903ef621a330e8eb01a9169e29cb2c09784c135581c5d08969c26b14e48797a27a3d73390371c8931ca00e1418de8bf01ccf5215435f50f SHA512 3f332d2f76c71affa92ab30b527621dafae09655b71839598784498fb7b07e5967907d6977bb2321ea7043a9c82d6dc2273c3bb5bf0fa7a8d4b11635442640b6
+AUX cdargs-1.35-format_security.patch 212 BLAKE2B 0abb8f8e238f25425dac6fed3b43846370634e4129186b39b72772f6d6d761a67aff678a2388df576da4c230364e103a1609e3ddf57fb8550685ba642cafbe9c SHA512 33e96c48ccc4fb09359eb1720488f5ed231e3c5b40fbd7ce71ca0903e4c17095d60f9d3b2bc506402839ef6c6b8e88bba2548120a1c59464d83070e3d782d750
+AUX cdargs-1.35-tinfo.patch 482 BLAKE2B dd9d06363022048293034643d495fc16fd0d1fdfef8190034fbdfb1e6e1c4654a34da6454e1c0bf553880eb512202c208c9d4d9aead7ad4a8f4d7993ec0943fe SHA512 54bf6faa9dfafa7b6749cbd94518e8735e5cdc9a2dcd477e7d3a98a96d64a90277871761058c11a54722331edccb850fa20b4a1f857ef9e1520f9875951c6873
 DIST cdargs-1.35.tar.gz 74103 BLAKE2B 06fa5b4ed7c00dbcceeda28c2b02dd46431748434a692f3690885dc1141764e8aacef2e09cab57cf1baab32cb66c5c39a846a09fd6381723f47cd8dc98c8584f SHA512 13df5d18de6f62309a0ecccc0dd95508d81d1955f87cfd2962360d3b7d74c5cdc2b0d2e00f7a4f1e7556bfbcbd3e2ecf4847a1a48ab47442e6d2d5a36db0cf0c
-EBUILD cdargs-1.35-r2.ebuild 1529 BLAKE2B 4d593f0c0bc9de436d93fd37e2a39eefe9c93ce849b496b599d4fa14b92397bb89576610066e1a5266e4d718b5a8f0ad7dd10528d9c120058a8754ed8e3f77cd SHA512 6456d40c8b2a5a85785a0f7dca210879d4c964e873bfe2ab91ba3a0da94ac96d241b0a87859405abdeca7a3432ad9f63c3569937315a23676065f9fb25745579
+EBUILD cdargs-1.35-r2.ebuild 1509 BLAKE2B 763746b9efc5f2dc87eae6d45b493aebf68a721df30e65cd7ad9c19c67e4ed62a69b42432603bc563ef5cf9d1fe8102d15687a982fc6d2c3db9342066010eda9 SHA512 8eee6d3ab9152b6d1167b0b01877f3ef508b9dd945e2261f1b094d4f429c83fca80bec9409e28010a907edf3d84d314056257500f833ed199e81d0d1969abfb1
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/cdargs/cdargs-1.35-r2.ebuild b/app-misc/cdargs/cdargs-1.35-r2.ebuild
index c1a76560ba1f..49a232fae2de 100644
--- a/app-misc/cdargs/cdargs-1.35-r2.ebuild
+++ b/app-misc/cdargs/cdargs-1.35-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools elisp-common eutils
+inherit autotools elisp-common
 
 DESCRIPTION="Bookmarks and browser for the shell builtin cd command"
 HOMEPAGE="http://www.skamphausen.de/cgi-bin/ska/CDargs"
@@ -16,7 +16,8 @@ IUSE="emacs"
 
 DEPEND="
 	sys-libs/ncurses:0=
-	emacs? ( >=app-editors/emacs-23.1:* )"
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
 RDEPEND="${DEPEND}"
 
 SITEFILE=50${PN}-gentoo.el
@@ -24,10 +25,11 @@ SITEFILE=50${PN}-gentoo.el
 PATCHES=(
 	"${FILESDIR}"/${P}-format_security.patch
 	"${FILESDIR}"/${P}-tinfo.patch
-	)
+)
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
@@ -41,12 +43,13 @@ src_compile() {
 src_install() {
 	default
 
-	cd "${S}/contrib" || die
+	cd "${S}"/contrib || die
 	insinto /usr/share/cdargs
 	doins cdargs-bash.sh cdargs-tcsh.csh
+
 	if use emacs ; then
 		elisp-install ${PN} cdargs.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 }
 
diff --git a/app-misc/cdargs/files/cdargs-1.35-format_security.patch b/app-misc/cdargs/files/cdargs-1.35-format_security.patch
index 978a8e92c088..525ad2434651 100644
--- a/app-misc/cdargs/files/cdargs-1.35-format_security.patch
+++ b/app-misc/cdargs/files/cdargs-1.35-format_security.patch
@@ -1,86 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>cdargs.git - cdargs</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='robots' content='index, nofollow'/>
-<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
-<link rel='shortcut icon' href='/favicon.ico'/>
-<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/cdargs.git/atom/cdargs-1.35_format_security.patch?h=master' type='application/atom+xml'/>
-</head>
-<body>
-<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
-<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
-
-<script>
-    var base = 'https://apps.fedoraproject.org/';
-    var tokens = window.location.href.split('/');
-  var repo = null;
-  if (tokens.length > 4 && tokens[4] != '') {
-    repo = tokens[4].split('.')[0];
-  }
-  fedmenu({
-      'url': base + 'js/data.js',
-      'mimeType': 'application/javascript',
-      'position': 'bottom-right',
-      'package': repo,
-  });
-</script>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
-<td class='main'><a href='/cgit/'>index</a> : <a title='cdargs.git' href='/cgit/cdargs.git/'>cdargs.git</a></td><td class='form'><form method='get' action=''>
-<select name='h' onchange='this.form.submit();'>
-<option value='f10'>f10</option>
-<option value='f11'>f11</option>
-<option value='f12'>f12</option>
-<option value='f13'>f13</option>
-<option value='f14'>f14</option>
-<option value='f15'>f15</option>
-<option value='f16'>f16</option>
-<option value='f17'>f17</option>
-<option value='f18'>f18</option>
-<option value='f19'>f19</option>
-<option value='f20'>f20</option>
-<option value='f21'>f21</option>
-<option value='f22'>f22</option>
-<option value='f7'>f7</option>
-<option value='f8'>f8</option>
-<option value='f9'>f9</option>
-<option value='master' selected='selected'>master</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>cdargs</td><td class='sub right'>Jesse Keating</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/cgit/cdargs.git/'>summary</a><a href='/cgit/cdargs.git/refs/'>refs</a><a href='/cgit/cdargs.git/log/cdargs-1.35_format_security.patch'>log</a><a class='active' href='/cgit/cdargs.git/tree/cdargs-1.35_format_security.patch'>tree</a><a href='/cgit/cdargs.git/commit/cdargs-1.35_format_security.patch'>commit</a><a href='/cgit/cdargs.git/diff/cdargs-1.35_format_security.patch'>diff</a><a href='/cgit/cdargs.git/stats/cdargs-1.35_format_security.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/cdargs.git/log/cdargs-1.35_format_security.patch'>
-<select name='qt'>
-<option value='grep'>log msg</option>
-<option value='author'>author</option>
-<option value='committer'>committer</option>
-<option value='range'>range</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input type='submit' value='search'/>
-</form>
-</td></tr></table>
-<div class='path'>path: <a href='/cgit/cdargs.git/tree/'>root</a>/<a href='/cgit/cdargs.git/tree/cdargs-1.35_format_security.patch'>cdargs-1.35_format_security.patch</a></div><div class='content'>blob: 3ddc550e607e9f908b891c7e3626ee256484607e (<a href='/cgit/cdargs.git/plain/cdargs-1.35_format_security.patch'>plain</a>)
-<table summary='blob content' class='blob'>
-<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
-<a id='n2' href='#n2'>2</a>
-<a id='n3' href='#n3'>3</a>
-<a id='n4' href='#n4'>4</a>
-<a id='n5' href='#n5'>5</a>
-<a id='n6' href='#n6'>6</a>
-<a id='n7' href='#n7'>7</a>
-<a id='n8' href='#n8'>8</a>
-<a id='n9' href='#n9'>9</a>
-<a id='n10' href='#n10'>10</a>
-<a id='n11' href='#n11'>11</a>
-<a id='n12' href='#n12'>12</a>
-<a id='n13' href='#n13'>13</a>
-</pre></td>
-<td class='lines'><pre><code>diff --git a/src/cdargs.cc b/src/cdargs.cc
-index e505e4e..1fdfeb8 100644
 --- a/src/cdargs.cc
 +++ b/src/cdargs.cc
 @@ -1301,7 +1301,7 @@ void helpscreen(void) {
@@ -92,9 +9,3 @@ index e505e4e..1fdfeb8 100644
      exit(1);
  }
  
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div class='footer'>generated  by cgit v0.10.2 at 2015-06-21 13:46:50 (GMT)</div>
-</div> <!-- id=cgit -->
-</body>
-</html>
diff --git a/app-misc/cdargs/files/cdargs-1.35-tinfo.patch b/app-misc/cdargs/files/cdargs-1.35-tinfo.patch
index d85a3b9b685c..a4ca4e28b10b 100644
--- a/app-misc/cdargs/files/cdargs-1.35-tinfo.patch
+++ b/app-misc/cdargs/files/cdargs-1.35-tinfo.patch
@@ -1,8 +1,3 @@
- configure.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index a21d664..263929e 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -8,10 +8,11 @@ dnl if test "$has_curses" = "false" ; then
diff --git a/app-misc/cdctl/Manifest b/app-misc/cdctl/Manifest
index 2dd65d4e5a83..4b78447b3087 100644
--- a/app-misc/cdctl/Manifest
+++ b/app-misc/cdctl/Manifest
@@ -1,4 +1,4 @@
 AUX cdctl-0.16-Makefile.in.patch 1474 BLAKE2B 436f47f59a21eea1785c70285532983854a445258eb7a91d01d1c5dc6cd29c4041b1d6999b61a56614bfe9d69bf6824823c783150dcef21a1fb1722ec7929601 SHA512 78d9c1a4b1e3c29fb9b83d6b9250e07157715fa70a00798f6bf49e0af2c2269dfec816df76f1818d401992b793504e8049df836bc0d8a73ab2f0488f4689b5e2
 DIST cdctl-0.16.tar.gz 34121 BLAKE2B aee95efe468c215102afcd40262f0f3e9196551a661052a9f0909ca068a6b74a25f3cdb01ac62fde2f940dcd6da6e5f4a33328331723b7a14d836bcab1c0c479 SHA512 e1c341cf0acabc28c8aedb3265e65ffe90668b83eb44d23577049cc81a160ab0ec8b6e813cf8ffe20aaf83b4d056a8f07c2e958f5a6086db3843b84b36e060b4
-EBUILD cdctl-0.16.ebuild 528 BLAKE2B f4f121c5d5f3a96e8b02e1b511ad61f061b2b6f6d3f7dc7e2a24a8bdbe136fe1a2339d9cb1fabe8522d4517196dd06d714f1cdc03c0121d4a368fb4bb5bd4b09 SHA512 8b03f644daf4477d780ba77e9ef68d0546e2116d173ca30d67a2fb4f76df9446b59e83256ac235039a7fc0a90127c3c89ce3a85dfc2ca5f2c02b89431729651b
+EBUILD cdctl-0.16.ebuild 455 BLAKE2B dce516cd538a38d7b6bd4897f28a4ab27e237e0f8b433054c9580b36f80e2424afcc9044a42215d874310914bc3c64b8da786409a1abd192e8bd9c235bb8be4c SHA512 25377cb9d0931005e4cc5edbb483c5aa76c7d0e0bc2634a58378ed66f22479db96fe129dad3f22e6f83a9832e5f92f61358c6a94a9063f5337446956c7723bff
 MISC metadata.xml 242 BLAKE2B 965d7f590657a56f8d90dace39b217902fd1f1f834b1b61d6e4119b92f8a85c090afb74eedc5cd987ba809f193ddf4cbeb44ed27de98e7f96c3bdd4a2332eecd SHA512 289f7a2af6d7c9dc7733456dd71cdc014bd0dd13d84d76605aa3ae4ba4bc39cab188b744309c974c14a2780662761ba2670a44037b40f07394e65c55c985ac6d
diff --git a/app-misc/cdctl/cdctl-0.16.ebuild b/app-misc/cdctl/cdctl-0.16.ebuild
index 32444005ab91..e552ac85380b 100644
--- a/app-misc/cdctl/cdctl-0.16.ebuild
+++ b/app-misc/cdctl/cdctl-0.16.ebuild
@@ -1,29 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils autotools toolchain-funcs
+inherit autotools
 
 DESCRIPTION="Utility to control your cd/dvd drive"
 HOMEPAGE="http://cdctl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
 
-S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${PN}-0.16-Makefile.in.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.16-Makefile.in.patch
-
+	default
 	eautoreconf
 }
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/app-misc/cdircmp/Manifest b/app-misc/cdircmp/Manifest
index e393aa6a37b7..e78639e1689f 100644
--- a/app-misc/cdircmp/Manifest
+++ b/app-misc/cdircmp/Manifest
@@ -1,3 +1,3 @@
 DIST cdircmp-0.3.tar.gz 17253 BLAKE2B 090e73d2d60ff10e8ba01c77c172b6e4b4603c778f4ad8b29dbcedd8e214f54377c171bc964c14ab4f08dc8e995b5c6b55601f75977b35669cbcfb23d0c19fea SHA512 66fa27a3c06aa4bd6584da2c6a38ad0798f5f10eb9b021080c473d03733bd2dba344549e95c22485bf72536a03a4e91a7497192296b6c297166e47a679cf0079
-EBUILD cdircmp-0.3-r2.ebuild 727 BLAKE2B b5e09d848d206728b43f6ab953eedd87fa3b325536388f71d2ec36a05fc8833e02fba8e5a8da521142247a10d7469e5b389d8fe2f2e4a61dcf5cc3af4bd19905 SHA512 31a4cb6ef8f315c3d0ba171e07f3493aa8b02d33ddd9fc328f645c169c710439a89507bbd40b4721c88e05007fb1daa57fabed5b27df90652ad3b4ed28a7920a
+EBUILD cdircmp-0.3-r2.ebuild 736 BLAKE2B daf9d84f64247e20270a3050dc5e1f12c31dcc59478f0ec482bff801087cebb7b15612f93b00545ac90c0931bf7f4b105c5859a7e2e51e8cfa46366b9bbf222f SHA512 0e399cdf9f3c25ea2848ba850a4622d3aab466ea7f6abf14f45a63603cf945fd7c23d06cdfa845e1ab49171fb2bb2081e0727ef27727956862052ccfb34d7218
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
index 320af7a9c01d..d4f394e39881 100644
--- a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
+++ b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ src_prepare() {
 src_compile() {
 	emake CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		LDFLAGS="$(pkg-config --libs ncurses) ${LDFLAGS}"
+		LDFLAGS="$($(tc-getPKG_CONFIG) --libs ncurses) ${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 672c49e4c9ba..93334b506b67 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,4 +1,7 @@
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
 DIST ckb-0.4.3.tar.gz 1588845 BLAKE2B bdf11580c8224dfe0a7d01f99e3bea1d36fa3d7c1de84ec991ee4454c838db614bd74757ec3b952d28ab672244bb4c28888f6b80366255cfb57ec37ff8742c1d SHA512 6772812fb9608251f3a14efeb16960966be446462ab3f5b1bec896761aeae9e5f5cf9c07b21e509dbef057825c3017323f82f066519cb512ebe2fc6eea6ec217
+DIST ckb-0.4.4.tar.gz 1593244 BLAKE2B 99476d3be98b3edac540b67b275a1ebec440f2a55d8bedd9bbdc815abd15bbeb3d035c703faa2dfdf9f4dcb70f49024c82b2990b1151b0ad5b78b741430d80f9 SHA512 b03d301a6b984957b5a3047769f25311c479f7992c59222b0ce9314b3204dac2d937c26997b97ec2ee1fdc79e3208c76a57a5c603dc1cd99ffb39fd426f58385
 EBUILD ckb-0.4.3-r2.ebuild 1151 BLAKE2B 26119621c4d58064209a92df8816fa3649fe6d09bb355a8faf2c3a31bc1b9247a747106d26d4c916e7641ee261531c609e5e73abd50ad45a871370c9082df253 SHA512 5a473d8136bfafac3cf82848a696108ca518d2873b8174d4ecf1b18d68e6a0b64713920e48bf7094634675a727f19fac8d22fb69c080408d349ccb24248484a2
+EBUILD ckb-0.4.4-r1.ebuild 1222 BLAKE2B 9bbe18f605c63962190d6b9ff32b9f15481e9b561d1979ca7e885ea06c67b12e39427a26cceb9210f0ecc89a10928d7b3ef9676f28106bf1ee330c5fad9e4f88 SHA512 49d385934ae7c6948f73086950e1aa0a82c7043c1b563282f649c84d37372abd07879641f022486c1d4d3879b8dae3efa9742636b08edc1b8a5b67560e49dd3b
+EBUILD ckb-0.4.4.ebuild 1151 BLAKE2B 26119621c4d58064209a92df8816fa3649fe6d09bb355a8faf2c3a31bc1b9247a747106d26d4c916e7641ee261531c609e5e73abd50ad45a871370c9082df253 SHA512 5a473d8136bfafac3cf82848a696108ca518d2873b8174d4ecf1b18d68e6a0b64713920e48bf7094634675a727f19fac8d22fb69c080408d349ccb24248484a2
 MISC metadata.xml 319 BLAKE2B 413fd0ee948a3bf39044251e819bbf2e10c2896b857b8079a23fe46d8639ddcc7c1c7289c8d3a6f8b9a82cb05e65b38298fabe4359c27497a7aced8fa97d276f SHA512 a878c93cd07a39758b418d7884df552a6741805d148959487d0b0114fb6e5476a718b637b02526310b810e153b0e027abafef14d4e3fd981e1ba1ba88bb1fda2
diff --git a/app-misc/ckb/ckb-0.4.4-r1.ebuild b/app-misc/ckb/ckb-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..7b290d85ef3a
--- /dev/null
+++ b/app-misc/ckb/ckb-0.4.4-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+RDEPEND="
+	dev-libs/libdbusmenu-qt
+	dev-libs/quazip:0=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/pulseaudio
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-wm"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${PN}-next-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+		-DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CHANGELOG.md
+
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The ckb daemon will have to be started before use:"
+		elog
+	        if use systemd ; then
+			elog "# systemctl start ckb-next-daemon"
+		else
+			elog "# rc-service ckb start"
+		fi
+	fi
+}
diff --git a/app-misc/ckb/ckb-0.4.4.ebuild b/app-misc/ckb/ckb-0.4.4.ebuild
new file mode 100644
index 000000000000..296ba6dabec8
--- /dev/null
+++ b/app-misc/ckb/ckb-0.4.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/libdbusmenu-qt
+	dev-libs/quazip:0=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/pulseaudio
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-wm"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${PN}-next-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CHANGELOG.md
+
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The ckb daemon will have to be started before use:"
+		elog
+		elog "OpenRC:"
+		elog "# rc-service ckb start"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start ckb-next-daemon"
+	fi
+}
diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
index ddeb1e08c9a6..7525d11e2b91 100644
--- a/app-misc/ckermit/Manifest
+++ b/app-misc/ckermit/Manifest
@@ -1,8 +1,5 @@
 AUX ckermit-8.0.211-build-wart.patch 728 BLAKE2B 5863f23b5eceeef8143e7060e28638b025e186d85b8ca4ebe5f421d89076b7a23914dea5f7ed3ec89169ab08c7996a804cda9e95e1e6473c8f6ca5ac8863bea7 SHA512 ab58d330153f8c86b737a7050dab6b77861451b2439010fcd45ebdd6656b8eb5f9d5cd87ad502d934ce3e906c73e68730b053da8155076408a0bff2b38011730
-AUX ckermit-8.0.211-cleanup.patch 2038 BLAKE2B caf0ed4e8da191cf5dc6f6d8bbfb03b9b898296f6df692dbd32cadf77723719d331b26c144a3c1578877686ce2d2861af30128ebce02645529042b6e2e8a2b08 SHA512 987a1acb9a9af63443eaf9cd1fe11bd422736f1c9d552a36c5f6c57033e445d243c3ba47ee24597e432873d7424ad12b0e5578e587b4f0db8d06ebd28a551ca7
 AUX ckermit-9.0.302-cleanup.patch 2870 BLAKE2B 6fc0d26cfb1715d92a5e718e6e4d1771a38ebbfd52c601c1e0c18497e677e53a5c4c608c97054da8c14c8af3e1caf7d32bb59dd3d89999b5af22d31bc67dda90 SHA512 c99a47ecdadc27d4a8dca2d917e20e84683e1729ceb8ab07f1818eeffd0ee7d9ca87531862000866a74e7d3b3b3cf977255b8f584f3828ab3443b684a6195b7f
-DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad
 DIST cku302.tar.gz 3122219 BLAKE2B 9f63261da2dc2b0fceb0af0fa81da63c87e68b7bf713037cf8675abeb81716fd0dd4cd1f84324562698d9b9126f26b8a651dc79deec37a056fa1047af2d9966e SHA512 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
-EBUILD ckermit-8.0.211-r4.ebuild 2020 BLAKE2B f365f2fdadb3b0ee32d500e307ace95b5ef59e3cf8fe7f06f41df40c6c622b4b866521e85e6bf4e6f06cf843f927856c2845f9915f8866ecaf35c74559ff5089 SHA512 af5937486bd4e17a6b86aa6af79c15cb8cfcb726caea2406e850a73fd34f29b9e1bf8d807e3433a4a6a477d659fc7d35fc625b8a2c3b0d38b805e42476517e54
-EBUILD ckermit-9.0.302.ebuild 1976 BLAKE2B f67332691f13b68cbcb4bef52519c7058addb97a7212647e64f2d6fc0c71a6065bfbd4d2b28918e4e46481352ad31b7673ca05cb5e8192fe4dd5106a476e57d4 SHA512 4d4b0ce68adb41e1d36c768c04534f21886a29fb17f584e46edd70b7ad388814b34baea737f960b9a0b7015917c1bcdcd73c34cfbe6005da478f77123f28d07b
+EBUILD ckermit-9.0.302.ebuild 2012 BLAKE2B 77def688e33314c10ec70ed4844e912f50299db105b9cff6d5163858ae29084ae3c34a827fd1da6bf245b89f68064bfc782c73f55d5f86f05a38093ee4268215 SHA512 c6c932e25ce45435a7bea0cb89190372b70ec4250c40475b7d43c52f50a64258f4af52f97ae39bfd0669c8f3fdc1a697c3fe75a53fd7c4873f29d5b499e9e0cd
 MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
deleted file mode 100644
index 9d8950eb448b..000000000000
--- a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils flag-o-matic toolchain-funcs
-
-# Columbia University only uses the third component, e.g. cku211.tar.gz for
-# what we would call 8.0.211.
-MY_P="cku$( get_version_component_range 3 ${PV} )"
-
-DESCRIPTION="combined serial and network communication software package"
-SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
-HOMEPAGE="http://www.kermitproject.org/"
-
-LICENSE="Kermit"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
-RDEPEND="${DEPEND}
-	net-dialup/lrzsz"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cleanup.patch
-	epatch "${FILESDIR}"/${P}-build-wart.patch
-	tc-export_build_env BUILD_CC
-	sed -i -r \
-		-e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
-		-e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
-		makefile || die
-}
-
-src_compile() {
-	# we don't enable any of the telnet/ftp authentication stuff
-	# since there are other packages which do these things better
-	# USE="kerberos pam shadow ssl zlib"
-	append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
-
-	if use ncurses; then
-		append-cppflags "-DCK_NCURSES"
-		append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-		append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-	fi
-
-	append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
-	append-cppflags -DHAVE_CRYPT_H
-	emake \
-		CC="$(tc-getCC)" \
-		KFLAGS="${CPPFLAGS}" \
-		LIBS="-lcrypt -lresolv ${LIBS}" \
-		LNKFLAGS="${LDFLAGS}" \
-		linuxa
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	emake \
-		DESTDIR="${ED}" \
-		BINDIR=/usr/bin \
-		MANDIR="${ED}"/usr/share/man/man1 \
-		MANEXT=1 \
-		install
-	dodoc *.txt
-
-	# make the correct symlink
-	rm "${ED}"/usr/bin/kermit-sshsub || die
-	dosym kermit /usr/bin/kermit-sshsub
-
-	# the ckermit.ini script is calling the wrong kermit binary --
-	# the one from ${D}
-	sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
-}
diff --git a/app-misc/ckermit/ckermit-9.0.302.ebuild b/app-misc/ckermit/ckermit-9.0.302.ebuild
index 8c7e12e0f401..e688a28197ba 100644
--- a/app-misc/ckermit/ckermit-9.0.302.ebuild
+++ b/app-misc/ckermit/ckermit-9.0.302.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,12 +15,13 @@ HOMEPAGE="http://www.kermitproject.org/"
 
 LICENSE="Kermit"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="ncurses"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
 RDEPEND="${DEPEND}
 	net-dialup/lrzsz"
+BDEPEND="ncurses? ( virtual/pkgconfig )"
 
 S=${WORKDIR}
 
diff --git a/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch b/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
deleted file mode 100644
index 5b7c1ed6b951..000000000000
--- a/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-clean up missing prototypes and broken printfs
-
---- a/ckcmai.c
-+++ b/ckcmai.c
-@@ -623,6 +623,8 @@ ACKNOWLEDGMENTS:
- #include "ckntap.h"
- #endif /* NT */
- 
-+#include <time.h>
-+
- #ifndef NOSERVER
- /* Text message definitions.. each should be 256 chars long, or less. */
- #ifdef MINIX
---- a/ckufio.c
-+++ b/ckufio.c
-@@ -40,6 +40,7 @@ char *ckzv = "UNIX File support, 8.0.200, 4 Mar 2004";
- #include "ckcsym.h"
- #include "ckcdeb.h"
- #include "ckcasc.h"
-+#include "ckuusr.h"
- 
- #ifndef NOCSETS
- #include "ckcxla.h"
-@@ -1803,6 +1804,8 @@ zxin(n,s,x) int n, x; char *s; {
-     return(fread(s, sizeof (char), x, fp[n]));
- }
- 
-+extern int ttwait(int fd, int secs);
-+
- /*
-   Z I N F I L L  --  Buffered file input.
- 
---- a/ckutio.c
-+++ b/ckutio.c
-@@ -1808,6 +1808,11 @@ ttgwsiz() {
- #endif /* NONAWS */
- }
- 
-+#ifdef CK_NAWS                          /* Negotiate About Window Size */
-+#ifdef RLOGCODE
-+_PROTOTYP( int rlog_naws, (void) );
-+#endif /* RLOGCODE */
-+#endif /* CK_NAWS */
- 
- #ifndef NOSIGWINCH
- #ifdef SIGWINCH
---- a/ckuus5.c
-+++ b/ckuus5.c
-@@ -7747,7 +7747,7 @@ doshow(x) int x; {
-           printf(" --bannerfile=%s\n",bannerfile ? bannerfile : "(null)");
-           printf(" --cdfile:%s\n",cdmsgstr ? cdmsgstr : "(null)");
-           printf(" --cdmessage:%d\n",srvcdmsg);
--          printf(" --helpfile:%d\n",helpfile);
-+          printf(" --helpfile:%s\n",helpfile ? helpfile : "(null)");
-           if (inserver) {
-               printf("\n");
-               break;
---- a/ckuus7.c
-+++ b/ckuus7.c
-@@ -2981,7 +2981,7 @@ dopurge() {                             /* Do the PURGE command */
-     if (n < tokeep) {                   /* Not deleting any */
-         count = 0;
-         if (listing)
--          printf(" Matches = %d: Not enough to purge.\n");
-+          printf(" Matches = %d: Not enough to purge.\n", n);
-         goto xpurge;
-     }
- 
---- a/ckuusx.c
-+++ b/ckuusx.c
-@@ -56,7 +56,6 @@
- #include <termcap.h>
- #endif /* NOHTERMCAP */
- #endif /* BSD44 */
--#else  /* !BSD44 */
- #ifdef linux
- #include <term.h>
- #endif /* linux */
diff --git a/app-misc/color/Manifest b/app-misc/color/Manifest
index bc0ccd7f0f17..0e2731c81cd3 100644
--- a/app-misc/color/Manifest
+++ b/app-misc/color/Manifest
@@ -1,4 +1,4 @@
 AUX 1.2-ldflags.patch 404 BLAKE2B e07b9c473e8b673d11c3837c6759c5beacc58fcf81ed1b9f0804d614fedc524983c237eb83be33182a384997f666842af554a950d26d8e7106f109ab5beee6b1 SHA512 44c774102cf9800b38d0831be640758a802cb2fdc2949036617ee23a47565944d514ecbee6532d2f426c766aef48814f362f7e0cb27ce8b280295af106426380
 DIST color-1.2.tar.gz 10040 BLAKE2B 1359f77e88c1c20d3643d6b00cad43fe5fbdb26d406d338132a5541668482c1a14e452ff502c10164f2d32d5c79b390328ffdad85012093d69fd767255f08fda SHA512 58f7d379bca3352b2e39eab83d2fa5891df86c45722541eb810becce813c8e866f28b856ed244a75b173f0dab5dbdc84ceb91d96175dcd2484e29abb98ba87ac
-EBUILD color-1.2-r2.ebuild 899 BLAKE2B 7efdd59c6cf0e4e18b589ba7afa21a677e722dd58f09a184109149e74010c0770790e383f41b9891820427d5acaa3ea7a3c0df855e0c23961b49f5df16b2d453 SHA512 c75640e77fb9fc4da78a9d6ef67bb67f598cf4bc6e8d301b9a1c83479ec5372c6b01f9d961e3569c39d8cfa1b6eb0ca4735d5ec478ba5e11beedb64adb129d3e
+EBUILD color-1.2-r2.ebuild 884 BLAKE2B 56a3fdd4e21e5e61119702b256fb81a1e0a091a9838bb7261ae66f003048d0f330ff03dc6ef1af8ca950f5da24db3fab7a19606485a7b63d1cb38b4569542d7b SHA512 e45ed2a84dd41475b7ce7f20a5a8dc028d0a04659a80164a975e00e3468f3ef108c8d41b4a83179171e036f357cfcf6004be87f37c80d6a92cf94a3424a72c4e
 MISC metadata.xml 588 BLAKE2B a751663c366701d7dccc560ea5e3961c5a2c428d98c341b8b74267c5bb1369c200fcf8c8f5c9d88fcd17ef072c3d98994501be12ff35445cb2c9397a44ec901f SHA512 eb169977c0c6512fc4a6bdd31083a0175bc2c5688f6eafc36807dd82494e2bea9dd263f3c2982ac059f50589cbcfbaf03b1e49eff20f7fc99c1f1b76c5f0fae6
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
index 1f428eea3837..04850977dee3 100644
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Easily add ANSI colouring to shell scripts"
 HOMEPAGE="http://www.runslinux.net/?page_id=10"
@@ -12,7 +12,6 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
 
 src_prepare() {
 	eapply "${FILESDIR}"/${PV}-ldflags.patch
diff --git a/app-misc/crunch/Manifest b/app-misc/crunch/Manifest
index 64a447ed11bc..90ed59937631 100644
--- a/app-misc/crunch/Manifest
+++ b/app-misc/crunch/Manifest
@@ -1,3 +1,3 @@
 DIST crunch-3.6.tgz 38635 BLAKE2B 987fc0fddbc9330c2f196b5914c535e3c81a0cbd30bd2121d05ccb937c9ba9f3f9296dd20a638efad8219cc5555203dc8b75b2fa6aa3e497a3da665b4c51fbeb SHA512 85a2a12bb481988ab27a19602122abc29bb307de0af279132dcc0565dfc4ba44ab9f7ca15d876001f2e6dcf7be77ed50168cb066fc6a65bf06ec5cf9d798e81f
-EBUILD crunch-3.6.ebuild 543 BLAKE2B 3d2bcc2de15414c2bc8975675affb85dff49e08cd2f014922cf930abec7a2f24aaadad4f025f523671ba2a67014d6c8305544a5815cbfc6bccc413e3a499092c SHA512 972dd123031d54a3e112a0610b471257d180b13af11d746134c19241a36b7e9f27a007e97e3e3069b6e71d22de1abfed448864d7164635ca624d696d8695a8e6
+EBUILD crunch-3.6.ebuild 504 BLAKE2B 3b29d310269d31f2e293d5a7baf65e19fd0e4a52b2e260221a75816a716180b5dfc1770d27fe6cfb55d45ce3530d4ad84f1cb111401c331324540c1592648992 SHA512 cc235ae6f30e9b1024b5eecd8f46cdbf684580f9715c8fb278d59663ab3601fb781e1e4e99f1c68444c830bac724aa6b68090bb33ec695a0aa92c36019ceb173
 MISC metadata.xml 332 BLAKE2B 1bd91ecbe54c77bdf8880d306081fea018c7508f12d5b508b915150978e907e831ce9dda40f199472a6360067b69d15d2f022a223c69a9c7d2ac649e57ef44ea SHA512 b537452a244bd1d52508d75606efc72d276f6cc502e3bf1840758cb73d9fa907aed0d97545504a67bc49ff72e700c6a487e4d874560698db4850af66b4184b68
diff --git a/app-misc/crunch/crunch-3.6.ebuild b/app-misc/crunch/crunch-3.6.ebuild
index 68517dd07322..d04886f3953c 100644
--- a/app-misc/crunch/crunch-3.6.ebuild
+++ b/app-misc/crunch/crunch-3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A wordlist generator"
 HOMEPAGE="https://sourceforge.net/projects/crunch-wordlist/"
@@ -13,10 +13,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~x86"
 
-src_prepare() {
-	epatch_user
-}
-
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest
index acf3d0b3bb6f..86e7ae3f32bc 100644
--- a/app-misc/cw/Manifest
+++ b/app-misc/cw/Manifest
@@ -1,7 +1,7 @@
-AUX 1.0.16-collision.patch 1367 BLAKE2B b36dc61f1a898c08e13e527adf219b47a15cad8a9f9f11a9e80adb289cff592349f16189f4e8f776bcf462f6488ef4be24b77fb70bf0f8f2cdff6517786ae16c SHA512 2f5e2dc0eb6af383207cd514a5e42bd1cd03f8748a8c1c66d0d83b7a5abd2fafc108a2207ff96bef5b74b9044c21fbe185e3b47a090d11387c7d1bb8f7684e76
-AUX 1.0.16-format-security.patch 412 BLAKE2B 07465169761141e6bfd415ac78366df1a27e8bb38d3ffe2091653235cf790f72b25e80b6ab744eeebd16b4ac57acfad20089d052ee76c728212d0a60ffcc6287 SHA512 604a22a47e36933d4b2788c1acfe1930e2935dac14dbad5a717ce69b26463bdffcc54aa74bf5dfc22631b3a587ca56bda359d86cebf9fa1ad7c7a235fb71a5db
-AUX 1.0.16-ldflags.patch 486 BLAKE2B 350b72daa7c419ff4b8de846d33921450d55d94d26714438f93d197bb620e9d1a6d70c681f4547b3b72fe7c3ee31fb0700d3bd1f8ee8e2dc8820c63b7be4c461 SHA512 75883411ef18c739e6f86ba53a5b515e8081ac10d1b3e894de9bee4dd0040620f0fe09786085acd325669475d0d1e99b4d46554a68ebffcad18e50cb281cabfe
-AUX 1.0.16-path.patch 550 BLAKE2B d14ac37b4dc3a951da4f472598e1a3a8863d9c61cb3994a3da97c31aed9b31f1aa1e1aa1a39f764be79aaeb4e53655983eddff5bcccb876605ed662b50bf04fe SHA512 2d8c1cf55e0d2d725aae4c3bd4f8300402b036e934218135ac840f9f891424458a79a9c2432bd4fa47255c30f096c3752a1a5897854f82da438398d5c671af23
+AUX 1.0.16-collision.patch 1239 BLAKE2B 39567192acb63116de0c9ae34eeb05619cf25d8640494222eea66a899c9f8b9f0859586443ef531031100247274184c0f55cf28382f1be48d50fb4d258694c4b SHA512 a6ed944efd2e1cb88a6b3d2ae4063c6b043880b1810441fcb67b4655d793da8cdba8c76005ad1cab6fd19263c928c41775bde24ade425e49902eff97e3181cbf
+AUX 1.0.16-format-security.patch 284 BLAKE2B 79945a54bf591e7b78475276b1f51e5c613f9992580de92fa7ebed90201b955fdf4b151283e5f3ae84174233598b9f0687bf48b60f91f02b76e2518dec4b8492 SHA512 0f6b701e0d7925dcc5ec125db4efcd967fc17d5d1e4d3b5b73786639d0c017c9125c800d948843f4746c2762a0f7bf35eab183e9edb2a2f1088aa01f59021ec5
+AUX 1.0.16-ldflags.patch 417 BLAKE2B ec4399063c9b082ea2b51cc33ba684f5b583392e350cc859e5b133fe324dff83c9d7efd3e0bd26b19534d760271b367088d05660c036eb58f870411b7ca4c0c7 SHA512 190d5fe9e583a5db62bb34ff228ee77e1f8bbb89c41943759d007f73571bb739ace842e7eda36b6eb50a63b212f8a73a4552a51e035f50aa4c9ab3414bccab4a
+AUX 1.0.16-path.patch 479 BLAKE2B 17108f1ff61d1ff3e4625f86589b6cc372cef6e849851df193093bef8f9fd43706f70eaec98544c3a2e4da20298b21c597d87dc56354e6317859f05b12bc9c38 SHA512 6ecc5cc11e65db11617b1ba902a414900e7e4f0ac319c60e4d5131769560b07a1dac3496b33dd07d44cf9ea6d95924114fb9361ef7b15235604a53b2b517bb53
 DIST cw-1.0.16.tar.bz2 76035 BLAKE2B 4257dad6df2122efabd9d5f51e7d0f0f5103afa261b4d7781ec27a81d9efc903c55a56e7b9bb1d16bb3c6bc856f15ec6f8d7ae69935511659bbfe82475377e38 SHA512 6a5da4e4dbb4d042d8b4e1e0727039f3103f9d7124a6f7c37ac094d7fee0ae10d9bacc6739fc133ca9fb682501bcafecd39a660abfe19fbf1fd9bf7ec06cfa32
-EBUILD cw-1.0.16-r3.ebuild 1552 BLAKE2B 879d4516147ee9632c02bef1b8e00191eec2014cecd94b66b9c3a2dd3a75ac8745d300c40c87e14e3db87174ccc36732177f386b51c860b0442980a8de6ae0c7 SHA512 d298a475374013aad061c6555c14ec9b819ca34f24f2eb511951ea5ac4baf14a248e8235bcf5ee7904244f8fa6ef5b5211da16aaca0a305d8644ea51f0a87378
+EBUILD cw-1.0.16-r3.ebuild 1536 BLAKE2B 48af35f48ed2693c7ce6307dc7eb1f178d5d039a4a34abb6811943be3a8cd31392ddf5ff847097a3b1f14ffbb35acb8107ecf06cf246774c1449d94ff2b87263 SHA512 c537ae708fb5ab3439edb76b525f8dfa8c406ddc3e2777c3c2b1a84b605dee34a0a513d1f2bfe4d48e2582b5f94eb533cfa44f263a517e2a256e5e704455cc13
 MISC metadata.xml 343 BLAKE2B 809bbff73b5e90cb0c958b05b619ff6e6e00a72fb6c174a7d010e29a4f28a4c7a6d26cf2aca92b8b3cfc3604d6dca7fc592f857618a1b2e6c6cf038c30b55e66 SHA512 d0aa39ed1e7fe08244130357fe59579405e1f2d08675bf3979fc1d3944033da32f58926a5857e3a526417709af1351fb443f91657ce4e7b3da0aa8405a60b3a1
diff --git a/app-misc/cw/cw-1.0.16-r3.ebuild b/app-misc/cw/cw-1.0.16-r3.ebuild
index 5a667b143f95..3a0b86621c4a 100644
--- a/app-misc/cw/cw-1.0.16-r3.ebuild
+++ b/app-misc/cw/cw-1.0.16-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
 HOMEPAGE="http://cwrapper.sourceforge.net/"
@@ -12,15 +12,17 @@ SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-ldflags.patch \
-		"${FILESDIR}"/${PV}-path.patch \
-		"${FILESDIR}"/${PV}-collision.patch \
-		"${FILESDIR}"/${PV}-format-security.patch
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-path.patch
+	"${FILESDIR}"/${PV}-collision.patch
+	"${FILESDIR}"/${PV}-format-security.patch
+)
+
+src_configure() {
 	tc-export CC
+	econf
 }
 
 src_compile() {
diff --git a/app-misc/cw/files/1.0.16-collision.patch b/app-misc/cw/files/1.0.16-collision.patch
index 52bb8cab8f3b..78ca0f99e395 100644
--- a/app-misc/cw/files/1.0.16-collision.patch
+++ b/app-misc/cw/files/1.0.16-collision.patch
@@ -1,5 +1,3 @@
-diff --git a/src/cw.c b/src/cw.c
-index d7b4875..a7811d8 100644
 --- a/src/cw.c
 +++ b/src/cw.c
 @@ -1336,7 +1336,7 @@ unsigned char is_cwfile(char *file){
@@ -11,8 +9,6 @@ index d7b4875..a7811d8 100644
   return(0);
  }
  /* sets left and right borders. */
-diff --git a/src/cwu.c b/src/cwu.c
-index 823618d..63f566b 100644
 --- a/src/cwu.c
 +++ b/src/cwu.c
 @@ -37,12 +37,12 @@ signed int main(signed int argc,char **argv){
diff --git a/app-misc/cw/files/1.0.16-format-security.patch b/app-misc/cw/files/1.0.16-format-security.patch
index 20f0b1d06b1e..ceb92c69a096 100644
--- a/app-misc/cw/files/1.0.16-format-security.patch
+++ b/app-misc/cw/files/1.0.16-format-security.patch
@@ -1,8 +1,3 @@
- src/cw.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cw.c b/src/cw.c
-index d7b4875..3ec1ac1 100644
 --- a/src/cw.c
 +++ b/src/cw.c
 @@ -643,7 +643,7 @@ void sighandler(signed int sig){
diff --git a/app-misc/cw/files/1.0.16-ldflags.patch b/app-misc/cw/files/1.0.16-ldflags.patch
index 46037312c6c3..4063de48d7f3 100644
--- a/app-misc/cw/files/1.0.16-ldflags.patch
+++ b/app-misc/cw/files/1.0.16-ldflags.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 9a6e4ec..e510493 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -19,11 +19,11 @@ all:
diff --git a/app-misc/cw/files/1.0.16-path.patch b/app-misc/cw/files/1.0.16-path.patch
index f62b5bd994d4..76c3fbf1d673 100644
--- a/app-misc/cw/files/1.0.16-path.patch
+++ b/app-misc/cw/files/1.0.16-path.patch
@@ -1,5 +1,3 @@
-diff --git a/bin/colorcfg b/bin/colorcfg
-index cf73b50..3e78c73 100755
 --- a/bin/colorcfg
 +++ b/bin/colorcfg
 @@ -10,13 +10,7 @@ echo "[ cw/color wrapper: user setup script. ]"
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 669c595eb740..a6982c3d86e2 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,3 +1,3 @@
 DIST datefudge_1.24.tar.xz 14152 BLAKE2B c0a386193e6761abade4643e2f56520738baf4bb739d4c94cec3e47a8feb5ebdf32a6e8b4a0c3dbb9584136b9855abcc68f5134e082083dfb61e977ae45c0bc7 SHA512 cd548a7e8ff10189e101fa339b2845cdd19a59354e43b02cf47e466855ec192dc2084951f7663a94da56a580dd24524047651d8bcb41aa478fe94b24dffaedeb
-EBUILD datefudge-1.24.ebuild 793 BLAKE2B 52e73296bc57723a9a05e0bb8f2f6ae66b7874885bf37fa05cd523413b58e9915c8b511d7ebc764098ae0b1ac220ade7fd1f39622f3ce34fc7abcea11fc2f71a SHA512 97e02b7a7364c8ebf5240f9d9671d86581f60a049827dbf68a7024ec64d9dea568674b6c58eb8c3a9ac5fd381169bf8c467b07d626da9005e48e06822230bce0
+EBUILD datefudge-1.24.ebuild 794 BLAKE2B 852cc8b3b7624626b684480d91679c886a4710690238d2c13dd1a8d05bc15083f3e03dd5ca69c9b9c95438b80fec864318ef538a22111ac50bfa5859148c8276 SHA512 4b4bbbba80b6fe795c94b6383db226c0886b7fb1368f207fa455baf99ad970b478798631f87c8f0f830849164bb749fefdb37430d4f54d033cdab426ce635fde
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.24.ebuild b/app-misc/datefudge/datefudge-1.24.ebuild
index 34bdcbffa6cc..002e37e93e9b 100644
--- a/app-misc/datefudge/datefudge-1.24.ebuild
+++ b/app-misc/datefudge/datefudge-1.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index f0535e112353..ff7239c77575 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1,3 +1,3 @@
 DIST ddccontrol-db-20190826_p20200613.tar.gz 85044 BLAKE2B 6f80a7a53843dc29ff6158614dd36eba3d7f8172e21592776426464729b4bdcfd3bea51b8412919aa5231015f75766da51eb71f4d808b4c280c045209a4edf1a SHA512 9171193fd31c877699df9e8740cbed0a8de68acc41b614ded36022a25be27f01cf34129033ae3c219211bff54ea82882a955f587dfa87fa7571d3992ac3fa4de
-EBUILD ddccontrol-db-20190826_p20200613.ebuild 827 BLAKE2B e079358faa755e6d3a44231929581001861fe700f0800fa2c4f693685c73eb2bd01c6a791c079053e9f2d968d3a9c64f6c0ea5fd7fd5b88b3272c7b69a9eaa05 SHA512 4612cc9f5b24df3fddfcf5e95d6f8bb9662c1bb25da4025b8fb7fa2132e0aa26c79fa6f4a93e723ebf11d18fe62b2c263d114612f06a0d6124ef1485d9fcff6a
+EBUILD ddccontrol-db-20190826_p20200613.ebuild 820 BLAKE2B c976f2ec2a274ddb6340e71e8b1ce7c173c1519ffabde33419039369df59ab711e8c08c6da3ced31865902c2a3dcd26e3cb71e2b8be7dd96370fb9dbd9a4aabe SHA512 596d054cdb7d711c5bd0f5738e50d18aae8f03e47159b6079fa50d27076f357b350dee04d191c1e60bcda7a17ace753d7e28da9b0248cf53d18e9f344f9ad178
 MISC metadata.xml 318 BLAKE2B 7d2751717a71de1512a92f653a63ace19241e11dff6e2a0b982a87f3631757450b5c2430bf273c5d441e649569bd6612e5c199b37ac8da3f14b5f4440719eeaf SHA512 3ea6d2450579fd400199cc8c06193b9a0070c0efd4ed8016268d7e097ad35f5e0987fb1b6326076b736094df0c5976e33f1e4ef94ccccd789de6662f547d46ed
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
index 773bddb8a141..f230ee9f2591 100644
--- a/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="DDCControl monitor database"
 HOMEPAGE="http://ddccontrol.sourceforge.net/"
diff --git a/app-misc/delay/Manifest b/app-misc/delay/Manifest
index 0234ae80a11a..6866adb592ae 100644
--- a/app-misc/delay/Manifest
+++ b/app-misc/delay/Manifest
@@ -1,5 +1,5 @@
 AUX delay-1.6-headers.patch 156 BLAKE2B fa056fbf65029060d1d5291d78be65b8821d5fe4ef5f2e2b09abddd4dc0e28f35de97e8d7a01651c8c7eacc810cb093730b9a1ac81d0e784c26ebf0828ff6527 SHA512 5482c96f6c2f9ce5f0183751d36360a22b3bfc7e29c23ba13022e51f0f2569b77014be4544c95e7b76cb3947118b36ae5dd94afb26c1951bc7f4b0746d120ac1
 AUX delay-1.6-tinfo.patch 352 BLAKE2B 9ca59090f3d6483201a8133b204fc5948f7584285050787737a2cb23444ceff6d223fa1eb7c6a6d5712b95dc457c080efe930f041d1d03e55e3a393c27cfc484 SHA512 462e098e1a03ad1743fc758ca7ffabaeea07c430c24e5db6daffb786494176f91b1e6d99a34e867237ecd97fa4be8def415a14db6c53c9ea7b6ab4af3cf600a2
 DIST delay-1.6.tar.gz 69860 BLAKE2B f1823ff114279987c6ff2e7bb15634b27f0875fede7f879dfd69f6efee7f08f76f06673ad66853ea2e1e257174dde267455f92aadf2395dd5dd5aa731590aa51 SHA512 45d34b768082ff2e4a73f1af63239f6b9e418f1cb46e5945606c0e8830ba2b8c14eeb21d7e0776ef669d2834ed6dcc66c3ddb0225c182c77e85b18b5b28d5d43
-EBUILD delay-1.6-r2.ebuild 689 BLAKE2B e9ab36b83149073c5a4c70a6efb03ff6df777551a609fbbfef306c1b302c3a09e61994c416c0e636e254ec098e5a0de27e1e3fe31f9223d915bb44f83bbfbc1f SHA512 127ead068111ad563a955f11126ffade0ce7521b791ffa73e39db517ca2f535d976fea5018d957818b3edb0afe437d317eb623d4c15cbbaf88027599ec64ddcf
+EBUILD delay-1.6-r2.ebuild 690 BLAKE2B 04b7c3799db54ce555625040af1fd63e0241e2102614adca4e13a68377a39cb0d2d958bc859c57c8d7075c7af0fcb36fe913bdefdc5c9f530a47353e3a471cb0 SHA512 6e748f9b36cf3a7dd58f5581377d1a7cd1101ba46b29ac6045658bacdc3b17d55592ee9a974f28c30469842322467f414a17c58bb9adbaff441497dbf4ab8957
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/delay/delay-1.6-r2.ebuild b/app-misc/delay/delay-1.6-r2.ebuild
index cec69b36fbad..e4feba5f19c2 100644
--- a/app-misc/delay/delay-1.6-r2.ebuild
+++ b/app-misc/delay/delay-1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index 568b3a602110..925288359413 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -5,6 +5,6 @@ AUX detox-1.2.0-install-missing-file.patch 642 BLAKE2B 232a89c132c681d47243411c4
 AUX detox-1.2.0-parallel.patch 1120 BLAKE2B bccae5f969e1127b8819a5542354ea2aaac765a3667679598d4edd5d3dd6bfac45845718599be59bbebc11d860d6fc56163777e3e3940da0805b9d5cc1bcf0bd SHA512 5a9c964cd46a1cd4463460a400226a80a9c1705bd60655362ca02950a06acacbafed1c039793eb6445988e91a47888dbf1c643bf8c34003e7c34a02398f58855
 DIST detox-1.2.0.tar.bz2 86118 BLAKE2B 2dbde6ebd98b59c18c60f99006731484dcbc698ab77b56991f2af94f4ad45da141046975af47b66242ff42d4e3a8bb3b515d4b70ba30f12cb1b8ceea5832f52a SHA512 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a
 DIST detox-1.4.0.tar.gz 106361 BLAKE2B 5993ded30282a16a81481885cdee41fe0b1c2ac34e5f389b53981e098d13acdfe367c7de462436fe3a4ee8ff86220f4c69d54a47c1122a0f39bde12c4d6ec908 SHA512 9486056b3b58dbb5ae16bc461586a997f8990ddb6e0db5ba561df862c16dfe926911fd09f065ef2578d39c3e3f1a267be201f865cf3f6b576c01910bda39cecb
-EBUILD detox-1.2.0-r3.ebuild 993 BLAKE2B 0ecfb0ee6437c8d45be1eeffa7a35d63bd60a49fe54b1bf53ca29977f611e9cd094b79ab92e9135d319505e305b7a24804043841f02da5450b4124dc768b003e SHA512 8e631cf1e4918543ae6c92dd05aca05b268385dc95b465c3249a17f8e6b9a7091d6f5c08f617722cc2ee22e62074fffc0d5a801cfeb6c5e75bd903986468f5c8
-EBUILD detox-1.4.0.ebuild 761 BLAKE2B 7e57e85fcd74bb94348441557a3ee1afc3885855a675e588fcae59af1e9b10c0370ad7ef272fe2fadba13a381b49da3d9f6f0109ef5b3ba942f6f6ea0df305ea SHA512 8eb75960ac89da5831fd390d0c5008cf9c1184cdab3d1854dccb69daaf8a259eb72ba3c6ae96354a90c430a5ce9758f5fa17ab3a6e7362b4d74cea1107680566
+EBUILD detox-1.2.0-r3.ebuild 993 BLAKE2B f815c0713756ea76ba6e9d2bbcd04af6c4c67a8605f518567a282713c33f898269953e5ceed216fed83065f6e49588070320a8b139f468fe41b37ecd0c8f34fb SHA512 0de9fdb1ea213e6e58ef4fb8ea3dda4a9ff7b2b2cf9c8f37eb470c7e20f0e971ef8e833bcff3a9c1aaf39a89ce4a01934a98dd87df6514b8cf23ec40c5943239
+EBUILD detox-1.4.0.ebuild 758 BLAKE2B 605cda9872bffe8755ece521b9bc7ecfc6ea3300a1cef8e93ff204da7d5da54f6a49e32a77864c54b036a0f571a5b52419d16733de28fa8874294d4e02948367 SHA512 8d083039907bcbb7f935f65b9129658a7b0071c90c6d03224a3d200ad3cf490f1575e77fefb08f66c32552c3db7fd06b0294045b7af091e629cfbc6789de488b
 MISC metadata.xml 340 BLAKE2B 448af504cf3e5e2d644d5a7551d5a0e7775f95601c06704584df7be0fe68060deddd9ad41e04e6240c346bb37a7f6017f5ed54e999ecb36efda481463a10388e SHA512 22cb6a81a6b5001f6ebeae252400eb4a7568a6baf028413d1eeaccad3de9b7b2e5c4d5a3f9e0cd4c87567a2135e7a4e7d0796d2efc377f2f26ddf0b555713943
diff --git a/app-misc/detox/detox-1.2.0-r3.ebuild b/app-misc/detox/detox-1.2.0-r3.ebuild
index ec5d2e34a18c..2ec1846e2a59 100644
--- a/app-misc/detox/detox-1.2.0-r3.ebuild
+++ b/app-misc/detox/detox-1.2.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit epatch
 
 MY_P="${PN}-${PV/_/-}"
 
diff --git a/app-misc/detox/detox-1.4.0.ebuild b/app-misc/detox/detox-1.4.0.ebuild
index 7a6a540e4cee..d168fe1e4e09 100644
--- a/app-misc/detox/detox-1.4.0.ebuild
+++ b/app-misc/detox/detox-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/${MY_P}
diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest
index 3728f78f26c4..f4f396974e10 100644
--- a/app-misc/digitemp/Manifest
+++ b/app-misc/digitemp/Manifest
@@ -1,3 +1,3 @@
 DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2
-EBUILD digitemp-3.7.1.ebuild 1808 BLAKE2B 3a81fb123fe2cef98264968f31abd4b41672b5825d96baa75ecf87070d91cdfb785e6521195d3d41f49a2d1d717b60321a906569f9f2cf0e43cec9033fa98754 SHA512 4d0bce875ed4bc7cdbc985d9acebb40ec74740a5c0caff5aa063b0178780b89b8c7b5abfeaabe2d03a70e10da07c3134335426ba198ca86e280b21aa51ab5687
+EBUILD digitemp-3.7.1.ebuild 1787 BLAKE2B eab478eaee2516bee1c1282816cb4fec4042ad39b2e6ae866aa198527ddf0e1e8011078435dcd353022b4d3070da6873f0d62534e471276a7457dc42cc39f283 SHA512 8e15e866c2cb62f9021042ef4cf3e3a7e97f9da38681f8210ddd6d3e4df05f85bae4285dd02302fadce9973aafa8c49e7c7d9c4231eb2b2fff7d17e2e9222e67
 MISC metadata.xml 981 BLAKE2B 70fbbfade9dbd7f8d24b2c871a5667fe6028e0cf8c51b76dc574d089c42bb61f0f845d3a065c1c8264312fc938d3cb4e57d5e88bda945b3337df37c2941a32e1 SHA512 1928a628e949a7a383a52d3a35751002ae3c37da973978347dff8a422c92e283e3e1dbef345e6557344a2d1884180f3f295d88634d80096184842cc08553923b
diff --git a/app-misc/digitemp/digitemp-3.7.1.ebuild b/app-misc/digitemp/digitemp-3.7.1.ebuild
index 01e1ebe0ca3a..65431c4aae4f 100644
--- a/app-misc/digitemp/digitemp-3.7.1.ebuild
+++ b/app-misc/digitemp/digitemp-3.7.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -9,10 +9,10 @@ DESCRIPTION="Temperature logging and reporting using Maxim's iButtons and 1-Wire
 HOMEPAGE="https://www.digitemp.com/ https://www.ibutton.com/"
 SRC_URI="https://github.com/bcl/digitemp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-IUSE="ds9097 ds9097u ds2490"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 x86"
+IUSE="ds9097 ds9097u ds2490"
 
 DEPEND="ds2490? ( virtual/libusb:0 )"
 
@@ -21,6 +21,7 @@ targets() {
 	if ! ( use ds9097 || use ds9097u || use ds2490 ); then
 		echo ds9097u
 	fi
+
 	for target in ds9097 ds9097u ds2490; do
 		if use ${target}; then
 			echo ${target}
@@ -29,8 +30,13 @@ targets() {
 }
 
 src_prepare() {
-	sed -i -e "/^CFLAGS/s:-O2:${CFLAGS}:" \
-		-e "/^LIBS/s:=:= ${LDFLAGS}:" Makefile
+	default
+
+	sed -i \
+		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
+		-e "/^LIBS/s:=:= ${LDFLAGS}:" \
+		Makefile || die
+
 	# default is to compile to the ds9097u.
 	if ! ( use ds9097 || use ds9097u || use ds2490 ); then
 		ewarn "If you don't choose a component to install, we default to ds9097u"
@@ -40,9 +46,9 @@ src_prepare() {
 src_compile() {
 	local targets=$(targets)
 
-	for target in $targets; do
+	for target in ${targets}; do
 		emake clean
-		emake CC="$(tc-getCC)" 	LOCK="no" ${target}
+		emake CC="$(tc-getCC)" LOCK="no" ${target}
 	done
 }
 
@@ -53,23 +59,19 @@ src_install() {
 	done
 
 	if [[ $(targets|wc -l) -ge 1 ]]; then
-		echo
 		ewarn "/usr/bin/digitemp has been symlinked to /usr/bin/digitemp_${target}"
 		ewarn "If you want to access the others, they are available at /usr/bin/digitemp_*"
-		echo
 	fi
 
 	dodoc README FAQ TODO
 
 	for example in perl python rrdb; do
-		insinto "/usr/share/doc/${PF}/${example}_examples"
-		doins -r ${example}/*
+		docinto ${example}_examples
+		dodoc -r ${example}/*
 	done
 }
 
 pkg_postinst() {
-	echo
 	elog "Examples of using digitemp with python, perl, and rrdtool are"
 	elog "located in /usr/share/doc/${PF}/"
-	echo
 }
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index e92f332010ab..deee1eceb70c 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -1,3 +1,3 @@
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
-EBUILD dtach-0.9.ebuild 465 BLAKE2B 8016c13e7c56fdae2b23689f003940f76b1c7dd1284ce960360a12b1463674f54b4503a7ac5abb3a3c8e91e82c49c7c5315883cb36298243d1cbfc72e06dda1d SHA512 64840147c3285909fe240d8216ea6248e9d29dcc0f73d2f9d3690a9958c7a5a507107e001d77408c35ee6fc9d262e496f5be1c41f666d343596c7887a9fb47b5
+EBUILD dtach-0.9.ebuild 466 BLAKE2B 824124689f03722492fc8e4c13ba55d77d1651d667d39c74bd4d5680751fc1c7b6c0bf8350e4677ccb6eef31282eaf33c0bafc2eb84d87ded2b054160718f42b SHA512 09aa2dd8f27e5678e566b5524b9974802108dac3f003f3e90be348eb4793b4c6674060d5739aa4000068f5fb1e24590f3e33c78383c19ecb0a0d10787a7bfb22
 MISC metadata.xml 393 BLAKE2B 756a37f0c08bb53ac424590f953e4c3fb6c1042f9a3532fa81871360e514a8c00deb96ebb5d77a0387794dbc97f83b1a30b4888ef0a7705b307ec723c779d0d2 SHA512 dc8b1b4eb987f20d2a83252dd8b9039b9b28c31d76be46dc11bda46a62f7a40e69fb802df3dbaf998e3339bdfffd6037e13d9bf7dcc43e00d86dd7411efabcf8
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 976bf60c519d..8818a3545e01 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/dvorak7min/Manifest b/app-misc/dvorak7min/Manifest
index 58419b4e58e8..7266b3c102c5 100644
--- a/app-misc/dvorak7min/Manifest
+++ b/app-misc/dvorak7min/Manifest
@@ -1,6 +1,6 @@
 AUX dvorak7min-1.6.1-debian-changes.patch 7956 BLAKE2B 77396f83105259f53556e6e47bc15291be00d7a822c5eecb52e95e525e10ee24f3a7cc6c731954de3b9a4228980bedc45b84f90c139c915766a53804a376f763 SHA512 274d9a33b59e18de206431b2fb4f1f37342b27dd4accb37dc16ee5470f4c6163f55c82d8b3466894ac20f3470d65ba05e8f332b0b489dc27814bcfe4270d4115
 AUX dvorak7min-1.6.1-makefile-flags.patch 684 BLAKE2B 94d9a24871d88f3d18e8804b3f09f5435dd1e5c4f084322dff2bb40213dfafd1ced7c931adc439b0ab8e089f080254bdff7dc58a7efc77b42da037ed10c9cfb3 SHA512 173858e4daaba8f6f764f4c9cb4aa8e7c6d513d1dff8bc3e2753a969bad15fd4d1a9e91a7da3b9a9353c67c40209b3f316d7f4394042329205d0d80dc9e1454c
-AUX dvorak7min-1.6.1-ncurses-pkg-config.patch 668 BLAKE2B 48dd6d4efe50ad7648c2caf3ebd333f212692d4c14c5be83e7d674fb133095a09860115974e2275674e798d81d03d89f943e210497637ace7f22803402d75577 SHA512 8a39fe1b1715d2b953f1e13e9548e4864324b78bfa7a0ca6165b787163807615dfc472e7a0c6a39aaff8257fc2008851e5768c42dbd3fca5e991bb8d1453e2ec
+AUX dvorak7min-1.6.1-ncurses-pkg-config.patch 608 BLAKE2B 0541105aba889a65ed74dcca7696a5bc0fb983778cd81cb7225317b25e17d7bac856ea325f4eed0e1724588d7d7d2fc1a271b7a2ccbc2263d565eb63b24aa7cc SHA512 85e2a05b6ec78be488c3f5bc1a29286a4fbea08bae69f0cbd1901c5f3c03de9d5340900bb898316da61277f66b6ff0a209cae66b029ff5b57166af6ddc320542
 DIST dvorak7min-1.6.1.tar.gz 53115 BLAKE2B f884f1900a7de0422f076e3701f7b982d5c5cba70ae1805bd3540ebd109e9bbaaa9e439272ac530862eac9dca2c0ba67b1d0040aa58294b5cabba2fa126d04ae SHA512 17ed601f298673a51d73b2efeb1555d91337f34cfbcc099a71c11de38fecdb29747de9533abec9028c3abc9f04dc9090e4452bba1c53cdac8d65e86a760e8a7a
-EBUILD dvorak7min-1.6.1-r1.ebuild 800 BLAKE2B a635043a5c9af9c5eadef748162e2b153038eb318f64e3c79f683e980a2e5ff9812a2e7ae87eaadb039a8db56eccb298ccab03c9211c017722d6c21cf2dbb0b5 SHA512 e22e35e8980266effade00b1ebab9765edf70da4ad142dfa6bb5b5fc158f39542399119d747130d506dd0c4dd06683a3ed1346911bd0f43b3c86a44ddd00eea1
+EBUILD dvorak7min-1.6.1-r1.ebuild 822 BLAKE2B 0c6f7136df13e84db9661e73fb0b7cc89b4a46bb6118939606a0ea2a358e0e508cf29158fe5a3754a1111c1bcd40d371913fddd08d920b51a3cee4fdcb8bbaf1 SHA512 819ba083b42db6751cf69f32e48a074e6b74b5e283ee2edc73ff7ee0d989e381543bd674d910799787d6642719a747a211a83753cf83edd199036c3cb714976b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
index 38f74d2fc070..cb6545c1f3ce 100644
--- a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
+++ b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,12 +18,13 @@ DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.6.1-debian-changes.patch"
-	"${FILESDIR}/${PN}-1.6.1-makefile-flags.patch"
-	"${FILESDIR}/${PN}-1.6.1-ncurses-pkg-config.patch"
+	"${FILESDIR}"/${PN}-1.6.1-debian-changes.patch
+	"${FILESDIR}"/${PN}-1.6.1-makefile-flags.patch
+	"${FILESDIR}"/${PN}-1.6.1-ncurses-pkg-config.patch
 )
 
 src_compile() {
+	tc-export PKG_CONFIG
 	emake \
 		CC="$(tc-getCC)" \
 		PROF="${CFLAGS}" \
diff --git a/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch b/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch
index 2f62112ceb48..045278ef4e06 100644
--- a/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch
+++ b/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch
@@ -2,8 +2,6 @@ https://bugs.gentoo.org/show_bug.cgi?id=722336
 https://bugs.gentoo.org/show_bug.cgi?id=689986
 https://bugs.gentoo.org/show_bug.cgi?id=698082
 https://bugs.gentoo.org/show_bug.cgi?id=702372
-diff --git a/Makefile b/Makefile
-index e0e7645..6aee6ab 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -15,12 +15,13 @@ LIMIT_LENGTH = -DLIMIT_LENGTH=1024
@@ -18,7 +16,7 @@ index e0e7645..6aee6ab 100644
  	$(LIMIT_LENGTH) $(PROF)
  LDFLAGS += $(PROF)
 -LIBS    = -lncurses
-+LIBS    = $(shell pkg-config --libs ncurses)
++LIBS    = $(shell ${PKG_CONFIG} --libs ncurses)
  
  OBJECTS = dvorak7min.o lessons.o
  HEADERS = lessons.h
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index df8cdc64e27a..64659f2b7fc3 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX editor-wrapper-4.sh 402 BLAKE2B 1cbdc02b300968ad6d8e6b68dbc27507d92820373efd3101f85c170c2a1e7a9e3114558fb04dcf0ce91a5ea094781f1c50c2c92ead0421f9ac8e2dc24aaf09e0 SHA512 502f8018d3c135ac05081cb896cad0296cc94f636a2410562afd915d9e44be3c2d71db319a803f5453396ebc2509cce0d5b4c5affdca875a27de2b0da1101052
-EBUILD editor-wrapper-4-r1.ebuild 902 BLAKE2B 695b748cb08317577570055a25931bd8504ebf041c3c5de50553f8879965af5ffdb32d9b9c8066b45603c8e3e1e15b96cc2eb3fd4a2ff2cc53e47e7c1fb9eba5 SHA512 3ceaed6075f8909817f0e468d4cf82ada38536317847751e4dcc86576b8e6e976da32ef3912e7e0c6b45b7a384f138c6b3934ff71452d3f4201109949caee869
+EBUILD editor-wrapper-4-r1.ebuild 903 BLAKE2B 532a7715cee52af25f22da601305ac1f21ade71110621c3338c792f434a39078eec358b49fe08512895afc54d1039c4ba846e9cb568e5053afac28f9494e4757 SHA512 10956be2ff026654b3c1c454ce33ee785dcc36703972fe50ab6d0118276da9f08a174ed67f19100a338600729cae61f362959eb19829357d8a84fb897010b2d5
 MISC metadata.xml 367 BLAKE2B c144d95fdc55aafe6dfe786f325aea6756cb51e05b7b370392bf201e5daf827ddd5b0b755d5d37d6e2a06f7929af634223f2d33a1e0e0684677ca90464e5e4df SHA512 f566d335cb37d8d951e7b86e3f4a3bafa5ed2d1b270d5d730c6e9576230848e64849f7ebf0a133a7572847faf0c075f0158f125c3f29d941b598b46ca0c7f4c3
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index 28db668bb039..39f32a983569 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 10b4e46e27e7..02f582e14536 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,18 +1,19 @@
 AUX elasticsearch-systemd-pre-exec 369 BLAKE2B 18fae13aa27931cfc3952309ab76847790f4f785d14efa93bb24cfa66b3b0fc655c19a17d5a7a1b431b6c037cf3596a04eed8f650cf51beb1917560e8817bd2d SHA512 fae1d6e4e52df7d0d3111d6d6bbddf12182de931d461669d8784b524e5671ad40fb645dc6a6cf3de0de08f032c0327da8b25d7cbc4c4a49e3e3a7a791c6cfcdd
 AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49
+AUX elasticsearch.conf.4 2199 BLAKE2B 0cc66acdc8ce76c4eba04e5fdb745d740bca2a1941535be054e99c33a208e0229609c0106b7f91c9a9f28c22ae8ebb73951dfe36fe2ca0ae51732f5fa1707a34 SHA512 91af72bf5272ed6152835c5e34408fa9e7245b09864613cd59c08da977d9130dbfe664d6aa6f11eac2ce07ebfdb3599e9f27ff219595f6d515c2c06f11f637bd
 AUX elasticsearch.init.6 2102 BLAKE2B e49581ac65b20feb24711674a2f5f46bc67d65cd8e5128f1d0868a84db36b0067b13ae39ea3f57d0b4c8ebfd91fb3d769088c29dacf8436beb66fe98cea0b03e SHA512 52116a49c9bce9ebe57316f96f3b6eff3a6bd544b930845d5fb9b74fc5f40535a0e50d71f8c7e602fbe8935ec35692b763a5255ad43afac5f7ac8ac00ba2bd30
 AUX elasticsearch.init.7 2158 BLAKE2B 934840e6013bca18282ceb6566bfe4fa9480a72a458bf1fc0566f4651e9e749ee9ff90f3bac2fd1cb75c5f7a3e91842a751af00b6245292600ad56060318a8ec SHA512 b847b089c18ec10892c395017a15f1f6e5af42055b11252219c832877f3f5d6c78988af85eeaf671fdfd9a7155ce19ea8e16f70bfe86c4453ea0174908eec520
+AUX elasticsearch.init.8 2150 BLAKE2B 6187331fba1933ddf5fc967d77e818305c6719a838fc6fdac5b821fb2dd659eef3993ca88105b2c30eabf5c2185f3cdae9a58000134c0599a8219ea8933ba532 SHA512 91e7fb2d2eb4a2c85246daa30a28a5eae48972eec5fbae52f16c58ef432c1fabc415e0690052869c70ccc4b6b2a75a228e5aef4b5ee934bc0fb4d00d48303fe3
 AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cddce2d5d2bfde2263bf088001ba1dff9bbbc8eaafb4e1d9012176fbeb4964dcd6f25f6e49935bdda90cec52f6d SHA512 adcc3147ce8d52f64fa21e7cb377ba88d4ea32254eaea03c68d45296bac46d7ff084b93469ca9dbabe013bf8bd183a96a219117b68fb91648b595206b60cebbc
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-6.8.14.tar.gz 149098495 BLAKE2B f1ccfcd9647a3584594a9db78f92488bc6bd5fe403c9b2cdff9001b87168136817084ce28eb8f14c6e54dd75b88118cf0eb6993e5502e74ecf826938f4c2ff57 SHA512 d7ca05707b9e3d8de19aaebc7811891a82897b2407f3de27ac95b2aad0d6669217c741e14bf768c3ea963977e3fa2ecc2f6d297aeafe985db52f6eb6780912b7
+DIST elasticsearch-6.8.15.tar.gz 149102328 BLAKE2B 0ce9ba565d751cd27721f3d49dd24761937c3476cee4896ba1a4d84e4fc238296129481f18cad64270fe8af71a043c2e8e583df14f2a084850fb10c93fcea0ef SHA512 c62c4d9d1bb83e10d3e1079f56b834f2f89b1f712c29d9ce7e81786199c71d287ecbf6df158eca56a7af711eafe13dfb276e12b34e1a0a6cf6719e1fbb44a142
 DIST elasticsearch-7.10.2-no-jdk-linux-x86_64.tar.gz 164380146 BLAKE2B 16797ed48c4cb6f91ed891014f275ad86a4852579232df1827413389fc9e505327412729f70783750252190a34b0e0d552ec0b5f25f3d0a811724191eccc6568 SHA512 bd3def00af04670ad04556c911ef8c68b639e1c3b621f36a8973d9700f95873d10bc706a4e3a98f892ac59c1b761d56035a236068d6958af772874e428940dc4
-DIST elasticsearch-7.9.3-no-jdk-linux-x86_64.tar.gz 162808745 BLAKE2B e6a12ec3cc3bec0bdf8dd10680dd86214bf619b1abfdfeb8524b0b0f50a0f1faaf03b13f06ab62055f80c7987dd04b0dd9f2beba16dd59a5d346fc6cceb51acd SHA512 fea21591edc790b9d5c48151619921085d1b0e5dad1f8c43efbd44a58babeb8bfad52f4329f1f34c71d47618e24d7320c0e591f8eb65d15c2b9c3e1492d91680
-DIST elasticsearch-oss-6.8.14.tar.gz 68236681 BLAKE2B 09c6c23517b880ee1afb1c3472d4518172927c226386c7d0f2f5b9312e7de236bd6fa7d527b949e3cace759af6a1fdfe7d72f1ccf8e2c6e15919c4c8c989ee9e SHA512 c0372969ec9e5f7aff551bc0aa13684fdaccd5a553e8ee896979488ab2f13181642222ab4eca4dc799181bce1405200b5aea4866c830483ce1e484fa6a714998
+DIST elasticsearch-7.12.0-no-jdk-linux-x86_64.tar.gz 173069694 BLAKE2B 5de74b1e6de743246cf48e32254f9646fa25c2820d0be9df886fdefe131a302ddb8906546147f0d284e2fc0faf8cc0238bf854fe1611d28bf1e7cb1518bd4e31 SHA512 205aa2a2fa2ab7eb7b54087420e0123aa97e5456e2e1f31cad9ea7b84be3f9823a2a7c47d4cf1697833e5f795359477d3a3b0ea4955a8f92583cf2228071827e
+DIST elasticsearch-oss-6.8.15.tar.gz 68240776 BLAKE2B 431d845e02f2118a98021af4422ece34274b6d0811a32c5a3e679da3f8f56ca9cd45949307268811edbb83327a4a80fb84866cbbaaf01f7d3af042412b1e1bfa SHA512 7e6a819339ac6043af218f9d97d5d68c50ac46900e4293e7fa18992f7a50b10b0ab2434e26ff0dc1546204ae7526de8ac6ef6545fc0db9c862ceeaa0d96c56f5
 DIST elasticsearch-oss-7.10.2-no-jdk-linux-x86_64.tar.gz 76383466 BLAKE2B e99c04b0d10ef5755986515c7127ebde00b58e0eba69b6a05e12bd0bffee70266bbb023680584bfe0f321d5a3cf79af89cce3a5191923ad721a9f6039ab82743 SHA512 7b63237996569ccdc7c9d9e7cc097fcb23865396eddac30e5f02543484220d2fc70a7285b430877e5e76a5d8716d9682de9fc40d5e57a08f331e82011fc59756
-DIST elasticsearch-oss-7.9.3-no-jdk-linux-x86_64.tar.gz 75609441 BLAKE2B 5c638426c4fd64b877b350a6845da5d771e7ea222af245d50d9361ae27193e1ade555a060493b1ec056bd273d37656c37a11445b73866dc5347cd608a9d3333b SHA512 679d02f2576aa04aefee6ab1b8922d20d9fc1606c2454b32b52e7377187435da50566c9000565df8496ae69d0882724fbf2877b8253bd6036c06367e854c55f6
-EBUILD elasticsearch-6.8.14.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
+EBUILD elasticsearch-6.8.15.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
 EBUILD elasticsearch-7.10.2.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
-EBUILD elasticsearch-7.9.3.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
+EBUILD elasticsearch-7.12.0.ebuild 2295 BLAKE2B 79ba465b21d2feee5c481eab2e0feb870bcda696d0ff2375fe49e75a8d7c6ebd040fe1fbca764bb61a8b8116d11a18a609dc230e794cb045aca70dba652b9b82 SHA512 57988aaeed4b5b0c6a3251e9bf7e5b13a07cd766710a8baf9c753beb8f7b16e3e18d8c9988f6c880afa76eb13ee2cae4afeda6b8d916f09a6d9fce8a5ab16bbc
 MISC metadata.xml 611 BLAKE2B 91d02c98271689922fc5d79355a378cb29a3c88e45b089ad89afb182e50f6a0bb19fa8160e2455eb8815e9b2655cea6232ba7845cfa970b4d82529993b5447b8 SHA512 daa5f2349a139c5952f9831c9517e6af48ebe337506f77e7ddbe67fc5ad6f243ecea82c858b7687e3baef26f20e1e3f0d2453f72ce00a5985c2a618dff2a6361
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.14.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.15.ebuild
index 6b347e7957c4..6b347e7957c4 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.14.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.15.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-7.9.3.ebuild b/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
index 826ad97256df..1eba30da241b 100644
--- a/app-misc/elasticsearch/elasticsearch-7.9.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit systemd tmpfiles
 
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+DESCRIPTION="Free and Open, Distributed, RESTful Search Engine"
+HOMEPAGE="https://www.elastic.co/elasticsearch/"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz"
+LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="x-pack"
 
 RDEPEND="acct-group/elasticsearch
 	acct-user/elasticsearch
@@ -45,10 +43,7 @@ src_install() {
 	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
 
 	fperms -R +x /usr/share/${PN}/bin
-
-	if use x-pack; then
-		fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
-	fi
+	fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
 
 	keepdir /var/{lib,log}/${PN}
 	fowners ${PN}:${PN} /var/{lib,log}/${PN}
@@ -58,8 +53,8 @@ src_install() {
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
 
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf.4" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.8" ${PN}
 
 	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
 	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
diff --git a/app-misc/elasticsearch/files/elasticsearch.conf.4 b/app-misc/elasticsearch/files/elasticsearch.conf.4
new file mode 100644
index 000000000000..a76bc5b7be38
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.conf.4
@@ -0,0 +1,62 @@
+################################
+# Elasticsearch
+################################
+
+# Elasticsearch home directory
+#ES_HOME=/usr/share/elasticsearch
+
+# Elasticsearch Java path
+#ES_JAVA_HOME=
+
+# Elasticsearch configuration directory
+#CONF_DIR=/etc/elasticsearch
+
+# Elasticsearch data directory
+#DATA_DIR=/var/lib/elasticsearch
+
+# Elasticsearch logs directory
+#LOG_DIR=/var/log/elasticsearch
+
+# Additional Java OPTS
+#ES_JAVA_OPTS=
+
+################################
+# Elasticsearch service
+################################
+
+# When executing the init script, this user will be used to run the elasticsearch service.
+# The default value is 'elasticsearch' and is declared in the init.d file.
+# Note that this setting is only used by the init script. If changed, make sure that
+# the configured user can read and write into the data, work, plugins and log directories.
+# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
+#ES_USER=elasticsearch
+#ES_GROUP=elasticsearch
+
+# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
+#ES_STARTUP_SLEEP_TIME=5
+
+################################
+# System properties
+################################
+
+# Specifies the maximum file descriptor number that can be opened by this process
+# When using Systemd, this setting is ignored and the LimitNOFILE defined in
+# /usr/lib/systemd/system/elasticsearch.service takes precedence
+MAX_OPEN_FILES=65536
+
+# The maximum number of bytes of memory that may be locked into RAM
+# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
+# in elasticsearch.yml.
+# When using Systemd, the LimitMEMLOCK property must be set
+# in /usr/lib/systemd/system/elasticsearch.service
+MAX_LOCKED_MEMORY=unlimited
+
+# Maximum number of VMA (Virtual Memory Areas) a process can own
+# When using Systemd, this setting is ignored and the 'vm.max_map_count'
+# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
+#MAX_MAP_COUNT=262144
+
+# https://www.elastic.co/guide/en/elasticsearch/reference/master/max-number-of-threads.html
+MAX_THREADS=4096
+
+rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES -u $MAX_THREADS"
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.8 b/app-misc/elasticsearch/files/elasticsearch.init.8
new file mode 100644
index 000000000000..e45ece0829b1
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.8
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${RC_SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${RC_SVCNAME} != "elasticsearch" ]; then
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+ES_JAVA_HOME=${ES_JAVA_HOME:=$(java-config -g JAVA_HOME)}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export ES_JAVA_HOME
+export ES_JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_STARTUP_SLEEP_TIME
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="-Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
+command_args_background="--daemonize --pidfile=${pidfile}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+	# fails to start without keystore
+	if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
+		"${ES_HOME}/bin/elasticsearch-keystore" create
+	else
+		"${ES_HOME}/bin/elasticsearch-keystore" upgrade
+	fi
+}
diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index 832f201816db..4900094e658f 100644
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -1,3 +1,3 @@
 DIST emelfm2-0.9.1.tar.bz2 1217126 BLAKE2B 994fb55f9aed452cf0b01b7a26d0b94b8a02dace54eb34f764fe6d9a8c6ea3820d4fce3242daa452e972fd6e630d564ee3781af6480c3a812d4f4bbc66caae68 SHA512 bd3a1ad2338c80d6824a2a84736470ecfa7e93f455cc8e3243944833807fe9b3544e2fea6bd6ccbddaf0188ad89ce616ed146271f6ffabec80f5dfb2f1ad6f57
-EBUILD emelfm2-0.9.1-r5.ebuild 2350 BLAKE2B eec9ddcf28542bb07408113fbe226e54835a70e31b1b3fcc59dc9543282cb795c12bf05881470e7b3ec79eeadaafe42263c45ecf7c13d18a3b82eef8d9027958 SHA512 66125aaf9435d88cbfb2a8cfe90ae1c323096daa3aa926851dd11f0937318dd591973275712133ee5a3b06496a4b9ef0bdaf4a68f58aca322a7aa2f65f5119c5
+EBUILD emelfm2-0.9.1-r5.ebuild 2230 BLAKE2B 0b5e0c434a7e9400a5a50826790ea5905c7a425f38552980436183fa472c70e7161e9bc9b09c80b1cb29542a269285ce2cf84cd8ee705de7804a4e04795dbaa6 SHA512 fda745f91bcd1ed24d5c7e186dea81dd5bbc66311bc85150e5ad8549d98e2d8848e8d5a8ec78a1a5eede7b1f07b8167794416aba35c426d38deefb2a55fe25c3
 MISC metadata.xml 452 BLAKE2B 21a44f257e58a0a62663b759bdbabfe22c548d2be874365eb4584ce196846890f3342a20ed4be0d4515e1350a5c795b051769003602cfdbdeb35e485d77a4282 SHA512 a42d336a0ee1d8949d2b35e98ff372ac8ddd3bdc5d4733b6195abd1c5e5cfa766bab721a9dc63cfa6ae34fb861a9621da5ea041889638d4bcb6ac2ac9b17fbc5
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r5.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r5.ebuild
index ad2c7bb12d9e..ed9ff0f319f1 100644
--- a/app-misc/emelfm2/emelfm2-0.9.1-r5.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r5.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop flag-o-matic multilib toolchain-funcs xdg
 
-DESCRIPTION="A file manager that implements the popular two-pane design"
-HOMEPAGE="https://github.com/tom2tom/emelfm2"
+EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="File manager that implements the popular two-pane design"
+HOMEPAGE="https://emelfm2.net/ https://github.com/tom2tom/emelfm2"
 SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
@@ -13,29 +15,25 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="acl ansi gimp +gtk3 kernel_linux nls policykit spell udisks"
 
-EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
-COMMON_DEPEND="
+REQUIRED_USE="spell? ( !gtk3 )"
+RESTRICT="test"
+
+DEPEND="
 	>=dev-libs/glib-2.26:2
-	!gtk3? ( >=x11-libs/gtk+-2.12:2 )
 	acl? ( sys-apps/acl )
 	gimp? ( media-gfx/gimp:0/2 )
 	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.12:2 )
 	policykit? ( sys-auth/polkit )
 	spell? ( >=app-text/gtkspell-2.0.14:2 )
 "
-RDEPEND="
-	${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
-DEPEND="
-	${COMMON_DEPEND}
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
-REQUIRED_USE="
-	spell? ( !gtk3 )
-"
-RESTRICT="test"
 
 src_prepare() {
 	default
@@ -96,11 +94,3 @@ src_install() {
 
 	rm "${ED}"/usr/share/doc/${PF}/LGPL || die
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-misc/empty/Manifest b/app-misc/empty/Manifest
index 257f292033a0..164ca2596cfc 100644
--- a/app-misc/empty/Manifest
+++ b/app-misc/empty/Manifest
@@ -1,6 +1,6 @@
 AUX empty-respect-LDFLAGS.patch 234 BLAKE2B a344d06f25ec7bd82d5633a9d716eb7235af51d532e9010685fbbea4b51c8deedbd99119403b0d592dc810bd52a70af96d55e3b4e40bbeeb1b7e4100a138c361 SHA512 a3d15d1ca8eb4c422080c24121cd1164ab534a374911fe8500980a3ea92e6bb90d6f8eeb6e1e0d86e49d901f344f2c79c386e8904f3d5f8b2b23c7e8c74463de
 DIST empty-0.6.20b.tgz 16269 BLAKE2B 15a50b2484278cb03b7d91cd5b6a14b9898a3ead3bf2017cc86d9dc8e3a3ec5650b20f57fec6ccdccf780c008841d41205098ea423731c593c1744ca55e5a934 SHA512 bdeda29ecde0bc7ee0432656f0497154e04dbad26aba62a0fe76ded394ddeefe2bfd921594a2dae44459b62ab4767d3b12a7a86216dfda56b6d77035a8b05c3d
 DIST empty-0.6.21b.tgz 26793 BLAKE2B d7266c03ef1580bf9871c294e54e292ba264ef6b72c4be1db8e408696bc8327891cb7827de68e429b0496165bc7e105c697c76f29267b3f10030bc6b183a4910 SHA512 4aef74a61161e8d6b6b5159adfa5b7f2779798fddfdbc070b15ca3f747081eb2f7984b58b0a0cef4452892712d274580cf33c64ffddaee3f70ac9bacfc2f7e09
-EBUILD empty-0.6.20b.ebuild 574 BLAKE2B 384b3e508d099891aaf766c66f96f8761fe4abea34e57ac60b982d893a9bee2a780118e26611a95f55299353666a4f5c0c7ef468e63626a9c31c01c57d8c5859 SHA512 64204416242302c0319cf9fa65c4a92fbd58a2e206de2c3d04f7fb6d9de46d34c1fcfd118b53268b56a0cfcc5d302c330e18e7d08d32a9803b1c42bb1e6936fb
+EBUILD empty-0.6.20b.ebuild 564 BLAKE2B defcdf39ddee62cca9361e89f0a1106f8494c3f5428343061ac1e755b9449c3a54f446df9e7eea7ca3e92bcd89d3ad9f8cac5069ed5d492ffa72718bdf407475 SHA512 238614e3b44540dcfcdb545f9ce99346e8224497d21024a56bb138fad1cf2b6f9acb858b518b857c5f3309346e6cc6e32d268801a98a91e40b4de3709d7655dc
 EBUILD empty-0.6.21b.ebuild 557 BLAKE2B bc166212adf8eb1d0e6f0de39e9858d5745daced57f4eb09bd3aca1f456aaba401fbb211b659eff3c8e8ea52dbeafdceeab95a4d13b1171b65a6b5a205c2237c SHA512 e97fbf9c0f4762058696036b8216e989dec442e4b33b3f914fa9e0ddb556b38669ada581ec7e643c78e7cea31b8e246b2b7a64be4a4bc9fb65c78f01c9f93d4f
 MISC metadata.xml 322 BLAKE2B d700d35373a23c3616b4d1e03a41db4836679833fa880ca2097b2492bb2c34410cf4c39a45928c1daab247ff6ea97a3e778c7e27e9732a42c8adbcb94b94bcef SHA512 f447d9015f3958c33d9035ef5e2b2377f9872a265dcaf37088cc52781f742aeed7665425ad9cbd86d5a00c5336b0c685ed25f5e203f657babf942d940e42f9d3
diff --git a/app-misc/empty/empty-0.6.20b.ebuild b/app-misc/empty/empty-0.6.20b.ebuild
index 529bce144e10..0660d112cd97 100644
--- a/app-misc/empty/empty-0.6.20b.ebuild
+++ b/app-misc/empty/empty-0.6.20b.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Small shell utility, similar to expect(1)"
 HOMEPAGE="http://empty.sourceforge.net"
diff --git a/app-misc/esekeyd/Manifest b/app-misc/esekeyd/Manifest
index aeb33c56d8d3..57e7d7f7b439 100644
--- a/app-misc/esekeyd/Manifest
+++ b/app-misc/esekeyd/Manifest
@@ -1,3 +1,3 @@
 DIST esekeyd-1.2.7.tar.gz 104502 BLAKE2B d8060837e533c5c3fda11dc3a2d67f3010b820035d1f1a794c296a132f3dde3c17fe132257b996532ae6caa57fe2150c370aa71d03c2e48b9a88568498144769 SHA512 dc15623e0ffdd4cc7f3834b2becabf54ce61ea5190fd44734b2aa426db3d936cb5e3caada82357d6ed41db6eba41e9f792e453e2bb93c0fe62d87ac29651c89a
-EBUILD esekeyd-1.2.7.ebuild 414 BLAKE2B 660aad1d50433168045007b71ae9aff7d4fbd8f09b5422d90ff34dbe044524ff8cd8c8c3ce7386eb5d8f9122899d6ca89e3451332dc676ba655bbb94d89f38f7 SHA512 d7cc489d0150a677215cd8f6ef880baf366cfb698807459d1f125a863d1e09c662f56bc248b5fbdf8483b4910890cae5243c207c3e8e74fc98ef5815f1ed3703
+EBUILD esekeyd-1.2.7.ebuild 411 BLAKE2B ac15d61336c88eb707c33c9306eee0f322aca8e3831e64605b0b9d78a68416268ff49c67c76b699108eca1c6eb718fcf8b696676abd15966844d8810734d82e6 SHA512 6cf397221052837399690bb08356671f700dd046c5b4bc23ffa96d61f59c9557474776e30f046d826e0c2dd528bf9805435f56e8d72c2a1b106f8e8873b49af8
 MISC metadata.xml 242 BLAKE2B 2db42b60282b2aebee2a73678b88c847cdce0bfec89d02b3f60d9e3d8dd0a9b3ce2116e0008ed7ac2d4ff4f4bb57432d425f192ee41eeb5942734c7b724cd726 SHA512 32c1c40f1795067c1b672cee155ba355441626501a25d253710e81f1bc973709dfefe6b02c52b1ae51a0202cb9ae0ea8a6e5ed9f3d617ca93d0745f38bc7b35e
diff --git a/app-misc/esekeyd/esekeyd-1.2.7.ebuild b/app-misc/esekeyd/esekeyd-1.2.7.ebuild
index 1afe1e9d064c..ba1cc0bce966 100644
--- a/app-misc/esekeyd/esekeyd-1.2.7.ebuild
+++ b/app-misc/esekeyd/esekeyd-1.2.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Multimedia key daemon that uses the Linux event interface"
 HOMEPAGE="http://freshmeat.net/projects/esekeyd/"
diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 2f91ec084048..592b399b3536 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -5,6 +5,6 @@ DIST fdutils-5.5-20060227_20081027.diff.gz 6748 BLAKE2B a6d9bf332a777c6c09c85ea8
 DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 BLAKE2B 4d0fbd1c9c4f115a9df3f7092e062173f6a8956df8d465bb0186f712f51f6ef9e4fc67c4c642cdf7ae7e9daa775d6657c4306f5837307a51daa0abcc12639b0e SHA512 db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
 DIST fdutils_5.5-20060227-8.debian.tar.xz 48480 BLAKE2B 16de5a3b9f634c3eafbe9048d84c6ff29933e5b5ad878de79e6b03aac49ec44334e7e8e090ad0518bc83e8adb91dd19612850f0de7e28bc9d9c10663fd9a5252 SHA512 a55823c2a4defe1ebad5a92c96a85766520a744b75f49e9f99eb14ec2c0ec44f91a72437d070942a4603f7e337ed60c380f61635b4aba57dbb5ddc8d771d8b89
 DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262 SHA512 a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
-EBUILD fdutils-5.5.20060227-r1.ebuild 1767 BLAKE2B 117b01b2c946b2385f7a3b76347de2bb58df31d5bfd9e54a0ca990e2e53e1e5231ca0ef1f908e6bd4cd01121d00254d57008da3142c014d51a2c3dde3b514a3e SHA512 a8abf363536ed5745809e2ce7b30917f69595a60805cc97882e2cccccd8248e4dbc2d8572fff57b552ba2a09a82b8283796b6db5242a70124df70f4184d0d99b
-EBUILD fdutils-5.5.20060227.ebuild 1381 BLAKE2B db59f53f90778a26c442908a13af1fffff8281c1d9383877b4fd2bbeeb620ee6a491f6452910d7767ddbf55016dec952d2aa0b8c18d5f315a0768f4baadb66b5 SHA512 75040032be4a0ffea770ff95c857ead59cf1b841c39e923e992e3350afdd98048239b9c8aa6462b34bcde911d61247a052a51d5d49ef66789bce134c7f14b6c1
+EBUILD fdutils-5.5.20060227-r1.ebuild 1767 BLAKE2B 3aba85bf2e67662c3ef8802d5cae14c972dfd628e0e78237d44adc6da78272449326e62d226dcafe2cb31efebda59bb57da90574437706ca7cef9b0d1ca5a648 SHA512 f00eb894aec13e064069238a93905c7e07cef26c59c17f128f914d0b97ff23b16d7b7de33fb7bea75770e4e0d97767d33d0de92a038e7275a091618db0cc75d5
+EBUILD fdutils-5.5.20060227.ebuild 1381 BLAKE2B 33bdacfdfe978c4f4ffecfe64d0cca218209d2f69008cc4bfad7c808b1dd42bb8092d5cd7324820d603428090a687a102acf3d17d588237aba53a854fdb37a19 SHA512 c19200d5d4da28ed68d2f12e683cdf1b451df762e151b9c67b99d50b4c76608bf2746f92ac228cd1aa97c231ab13f65d6f9833de67ff20c1fdb4da1c832e67c0
 MISC metadata.xml 250 BLAKE2B fe89695d5dcb55e3a59fe901cba061e1b73e5d09cc72d362bb3ec127aecdba741ba23920096bfad7a39c43e35ffbc006fe84f3e50a34c91097a32deceeb91e84 SHA512 c599b09b9aaf744dfe13d0707adde7d3dfd1a8a411e937fcba25e65c6045792cdcf6ceb9004e3dd38b014c486c9f1334bfc898419f59806ec6abebfc71bca382
diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
index b0196c0d391c..2c47d3562892 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils
+inherit epatch
 
 MY_P=${PN}_5.5-20060227
 
diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
index 632a26a8982b..2df9ab872a03 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils
+inherit epatch
 
 MY_P=${PN}_5.5-20060227
 
diff --git a/app-misc/figlet/Manifest b/app-misc/figlet/Manifest
index cde7ca47187d..5a8339ab84d1 100644
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@@ -1,6 +1,6 @@
 AUX figlet.bashcomp 1376 BLAKE2B a0e07ba26e97890bb0a6df473c609d40e68bd31a1ede5369eb2e4f04bfafdfdb680d6fc62670f1299db6978add0298c833afd6471ff26992db96fbd0a78f6874 SHA512 1a9d06139bbb105c9d909d1e7bfb64b04d6ccba6e0ebfa0968f75264da5582c2f449ad5759f36ec90bf068e69005c2eac2d0565765b02a13044531601b7b9d18
 AUX figlet.bashcomp-r1 1214 BLAKE2B b2f521559b9f3f957d1fe060e72dffa3b2342f389e5c1791dadd94181ef215344de2d909cf4abd5de1beef7f03a637576401db68ec1d537b569a89e0a9bb3a6f SHA512 7140cfbacbd99f0f4e9463bb024ead73ea1a3f6ddf9cb5806134ab711e772f32c57e69596f63f125cf13941cff51f84ccdb9f0288ca8614c99b9f1890d3d3e69
 DIST figlet-2.2.5.tar.gz 233201 BLAKE2B 9d7a8b518ee91bd937d7fb81d782c894bc2a1738b696b03d948c1319e68aadde9ff1ea291ee77f9e79bdd950c68fe98c9e4539e7e76ef5f9e758c16b968966e1 SHA512 bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb
-EBUILD figlet-2.2.5-r1.ebuild 927 BLAKE2B 62a7221cd33888c2f78ed86a9d07ff34405a43c334ef71e1f1d3170ae1b4d46e32592717e43e920353e3c97548e4d35c228f06214d57d48591e65bde378d38f2 SHA512 3004779a6f0a1ef6e5e0ffe1b6d3fa4cffaf32aa96bd7899dfdf8716196a49591aaa0002a4b23ea3cf2807d141f130c568a9de6b33bdc584ee6451b6c26ed13d
+EBUILD figlet-2.2.5-r1.ebuild 921 BLAKE2B 2a033908b8494ceb3f8dc2f4ec6174852773b4a9e00769bf20b8dc6e08acbaf6dbb82375146c69b05384209bae7b26ebca5f33189d03b99a6cc27b75b44880e5 SHA512 4e063d1db69c4933fea8fce98ff435fdc6a39c0baa6d598dbf7c7ff2ac04f9f0d4b8620de6833080b6385ece88a01ad8e3771febde76437f36008d3dfc9433eb
 EBUILD figlet-9999.ebuild 805 BLAKE2B 9562e2503c2395d88e78e832c5ae1fb5fc2a49c83871cd868cda802138db038f685dcbe60ffe77d9cfcea7b75281fb5596bee641d8ad9da28167452b4a127302 SHA512 1486ee9197ebab6a17e781366037f5e8cd24ead017dd2c87de373321f18bf3e908e952f983b2e9be6bda7914e51938324e8fe257487ccb015cf180495b1c7304
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 9e32653271ab..7514e810fb65 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils bash-completion-r1 toolchain-funcs
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="program for making large letters out of ordinary text"
 HOMEPAGE="http://www.figlet.org/"
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index 5e2543ee7e63..bce36e8031e9 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -13,6 +13,5 @@ AUX g15daemon.service 209 BLAKE2B 0b909fd73dc8d0961f35257d430e4c8b321bf12671a778
 DIST g15daemon-1.9.5.3.tar.gz 414603 BLAKE2B 4f683bab47f6cbde3a028b306c1999ea4fcb84c0c05160a17374be93f953d21588f332e8fbf040c607545c31ee09e30b56b1068db95a801472c9d72ee9fe8e43 SHA512 7a1770d08d1d4155866bba3b676d33bf943363f4519af41a13ab6ec73cc5d6c536b173977b3e3583b594b149b7f01ffbc51123a4678c2a249a51ff0b42c8b69a
 EBUILD g15daemon-1.9.5.3-r14.ebuild 3618 BLAKE2B feb5d82e02c8a323b8b181026a3901900f7deb293f0a5ea5ae2fd8e646734d4a7831f63caed326a095b9cdc328229bb361b94d7757d3cb4f387f019e36a34aed SHA512 3af32ddd33081a202cf0c204d8463f6bbf7665a5ac56a5cb14ddb059b0a19ef9ee9abcc7df9d0a0dcf33f216a1226cf13bf39b1ccac8cc8d224bbd9c2389d233
 EBUILD g15daemon-1.9.5.3-r15.ebuild 3670 BLAKE2B 7fcc72a0ca0ded18c2900ab5c1875adcad9834b9dac8182842337e6ec77fe4686d7060eb1a275cdf317a7b11bd3b99fb40c05e62568de5412d3446527c347b99 SHA512 0da399aa499738c1cb4f7b613df740e55831b939985d79e975e97af25ef78568d2b213129dce897bc7c92e2f79bbcce846079214275975c3d2ff8e34449b28dc
-EBUILD g15daemon-1.9.5.3-r21.ebuild 3686 BLAKE2B 3f01e34e4faa0543ec3dcb27b0e34d1372dcc38359289216f83854704c9a1ff1da2fb86b8b32fe98fc14a7c98e564edc562e6eafa0059fc2df98e6087caa3ecf SHA512 adac636f001da27d189c1f5b9ceeaed78b1fa956567cf802da13af93f99ec16812dd7aea5e6d44ffccf38cc33c5aae0306c78d86d574a676361c3d58c78bdd99
 EBUILD g15daemon-9999.ebuild 3920 BLAKE2B 2d9bb2d713a950b8955739a83701b91bd06b69ea3242a3444b03e022c2a2e5b2b365eded1bfea9737bfaf905f386b496c9357316a95ec917b8fbe388cb602938 SHA512 09012652885ced1ccccb3e44d18ee14fca634bddc88e537a2eaeed5b444cdaa4945b3ec0fa8c7b9a078c0a116e5c465c84ceeee557aa046f2eebe450bb88b8b2
 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
deleted file mode 100644
index 5e6b82ace427..000000000000
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev
-
-DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
-HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="perl static-libs"
-
-DEPEND="virtual/libusb:0
-	>=dev-libs/libg15-9999
-	>=dev-libs/libg15render-1.2
-	perl? (
-		dev-lang/perl
-		dev-perl/GDGraph
-		>=dev-perl/Inline-0.4
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-forgotten-open-mode.patch"
-	"${FILESDIR}/${P}-overflow-fix.patch"
-	"${FILESDIR}/${P}-g510-keys.patch"
-	"${FILESDIR}/${P}-docdir.patch"
-	"${FILESDIR}/${P}-avoid_bashisms.patch"
-)
-
-uinput_check() {
-	ebegin "Checking for uinput support"
-	local rc=1
-	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
-	rc=$?
-
-	if [[ ${rc} -ne 0 ]] ; then
-		eerror "To use g15daemon, you need to compile your kernel with uinput support."
-		eerror "Please enable uinput support in your kernel config, found at:"
-		eerror
-		eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
-		eerror
-		eerror "Once enabled, you should have the /dev/input/uinput device."
-		eerror "g15daemon will not work without the uinput device."
-	fi
-}
-
-pkg_setup() {
-	export CC="$(tc-getCC)" #729294
-
-	linux-info_pkg_setup
-	uinput_check
-}
-
-src_unpack() {
-	unpack ${A}
-	if use perl ; then
-		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
-	fi
-}
-
-src_prepare() {
-	if use perl ; then
-		perl-module_src_prepare
-		sed -i \
-			-e '1i#!/usr/bin/perl' \
-			"${S}"/contrib/testbindings.pl || die
-	else
-		# perl-module_src_prepare always calls base_src_prepare
-		default
-	fi
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -fcommon #706712
-
-	econf $(use_enable static-libs static)
-
-	if use perl ; then
-		cd "${WORKDIR}/G15Daemon-0.2" || die
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	if use perl ; then
-		cd "${WORKDIR}/G15Daemon-0.2" || die
-		perl-module_src_compile
-	fi
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# remove odd docs installed my make
-	rm "${ED}"/usr/share/doc/${PF}/README.usage || die
-
-	insinto /usr/share/${PN}/contrib
-	doins contrib/xmodmaprc
-	doins contrib/xmodmap.sh
-	if use perl ; then
-		doins contrib/testbindings.pl
-	fi
-
-	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	dobin "${FILESDIR}/g15daemon-hotplug"
-	udev_dorules "${FILESDIR}/99-g15daemon.rules"
-
-	insinto /etc
-	doins "${FILESDIR}"/g15daemon.conf
-
-	# Gentoo bug #301340, debian bug #611649
-	exeinto /usr/lib/pm-utils/sleep.d
-	doexe "${FILESDIR}"/20g15daemon
-
-	if use perl ; then
-		ebegin "Installing Perl Bindings (G15Daemon.pm)"
-		cd "${WORKDIR}/G15Daemon-0.2" || die
-		docinto perl
-		perl-module_src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "To use g15daemon, you need to add g15daemon to the default runlevel."
-	elog "This can be done with:"
-	elog "# /sbin/rc-update add g15daemon default"
-	elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
-	elog ""
-	elog "To have all new keys working in X11, you'll need create a "
-	elog "specific xmodmap in your home directory or edit the existent one."
-	elog ""
-	elog "Create the xmodmap:"
-	elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
-	elog ""
-	elog "Adding keycodes to an existing xmodmap:"
-	elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
-}
diff --git a/app-misc/g810-led/Manifest b/app-misc/g810-led/Manifest
index 7ec484543f19..04e61a2ff338 100644
--- a/app-misc/g810-led/Manifest
+++ b/app-misc/g810-led/Manifest
@@ -1,5 +1,5 @@
 DIST g810-led-0.3.6.tar.gz 34544 BLAKE2B 142fd54d7721a1deebfb019b644a4c8ab0fd5e1662391075cea67a4c7b7145034101f14c22975bdf079ee5b8e56c4a73e18fe31ce5d7fcf20ff4b9c64ee85502 SHA512 5a1877ee135a662bc5eb15c1afe5370cfe9243b4479823e3492f0da8f407b1438e3d7e35bd9992eea8dcbd4d548c9acdb7e74f4c99efbd4e9e8e6ddae33f8a5b
 DIST g810-led-0.4.2.tar.gz 36669 BLAKE2B 738ca1849b05ddc35e42c258f67b2fedc2ab207594a32111aeca8cb1cffa99580e0f22e57ea92aff0e49f546e871b5af1c77cd5830349af98c9a977b27a0186b SHA512 03e62265964b6d47d474b57a92beb3a017e8479113750e7d52790d0779b8893eb7e3761f236db94ff1e1ddb0424c711fd1a35c869d0f93ad68104b1ddd2bf1e8
-EBUILD g810-led-0.3.6.ebuild 1030 BLAKE2B d4e1cad7408ceb58c18e56906de4f9eb6245b31f5742cb3e692f16f4282d4bda92ea84148c71d8ffa7dc17d68a73e03aefad3da2b72fe86cdcdaa43e8fa5b18f SHA512 1f961c941a7b797de5b68b45b5237fabefcca53b841437dbc6d2adfefb0c744851bce2c891ffaa234236b407d0866ea1971368cc6931952b8888e2c8b3a6764a
-EBUILD g810-led-0.4.2.ebuild 2033 BLAKE2B 1624115e3b4412155f618b05aa73edc024b3cd6076be42453714cff38add7910b4874068dc4b6b0b08c8698120b85817caabefa000432b8c6a601da09c0acefd SHA512 e3f30b558a9c9325a500a3c50999ba1b7132665f2ae8bd8650484221778c0dab825a670460314d27ba102efcd65ff685110e334cde9bea207a1acb344f0c0a88
+EBUILD g810-led-0.3.6.ebuild 1023 BLAKE2B ee801168b7b981d46d59c65b1081a6fd87fc5961c49a1694dcc994c042d34d3d02e80e308e67f18b55f46411a048d97e3a2612d9dde07e5533326ce0bf01d5da SHA512 d05c4eac97cc432f09a64f3707a34779de87c5f79ebec153c2b4b1084ed891cb29f8a2956d7c985fa729c6e786029e9a29230dcb34974fc03fbc1d14202a2be9
+EBUILD g810-led-0.4.2.ebuild 2026 BLAKE2B 3ffeb677d8f91dba21fb4eaa5b1e38694e25c203e09a17165c8eec989e77bb954b1b5246f2a244eda94ed7ec6bb8a1f33e018a7e163dce1e5cb0635a844cc5b0 SHA512 ef8ce8e952dbece22c71e31ca601b6ff10b1fa94450569bdeea85861413f3e6a448e4db69a65a76f63ba43dba624aac6a5f02d8c8394ba0a64257432dfde6a8f
 MISC metadata.xml 640 BLAKE2B c948b25bf2c15e5f7a16a5bbe3ecfaf09e4d2d0110745c58c1a7e850cc691db8e87a4e9e3eb5c1bdb3ebb28f1a977f8dd2dc5d624a26dd5b3f6983e18dc4ceb6 SHA512 69dbede1a939f762327f40629d284b23b5366e17e659355dee3de56a61e417c580e6c3a355f1c1ab44cc1b3500a361273e7146234a7309ff2274132d052f8010
diff --git a/app-misc/g810-led/g810-led-0.3.6.ebuild b/app-misc/g810-led/g810-led-0.3.6.ebuild
index 2e51fcb5d4f2..b889bf0db9e5 100644
--- a/app-misc/g810-led/g810-led-0.3.6.ebuild
+++ b/app-misc/g810-led/g810-led-0.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd udev eutils
+inherit systemd udev
 
 DESCRIPTION="Led controller for Logitech G- Keyboards"
 HOMEPAGE="https://github.com/MatMoul/g810-led"
diff --git a/app-misc/g810-led/g810-led-0.4.2.ebuild b/app-misc/g810-led/g810-led-0.4.2.ebuild
index 5e5b098aef05..5b912b7836b9 100644
--- a/app-misc/g810-led/g810-led-0.4.2.ebuild
+++ b/app-misc/g810-led/g810-led-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils systemd toolchain-funcs udev
+inherit systemd toolchain-funcs udev
 
 DESCRIPTION="Led controller for Logitech G- Keyboards"
 HOMEPAGE="https://github.com/MatMoul/g810-led"
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index 67576c4d331a..c71968f9380a 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -1,6 +1,6 @@
 AUX gcal-4.1-glibc228.patch 3267 BLAKE2B b754919136da6652ef2f44bfbf9f9b0be839b89a35b23d028a4ca0cbb6101297066c862b2139ac424b276caf59dd12473d0194ca5b49f42c5bfcdfea2b37d3e1 SHA512 e1d54483561ac5b9473bcc42702b015a196fcde100dd2098dfd07642b7a5ee28887ef259296e98d7a46f18781e2b6a9c89424ebfe65b8ce601457b4f75af08af
 DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76e46e5a921a5e23ced74ae98bf09446e02988c98c29ecadf631b6624cb43e76c8da736a185e52ed34441c334 SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963
 DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
-EBUILD gcal-3.6.3.ebuild 741 BLAKE2B 67bc4f0efb5c881d055a1cdd3f472ed1d0bb493f940f768e04a00479c2b4bb69829bf4e4116b18ca46d4a9338b96b838cf68c7dfdaf7dcc7da8cb1a71efc408e SHA512 106459f020ffdaeb66fd44afae2f130eabbb516b4058f131ae333ddd4cdaa5bc1a2251fd1c9fbca11753d77a406f216288728e90a4d410f262d90e8f71c76b62
-EBUILD gcal-4.1.ebuild 901 BLAKE2B 9f9641940dd81521a77232744ccf6336bb0275a44108e48bb61d4a6ebd2032dc419b6fa360065e44acd679ef3b4509f3e99a9b258159cbe279926e999b79e82b SHA512 895fdfcca1d97ee3362e3b1a2292bcb2a82e4120b7fd8b5ceeddbd1c0f7c42f663973438ecefa1db7de3ec8bf518cbec25a376406df9c74a4aba9b0ba0a16512
+EBUILD gcal-3.6.3.ebuild 756 BLAKE2B d921836afc98c73ef7040bb23f6672fc80b0c4256351b1ad53d4219de8574d6f20154b7e59dc41517a065411ca24d7f356ebe2c31621837a82fd27c86d4a2b1a SHA512 abec0eb87080b32bdbf86be2643eb9aa56f0fbdd4fe5d8355a3f40fa1ffc241335793150bf1634691448ba60998eee2ed91419d49a3190b6e05043993788d851
+EBUILD gcal-4.1.ebuild 884 BLAKE2B 6729643c4a7e0f34ce43e3af35b85b4c577878d4b018e828ac3c7920eae12f441399811fe93aff1d5eb39f8a5667d89004508fd8274119be8898a35d5b9ab7cf SHA512 a1e0d8a1fddc97b240ec18bb1218278e45bfce65d4522576a6cbc786ac94b22b1fed3fc915e763e7bcfb014074beaeb2cfcddc1230244e347ba451bccd3e6769
 MISC metadata.xml 1018 BLAKE2B cb75f985009092bb5b22cc15d4ad11da0f049d6b4fe1ac02479a73d5333102a0abe0a80f7673b408d6991b9c1c862706279a25abbd071f9faf3c1d012d69ecc1 SHA512 44362e0e9926b26bab6a3eef736bb8e6c1d76e33f94ec546a97bde251a5e03d8102d3f17ea48a20f18da957c325b766647e3574bd8e13f0f070a15b105d07ea3
diff --git a/app-misc/gcal/gcal-3.6.3.ebuild b/app-misc/gcal/gcal-3.6.3.ebuild
index b84cc575396a..f872ffb027c7 100644
--- a/app-misc/gcal/gcal-3.6.3.ebuild
+++ b/app-misc/gcal/gcal-3.6.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="https://www.gnu.org/software/gcal/"
@@ -14,10 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses nls unicode"
 
-DEPEND="
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.17 )"
 RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( >=sys-devel/gettext-0.17 )
+"
 
 DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
 
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1.ebuild
index 56c197b65ff0..5fda1b0ee397 100644
--- a/app-misc/gcal/gcal-4.1.ebuild
+++ b/app-misc/gcal/gcal-4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -14,13 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses nls unicode"
 
-DEPEND="
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.17 )
-	unicode? ( dev-libs/libunistring:= )"
-
 RDEPEND="nls? ( virtual/libintl )
 	unicode? ( dev-libs/libunistring:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( >=sys-devel/gettext-0.17 )
+"
 
 DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
 
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index fb6f90e88a65..7f37aed9f41a 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -5,5 +5,5 @@ AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d654
 DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
 DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
 EBUILD geneweb-6.08.01.ebuild 2193 BLAKE2B fbd1b8f71b4c1e1e33956659b08f5e4ea441a8266dae4b65103721520851e2a6eaa0f5c9d8a35d261a4677d1b1d88c939064fcc933e1e0952202c880ab251b1b SHA512 8c2c767970c1f6bcf9824ce5b4003e6452ada10a2c31b49f707a1aa9c8bff2323141065e553e3e07efef4a66568997769a6643ffb535748f1446832b1dbbbab0
-EBUILD geneweb-7.0.0-r2.ebuild 1829 BLAKE2B 47c73aac31ad3308b1f222fd0fbefb77df46b00653bcc3ff073c497dcfe9a3aa87b5598c28cfa2536de26a30c1a1deb642390a6e3036917fccf07877db377182 SHA512 d871b881dfc6c9b4eb50f5437c133169bac4042814da40c2470ff502d00931d0721c9a2e3000d83da1a75c5dd38c931b9ff7514016d857c9b9406ab252c47f71
+EBUILD geneweb-7.0.0-r2.ebuild 1814 BLAKE2B f45752415e65a57e849833a406babcd1af3684b2d0f6091f0ed2a0d41dbe1f3d4ad4dcf28fbd3cdb24575bec090a8bf6287cbed710f1cea62475e1c7679fce68 SHA512 108e16e5f6862d97c901b79ac723e9ea77a06100882ae1ad9e73ca190d672d43d4c4cbd55026f18033f5a27d5f41d254278570ca48aa1c35a4544a41b47734c1
 MISC metadata.xml 652 BLAKE2B 1a96b9b6c9467f401450a4a71e7714d2bf87327963febe613c18236662ff8a992ef16315b38688fabf61124b0ebce9f618f81c29e56b53eb1eaeaf90be730cb4 SHA512 ce9b3c6218c48dae0a0b9998866457170a684f914b3f06e84f1e93d7fc52985237a1751fcaf06bb5d76fc093b4e4f8d06292dd0527c70ae4d128c5cd9c53c979
diff --git a/app-misc/geneweb/geneweb-7.0.0-r2.ebuild b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
index 17c350fb0681..128db7e7151a 100644
--- a/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
+++ b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils
 
 DESCRIPTION="Genealogy software program with a Web interface"
 HOMEPAGE="https://github.com/geneweb/geneweb"
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index e35871fa78a8..d4ddf7605ee5 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-0.20.7.tar.gz 1414198 BLAKE2B 18af2f136557d5d5674e05669839e1213c1c8234bfb2a14875057989040cae2955e7a569456a93fb181121afa796e711a8b26e26397d743dc6d3ac2eefd7088d SHA512 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0
-EBUILD gentoo-0.20.7.ebuild 1291 BLAKE2B a66c1f334301f003cf86037136e4ef997c22152ce0d04496c2d2ae33a408d0ee91f9ef0de2046f9ee4c158acdc56ab219add0316014215a3c08c10c759286c3c SHA512 962cd07ff93bb4d7fe2bb14c0db15f5a33115ae1682c7cd9bd1e59b2e1bd1824f6d5785d92d4757ed609dba0313d535c881467e9c5c4c971dc1f1089539c1612
+EBUILD gentoo-0.20.7.ebuild 1293 BLAKE2B 0e277f475d73c14f2f7e30ec0e848b107819e152260be41aaed6e4e51819237a73cafda571d4145f5f2e7163d2e8364b2c25f38f3af9882ef7c4759cc6212249 SHA512 1cf62ba2b07f3ac28b688807c3a1510bea7d02057df451fe75513c64ba951e36dd896d879422314e2a633d960f6100d55f071d223f4610c6752efa01e8df4501
 MISC metadata.xml 352 BLAKE2B 72fa87ea40fa0242a63fb53b736533de198a19cbdbdd751ee68413ff914b064169cdf5df0b5abed6d3d757a8a044c40261abd25bbbfe90ee159264a703fa977b SHA512 ff05feda3a7284c70f12d7fe7f7beca8c49eeb120c6c7302c73f5c28f2f903ecb97cf91a8a374e7b0c86d9dfba1c80627274a30249a388a65390303dd09d194a
diff --git a/app-misc/gentoo/gentoo-0.20.7.ebuild b/app-misc/gentoo/gentoo-0.20.7.ebuild
index 26e5fd720d81..8cdb913f1e7f 100644
--- a/app-misc/gentoo/gentoo-0.20.7.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
+
+inherit autotools desktop
 
 DESCRIPTION="Graphical file manager for Unix-like systems, using GTK+"
 HOMEPAGE="https://sourceforge.net/projects/gentoo/"
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index f1f44dea8a94..283603b2f688 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,9 +1,4 @@
 AUX 2.5.3-optional-vapi.patch 2135 BLAKE2B 0e2d2620fb1fbe287eef4f9d749d77c75452bf0d12fdcfd4f5cebe9d35118cb22ff6366562a0a1a9b07bfd452ac35580d563c498d4d77474dcf6613b24da5d80 SHA512 254fcffb4500031100c802e751cf84d2ca85b8a890cee7aa3b538dd9d5374cda560eaad262c5efd4ba7c2503d4130a958adeb77eba66162627708d2448096338
-AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
-DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
-DIST geoclue-2.5.3.tar.bz2 85084 BLAKE2B 3f61c16dcb4d0de95499865d83df4bd9b393d9d2f204b70029fb753666caab0e74468ae14f37ed78475d623caae9553e0e69b62765afebc6730212428d377aff SHA512 b4188f1b055f84ce0c58e497896a328d09838073b867598a0ca026c741e4464ae7ee54e53e9f02addd818152dce4a21eb5f83a3245e7ce1a93eec5671d0a9ee9
 DIST geoclue-2.5.7.tar.bz2 85764 BLAKE2B bf0a6e312b7a303ed2cfc33f02cfad0e68e44f60899a327c9eba12f4967d2a3a5922a475f8fefb6f47da328c92dc75706504b41bc2dcd21db3fc5da7c2a50180 SHA512 16ec15afa41910b7d993a9918dd3c068dea3f6c5be922b7ac772493cd6aabb0cad3fe2206b82c1a008781c3f1ddd8f4afd8f70b5d497920bea8ed5e473f0fd1f
-EBUILD geoclue-2.4.13.ebuild 1664 BLAKE2B 6c03fdb2d889caadf3d0ea7d32ee4f9497479316591a6c3ff796b8dcc84b8c22b9d4096c7c063d743f40c4001a6f697d31056785a29465d78d87a1d7defd59b3 SHA512 7f8afcff6944b800515b4d2e5bf1140050bb88372043b5945b9fa3ecaa5e0a7cb6c20ae1fcb2e85450f413e921a7180c2b3ebdc4061de5138779f527e96735e7
-EBUILD geoclue-2.5.3-r2.ebuild 1742 BLAKE2B c134c15fb5fde6e0fd4a3ada5a9f5471bc7cee1c2ded9d2fd608d4469c765e3f5751dd790127856c4c478fe28069ca5aeb637159dda610d697f1f576662f18ab SHA512 8df4106658cb34b423a3366d7ef425b6045eb76ef233ebdd6b9358e0d7dbf21e85153a67c826e031ee73ef835bd86abfb25d42f6ce11ab15e11d7f0fde4bab52
-EBUILD geoclue-2.5.7.ebuild 1674 BLAKE2B 50d5f3c66afd38a30f16fabeb465e88d62afcb92968753c2d1106fcb9652c5c79a7248b402160c94f54e21339e3f4ddff718396e8a8111c1d71f7a4f500e25f9 SHA512 b5bbaf187aa21dd31628e5601901b0aaced98c953d8f8fa3578140a95c41207047f61d7ae4fcaf6471a1fd7de48d06a7465c8fba4e8cf4bf03384bd921bd4070
+EBUILD geoclue-2.5.7.ebuild 1756 BLAKE2B 3ef91e37fe3ec67328819233bd6e88d969053dfddb3f6b88d2b938ec49d13c6d4db43f00f15e5b9aa1afd1c7ee3d4e7078326baae607832efcdc3227151e3e45 SHA512 a8a5031d8b675114e7c6f6f053aa4149e7c12aead12a5dc013dfd647778031c5fc340fee2194db34e500dc09858e00d17f8403a291d9c2728bb7cfbbc19d991b
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch b/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
deleted file mode 100644
index b27bf5d44c01..000000000000
--- a/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This has been edited to fit geoclue that import the code from geocode-glib.
---Anthony G. Basile
-
-From 3ce317a218c255b8a8025f8f2a6010ce500dc0ee Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Tue, 22 Mar 2016 09:48:00 +0000
-Subject: [PATCH] Use __UCLIBC__ when checking for GLIBC features
-
-Commit f0f85d8d introduces __GLIBC__ to check for glibc only features.
-However this is not sufficient for uClibc because it shares code with
-glibc.  To select for features in glibc but not uClibc, we need
-defined(__GLIBC__) && !defined(__UCLIBC__).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764021
----
- geocode-glib/geocode-glib.c | 4 ++--
- geocode-glib/test-gcglib.c  | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/geocode-glib/geocode-glib.c b/src/geocode-glib/geocode-glib.c
-index 4e3b3fd..6215fd1 100644
---- a/src/geocode-glib/geocode-glib.c
-+++ b/src/geocode-glib/geocode-glib.c
-@@ -213,7 +213,7 @@ _geocode_object_get_lang (void)
- 	return geocode_object_get_lang_for_locale (setlocale (LC_MESSAGES, NULL));
- }
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- static gpointer
- is_number_after_street (gpointer data)
- {
-@@ -246,7 +246,7 @@ is_number_after_street (gpointer data)
- gboolean
- _geocode_object_is_number_after_street (void)
- {
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) || defined(__UCLIBC__)
- 	return FALSE;
- #else
- 	static GOnce once = G_ONCE_INIT;
--- 
-2.7.3
-
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
deleted file mode 100644
index 6dec1598db5a..000000000000
--- a/app-misc/geoclue/geoclue-2.4.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_EAUTORECONF="yes" # 2.4.13 isn't properly disted, as released concurrently with 2.5.x, which is meson
-
-inherit gnome2 systemd user
-
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
-SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+introspection modemmanager zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.14
-	>=net-libs/libsoup-2.42:2.4
-	sys-apps/dbus
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	modemmanager? ( >=net-misc/modemmanager-1.6 )
-	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
-	!<sci-geosciences/geocode-glib-3.10.0
-	x11-libs/libnotify
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug only affects CFLAGS
-	gnome2_src_configure \
-		--enable-backend \
-		--with-dbus-service-user=geoclue \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable introspection) \
-		$(use_enable modemmanager 3g-source) \
-		$(use_enable modemmanager cdma-source) \
-		$(use_enable modemmanager modem-gps-source) \
-		$(use_enable zeroconf nmea-source)
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-	gnome2_pkg_preinst
-}
diff --git a/app-misc/geoclue/geoclue-2.5.3-r2.ebuild b/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
deleted file mode 100644
index 4f5b490e4dc4..000000000000
--- a/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit meson systemd vala user xdg
-
-DESCRIPTION="A location information D-Bus service"
-HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
-SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+introspection gtk-doc modemmanager vala zeroconf"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.14.0
-	>=net-libs/libsoup-2.42.0:2.4
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	modemmanager? ( >=net-misc/modemmanager-1.6 )
-	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
-	x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		>=dev-util/gtk-doc-1 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-optional-vapi.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlibgeoclue=true
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc)
-		$(meson_use modemmanager 3g-source)
-		$(meson_use modemmanager cdma-source)
-		$(meson_use modemmanager modem-gps-source)
-		$(meson_use zeroconf nmea-source)
-		-Denable-backend=true
-		-Ddemo-agent=true
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Ddbus-srv-user=geoclue
-	)
-	meson_src_configure
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-}
diff --git a/app-misc/geoclue/geoclue-2.5.7.ebuild b/app-misc/geoclue/geoclue-2.5.7.ebuild
index c2a62fecfdde..b039c33965dd 100644
--- a/app-misc/geoclue/geoclue-2.5.7.ebuild
+++ b/app-misc/geoclue/geoclue-2.5.7.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
 VALA_USE_DEPEND="vapigen"
 
-inherit meson systemd vala xdg
+inherit meson python-any-r1 systemd vala xdg
 
 DESCRIPTION="A location information D-Bus service"
 HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
@@ -12,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+introspection gtk-doc modemmanager vala zeroconf"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -30,6 +32,7 @@ RDEPEND="${DEPEND}
 	sys-apps/dbus
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	gtk-doc? (
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index 0896efd423e3..d7a18820a10b 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -3,5 +3,5 @@ AUX getopt-1.1.5-libintl.patch 352 BLAKE2B 39cb63285b1124a2c8577bd52128e04e0e86b
 AUX getopt-1.1.5-setlocale.patch 323 BLAKE2B ee68f23549c402bdb91cd4475ee0b1d30d8254d5161874eb029ce7536b3679fe5f323590c86d28af2dec9c2c6ba8ac95b0a3ac6103cda13fe8349629c13c872c SHA512 1ceb4353355cd1af697b5d46bd58b092b8792a2add97fb8498bfa6e036487e8c811333b03d0461117f1c2c5e90a3f33cf773cb9b0732c753beb8d75345e6c36e
 AUX getopt-1.1.6-longrename.patch 3013 BLAKE2B 608ad737eaad184436a321797b5099bbe5a1436e812a40a2ee30aa7b80e86f360e9e3c18629ae96e5edd6d0090a74758b99699833052dee2db7e76bd055f2659 SHA512 7157f9bd2bc660519972898bd24f0f04f01196a54c44a3a3ba4b0fda0acfb9b13cabba7cfbd1e784e9f5b3c94f2955325f47933e5d6affcb1a0f740d933206b9
 DIST getopt-1.1.6.tar.gz 58926 BLAKE2B 839b9c1701c21425cbc6b68ab245eb693e0e575a0673f62e3cca8f6932485c1124f42710c0ebeb3c157ab89e56e02b251a99aca7a12723735c63f33443003007 SHA512 aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10
-EBUILD getopt-1.1.6-r1.ebuild 1672 BLAKE2B 777ad30a4e2669a9b26f8d77e7ce8abc6d0a9a55fca2fe40f6c4571706a869f7547969e490ce132205933b98daeb70a5c2f2cf70bf11d29132c00691bf0b2c09 SHA512 e03dce461def4a94462427874cbba9cb607f10a1c23408584da9b7c53102a18f73d3fc737c528ce062844d1bf39dd57409300631bb215c4cbe0710c94798493d
+EBUILD getopt-1.1.6-r1.ebuild 1665 BLAKE2B e7fe370ddc9ca126438940b64699e292a766a71331d7bd1842b7bbe0538a7cb535b05f0ece86efa4b750c3d56c39492397ef39ebd99602f099412904cfcc9825 SHA512 8ca12b9bc4e1931f688a3d405b7ea256ee19ad268a95a8825d80b26ad585019e5172da5514b2bd9206504d7b3b123ab65b0fc58c3aeb4b7d9e3cb85bb3f2a5df
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-misc/getopt/getopt-1.1.6-r1.ebuild b/app-misc/getopt/getopt-1.1.6-r1.ebuild
index f39bcae08400..718e4cae3c65 100644
--- a/app-misc/getopt/getopt-1.1.6-r1.ebuild
+++ b/app-misc/getopt/getopt-1.1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="getopt(1) replacement supporting GNU-style long options"
 HOMEPAGE="http://frodo.looijaard.name/project/getopt/"
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index b67c62bb1d3d..0cf3fae4c54d 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,6 @@
-DIST gnote-3.36.2.tar.xz 3511244 BLAKE2B d7b8859ec47f8da2d37f285141d4c7fc0f591751a1ebea70339d6cdb727c74a6ca711515f8169130e1b46c1653c0c98da3bc4bce691b8d7a7f2794745e8db2a7 SHA512 6d2e32954836b4ac2800071385eedd6ad391936ee52626b7d51b077e4b4a3e071149804281e645b0fd88dc18e9f3c0f8d53e0994d33875ce5375d6b50b14d5e1
+AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc9021b4b95b46934d4713f39cb107a644db948cac73175fa6dcdbdf566639894521b1415957af2dc8b661aca08e1 SHA512 3f4cdb300299fc224f3c5fd2cc8a4f8d47a7eb41af47eb233555f714879cdf1d0e294c5045a4fb89b4b721b6029f5c38dac7fee5d6c1c11461efe0523a3edefe
 DIST gnote-3.38.1.tar.xz 3530348 BLAKE2B d3312162ffdf505dea31f8e8848bd755d6fc54a5f95250ce6b90a28e04801fb86a8c4e239471442a4501068a841e38e4764da8f16528849fdec57a88bd271891 SHA512 ccfe35ff3dc8e90fa96307565875401540c9e03a18ffd5b2c25fdb053927c4bb2b6b5515456f5260c053948b1a63bf6959a73e1ab09feefce61ed2adc257734f
-EBUILD gnote-3.36.2.ebuild 1546 BLAKE2B 4ce85d4d9ff99dd114b5bec5643d9c438ba77a563c8c878aa72d1fe2e789163960d18910d09273f11861561175d215fb128613d3dfceb192aedeaf16f2406fda SHA512 ef696ad04560cb4d27a7446e19f3d04c9fb8877a227e77c1f7dfc3c47aa2f276db6b7b095dbb484f94911a13a379f41bb298f090c7efb65ad400e2eef6895528
-EBUILD gnote-3.38.1.ebuild 1553 BLAKE2B de254f316e6a3db0f38d86aecf155e972beb2cde1d0a8c0cdba09105082af7703bddc8920535f06f897e5395b5a8b5489d7d794b15c2ec5a74f4a712992280e0 SHA512 14aab4d7236bb2e3fb2799b7cce1d246912f7c16ac78ee01e8f516ede5b09d1f0cce1369f90e72236158708fdc4f5ef40dbee3f11e04c5b31d7791f58a9bbc0c
+DIST gnote-40.0.tar.xz 3418516 BLAKE2B 93834a3d9cdae89604be01b96c5293741263a1812ed23cc51a151c250f42c33c560456ac78a5a97f713dffc095b6f53ffe465da89867df89497239443939f3c4 SHA512 098273ee2de15152e7da739b857a8f7c43561e51013d1f42a631b0a9f52edebcd089817a9009556697e4c4b43506834919cd0f8cae7b3d899517f4b6d42eeb31
+EBUILD gnote-3.38.1.ebuild 1604 BLAKE2B 3de1688743a57faa5d11f39adeb2fcbd337a58ed4e7e9b2784cf79916fe54248d19cba834890336ea22c7cc71bc6b481a44634e34485da1890f0368bce43d3b5 SHA512 ee634cbf38dbc32bc1c5804fe5bfb58a4f405ad1c3032a204041192c2ac54321027c3b0ebe41f0c1df984912a366de178adf671345cde65bbea5d4be41fc4a5d
+EBUILD gnote-40.0.ebuild 1563 BLAKE2B e9112a82cb20c0bfa6cb0d19c2cbc811fbc42251e76f84026cb5e849d728f7042315e4d7d3cafca19dd948b043d5054da938ff87312ed3ae20e09965a991d139 SHA512 070dee31791766de946e674387c3a65e57c5385d58571b07a45d86caa4b251d892064a38d20e94aaa1ebb03c828fe363b66f562af4deb7b7dd31eba5a237ed04
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/files/gnote-3.38.1-cstddef.patch b/app-misc/gnote/files/gnote-3.38.1-cstddef.patch
new file mode 100644
index 000000000000..0ea65b9bbd26
--- /dev/null
+++ b/app-misc/gnote/files/gnote-3.38.1-cstddef.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/768198
+
+From 49e652613a1e28f1220f593ba18108839d3d2505 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 22 Mar 2021 15:04:01 +0100
+Subject: [PATCH] Fix AbstractAddin compilation error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gnote/src/abstractaddin.cpp: In constructor ‘gnote::AbstractAddin::AbstractAddin()’:
+gnote/src/abstractaddin.cpp:29:15: error: ‘NULL’ was not declared in this scope
+   29 |     : m_gnote(NULL)
+      |               ^~~~
+gnote/src/abstractaddin.cpp:25:1: note: ‘NULL’ is defined in header ‘<cstddef>’; did you forget to ‘#include <cstddef>’?
+   24 | #include "abstractaddin.hpp"
+  +++ |+#include <cstddef>
+   25 |
+---
+ src/abstractaddin.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/abstractaddin.cpp
++++ b/src/abstractaddin.cpp
+@@ -22,6 +22,7 @@
+ 
+ 
+ #include "abstractaddin.hpp"
++#include <cstddef>
+ 
+ namespace gnote {
+ 
+-- 
+2.31.1
+
diff --git a/app-misc/gnote/gnote-3.38.1.ebuild b/app-misc/gnote/gnote-3.38.1.ebuild
index ad33ccce7862..6f20625b348c 100644
--- a/app-misc/gnote/gnote-3.38.1.ebuild
+++ b/app-misc/gnote/gnote-3.38.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # Automagic:
@@ -38,6 +38,8 @@ DEPEND="${DEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch)
+
 src_prepare() {
 	# Do not alter CFLAGS
 	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
diff --git a/app-misc/gnote/gnote-3.36.2.ebuild b/app-misc/gnote/gnote-40.0.ebuild
index 0a1202afea6c..d59f76c84cde 100644
--- a/app-misc/gnote/gnote-3.36.2.ebuild
+++ b/app-misc/gnote/gnote-40.0.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
 inherit gnome2 readme.gentoo-r1
 
@@ -11,33 +10,35 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 # Automagic:
 # glib-2.32 dep
 # >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-COMMON_DEPEND="
+DEPEND="
 	>=app-crypt/libsecret-0.8
 	>=app-text/gspell-1.6.0:=
 	>=dev-cpp/glibmm-2.62.0:2
-	>=dev-cpp/gtkmm-3.18:3.0
+	>=dev-cpp/gtkmm-3.22.20:3.0
 	>=dev-libs/glib-2.32:2[dbus]
 	>=dev-libs/libxml2-2:2
 	dev-libs/libxslt
 	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/gtk+-3.22.20:3
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gnome-base/gsettings-desktop-schemas
 "
-DEPEND="${DEPEND}
+BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/intltool-0.35.0
 	dev-util/itstool
 	virtual/pkgconfig
 "
 
+PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch)
+
 src_prepare() {
 	# Do not alter CFLAGS
 	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
diff --git a/app-misc/gnuit/Manifest b/app-misc/gnuit/Manifest
index 50245a0b535f..e75b08ee4c02 100644
--- a/app-misc/gnuit/Manifest
+++ b/app-misc/gnuit/Manifest
@@ -1,4 +1,5 @@
-AUX gnuit-4.9.5-format-security.patch 427 BLAKE2B 29d289419aafdcbbeec4d530f202036f0715fef4686df1564aa34302858e26856b678133ed618ae52fcb7f39bafa759173bcdae530c8c1e0a7b78614924fcbad SHA512 de604126f686af2eec160d4bd735f3888ee87a0b7bab38bb3d00d4dd26694c66810641687bb413933acb7991893a8772490fdc36fd001325d2a2b5f82bb3afc2
+AUX gnuit-4.9.5-format-security.patch 296 BLAKE2B b9e315a48ee9049c6eddd93bea1b934e917c35f32f993f30dc7f69dfb4f7203d56bccf6e292ca67e71ae1372296a2dac34d7e05bdc665e5d03d67f4e9ef104e6 SHA512 01b2bcd93d78db06eefb1e3c40350c4c2d47b1f5130574675baccaf49f2a4908f9f631b9563de36dac6ac2dbe78ae8bddfdec4af804dc68898b8ff91317aba98
+AUX gnuit-4.9.5-respect-AR.patch 170 BLAKE2B 3a3fea147bf671d745f6ed59609cb946a1e630a80000ebf28d8df79c65ad26751a0fd075e8407a8e4177de6ef446ecbac00d05fecb870ec2ae69c049d10d4c99 SHA512 0f7e1cb33e2d0025664f3975a5ca9e216114e9ac4f6b4bbbab7a22a96351609e1eb4490a04929e843ae4a37ac22c8b55e4fc716c9483089de4b5f0f3bbaaf471
 DIST gnuit-4.9.5.tar.gz 894362 BLAKE2B c609ac823dc93ab4092638dbfb19e85a9d7629f41be43ac1670341151daec49486c220b96b97492b9a51e4400e8581c2d7dc58c9092cf2c09e600d852993ab75 SHA512 91f1a86f45d5a2fab91941587aed3c1e57ae68271584bef38560c9a31fabbdfeba801d87cdf5640ba9f2041e43305e49c64953b8d5370f3f6a463b2fa2a7c5da
-EBUILD gnuit-4.9.5-r2.ebuild 1123 BLAKE2B 6af7d20778ed3600870fafd8bcaede31525e1abb41f5338689e4b542ce52b63813f85d81c246e723618dabc9bcaf7a4271996e4c96fb964f2ac2a6fa7b0c08e2 SHA512 412d4c1ac55b92223b7f78fa085d42355d21dca51006c2b5ac219f184a3f28443e467c184888dc433b44294711ba8d129051567d2f3664dc11fc1462c3456fd1
+EBUILD gnuit-4.9.5-r2.ebuild 1239 BLAKE2B a155fc898408bd506b16bfa22aa55181ede30fc64d546380a4601f5bf31e6e6287094218cb6e4e0edf364b428b79505d1b6d19e28aa9db21e1dd87f5d58096c2 SHA512 e9afac5875293c6442059955854ab494c7c3f0ba4c0f760f7dfb971ecc05f55912a597d107bc82f642bdd3a75292b8fd50fc7d05a13acbe17ce5003135b1b849
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
index ec2a1c51fdb8..6ae1d9a3ebf3 100644
--- a/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
+++ b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
@@ -1,8 +1,3 @@
- src/git.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/git.c b/src/git.c
-index c6040b2..595912d 100644
 --- a/src/git.c
 +++ b/src/git.c
 @@ -1917,7 +1917,7 @@ main(argc, argv)
diff --git a/app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch b/app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch
new file mode 100644
index 000000000000..ea18af55bd8f
--- /dev/null
+++ b/app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,7 @@ AC_PREREQ(2.59)
+ AC_CANONICAL_HOST
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++AM_PROG_AR
+ gl_EARLY
+ AC_PROG_CPP
+ AC_PROG_RANLIB
diff --git a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
index 3f949e51f693..be1fe1604d60 100644
--- a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
+++ b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit autotools toolchain-funcs
 
 DESCRIPTION="GNU Interactive Tools - increase speed and efficiency of most daily tasks"
 HOMEPAGE="https://www.gnu.org/software/gnuit/"
@@ -12,13 +12,22 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${PN}-4.9.5-respect-AR.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-format-security.patch
+	default
+
+	# for AR patch
+	eautoreconf
 }
 
 src_configure() {
+	tc-export AR
+
 	# The transition option controls whether a "git" wrapper is installed, it is
 	# disabled explicitly so we don't need to block on dev-vcs/git.
 	econf --disable-transition
@@ -26,8 +35,10 @@ src_configure() {
 
 src_install() {
 	default
+
 	#emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install
-	mv "${D}/usr/bin/gitview" "${D}/usr/bin/gnuitview" || die
+
+	mv "${ED}/usr/bin/gitview" "${ED}/usr/bin/gnuitview" || die
 }
 
 pkg_postinst() {
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index c2150e89a171..5a5917d9dd0f 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,3 +1,3 @@
 DIST gramps-5.1.3.tar.gz 17352457 BLAKE2B 8356e29d4e9e2ee78f0f09e54db8f77b2db991652f2c6b2fdc742b8f2e160a2c9c2b7df1a43c34e5d05b12b540e88cd8572fe89cfbb3a1ecb6df650a39ac0651 SHA512 045d5dd6aac4745ce527624657bbee25b9130e63b1b66bdd6a8409cdc876f1f3a4a6c0435d433a62bfffb723f6ac66d93829b79fc12c8768694c266b7a3b82cc
-EBUILD gramps-5.1.3.ebuild 2742 BLAKE2B eb76a2536d3840f1c2aa9700b3d7cd985f7f22ed11a510b19ac864031841ee6481b15e79e82e3b6ed4c835e30599e72b431e4d98d658e4e9359a054ed11d8f74 SHA512 019f19b67ec71f6a8f7cfe5ad9d7350c191b2f263375d61a822d39f2d4335756f3f2260ea1bed99ae4c0b496645d96a431a095af20005aad84126b8b8612d028
+EBUILD gramps-5.1.3.ebuild 2742 BLAKE2B e0debd52ea99d5b731ed060409b14ea6fbafdbf1078047276b7e6445ba218f3b86702bc6d4f3ad783dd43cb926e9057a19b9803deb7e0750d38f2b9f538db6dc SHA512 89a303b4796311a6177a62da4c57c24211db600edda6f472ebd4008c3a381a8714dd9f28f3289f673b4a0447e679b10304ebe13b917e800ecb6c1023e8b94fcb
 MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
diff --git a/app-misc/gramps/gramps-5.1.3.ebuild b/app-misc/gramps/gramps-5.1.3.ebuild
index 96cacdf889f3..b82ca6ba3681 100644
--- a/app-misc/gramps/gramps-5.1.3.ebuild
+++ b/app-misc/gramps/gramps-5.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="
 		dev-python/bsddb3[${PYTHON_USEDEP}]
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-		dev-python/PyICU[${PYTHON_USEDEP}]
+		dev-python/pyicu[${PYTHON_USEDEP}]
 		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
 	')
 	gnome-base/librsvg:2
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index 4a223ab41eec..f95b4840b5cf 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1,3 +1,3 @@
 DIST grc-1.11.3.tar.gz 45205 BLAKE2B 852f58145fe11ceab3e6222b61c18cdb18a09f0666f28df4b8b8a8bc42a22dd01ae7e2bcf6232a6aa0d1f42ac233148f694a0eafbd995fbd5d147e06480f7abf SHA512 abc756a21e039c136bbf9be1ef7c1890aa2415ac21e87fb7377c90ced1def2dcaf9ce5cce22edeac68db20f6d6ccea31a2ec57044a37ba200ff79273bf11d8cf
-EBUILD grc-1.11.3.ebuild 1383 BLAKE2B 6f2fbb92de697272034afbba3ebbab33e754412951c297b8b735005c5cfdf83a0556782dce6d569d249771d4ec8c6d168a3cbbb0466756ed05aee5048da76b19 SHA512 7ca8e9d98a6d604038a56d139ad400351223ff29fbb6e4c6f496c168ccb346c593ed5419ccbdf71bdc824cefcfe0ff4f506dda1d15c794b86bb0dc91c2dec6ad
+EBUILD grc-1.11.3.ebuild 1376 BLAKE2B 1f273c830d3fda83e1d10e29c34c7383513662e7f48ac46a3e7302108df11e08ef475acfb6c55747cc43f2d00c53825df5a52a1e20919b4367bfe98980fea75e SHA512 6b4fdcad9603a2798557ee57e827d0bdd70bc57c1612cdac62e65fef0f6c5ef8aac010315c069f37a2995684d72b8064afc4d89faec22f6654665faa5183fafa
 MISC metadata.xml 351 BLAKE2B b542ab1f09e03d0fcd473a1d364c557732f0ebd865398da2bf6b322987c0bf22d916d642dcb73c0c7c72d57f7eb41caa0aff1456b49dedb0895a5f5c31f3721a SHA512 39fabd038b08bc0fb057be0d211272b65d94cd9f1afedfd576138be1ddc1748fd673684b1c407649409f2834024cad324f78564348e9da570cde26be3282bc8b
diff --git a/app-misc/grc/grc-1.11.3.ebuild b/app-misc/grc/grc-1.11.3.ebuild
index bb4971a4e8af..13d6ac263364 100644
--- a/app-misc/grc/grc-1.11.3.ebuild
+++ b/app-misc/grc/grc-1.11.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
 
-inherit eutils python-r1
+inherit python-r1
 
 DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
 HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index 48cc52058a28..e2572ba8da1e 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -3,5 +3,5 @@ AUX gtypist-2.8.3-xemacs-compat.patch 592 BLAKE2B 23d8195c23c0e510b42c5b4ef9b466
 AUX gtypist-2.9.5-link-infow.patch 453 BLAKE2B 6fd312a511b4d151a42679a329e47acf0e2368b86cdf5f193e7ef5af756abe6bd6a77168c2d6161e45befdc05dc851f5df75f974e865f0975591670fc2ea6fd1 SHA512 eebdaeca3302f0b6a62f91de216f6f6381cd22fb78625bc31395cdacfd2aaf34d7d1df71a7c523b13f97172daa8d5df8d62ba48458d9e8e8d64b5fac3b123186
 DIST colemak.typ 8922 BLAKE2B e3c422e9172e215406a5165a44c51c38f3372c9988f1bafdb537463a9a3209f1759a312c2a5d316ec3a2a0b39563521b87aa6944cdd0b4cf94c960cbe70c7ca3 SHA512 f2c2816836c83d7b640f7f703a4924c62ff0746e0d4cf2a2ca36d434017770272518b835ea273815c93ab9df1c0e4d142f5fea1e5f0b1484ecdc652a53bdc499
 DIST gtypist-2.9.5.tar.xz 929356 BLAKE2B d83506ee8ab26290fae47f98aed4e5e63260f39d5391a9a735d009f34a787cd670b034375c946c7562545b84ed4655d51c385209d676de76cf4891ead9845ea9 SHA512 d6891cd58d23f9b023aec97dc825cb15f7371ab18e82133b9a284d3329b1526bda8e1c5d7225f335c5ec673280cbbe3ad92471eeb15db4ecf29e7feffe27e095
-EBUILD gtypist-2.9.5-r1.ebuild 1565 BLAKE2B b6973250feca2d15ef1c7e26ac0749e1f9230d876cf590ae05ccba9f177fc7cd480341c75bbcb5b747ebe6bb282f441e4ffe86ccc91196b9904a3cb16485491c SHA512 4d0a71cba518197cfe1a7f1698ca31df7cc5d587983947b2bf6e989aea136d697b33e6fa8e3c746e106b6edd99a0cabff82165be194c3bd6552392038b79976b
+EBUILD gtypist-2.9.5-r1.ebuild 1572 BLAKE2B 8df9e8f212f42bb84695732870a24332a86498b9901866ce82c3deefa7a33494540dc678b1d80b55140c9951979faf6239010c3ffe4e7cf02e0936e7f17c4794 SHA512 caefa537e6f4809fa7215b67ac5877b6c38241989a2d9bfe2a9247a52bf5c72c37c1e66cd334adc4d92fe38dcb1d9ba7f8c6c5d420aede308c018801dcfffbe5
 MISC metadata.xml 406 BLAKE2B 913231fa4e415fb6e9c7bb67652fa8232479dc009ec930dd57dcec1a8bdd4f4a311197bcdad29c79ad138012cec5f719f2372ff506d0e1fba8248a75eb0fd3ce SHA512 8c226f2754e76b9ec21f28f5973ff51a584e33391cdf89961e753f990533356c397f3e105036b7e160d5c0098d31b1581bf9610ac4a51547fac64a276485d955
diff --git a/app-misc/gtypist/gtypist-2.9.5-r1.ebuild b/app-misc/gtypist/gtypist-2.9.5-r1.ebuild
index eb03eaca1696..23dd66e075d5 100644
--- a/app-misc/gtypist/gtypist-2.9.5-r1.ebuild
+++ b/app-misc/gtypist/gtypist-2.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gtypist/${P}.tar.xz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux"
 IUSE="nls emacs xemacs"
 
 DEPEND="
diff --git a/app-misc/hddled/Manifest b/app-misc/hddled/Manifest
index aa853a189c27..f801cd73d61e 100644
--- a/app-misc/hddled/Manifest
+++ b/app-misc/hddled/Manifest
@@ -1,3 +1,3 @@
 DIST hddled-0.3.c.xz 3108 BLAKE2B eb7f2ab61d1969fe0f6ee3a8bebd7346b5cabcbb8a432a9c8c802289dc022efab09e2ca627915c9d2aacaeac8e6519524b9d77d34141850de7693778e825fba8 SHA512 9f535557aff78d3c9693a8d34810a768e8306de73841ba0d0a928a5d205a8a5faf632a9bf51db8763b5d8d2b3de73ee6f06af62f1a0025b0912c7c18133cdf19
-EBUILD hddled-0.3.ebuild 769 BLAKE2B 2b974309f60b7e4d288ffe8b6d6daaba58536dfa49dff4a53824b84920b66776818cd6a19227401ed4cde8899c3cbaa9aefd7902c5d18da46a0096a3a8ddd2ef SHA512 6126294072c6f224c8a44cf6c1218c22937a433155d116e81ab028565eb758d39b60f4a20e2c0dc8fc4c95ede2dbc56916009b98fda841156d4dbb24e8c9ec49
+EBUILD hddled-0.3.ebuild 791 BLAKE2B 96af6b998f1b8f932826bd45f5d0c25e9c7a43fafe3378c16e6fa5335bbe0eaa8b15056556b6246bcc3d3ee75f51a7c0ee13e902f896c98bef73411d1f00f49f SHA512 30e94d507f881511744a8e5af258130b713c02186f944026e134ffc7631c204f5d70ed00253651aec48b4d1b9064e53531f0e79312f727c1ff5c2d3d67dcf353
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/hddled/hddled-0.3.ebuild b/app-misc/hddled/hddled-0.3.ebuild
index 97557da00d47..2e4b5b8cf0bb 100644
--- a/app-misc/hddled/hddled-0.3.ebuild
+++ b/app-misc/hddled/hddled-0.3.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="Show hard disk activity using the scroll lock LED"
 HOMEPAGE="http://members.optusnet.com.au/foonly/whirlpool/code/"
 SRC_URI="mirror://gentoo/${P}.c.xz"
+S="${WORKDIR}"
 
 LICENSE="Unlicense"
 SLOT="0"
@@ -17,22 +18,23 @@ IUSE="X"
 DEPEND="X? ( x11-libs/libX11 )"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}
+src_prepare() {
+	default
 
-src_unpack() {
-	unpack ${A}
 	mv ${P}.c ${PN}.c || die
 }
 
 src_compile() {
-	$(tc-getCC) ${CFLAGS} -o ${PN} ${PN}.c ${LDFLAGS} || die
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ${PN} ${PN}.c ${LDFLAGS} || die
+
 	if use X ; then
-		$(tc-getCC) ${CFLAGS} -DX -lX11 -o x${PN} ${PN}.c ${LDFLAGS} || die
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DX -lX11 -o x${PN} ${PN}.c ${LDFLAGS} || die
 	fi
 }
 
 src_install() {
 	dobin ${PN}
+
 	if use X ; then
 		dobin x${PN}
 		elog "X version was renamed to x${PN}"
diff --git a/app-misc/hexcompare/Manifest b/app-misc/hexcompare/Manifest
index f2b807a10077..aae80c5fa5ef 100644
--- a/app-misc/hexcompare/Manifest
+++ b/app-misc/hexcompare/Manifest
@@ -1,4 +1,4 @@
-AUX hexcompare-1.0.4-Makefile.patch 445 BLAKE2B 68b34176c976109a2c9b7cc17b88b92f877f2f05784bc726907ae2c28b4923d8f0649fd3fefa987e04c0b996ac2da1ab4789f90162c4eed7b3db3b70add229df SHA512 8f66e5b080d41906ea9301c066a51f5869a7274e29a6a1391ea81d129dfc88682f035c1ab57319199d5e82020fac7e96e2666fec362a5605d562dc5826448a4b
+AUX hexcompare-1.0.4-Makefile.patch 421 BLAKE2B 1a53eaef556230f59294f94492ce848e722bc3600d3d70fd1ad7b7e26ae061e3fc34b5ef6175e605a1b98fa226b1e2935c8c8cec2adae18bfd5b55cfaae59cd8 SHA512 b32d3eb656bd7c5021e0d4fb98fb5b1b4338d9ecd7e1efaa7f7ff4f8de536df53aaa1edd344653d65535524b9287d65e85938eb6de42998b7113c0f4f31626ad
 DIST hexcompare-1.0.4.tar.gz 9686 BLAKE2B 930004101504ec2bce1aaadac03a221e29e4668cf58591292510d3c66effbdd5f91fc405fc4d55d9116ec3ba260c91927371c8768e01ccf4169cb6d955642128 SHA512 847bf7e26f27aa0ff56e38b3fe95ad7940a0226e0c496963530fa405d8a3a50f8288a4c7f28d48d4cce05e52c1f69180917a7f10da0943cabf977f78b62eb5fe
-EBUILD hexcompare-1.0.4.ebuild 533 BLAKE2B d937143767bad3cefbf91c9533bf4411b6202b9372a335e230e2f99070597031fdeaa3051cb0ce460ae97e40bd2c2277e297bf6636e62bcbbc762b5c72deeb7d SHA512 3718883457b7dc577392c254d7d4345aee25c0a56e33051383247a40b01f0da8adccea3ce3802f20398f8362ad5154ab615c76a5456365f3f366ac57d628d181
+EBUILD hexcompare-1.0.4.ebuild 572 BLAKE2B 3f782625dc21ef157c69c131df6711ff32944247c34c51672ca34b8fd9ea2fd13f1398e88e53e14f58cf399fb80361e1e6884c8f93ffd3a9c2ba3ebe03c6da61 SHA512 29f0f62942b94b746381aa81285a3a40ad6543273281678dd718dde9916630c8e324b7eccf599d490ce1c341dae969ea95ec2773f672153c7eefc7cb1337e438
 MISC metadata.xml 247 BLAKE2B 3362ea9ddb31607fa1426a03bc8be5d5a0b41d13ee83d637244cd31e1a92a894c9cd49b540d3e8a640947386b60ad100ad480bdd0222bbb89357c59bb2aad23d SHA512 1d627a295a24a74a48994cb68bf025f3a945fce6933ec14f9ca0bdf962839d40c31820e27fd70e8119dd75f6c02cb2303c558a9e3a818b96988670f4a2bc16dd
diff --git a/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch b/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch
index 5ccef2047bc7..2af79a1d2967 100644
--- a/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch
+++ b/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch
@@ -1,5 +1,5 @@
---- hexcompare-1.0.4/Makefile
-+++ hexcompare-1.0.4/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,9 +1,9 @@
 -CFLAGS = -O3 -Wall -Wextra -pedantic -Wformat-security -std=gnu89
 +CFLAGS += -Wall -Wextra -pedantic -Wformat-security -std=gnu89
@@ -8,7 +8,7 @@
  
  hexcompare: main.c gui.c
 -	$(CC) $(CFLAGS) -o hexcompare main.c gui.c -lncurses
-+	$(CC) $(CFLAGS) `pkg-config --cflags ncurses` -o hexcompare main.c gui.c `pkg-config --libs ncurses`
++	$(CC) $(CFLAGS) `${PKG_CONFIG} --cflags ncurses` -o hexcompare main.c gui.c `${PKG_CONFIG} --libs ncurses`
  
  clean:
  	rm -f *.o
diff --git a/app-misc/hexcompare/hexcompare-1.0.4.ebuild b/app-misc/hexcompare/hexcompare-1.0.4.ebuild
index 7b11bccd5ad8..597e96bc2ffb 100644
--- a/app-misc/hexcompare/hexcompare-1.0.4.ebuild
+++ b/app-misc/hexcompare/hexcompare-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="ncurses-based visual comparison of binary files"
 HOMEPAGE="http://hexcompare.sourceforge.net/"
@@ -12,14 +12,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="sys-libs/ncurses:0"
+RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	tc-export CC
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	default
 }
 
 src_install() {
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index ff49ab67df4d..52c3b66ea5c2 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -2,5 +2,5 @@ AUX irtrans-server.confd 392 BLAKE2B b23c07dc308bcda49f49985b7d6c77c3391a959a142
 AUX irtrans-server.initd 564 BLAKE2B 1ef6433ab6866ca5c3947737ec55a1a5bd129456aa3247d69005bf8b48ff2a139228ffdd1032dd9654528ffe77e369a8d8d796a8dc421f626cb8cb7a19519a1c SHA512 fb47c9d695e879e0db95fb5ae427b5d0248c65b6fa701408369c845cad1025cb913d85d68145fd69ad96ee65092b549384ee7e8135f095254840fd25ef7aa781
 DIST irserver-6.09.04.tar.gz 665809 BLAKE2B 1f336e34a3a79490266a762520083c74f79d34b2b8603a9d4b8e29347346c658c1723608627590d39ebb66bebe9886a4052376ade81704db3b2c1cccf229b87e SHA512 d63f8bc79c2a5a8050c5ac21b086be3826f66102dc2f111bf8084b57756c6bcd84615d1675781b26520c34f7a3e08726dbc4ae94dd4f4afc446383597c433399
 DIST irserver-src-6.09.04.tar.gz 200481 BLAKE2B 7eaffd5bb335dfcbe6f0716af57aa898d2cce1a984a2f050081bd71a9c63d5d1e5949fdebdcbbbee05c337141d0efe5c6ebcb937726ff9506a766f69ed8d2f58 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6
-EBUILD irtrans-irserver-6.09.04-r1.ebuild 1883 BLAKE2B 2381429568f1592a4dd2efd8426da328a0e1a202d9a6682c37f4adab0b76d7619643ec16fea38571c7b89eda6e1a5d7bff8092d4edb87b7de0b507b36c4e76cf SHA512 d1fde7eeabb728cb9cec417896a61a817523000dd7f7ce1eeff3958d721d9d1657603178e3ee9fafc7bf741436e4d41cba56490a62f9ccd8dc48d5085a078e01
+EBUILD irtrans-irserver-6.09.04-r1.ebuild 1884 BLAKE2B ac15d36e9c475978f842af7a2828c085334928751e782aa3b5d78102bc214a038699a9b4d7b3967d879f609ccec06814ba9659f4ba06cb8774af8d730ebeaed6 SHA512 e7a3ddd85945bca2539ce145e978556f953b5fc1463a90866ec170848d47525fe3b69ce493a3b3b88fab5fc978d510d86968081ab99a7e6cd3b4f8c2b07c57c5
 MISC metadata.xml 457 BLAKE2B 9a6dc4962ff3c3e7816a1ece72106ea970d72ae525cd7d39dff2ae0cbde05ce7014b0af95060446c460df5ccfa39994a07594f0c55341cd2fdb5000611e44f99 SHA512 ec91588e4d6959585f2174fb45a6bd7edd2aad79e4d9552ed024d96b87eaa8fafbfcea47ff35e9fb4d61ccc0dea5ed8cd6d64e2e87edc7ef2269b83e81e15014
diff --git a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild
index 9cca69fbe4af..5cd00f0a8e56 100644
--- a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild
+++ b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs mono-env
+inherit wrapper flag-o-matic toolchain-funcs mono-env
 
 DESCRIPTION="Server software for IRTrans"
 HOMEPAGE="http://www.irtrans.de"
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 5fa67496cd8d..b1c122c08c4e 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -9,5 +9,5 @@ AUX jail-2.0-openat-syscall.patch 645 BLAKE2B db200b5969f031059a749283d5ee0945ab
 AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982d7c435418a2895a19f9663c8f015ee5992a2484f4dcfa1f7be5a5ac953cc6e76c2b035c63a4410e2a22824f4 SHA512 64e72367dee1f1639a4206280a28228d01702ddb1eefa75c7faabe32cbec699f3083d11b67dccdd56b8953f34646ab4eceb70ac898f1b2a60d142ce564a92b4f
 AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
-EBUILD jail-2.0-r4.ebuild 2225 BLAKE2B 9d4d2d7b52ad25b14fd0acfdf12eff4ea85cfe009ff45ee8cc8a639a839b50df7323e3526bc7413e00eec48628dcb11ac530ea5aaa17b05bcefce531e5d63491 SHA512 467e6d011f3deaf90e2a53ebb0330b6ed44c909dac025df5f403c8dfd150d85381a0cab7c3dc6fcc3bf9d6393d28a260797e196dd7e27922505c1df16fb08e37
-MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
+EBUILD jail-2.0-r4.ebuild 2228 BLAKE2B 0dc5385363d4b9b52cebd572fd8094613447545f199f665f080bd2dd9cea90f362ec8b369b1f9e782c4ddd20cd657892fd1cf311752bca515374df19748a5ad3 SHA512 38c2769338d5442589f01fde20d19657ad09ace8cc4ac2b821bad9e41a0e40c41000a8b3e3e645b18bfd645a1fa0e58641bc015c2149cdc6d6d2c0d732e319fb
+MISC metadata.xml 745 BLAKE2B b3182c8a1f9f31ecfe0526b88d2e8fd4f898af2a6ddc4371a841d2a7aa2e4d89cb462b03bca0f334b952afe910d7c6bd555083c292326f57e2f91755259fc40b SHA512 6b4396d20fb883385246425e04dda03453f7a49b210a30b0863b1b163b664ae5bd55ddc8c6bf862cdffe1087e34167299379c28e06a8ac6aacde2f2993363880
diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild
index 4e8ef915d7e0..b3921ab2daec 100644
--- a/app-misc/jail/jail-2.0-r4.ebuild
+++ b/app-misc/jail/jail-2.0-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries"
 HOMEPAGE="https://github.com/spiculator/jail"
@@ -11,13 +12,11 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
 
 RDEPEND="
 	dev-lang/perl
 	dev-util/strace
 "
-DEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9-gentoo.patch
@@ -35,41 +34,45 @@ PATCHES=(
 )
 
 src_compile() {
+	emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
 	# configuration files should be installed in /etc not /usr/etc
 	sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die
 
 	# the destination directory should be /usr not /usr/local
-	sed -i -e "s:usr/local:${D}/usr:g" \
-		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" src/Makefile || die
+	sed -i \
+		-e "s:usr/local:${D}/usr:g" \
+		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" \
+		src/Makefile || die
 
-	emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
 	emake -C src install
 
 	# remove //var/tmp/portage/${P}/image//usr from files
-	FILES=( "${D}/usr/bin/mkjailenv"
-		"${D}/usr/bin/addjailsw"
-		"${D}/usr/bin/addjailuser"
-		"${D}/etc/jail.conf"
-		"${D}/usr/lib/libjail.pm"
-		"${D}/usr/lib/arch/generic/definitions"
-		"${D}/usr/lib/arch/generic/functions"
-		"${D}/usr/lib/arch/linux/definitions"
-		"${D}/usr/lib/arch/linux/functions"
-		"${D}/usr/lib/arch/freebsd/definitions"
-		"${D}/usr/lib/arch/freebsd/functions"
-		"${D}/usr/lib/arch/irix/definitions"
-		"${D}/usr/lib/arch/irix/functions"
-		"${D}/usr/lib/arch/solaris/definitions"
-		"${D}/usr/lib/arch/solaris/functions" )
+	FILES=(
+		"${ED}/usr/bin/mkjailenv"
+		"${ED}/usr/bin/addjailsw"
+		"${ED}/usr/bin/addjailuser"
+		"${ED}/etc/jail.conf"
+		"${ED}/usr/lib/libjail.pm"
+		"${ED}/usr/lib/arch/generic/definitions"
+		"${ED}/usr/lib/arch/generic/functions"
+		"${ED}/usr/lib/arch/linux/definitions"
+		"${ED}/usr/lib/arch/linux/functions"
+		"${ED}/usr/lib/arch/freebsd/definitions"
+		"${ED}/usr/lib/arch/freebsd/functions"
+		"${ED}/usr/lib/arch/irix/definitions"
+		"${ED}/usr/lib/arch/irix/functions"
+		"${ED}/usr/lib/arch/solaris/definitions"
+		"${ED}/usr/lib/arch/solaris/functions"
+	)
 
 	for f in "${FILES[@]}"; do
 		sed -i "s:/${D}/usr:/usr:g" ${f} || die
 	done
 
-	sed -i "s:/usr/etc:/etc:" "${D}"/usr/lib/libjail.pm || die
+	sed -i "s:/usr/etc:/etc:" "${ED}"/usr/lib/libjail.pm || die
 
 	dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION}
 }
diff --git a/app-misc/jail/metadata.xml b/app-misc/jail/metadata.xml
index 425dd3d2d460..26ee509dcdca 100644
--- a/app-misc/jail/metadata.xml
+++ b/app-misc/jail/metadata.xml
@@ -7,9 +7,9 @@
 		<bugs-to>https://github.com/spiculator/jail/issues</bugs-to>
 	</upstream>
 	<longdescription>
-Jail Chroot Project is an attempt of write a tool that builds a chrooted environment. 
-The main goal of Jail is to be as simple as possible, and highly portable. The most 
-difficult step when building a chrooted environment is to set up the right libraries and 
-files. Here, Jail comes to the rescue with a tool to automagically configures and builds 
+Jail Chroot Project is an attempt of write a tool that builds a chrooted environment.
+The main goal of Jail is to be as simple as possible, and highly portable. The most
+difficult step when building a chrooted environment is to set up the right libraries and
+files. Here, Jail comes to the rescue with a tool to automagically configures and builds
 all the required files, directories and libraries.</longdescription>
 </pkgmetadata>
diff --git a/app-misc/jot/Manifest b/app-misc/jot/Manifest
index 37851716c8f8..ce3c7353d095 100644
--- a/app-misc/jot/Manifest
+++ b/app-misc/jot/Manifest
@@ -1,3 +1,3 @@
 DIST athena-jot-9.0-3.src.rpm 25378 BLAKE2B 2d472d9d4c97d3d0da50d8b50120ee9c3460ed3d65656de51c419a7b9b6ea14e8755d35676b24199c1d6ed50b79d7d55753bc370b148546e12d57fab18473356 SHA512 b284121cbca3e98181285eac007b2c9133826c18157f9d1f983b83443f91a3e00c29b30ceb986fbbd86cda1541f0990b5d66579387b78143c250bb01453d7296
-EBUILD jot-9.0-r1.ebuild 506 BLAKE2B b7dda3f4cbe88b1b44bc665baaa78233c812601f01fb20fa191a4bf08f2ee50e3bf2d860703ce8da61d86d99dfb6fc5f952425dcc108a0e7e659e3f7958ae8b8 SHA512 5d110fe5f71f3c9b11dbb97c7c1178882708bfef9e4066c72e8cd72aa42c1abe150d7ce554ad073f7e3bc96da5cb3b9db59aa12c619f1afab123e7e07cf3f44d
+EBUILD jot-9.0-r1.ebuild 502 BLAKE2B 83a883edf0fad71cb763c81d2e63442eff8ce3e86d5e3f7877d0cc6b6fc97b0a445e766a1eeec37398d0a43558bd8c565e3e305a64549480a1f22f99b1f06bd0 SHA512 f5cc542c823d929a671043356601fda8adc9ce4c0db791f63dbf70c2221c037bbbabbf8f14bc97b83f45b291aae58b80667d479b1d9b9b50eae22384741c851b
 MISC metadata.xml 340 BLAKE2B 4dd8785f3735e5b6599af1687792c9e5a5265abf7a8591d78f7c09889956e9abcba7440ed16a06d9490880428de876e818a9a3da9a4642a5ebcd3cc8c204b245 SHA512 7bb1de852b98f75b4886a9973db26545f64cdf4fde83192ab73899b6761f481bfa8f5b89bf9cb6f2fbfe735241b1ed5a7909a40e2d0c29f4724c2f19c99d1a7a
diff --git a/app-misc/jot/jot-9.0-r1.ebuild b/app-misc/jot/jot-9.0-r1.ebuild
index 477b2f953e88..54ae2ec49a33 100644
--- a/app-misc/jot/jot-9.0-r1.ebuild
+++ b/app-misc/jot/jot-9.0-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit rpm toolchain-funcs
 
 RH_REV=3
-
 DESCRIPTION="Print out increasing, decreasing, random, or redundant data"
 HOMEPAGE="http://freshmeat.net/projects/bsd-jot/"
 SRC_URI="http://www.mit.edu/afs/athena/system/rhlinux/athena-${PV}/free/SRPMS/athena-${P}-${RH_REV}.src.rpm"
+S="${WORKDIR}/athena-${P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/athena-${P}"
 
 src_prepare() {
+	default
 	tc-export CC
 }
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 33809c021b4e..d8787dce1325 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -8,5 +8,5 @@ AUX jq-1.7_pre20201109-no-git-bdep.patch 540 BLAKE2B 745496f01bbc19ede3f5c17be4a
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
 EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69
-EBUILD jq-1.7_pre20201109.ebuild 2366 BLAKE2B 7cebf48801da2fc21e694835f6818fca6bab91650aaeb7af277cb7b38ed3a6e566c8e0f2c389a7ba7db59f7c63362ef47e91fd241ec65d2047210f2ea08fcb78 SHA512 baf4ace0ad546c8a04dbf784071891b2ea0de243a1e77f02855b8075c87e5d1942f8e994e1f98d317d50fd446d6cad976780914106d89484c8b373ddef985d20
+EBUILD jq-1.7_pre20201109.ebuild 2365 BLAKE2B a61d88a4b7fc5dabc8d74fd4b7839f5e02ea8fd157ea190a32ea1c93576b7feb079fadd96724ad21515de2e4e52d7ec5a846cb1aaf6529c98fcdff817399f352 SHA512 661b168574cb384fe1702f5bf0a7b15b5123d64e31623e8b6e2311dd529f8a48b6b6418f957cab035cba282e62825f009958878cc69c9f3cd90dc488aef315bc
 MISC metadata.xml 609 BLAKE2B 0ca0b4be60514d2a6ca287fab34e3e16574600fbaea6d924965242b27f25527f3ee3ad5b2c5ffbdb63662fba16511a9d70589990d4f4a506ecf7aba3e6541fbb SHA512 ca934d537070ea1ff8c7b6285870ee3aac60552b6b99e9fd7d361c157bb371926f532388d43e10570a27dbad008c5068ff4c9a17a05ffb14e7f95c84eeef19d0
diff --git a/app-misc/jq/jq-1.7_pre20201109.ebuild b/app-misc/jq/jq-1.7_pre20201109.ebuild
index 22f1f4f05b57..7d92e06d34ad 100644
--- a/app-misc/jq/jq-1.7_pre20201109.ebuild
+++ b/app-misc/jq/jq-1.7_pre20201109.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
diff --git a/app-misc/kanatest/Manifest b/app-misc/kanatest/Manifest
index a8567d117763..8bb9e0e6755e 100644
--- a/app-misc/kanatest/Manifest
+++ b/app-misc/kanatest/Manifest
@@ -2,5 +2,5 @@ AUX kanatest-0.4.8+gtk-2.22.patch 967 BLAKE2B d8e0802faeccdf32449ec49ff6f2a828db
 AUX kanatest-0.4.8-autoconf.patch 363 BLAKE2B 4f73332578adaeae1d9cd9368e377b76810e1b1c4c2e8fe02f2e647c15b95bd4bd860a24955b27b7ee223a321e0fa88386b45ae47f3786dc4f23a00e1ad7dd39 SHA512 25dff41e539ce5b758799df673735407c13560762a091a886e552c26be4dd7191bcd867523756e1f0b52066c13774ee16d5b1a32deb94e0355a9ae1396d0cf54
 AUX kanatest-0.4.8-cflags.patch 432 BLAKE2B 95da5c15032bf7476814da5b2a8d946f8a65f19e410618a59c3872122f2d9fd8499b1bc273941152034e0860f5700060eb96360012b20ab5a95c058f12bd250f SHA512 7d1d9ffda261a918d37b76fac63e641428c41ac225845cfe58b1bf5e4c8908447c56340f581b918ef55d34754f7b795d4cd0fb1eb03ea6327e43b719a95a367d
 DIST kanatest-0.4.8.tar.gz 302154 BLAKE2B b5bc8668f2526abef3ec576c5781b16d7c226f744613a38010125bcb1c977f0fc0b58809ba2a468a216f4b4d7b974e0d12693eea9754cc4a0ce75efcedfb1333 SHA512 c52a5e4104c17eae29f03f30abd7f003c83757e04298427112593603eab0edf7d7927b0567a053f2ea3b8aac66921546180c452d84ef6b3cdc2a361f14cbac47
-EBUILD kanatest-0.4.8.ebuild 956 BLAKE2B 8494f89142a2b7d0ffc8c38581e5f5b26c35aa8bf3e867ab5b09d132c495b5f3eee6dc99e3bf1ecea4109a64df78f20dabd89812e51c4fa9b5963f3a38d8701d SHA512 df15f6d6a70bbf03f6432d47967997a19bb0e31b1f6cbc4037a5580c1f6fee12f3312a2b8af1baa0010640922506997f00dc288d053151b2ffbf5b861cb83036
+EBUILD kanatest-0.4.8.ebuild 950 BLAKE2B a3e9df62e38ae30ce582c571cfbf965bc9f36efd25fa5203800b9cacdf056d24ba7bcbebe7486a4360c404f2c46f8d081a7de3bb6b7814dd562adbb683373914 SHA512 73bf94c9e66e22184feb62719a604e99e3333e19a2e07bd69e8d940fdf4a9de51d8652697b265ae5491f4ba557b271b9f6e2adc569ff3e8e763c65600e53b5e5
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-misc/kanatest/kanatest-0.4.8.ebuild b/app-misc/kanatest/kanatest-0.4.8.ebuild
index 903fce705d6e..d24f05ecee86 100644
--- a/app-misc/kanatest/kanatest-0.4.8.ebuild
+++ b/app-misc/kanatest/kanatest-0.4.8.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils gnome2-utils
+
+inherit autotools epatch gnome2-utils
 
 DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
 HOMEPAGE="http://www.clayo.org/kanatest"
@@ -11,14 +12,13 @@ SRC_URI="http://www.clayo.org/${PN}/${P}.tar.gz"
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.12:2=
 	dev-libs/libxml2:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-DOCS="AUTHORS TRANSLATORS ChangeLog README"
+DOCS=( AUTHORS TRANSLATORS ChangeLog README )
 
 src_prepare() {
 	epatch \
@@ -35,6 +35,14 @@ src_prepare() {
 	eautoreconf
 }
 
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/leave/Manifest b/app-misc/leave/Manifest
index 858a2268cd9e..b29cd39a6dfb 100644
--- a/app-misc/leave/Manifest
+++ b/app-misc/leave/Manifest
@@ -1,5 +1,5 @@
 AUX README 455 BLAKE2B 5fbc04499c0fd5b636edf37f54e64025c5ad0bbd13d4639559020f11887c45598343e383206e916eb73f59b581f5c78cdc05fa350be59cbc388002b1c639079b SHA512 86135607b70026c849d0851fe4c9aeadc2385eebe2be93949d519f566810916d26388a191c16a88d451d653cb2f6f6ce896948e9f07b9f994c02403898f28242
 AUX leave-fix-makefile.diff 453 BLAKE2B b3252ac7d1bcd41268dc525469b9a35624a0ad34dc4645ce122e59ef08275dba297960f3497a19570b35af7ccefc65454f697be748964da4b44043aad7fb4241 SHA512 a13da158f33c672c28e9e1b5fd169db9c7fcec55f533874ee237c529a4da21b9c68e400ff0f9a3e604c8b487d0548ed6a8693ebaa50b12b660a989f50b60d83a
 DIST leave-20100918.tar.gz 3477 BLAKE2B 2a709c653f2f853d50822fe83bb4f7894aea57ad3d0c15fb4ca4b5c3abccf63f0cd3344f379691e7721915e2bb5f6f1c61506f265e9cd6d74175ae4657e72376 SHA512 69df594800159bc80baeb3945aad144ceabe21bdac22ed2cd706b0ec610895dc82e58bae59ed0230eb97e909812bc90237b7c70e965125e7fa6767972a6259d1
-EBUILD leave-20100918-r1.ebuild 632 BLAKE2B 547942512b07bd3f3f5863fde9d7f71d128719525e02d513caab4ac1d4877102e05e5e3193f8b469d16cd832d50f6418fe5192f7c0808200827057336a7ec384 SHA512 cb4b211e94ec8d8f5c7b23f1f7910da8fb13a20afaddc649b44d8a8cc526b346e10efee3ddef90a8b96e6ecbb10e280c2ff28b0da6e466e9c05beacc82ef13c3
+EBUILD leave-20100918-r1.ebuild 622 BLAKE2B 59509c209b25c9417556ae3a5d15e05dc1ee928b4593c179728107a91ee48cdf4ce081fb2988a613dd7a6e05958eaa2c0be102ee4b1bcdb0f270840dac1d4aea SHA512 84ad71cc3eee6df07ef37a19786a6833c02f137e5013ce552638ba50ce32e748ea1a98d7fab73fbee9c0d71149ce39d43038d54e0c71e0c52a29978534306f86
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/leave/leave-20100918-r1.ebuild b/app-misc/leave/leave-20100918-r1.ebuild
index f9514aa08ae4..b5046a2f965a 100644
--- a/app-misc/leave/leave-20100918-r1.ebuild
+++ b/app-misc/leave/leave-20100918-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="FreeBSD command-line tool that reminds you when its time to leave"
 HOMEPAGE="http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/leave/"
diff --git a/app-misc/linuxspa/Manifest b/app-misc/linuxspa/Manifest
index 883dd2123c65..4368168b7746 100644
--- a/app-misc/linuxspa/Manifest
+++ b/app-misc/linuxspa/Manifest
@@ -1,4 +1,4 @@
 AUX linuxspa-0.7.1-compile-fix.patch 345 BLAKE2B 98594daf87751bab29059329768e7de15b5310afe6480438791751c209be10478a95ad0d9b8b6bd5fe748e990ab52753daf30bba622fce434e9017dc6b54bde2 SHA512 28ca542d3b72cbf7a5e33caa1a98b6a0d76a021359f5fa7222cc1328b938dffc5fdf4a39cf11d60c7247d269cce938239a1c0eff8e32b60835598a41290c07a5
 DIST LinuxSPA-0.7.1.tgz 45448 BLAKE2B a3181e823cf780e000bed2850786bda8045e5d4781ccd78fad420fd42109918aa5c8167ca4a1246795c8c98bea65b3fbe633d6fcea3d58770199c33eab81b5e8 SHA512 4b622330e88abe7d4b91392e75ef8d90902b731e051a7bdc93895aa82b6ae33a5e65bbe950c8d6884985cf8b7bdb1c3dd46b24d75f7c90a872e0a7758f929673
-EBUILD linuxspa-0.7.1-r2.ebuild 850 BLAKE2B 16f6b4dfe385f1bea3c4e2d565acea5bfb672f0c19fadab134d96b2f252dd09a4329acfc78d3f27dccc9281de211b8f2ce76c06cc84339cb92521e863f58ff06 SHA512 5f818484257272ea59c0df8ced170a37682b69c9e5b391081fe2264879e376866792d596c52c8f72a7ec890c74941b0a39ad08d27276d73e7b48581c9675f62f
+EBUILD linuxspa-0.7.1-r2.ebuild 840 BLAKE2B 6cd4bc24fe0e55121e048393f56838af4b47cd7f146ef7b8a49bbb4b08d253b7caeea5ba4510519b2a0788c9d5e7b60c6e0e316fdb5e1957bd6279b4b42d8e17 SHA512 3811791d0ab4d5d41c7c0875235ed43d7d283db0a3276a7fe48c73ba91089bcbd7e6fafa630eccd3215a6472569eb2be2954151dc619b5fa777df4b729bfc1e9
 MISC metadata.xml 250 BLAKE2B 323b829796ef95b2c3b28a76479a54bf8da53e2e2bb8a112e984cc405ff36de4e66632f9d42526dfec353f2eb7b36e2daa71cdfb473125e27656704f4fa8848c SHA512 37ec77d2258edb70beaf298e53680c0feda9191988bbdc537d8c661770a08cae897d337213730682a4854cd08d592b56a3be3c1247cece6bd9cc2cfbf6fc8963
diff --git a/app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild b/app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild
index bb0ccd7bc9df..efb3d532513c 100644
--- a/app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild
+++ b/app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN="LinuxSPA"
 DESCRIPTION="Linux Serial Protocol Analyser"
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 2ff9f9b4414e..cc5e127d7d6c 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -8,6 +8,6 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r3.ebuild 3846 BLAKE2B 77143c5af5cc855ec5a26aa31576101c4634a762ac99a17157c8ecb0b44ba7f1354f9c4a78484e99ea44b2ac1c6c77c703d3d7f632be4ab55fe19a336cfd0896 SHA512 9c3bd892362b3baa03db1570eea0ee497c34263218938721cf59914a07f97ecdba437482103e14901bbe0f0462a81b3363d693bc71a17b46f621d8572a04b0b1
-EBUILD lirc-0.10.1-r4.ebuild 3900 BLAKE2B 0d877b1c49bde58b015fff913fa03c00894bd814b302a774b5ac6b846a05798d02494a8b526514bffad32d7ca1dadb7badfb3c0b33aa04d587807a0eb679e532 SHA512 f9b2b8c1cad3491c6e56dbef33cbaa26ec856d94eef51e781f335275c3cfb469cda3c450f6a86b566d43da6f5f42b4db7df44037fcd5bea4433107b690964364
+EBUILD lirc-0.10.1-r3.ebuild 3839 BLAKE2B 87944043792b9073e8485e1253f93bec44bc29dc4406e426205a4f31c283d2fa372c7a3977915ecf2e350bc94802b396298496a51487a1023d3fa49692605763 SHA512 0e474403236a524148c4ad358108bbeff697ff83a9feea9ebade3f1b02a6d0f84cccf649169b3f199e9291f1306e0649b30b5d9845b4572b56a11712e672c002
+EBUILD lirc-0.10.1-r4.ebuild 3893 BLAKE2B d7a0b4ca2ddf368528e7865edc399e9bee9b028328ec7dcba50bdb9e90d8566c51aab85edd222ef90034006689ed98c7bd3969ce0e172f7381687bc7b1dbbde2 SHA512 373788d69845a78ab4e06f8551a0f10e731609a67a054fecb2c725fb0fe3e84c497ecc62265776137f4b5989f77ad5ce228dd49f25b97af8be938d306528050b
 MISC metadata.xml 817 BLAKE2B 2bf367849a5d41cc4a0b5827c41a45ec144e6c180295d8a2e00376a90b88f98fac655812bab6693464417553cb133cba59c982a84a76d54b0b94d302c0ca862e SHA512 3ed7ee97de581de955efc5120f20603dc29f4456cf2b51ec4391cf0811df33472d8b5924a52910ddf88b54733edbd7622ae5e86630bad1fc8527393f60f651b0
diff --git a/app-misc/lirc/lirc-0.10.1-r3.ebuild b/app-misc/lirc/lirc-0.10.1-r3.ebuild
index 160e4d70fece..9c104f0a5e32 100644
--- a/app-misc/lirc/lirc-0.10.1-r3.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_7 )
 
-inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+inherit flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
 HOMEPAGE="https://www.lirc.org/"
diff --git a/app-misc/lirc/lirc-0.10.1-r4.ebuild b/app-misc/lirc/lirc-0.10.1-r4.ebuild
index fcd0c35415d0..4ba35d6b3865 100644
--- a/app-misc/lirc/lirc-0.10.1-r4.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+inherit flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
 HOMEPAGE="https://www.lirc.org/"
diff --git a/app-misc/lockfile-progs/Manifest b/app-misc/lockfile-progs/Manifest
index f41c4179524f..4ae6cbe629aa 100644
--- a/app-misc/lockfile-progs/Manifest
+++ b/app-misc/lockfile-progs/Manifest
@@ -1,4 +1,4 @@
 AUX Makefile 1906 BLAKE2B 9c294471555a7dbe6d4342e8af7c744731c05ab22adc2192eb94da5e166c5a94705e328ca600055e722d8610869d20246fab741ef494f6e68d987c913e8054cb SHA512 c3ebd2f737fc664b37e235a0a68f50ebe80f00dbc522566520edb9827771344d022531c50283be5eaddd26d72295faae2676ef58838dd65797c74059719d826d
 DIST lockfile-progs_0.1.17.tar.gz 14833 BLAKE2B 3e67aee40a8700c330eb8dd1f9ae3973d50f733333825a3e176434586357e9bbb3db9d480f6a778d383c5dbaca03d3cde90291c7668e3b9bc425b93a0b53fa2b SHA512 9d912e1a518fe9c02054beb25c4591df6db55cc2fe9b7049fb85368465bd9ced9660bb0a809ee60a7effbdc6524613c40fa69d9d27fc2cfc964f41b7486c3596
-EBUILD lockfile-progs-0.1.17.ebuild 753 BLAKE2B 605e24eab8adf5c962a6eefc83e1866be1e7266083133344e55ad03b96d00fb6de6b28bf4d57e2aa911ed56714e9687160b6a8447fe95bd99e41d9f1dbd133f3 SHA512 1de9c1259833365c5e5744a2e04675f575db7828632eb7d27049485b66c3e294c398716f9adf676c7df62b194bb127dc957d5ed256e58af62c1aedc6fe8de6c5
+EBUILD lockfile-progs-0.1.17.ebuild 755 BLAKE2B bdf66bc97da6b91d02550ad7833453bd6e71c39033dac98b0cdee1415ce2e5e36ef7bf304c2163794cb3954a2f5bccd29d72f2282b6b7f831df1769488d88a7c SHA512 f7e8f099ae7e52ae573dbd90d428ed82a9047541097b1e7515160edfd8e21fa6a66cdde00095e15f39b8cd3eae307d337b70168a3d2ed3ee992736e0bc9119a7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
index 72d14a1b5177..98f2ac3db112 100644
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
+++ b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,12 +12,13 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm ~mips ppc ~s390 sparc x86"
-IUSE=""
 
 DEPEND="net-libs/liblockfile"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
 	# Provide better Makefile, with clear separation between compilation
 	# and installation.
 	cp "${FILESDIR}/Makefile" . || die
diff --git a/app-misc/logiops/Manifest b/app-misc/logiops/Manifest
index 4a34dca0e2ff..d42a6f2e93eb 100644
--- a/app-misc/logiops/Manifest
+++ b/app-misc/logiops/Manifest
@@ -1,6 +1,4 @@
 AUX logid.initd 509 BLAKE2B 950294904989544d1dea65f516493a986cbe8556a17e66f7be0cd33f19d514b38e820c61241d32785d6f3607d6f2c6a2af4270ab60dc72dfcc5a5ffa7b91779f SHA512 bf98e11c87d9486dd3f59494eae7fda9536bc6a90166bf8fa5c4226d189a86bc83aa9192d0b8f6e962cdc7d0f76e295d50c7c345f9ae445926670ecfe3b6830b
-DIST logiops-0.2.2.tar.gz 64350 BLAKE2B 84a8a0a7efd9c1cb87f78ad8bb685f75f34952a95879d93a4db6782dcc1b416a28402cd68affdea25c127013be801a819bbf91a614718ec413374c47c8282c34 SHA512 49803fe383b04a3c6cb6b1d094c73b29dd30534c8faad0ff1a0b3a35cf031c8b2751d1368d6bb2fcb1be84c83a97b70bc31a0fad1e898904b5371a210a6e88f5
-DIST logiops-0.2.2_p20200108.tar.gz 69366 BLAKE2B 3a688123c6167ec365c2f538c8f36818662bf63f3b1cd98e26bb4fd32eaa6e026b3e1b9e8dc116a6b6988d7abcd34fe7506329a9453bbd678bbf6b0ec53fd4f5 SHA512 5072f85f7c9c2505a8e3e5e089383a22c6ff659ece35f6761f77c2b3c7bd65a8ace7351cefb387a46c2d9e1a904573c96bf5ef3d11f12300b699c1df2ffae3d1
-EBUILD logiops-0.2.2.ebuild 1009 BLAKE2B 978cf4360d03423231df59a0526ba11b6b7b447a35d7a00f6980b4ef7479fb8b4fd41ab797fe9fcbb2ce5f7b81d0c65db13a1ce9ced9076d5176c92b64017f35 SHA512 6ec573e8478900821ded86c029d929958b7478833cccfe50f97555db5cd5edbcd465e4e14fa8f5e0abed719810c25393b15d5b88e8b51b3f1cfbc10ab68b964d
-EBUILD logiops-0.2.2_p20200108.ebuild 1109 BLAKE2B 5a787e9f202a925fe81f006c479633e657e5ce4acb0393b96746d3c0bf5cdafe2411a5ce0d2cf7b87c523d0edddf112d036d641ecfde187c191eaae91d28b525 SHA512 e03c90b287f842e1d4fc9359b22e69c7baf8f9a55c3505af4ee0fbc986e896c723a47016da1771f663d6377a8825e31dac1c570cf812a90a817123973d4979d9
+DIST logiops-0.2.3.tar.gz 69321 BLAKE2B f188c39bcf4a9d386a34a97612fed45db1bf93858717d4c6fc4ba08a78acd1ae020cef875421d4131cdc3f0219c848c67b7793888ac13e064539ebea293b4afd SHA512 5a7b7e76a89759a30e25da6117992e96d0a1a0db25af3d524d725e753fb5ce5fc67c8a5bdeb8b707a81f99eadfc8f24035a3a5e4544b1153bdedd2373a65173d
+EBUILD logiops-0.2.3.ebuild 1019 BLAKE2B 968df3c1258de104ee3b7e5fb6369e4dfdcc67d85293e23a42bc95e2eea374cc54a8ce0c77f81d51c88cef36f6a2af140f7454e9742264976d668751ea39d19d SHA512 b5434be70eab29dc35473479f4c127d5116d72dd5998000719936278f7d448939e85dd55d4b6a6bbe5bd8bc13ae0de3238595a315fcea138164130a91004bdef
 MISC metadata.xml 393 BLAKE2B aaec420ee83380a435e6e5757f404d4ac0a9d6827bd35daf57807de0b0603e88308e1ecadca6c522afeccec6bb2e73d12970f2e5df180961fd9527b54f40351c SHA512 86b4e72e338e102564be34f04bc29da0cc3b4f78b608e31596f79e74dd85e074dac1f75d90fa1da9ae4fc62dbff8a35efc23bc9d16a52f147337cef795115ba1
diff --git a/app-misc/logiops/logiops-0.2.2_p20200108.ebuild b/app-misc/logiops/logiops-0.2.2_p20200108.ebuild
deleted file mode 100644
index e0dd5d90a2b1..000000000000
--- a/app-misc/logiops/logiops-0.2.2_p20200108.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="a0687c8f18e312824ac04043c410b637ce89e371"
-
-inherit cmake linux-info
-
-DESCRIPTION="An unofficial userspace driver for HID++ Logitech devices"
-HOMEPAGE="https://github.com/PixlOne/logiops"
-SRC_URI="https://github.com/PixlOne/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
-
-DEPEND="
-	dev-libs/libconfig:=[cxx]
-	dev-libs/libevdev
-	virtual/libudev
-	systemd? ( sys-apps/systemd )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "TESTED.md" )
-
-pkg_pretend() {
-	local CHECK_CONFIG="~HID_LOGITECH ~HID_LOGITECH_HIDPP"
-
-	check_extra_config
-}
-
-src_install() {
-	default
-
-	cmake_src_install
-
-	insinto /etc
-	newins logid.example.cfg logid.cfg
-
-	newinitd "${FILESDIR}"/logid.initd logid
-}
-
-pkg_postinst() {
-	einfo "An example config file has been installed as /etc/logid.cfg."
-	einfo "See https://github.com/PixlOne/logiops/wiki/Configuration for more information."
-}
diff --git a/app-misc/logiops/logiops-0.2.2.ebuild b/app-misc/logiops/logiops-0.2.3.ebuild
index b5a8ed982127..f5d596d792a9 100644
--- a/app-misc/logiops/logiops-0.2.2.ebuild
+++ b/app-misc/logiops/logiops-0.2.3.ebuild
@@ -7,7 +7,7 @@ inherit cmake linux-info
 
 DESCRIPTION="An unofficial userspace driver for HID++ Logitech devices"
 HOMEPAGE="https://github.com/PixlOne/logiops"
-SRC_URI="https://github.com/PixlOne/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/PixlOne/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-misc/logitech-applet/Manifest b/app-misc/logitech-applet/Manifest
index 3ecf7b1f7da9..a30cb3cbace1 100644
--- a/app-misc/logitech-applet/Manifest
+++ b/app-misc/logitech-applet/Manifest
@@ -1,5 +1,6 @@
 AUX 40-logitech_applet.rules 251 BLAKE2B f29b2df9ca3427e4bfbe993a9d92ce39df25aefc13d4698418a13530e60f2c57c80ae9f4f2a3baecc1ddd2da2178d5be5f68d354f44fb88a5ce357e05d510c4b SHA512 689058ab61508c342a29dea2de620473453e9237c33cc0119b2c22dc502b6c345d8e42d7769c7cc246c75efbbfa91bd2fdaea15c40ce89468224274b20b80670
+AUX logitech-applet-0.4_pre1-configure-error-handling.patch 594 BLAKE2B fc1484e8e35e79f7d6e27ba51ec9093f11c48974a59ce20d01032d978ab3786a8ef44533dd8b84b63ed4713d47de052ce589b3f3a99bb3dff4364454520f7780 SHA512 b67e2ca4fffd907168f75764d5cdfd1eba10e2137365b970b74bf2bddac57b0a8733f3f87e222eaf945023a6c9405eb09775c17cbaffc1fb904b1e06ff16e1bb
 AUX logitech-applet-0.4_pre1-mx300-mx518.patch 5815 BLAKE2B 79c277fd37a439ba3441e0414437004443967c06db6d5615a47da134ddf2daa8b4ffbde43aa3a210e6a76e8125def42fd033fe706ed85a937249db6feb5feb86 SHA512 5b613821ed6c88eed99c36bf1d6df5c27183e41e176082247752970f372aef0e299e729aaeda508ef1cfe323a0e3ce368d3ca1a13a6836278458a531531883ff
 DIST logitech_applet-0.4test1.tar.gz 75783 BLAKE2B 71ac28c1efab922c5d48db00be53eb0c9200ea05972d1fc1a9551f3963fd9d4be46e7a66ebabb873873e1c0e89486e0e32ea7810cafb3eb0ade67cf399c46508 SHA512 64389b365d9d3473bf3ec027c7d9ee34cbdcddf9abb6bfabf4e771a255dade80e6758b7a997da3eaf23c19f1bd4559e79fb199e9f62e0f2ad1af92eab4b23789
-EBUILD logitech-applet-0.4_pre1-r3.ebuild 701 BLAKE2B f24c0721bfd186e56f8432a795d2f9e1789122a36d1b8b85e439a7ee0459f653777974f4ed271b4c0836f80aeae741cd5efa310f779925f7a72fa8921fb544a6 SHA512 1ff40051c70f4b54beb8a396628a00bbe738936f6efb180e3a7228a71c2ecaf8658091e7c93670f7a40623eaedf2d813fa8e2c851a42a485ea9969ea9b484f9a
+EBUILD logitech-applet-0.4_pre1-r3.ebuild 851 BLAKE2B 34e6213378a443a4af39475ac562fd9bab46f3d829247611f432e24c96efe0a2cf0ba46115d9dbab3f0b3ebf6246d3e925514b8a4217058b91f426d6744b46b0 SHA512 8cd14c25828edef0a7c9477f07c25732cef7ed7b7f481409ce04afa7c9c7ea10dba7635e983d28cc702af1da60e822f3d1095b95a4db27d74999522fb561470a
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch
new file mode 100644
index 000000000000..1373a1010c1f
--- /dev/null
+++ b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch
@@ -0,0 +1,20 @@
+--- a/configure.in
++++ b/configure.in
+@@ -24,7 +24,7 @@ if test "$LUSB" = "no"; then
+   echo "   http://libusb.sourceforge.net"
+   echo "   or use the --with-libusb-includes option, if you have it installed"
+   echo "   in an unusual place"
+-  exit
++  exit 1
+ fi
+ AC_CHECK_LIB(usb, usb_init, LUSB="yes", LUSB="no")
+ if test "$LUSB" = "no"; then
+@@ -33,7 +33,7 @@ if test "$LUSB" = "no"; then
+   echo "   http://libusb.sourceforge.net"
+   echo "   or use the --with-libusb-libraries option, if you have it installed"
+   echo "   in an unusual place"
+-  exit
++  exit 1
+ fi
+ 
+ AC_OUTPUT(Makefile)
diff --git a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
index 54066326d6cc..ed10f90c5788 100644
--- a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
+++ b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
+
+inherit autotools
 
 MY_P=${P/_pre/test}
 MY_P=${MY_P/-applet/_applet}
@@ -10,6 +11,7 @@ MY_P=${MY_P/-applet/_applet}
 DESCRIPTION="Control utility for some special features of some special Logitech USB mice!"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,10 +20,18 @@ KEYWORDS="amd64 x86"
 DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-mx300-mx518.patch
+	"${FILESDIR}"/${PN}-0.4_pre1-configure-error-handling.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-mx300-mx518.patch
+	default
+
+	mv configure.{in,ac} || die
+
+	# For error handling patch
+	eautoreconf
 }
 
 src_install() {
diff --git a/app-misc/logserial/Manifest b/app-misc/logserial/Manifest
deleted file mode 100644
index 8fbd835559b3..000000000000
--- a/app-misc/logserial/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX logserial-0.4.2-gentoo.patch 704 BLAKE2B 7591caa786188f9ba051b3e43462c85a096f5d09cad3b7992f03af7329d31e96600d96d450107a6dc3e6ae19cf7a78030e99119a6d4eb3ac6f36c1f1ca2e1008 SHA512 53874fd3d8c1e15af3614f779c1a85c53d43218c13ac508166dfca8c9012d7e251d9fbb3fe22cbcd2167594848ebff5f2e9f48dcad11c153f18abdf2e46233bc
-DIST logserial-0.4.2.tar.gz 9697 BLAKE2B d32b03e50459a65d0072aa961421c6aaef67483d16d6e95b6071fe805f69b79fa1b3a63fb8ce5945fa19f3c912fd6de051549da3edbb2814b7eb4c68c036cc19 SHA512 63784f5f3b84c1fbf85e0b5295ab33c427626562d880de3202b792ad354f93d645d4c2ddb7dc38d48ee25a15df51f1544aa0abea45fccef333553492ed86e9ad
-EBUILD logserial-0.4.2.ebuild 583 BLAKE2B fcd1d9558c8147632dc0f7e86408a52ee57af6b007dbed3f1b7408295e1ccd335a2b366e0db14ed812c4deec952015721e6d5034cdc127e187b378edd51ab2fd SHA512 390d0561a8b6e6177ba66468f850fcde1e4ff63086f5d061674bd8bdad0f94f0d10873d73e361caa6e84daccde05df2944010a2e5272fedeb2fd1ca65b7da737
-MISC metadata.xml 407 BLAKE2B c580472939660c935fc938ce3a21f41301f844604a862c1e20a256dcf2c003897845536a17f2ea9019a0c44dfeda8dba59c7ea433513509f2e8b143bc7a1b5aa SHA512 109d8f5e8c6c3a3a2c76d65af1a9c677742e1c505edf11b8d9b4c5e917072de9feab9a1e836e4756d9020a20297fb46b1b95b6421066f9fd9fdf4dd8786e8ab9
diff --git a/app-misc/logserial/files/logserial-0.4.2-gentoo.patch b/app-misc/logserial/files/logserial-0.4.2-gentoo.patch
deleted file mode 100644
index dd594e34f76a..000000000000
--- a/app-misc/logserial/files/logserial-0.4.2-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur logserial-0.4.2.orig/Makefile logserial-0.4.2/Makefile
---- logserial-0.4.2.orig/Makefile	2003-04-12 19:41:07.000000000 +0300
-+++ logserial-0.4.2/Makefile	2009-07-21 19:39:18.000000000 +0300
-@@ -5,22 +5,20 @@
- # FUNCTION:
- # Makefile for logserial
- 
--CC=gcc
-+CC ?= gcc
- 
- NAME=logserial
- VERSION=0.4.2
- 
- OBJS= logserial.o sysdep1.o
- 
--OPTIMIZE= -O3 -m486 -Wall -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS
--DEBUG_FLAGS= #-g 
--
--CFLAGS= $(DEBUG_FLAGS) $(OPTIMIZE)
-+CFLAGS += -Wall
-+CPPFLAGS += -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS
- 
- all: $(NAME)
- 
- $(NAME): $(OBJS)
--	$(CC) $(CFLAGS) -o $(NAME) $(OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -o $(NAME) $(OBJS)
- 
- $(NAME).o: $(NAME).c
-     
diff --git a/app-misc/logserial/logserial-0.4.2.ebuild b/app-misc/logserial/logserial-0.4.2.ebuild
deleted file mode 100644
index 62f267f92996..000000000000
--- a/app-misc/logserial/logserial-0.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A tool for logging raw data from a serial device"
-HOMEPAGE="http://www.gtlib.cc.gatech.edu/pub/Linux/system/serial/logserial-0.4.2.lsm"
-SRC_URI="http://www.gtlib.cc.gatech.edu/pub/Linux/system/serial/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin logserial
-	dodoc CHANGELOG README
-}
diff --git a/app-misc/logserial/metadata.xml b/app-misc/logserial/metadata.xml
deleted file mode 100644
index b179f1fc8fab..000000000000
--- a/app-misc/logserial/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Package for loging incoming bytes on asynchronous serial ports. It was
-		written for loging calls on our telephone central, but you can use it
-		for any devices connected to serial ports. 
-	</longdescription>
-</pkgmetadata>
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index c914a73e6942..9f17ca09b1b6 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,5 +1,7 @@
+AUX mc-4.8.26-file-seccomp.patch 4794 BLAKE2B f6b2ba15b2f7f57aa620fc5745816be434d357f8b4023197691f8827c1e5d6555fa542e0aa3b471036c7d60a3ab5761d261e62d3fc599fd14593c82c4cd238dd SHA512 a65b414dfbb4f934351a87496e012131b1e811cd1fd21a91c167e8db212ee7485f097d3a5a4faed2d904e50e34cb7488a6ffbbcb41bf341167f3837f891e85b5
 AUX mc-4.8.26-shadow-crash.patch 936 BLAKE2B 65bf04b92a193de03457f95b94c7eff7677cedc0886fff4d934bd4e3bf94babf3650d5e56ad54eb73e41791e67089c9a65b6628615b87609035e6b823fd317e6 SHA512 8874e98bc5a9b032ff094d3042c71bf279f42c71840920ac3221011ae991fb199050e60d47ee8a65ef82bc5b64e4c14233fd3909c49de807fabf771a953a6c6a
 DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
 EBUILD mc-4.8.26-r1.ebuild 2841 BLAKE2B ba0cf54b91292f2184b0e05203d0a407efe28eb13ff378ecd0b881bf46506d43d4a52e1d8d2218f2e864fcfad7167dbdbc0ad19030c3988fac6fd2075eaf238f SHA512 40e67c95d0a0bcf350d25a36edcc00bb850152328794b5a0a03a4243b43a31c82f910e11a10e15ef0eb40bf3f0845454802af223fb20b75fcac24aaad4ebdf17
+EBUILD mc-4.8.26-r2.ebuild 2973 BLAKE2B e87bfc76b10345892c521a9295e522ac46df4ef04e2e34cf9da19619cb236d2b919ac26f20a8c623f5e3fd5c39ba510f04bb8c13a2545c5e0d28a8e290c524fb SHA512 00a6084639337c55f44b313e529f56c6e03d398dec349cdb856c4335ca3df48351058a54d7dc3c5824c1bfa3b7a5e94ac8d3649884a30734a0189f3cf42a5bd9
 EBUILD mc-9999.ebuild 3039 BLAKE2B 080662107814c15a4889a73c9f3b9338a305fb10b5ae2369acfb6f2f818d63215e8e176af0d8fed2fda6a47f83d8de45bbd37d6c0c4be108e3a8dec8bcb9203c SHA512 e107269656f99702c1c544e161dc0a36663798d4bb3798213a5d05d6cca1a0c072f487d833a5cfe2f2b48abb983ed5ace4041258661bd61dcff0f8d3ed0d9cd4
 MISC metadata.xml 773 BLAKE2B c7f3bb9bfb49c380a0493eabadcedec215df8696c5d52433aaccdffa0bf5ba3b89c77c291e19ed88c5ac29718e34eece1d3dabbc3ba6c1ec7862970f3900e204 SHA512 c5c0ca5a41a78cf746e14264b291f81ccffaa9c34a4149d27a9293cca8d304cb4844c07979b31218b250c3baeaccef2cba529c2ab43e81dc5552dca34ddbd4da
diff --git a/app-misc/mc/files/mc-4.8.26-file-seccomp.patch b/app-misc/mc/files/mc-4.8.26-file-seccomp.patch
new file mode 100644
index 000000000000..0a36f47f3a40
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.26-file-seccomp.patch
@@ -0,0 +1,142 @@
+https://bugs.gentoo.org/776988
+https://github.com/MidnightCommander/mc/commit/1ed638d66cf803f69ac12ee80a72d217f2146e43
+
+From 1ed638d66cf803f69ac12ee80a72d217f2146e43 Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Tue, 16 Feb 2021 16:29:51 +0300
+Subject: [PATCH] Ticket #4180: fix zip handling.
+
+After 8857423e4ebb770b6f0ea3103abf5d35c85fcbe8 zip archives opened with
+an error:
+
+    file -L -z archive.zip: Bad system call
+
+This caused by using /usr/bin/file with -z option, because seccomp (a
+security sandbox) doesn't allow it..
+
+Solution: use -S option together with -z one.
+
+The file command accepts the -S option since 5.33.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ configure.ac          | 66 +++++++++++++++++++++++++++++++++++--------
+ src/filemanager/ext.c |  7 +++--
+ src/setup.c           |  2 ++
+ 3 files changed, 60 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5f372dc3f5..f2351c99ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,23 +115,65 @@ fi
+ AC_SUBST(MANDOC)
+ AC_SUBST(MAN_FLAGS)
+ 
+-dnl Check for -L option to file
++dnl Check for -z, -L, and -S options to file
+ AC_CHECK_PROG(HAVE_FILECMD, file, true, false)
+ if $HAVE_FILECMD; then
+-    AC_MSG_CHECKING([for -L option to file command])
+-    AC_CACHE_VAL(mc_cv_filel, [
+-    file -L . > /dev/null 2>&1
+-    if test $? = 0; then
+-	mc_cv_filel=yes
++    dnl Don't use the file command if it doesn't accept the -z option
++    AC_MSG_CHECKING([for -z option to file command])
++    AC_CACHE_VAL(mc_cv_file_z, [
++        file -z . > /dev/null 2>&1
++        if test $? = 0; then
++            mc_cv_file_z=yes
++        else
++            mc_cv_file_z=no
++        fi
++    ])
++    AC_MSG_RESULT([$mc_cv_file_z])
++
++    if test x$mc_cv_file_z = xyes; then
++        AC_DEFINE(USE_FILE_CMD, 1, [Define if the file command accepts the -z option])
+     else
+-	mc_cv_filel=no
++        AC_MSG_WARN([The file command doesn't accept the -z option and will not be used])
+     fi
+-    ])
+-    if test x$mc_cv_filel = xyes; then
+-	AC_DEFINE(FILE_L, 1, [Define if the file command accepts the -L option])
++
++    if test x$mc_cv_file_z = xyes; then
++        dnl file is used; check -L and -S options
++
++        AC_MSG_CHECKING([for -L option to file command])
++        AC_CACHE_VAL(mc_cv_file_L, [
++            file -L . > /dev/null 2>&1
++            if test $? = 0; then
++                mc_cv_file_L=yes
++            else
++                mc_cv_file_L=no
++            fi
++        ])
++        AC_MSG_RESULT([$mc_cv_file_L])
++
++        if test x$mc_cv_file_L = xyes; then
++            AC_DEFINE(FILE_L, "-L ", [Define if the file command accepts the -L option])
++        else
++            AC_DEFINE(FILE_L, "", [Define if the file command accepts the -L option])
++        fi
++
++        dnl The file command accepts the -S option since 5.33
++        AC_MSG_CHECKING([for -S option to file command])
++        AC_CACHE_VAL(mc_cv_file_S, [
++            file -S . > /dev/null 2>&1
++            if test $? = 0; then
++                mc_cv_file_S=yes
++            else
++                mc_cv_file_S=no
++            fi
++        ])
++        AC_MSG_RESULT([$mc_cv_file_S])
++
++        if test x$mc_cv_file_S = xyes; then
++            AC_DEFINE(FILE_S, "-S ", [Define if file command accepts the -S option])
++        else
++            AC_DEFINE(FILE_S, "", [Define if file command accepts the -S option])
++        fi
+     fi
+-    filel=$mc_cv_filel
+-    AC_MSG_RESULT([$filel])
+ fi
+ 
+ dnl Only list browsers here that can be run in background (i.e. with `&')
+diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c
+index 4e6f10c6c5..d6a09df7bb 100644
+--- a/src/filemanager/ext.c
++++ b/src/filemanager/ext.c
+@@ -71,10 +71,11 @@
+ 
+ /*** file scope macro definitions ****************************************************************/
+ 
+-#ifdef FILE_L
+-#define FILE_CMD "file -L -z "
++#ifdef USE_FILE_CMD
++#define FILE_CMD "file -z " FILE_S FILE_L
+ #else
+-#define FILE_CMD "file -z "
++/* actually file is unused, but define some reasonable command */
++#define FILE_CMD "file "
+ #endif
+ 
+ /*** file scope type declarations ****************************************************************/
+diff --git a/src/setup.c b/src/setup.c
+index 77c07649d5..2ef07f2569 100644
+--- a/src/setup.c
++++ b/src/setup.c
+@@ -317,7 +317,9 @@ static const struct
+     { "old_esc_mode", &old_esc_mode },
+     { "cd_symlinks", &mc_global.vfs.cd_symlinks },
+     { "show_all_if_ambiguous", &mc_global.widget.show_all_if_ambiguous },
++#ifdef USE_FILE_CMD
+     { "use_file_to_guess_type", &use_file_to_check_type },
++#endif
+     { "alternate_plus_minus", &mc_global.tty.alternate_plus_minus },
+     { "only_leading_plus_minus", &only_leading_plus_minus },
+     { "show_output_starts_shell", &output_starts_shell },
diff --git a/app-misc/mc/mc-4.8.26-r2.ebuild b/app-misc/mc/mc-4.8.26-r2.ebuild
new file mode 100644
index 000000000000..9bd2fbe7d5ed
--- /dev/null
+++ b/app-misc/mc/mc-4.8.26-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shadow-crash.patch
+	"${FILESDIR}"/${P}-file-seccomp.patch
+)
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# patch touches configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 366c6ac09c6f..7f6020d018ca 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6
-EBUILD mime-types-9.ebuild 530 BLAKE2B db9e18d84fe28a427504fe8e857c0c15201c34933867c2b378937720feb4c8c7e9a023a2826d4298c715e476035c4a162b6db6a908d14f4e686051fcf78290a4 SHA512 3fb95b57ff741aeb234fad3116d28bbf40a588f344ebe018ed1a010a012ffad325df572abc86068e7883cb56e2270d7a6a4f2be1d972bf7df4e3144dc9e37138
+EBUILD mime-types-9.ebuild 531 BLAKE2B 947831854c9ac5abdad5073c25173347d6d3d6e28c1167e67a61e23a5c59f409bfcb91f8b5be5318b61ef58f66c481f6ea4aec6b7324e7fdb844e6d6e59519e5 SHA512 17894f9313fb1e02b6762b58e4ca33f334942f468a872df0d23273f66e4e5d33405d119e813ee7a25563cd86c55069bba77ac74a74b08d6a6786f41556a44bc1
 MISC metadata.xml 243 BLAKE2B 01e59967c1ef8c4287aa399e0b64a651d273858118726001d0cc8c9450f219696f7827ede0f3613b0947613186bd98b31629a5dad3a9e67b0517b37d9e08843f SHA512 563d66eeb96298c8537589586287f9c8c6819985c37609ce4a26e0ecab1ce19192f99a73f63a4577193f90a371ff00ed2a15254a25be6061516b73d0c1141278
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index 0dbc34536408..aff82ac6baf1 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 src_install() {
 	insinto /etc
diff --git a/app-misc/mmv/Manifest b/app-misc/mmv/Manifest
index 73a47229d108..b02af65ec3b1 100644
--- a/app-misc/mmv/Manifest
+++ b/app-misc/mmv/Manifest
@@ -1,6 +1,4 @@
-DIST mmv_1.01b-18.debian.tar.gz 13463 BLAKE2B db67247bddd38580401d8b1a18aa9ce82af42a994bfe60141066aa08e19a01f35903cc1d8184cb4271ebe2a4a187607a7c5a6a750c121caafdf71fdc0ccb8896 SHA512 3543aff53c67cab00689d4c8b778447c976a7860a569bd51f74534bec8bd3b67b9e12743bd03bc6fda930748abddd12e16f1965686cbce04bd48bf191fc4127b
 DIST mmv_1.01b-19.debian.tar.xz 12436 BLAKE2B d75251528cfdbfc343880450481973dad932707c00af38b1bf4b74f917f3e74b0b60aea2aa5d65b8ee63edf8beea61bedd6fa1859f109a7c3e02eabbd0a1bbeb SHA512 86fb93180a8645a40f45d0b9331693f6a86fbe1a378857350c9573e45261e008ab2154836df09a4f569bc35b6601d0317a0f1f1a901530e26e391c3a25c666f5
 DIST mmv_1.01b.orig.tar.gz 25656 BLAKE2B 4e3c7c27831fb5aeeb09461116330a993998da510b32a7ba3b1151c0d14a336eab7cf37bc3ac91720f38fb41258a60488e5d066b152d0c717f5413f8514d9026 SHA512 4bf4e096b930bdde225ba5de761e968af3aed33dc13194b1a1a79078cd27e158b04aae131b5167cf5f844e35355d67359443cd598db22da15a5af06752438917
-EBUILD mmv-1.01b_p18-r1.ebuild 1303 BLAKE2B e744a1dbc990b5013217089d13c80ae61be6e3a98ccf10080790dededc54cdab9bbbc0effab383c75b22cbe0503fdad35f9e5588b37180e85f3eee10cc9966b3 SHA512 c38171d3bd82203645cff3e4dd34e838f120af81f489ce52d5c39f579205e24ab165c6f78ff738b2ae827550e259f67513ae7df40254531dfa01e920ef08b7b8
-EBUILD mmv-1.01b_p19.ebuild 1397 BLAKE2B ce5b1fc79756c5490728013e12adf3fed1600d6691a005cc267c4ad903e43dec912d75ef64b3fb7c5a47b79bbc9605292b33b29d1fee70c61a41678fa0956897 SHA512 cd06a0609340dd324d8d654823ecc3fe03d34f8b13a9b938e16165d1efe2fe81f6332b86856dfd468c904ad32f30ffcf1d1464e637648c11239b982379b36c8b
+EBUILD mmv-1.01b_p19.ebuild 1394 BLAKE2B 2ae960e0a76972697d6bf7ad082d1be16163b9b13cbea451a1503ca14b3e2e7469eab5abc35fc4ba1d2a89672f34bd100fe9aac80e7d93b8f6f4f87bb670276c SHA512 b7bd9215c74a34d00d64c4dc5a4c9a222dc6f366254ddafcf1f578471f4ffc09b959803caefd75bae198c0d7a507535b8b04b2d6e2f3543a87b0dedb237cae06
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/mmv/mmv-1.01b_p18-r1.ebuild b/app-misc/mmv/mmv-1.01b_p18-r1.ebuild
deleted file mode 100644
index d9873bba502f..000000000000
--- a/app-misc/mmv/mmv-1.01b_p18-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DEB_PATCH_VER=${PV#*_p}
-MY_VER=${PV%_p*}
-
-DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns"
-HOMEPAGE="https://packages.debian.org/unstable/utils/mmv"
-SRC_URI="
-	mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}.orig.tar.gz
-	mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}-${DEB_PATCH_VER}.debian.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-S="${WORKDIR}/${PN}-${MY_VER}.orig"
-
-src_prepare() {
-	default
-	epatch "${WORKDIR}"/debian/patches/*.diff
-}
-
-src_compile() {
-	# i wonder how this works on other platforms if CFLAGS from makefile are
-	# overridden, see bug #218082
-	[[ ${CHOST} == *-interix* ]] && append-flags -DIS_SYSV -DHAS_RENAME -DHAS_DIRENT
-	[[ ${CHOST} == *-interix* ]] || append-lfs-flags
-
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin "${PN}"
-	dosym "${PN}" /usr/bin/mcp
-	dosym "${PN}" /usr/bin/mln
-	dosym "${PN}" /usr/bin/mad
-
-	doman "${PN}.1"
-	newman "${PN}.1" mcp.1
-	newman "${PN}.1" mln.1
-	newman "${PN}.1" mad.1
-
-	dodoc ANNOUNCE "${WORKDIR}"/debian/{changelog,control}
-}
diff --git a/app-misc/mmv/mmv-1.01b_p19.ebuild b/app-misc/mmv/mmv-1.01b_p19.ebuild
index c5125cc5d68f..d61f2fc9ff90 100644
--- a/app-misc/mmv/mmv-1.01b_p19.ebuild
+++ b/app-misc/mmv/mmv-1.01b_p19.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}/${PN}-${MY_VER}.orig"
 
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index ffed501e1d0b..582764f9dcad 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -4,8 +4,10 @@ DIST mosquitto-1.6.10.tar.gz 613060 BLAKE2B 8c148479f79a1aa8a9abdb2bd386dbf9466f
 DIST mosquitto-1.6.12.tar.gz 618718 BLAKE2B 4e7744d212f0fda980e485d102702547e76b39e4b98904afb05b372af8deba4eaaec2186dc61e8b218808a2435ed81f5fa621ebf41d5877c25b091ff64e8eb8b SHA512 68cd2e4aa14254c0332ad78eac1f885e0e4e9f2332540d3778b8c7df096db7618b8467b5bb25f70ddc3306d01dd36eb9a9e2bf2738da77e196c7a1ccaed869d2
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
 DIST mosquitto-1.6.9.tar.gz 610934 BLAKE2B 59d126a2b26be895f078be0c0dcf3513e56fc135dc956d9361ee191bd7ad6972b4692cd1824ad7a4e86a982df70c1e198e937f9ab23bf778069690098f87c815 SHA512 f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7
+DIST mosquitto-2.0.10.tar.gz 759106 BLAKE2B 9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c SHA512 c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174
 EBUILD mosquitto-1.6.10.ebuild 2889 BLAKE2B 592c7c7439864cdc787843d07862f45aee57532f6a4d15840daeb85ccb8c4b635281832a9b1dc6e1e3b405d71f6e028eda56add7e4e71f4aafa645ee3bda2b54 SHA512 8ddc2378385f2f1da78628edcd41e43f541d5fa03574b82ae6bd766b46f0cee87f1f6edcb893c861536bba306a5aa9454841298cbdc0982fdc952f1c555c40b7
 EBUILD mosquitto-1.6.12.ebuild 2887 BLAKE2B eee9bb7f59b73e59671478cf8099523a565c6539781f4092527b05563a6e7377abb66fa09bd8d675adebbe34e1126cc7ce3afbfc6538277d48797456190b5b26 SHA512 1b7f43fb0a47aff7de08cf12a86e5225d4f6830f480e4ad4c7f8d28aa8582dd74a4575798844ed857aabd575d13b4f2355597ff7df435fe0e387e3388f6e320a
 EBUILD mosquitto-1.6.8.ebuild 2842 BLAKE2B 9c3edb2fd1801aaf523029260906bf36d45a30f8e9170f2530e3e142cfa17e0ab0f1067d40540237e0d4995a5fd98c08272aef92a9d9262226296a4656d1abcd SHA512 b4654f1e54c557188967957e62b4def70a3766948a38a7a7d34f70fbd3aa00944feddb9070ccbcbbdcf93cc39cd6bd2bc2b71700b5476e885e7ae79ffa866775
 EBUILD mosquitto-1.6.9.ebuild 2882 BLAKE2B 3fc6ffca0938013e28973b90dd24be274d31a0699e888ba034a77906ed2c97044d9219a91487cd9ec4d19d07c92b2db533cc1d447f5aeb1e010b1e85911203f0 SHA512 557e802c11ffa1ecdc53da365d3a2773997a4571ecb529f1c8a1ec5e07c63ae0f3790e66a7b1e9ab8fffbf197c2f3490558ffcfc5e8c327c05830e10c812f25e
+EBUILD mosquitto-2.0.10.ebuild 2649 BLAKE2B 63156d495dd1ef8da4b6f9539ed7246c2a1149811e0fa7cfe4cb60a4f25852130391a639212f9d907f9c0685a72571439b67eef729746f8846e273c218c6bbed SHA512 5003ea615b389f83b4773e2eb8b0d3d36c3412f095fa64be8f927f700efc2742b747b5c8146b80051d80325a2943fa6dc80ca91cbb2df13e1fa25c805d6bf8f8
 MISC metadata.xml 611 BLAKE2B d40adc8754f0c20b5c0634b75f12df935d246c67d3a9edccb8db262888b5dd6154fbfc21c270b854e61bb0389c625e3608623dcec519e05badc96f1bbdadf38f SHA512 93161a58861a9ea1ab372495fb66bb695d3be5e59dea96418aaf1f5fad936827d7d65a154711ef8c6c9fc752a69fef20c90741ac2627dfdefb8d38d63a3121fb
diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
new file mode 100644
index 000000000000..40fa1801f2cc
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/ https://github.com/eclipse/mosquitto"
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+	acct-user/mosquitto
+	acct-group/mosquitto
+	dev-libs/cJSON:=
+	srv? ( net-dns/c-ares:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}
+	test? ( dev-util/cunit )
+	websockets? ( net-libs/libwebsockets[lejp] )"
+
+_emake() {
+	local LIBDIR=$(get_libdir)
+	emake \
+		CC="$(tc-getCC)" \
+		CLIENT_LDFLAGS="${LDFLAGS}" \
+		LIB_SUFFIX="${LIBDIR:3}" \
+		WITH_BRIDGE="$(usex bridge)" \
+		WITH_PERSISTENCE="$(usex persistence)" \
+		WITH_SRV="$(usex srv)" \
+		WITH_TLS="$(usex ssl)" \
+		WITH_WEBSOCKETS="$(usex websockets)" \
+		WITH_WRAP="$(usex tcpd)" \
+		"$@"
+}
+
+src_prepare() {
+	default
+	if use persistence; then
+		sed -i -e "/^#autosave_interval/s|^#||" \
+			-e "s|^#persistence false$|persistence true|" \
+			-e "/^#persistence_file/s|^#||" \
+			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+			mosquitto.conf || die
+	fi
+
+	# Remove prestripping
+	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+	# Remove failing tests
+	sed -i -e '/02-subpub-qos1-bad-pubcomp.py/d' \
+		-e '/02-subpub-qos1-bad-pubrec.py/d' \
+		-e '/02-subpub-qos2-bad-puback-1.py/d' \
+		-e '/02-subpub-qos2-bad-puback-2.py/d' \
+		-e '/02-subpub-qos2-bad-pubcomp.py/d' \
+		test/broker/Makefile || die
+	sed -i -e '/02-subscribe-qos1-async2.test/d' \
+		test/lib/Makefile || die
+
+	# Extend test timeout to prevent spurious failures
+	sed -i -e 's/SUB_TIMEOUT=1/SUB_TIMEOUT=3/' \
+		test/client/test.sh || die
+
+	python_setup
+	python_fix_shebang test
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc README.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+}
diff --git a/app-misc/mouseremote/Manifest b/app-misc/mouseremote/Manifest
index 5cc5f502216b..b1cbc02bbda3 100644
--- a/app-misc/mouseremote/Manifest
+++ b/app-misc/mouseremote/Manifest
@@ -2,9 +2,7 @@ AUX mouseremote-0.90-fix-warnings.diff 631 BLAKE2B ca0d5dfc9cdcb51a9a7426be22011
 AUX mouseremote-0.90-gentoo.diff 1130 BLAKE2B f219bba9912a620a02a91881e6bce1d0558dfec032d1b926b4be7439b25a224a8655de2f054230a0705fa1a5777d1e997dde7f9c07f5d542937519e3cf178921 SHA512 607483c622f3347d3fad6de2f8c9eacd3a4f389baaa2bed94e72a6d5db65006c67231b92962ad08b1756983fe6af7d599b93bba880558867a032840942654e6b
 AUX mouseremote-0.90-makefile.diff 507 BLAKE2B c93decf07db9ad8f25c9ee8902b1e9841fe29e10c26cb1dc0c49736a3755edc25cd8545190b25aafc1b36d903e381f24e01fbf1a80efd04983f815883cdba09e SHA512 160efb2db998c42ab2efb34e8b462f3b709a03b8d4a8bf0be4c6c45c8204285e67bc6e5cecc4dd25ee71c6625b3e7653f83a2be8c51ed09103e2f119102b2ec0
 AUX mouseremote.conf 461 BLAKE2B 323401e37e6824b581ac63c947f5551b96bea35b9901310a039f86754ab35648b09b49fe5a01ce80be518fc6841b424d65c5ae5d1e64c8864035ca080183325a SHA512 b1e99866c0aec8036ea6bbd0e831afca79a5530ab1635fa1f6f407f7c49df5aa1df9c14e7e864fd6503063c05fc882792f6da4785e694865e4ef90d459a8e1f4
-AUX mouseremote.start 598 BLAKE2B 758b559aacbf1c3af63286cbe994087fd02e7c44d272ba1542d78b388baa7346240a5e0e66dada484ed877645e56a786ed6b7eaa4411893a66d88ea0e80200ea SHA512 9cbcd5037057498ccbe8dc4a16308f7390112389440cbbcc4675b2750bfeeca2c54b1fd3da5d91efb3f2e9bcd453b125c526c3412a1e30fa56a937183aca7abe
 AUX mouseremote.start-r1 607 BLAKE2B 5a260f70faf0fe6ff119c83193e04a497b9865616763de970b978a92e53c63a2ca4e7c36a9e35403ee2b23fe23baf8610bf17d07fd3b0d57eca6d8ef872418d6 SHA512 41783d068e8c3a2d835edde5b8e3d5f124418a80abeadd770d1b62d3fb2b7a654ae62a6008bfac074640fd61307f56dff66d953a234dc4aaa5a6cadd85bdfdc0
 DIST MouseRemote.tar.gz 41752 BLAKE2B 90e80bf4d6584db567e035c293460bbf4d30592fa6c25a6cf97769f4e9879b935ef597d8073f429e630e3fb4947f9e8cbdff7450cb5c3b64d0f482e576e2905d SHA512 d92ec4a1efda7e63cc02283b2aabcd6b42bedba17539371856e6ca3b6b5feaf9c306604db9a781836375afb6da226c16b8031f5f749d367857c2cde28e097483
-EBUILD mouseremote-0.90-r2.ebuild 1945 BLAKE2B 7bd0b8a6b5bdfc7f8e1485a1f0dd1d28ce83d832175460321e4bd7527824bce590d846d8c440d7e588d336871bbc5f981e74e8b181de82a0dbcd5c69d8e3ee52 SHA512 0463baf4ac6a0d07a85a15ea46b04fd08a3660d23ee5a027e924498063f0b22bddb3c7444ece5667f4a1991d7499509474b774a2992282185b5091ded5fe3814
-EBUILD mouseremote-0.90-r3.ebuild 1939 BLAKE2B aa57173ac7df795283d317f4aa863cc028a1f9a113f08e980f0eabfd790f023dacd653e0ded24ff5a4ec6e3996a0d866ace27c192843b6120d1772269d783883 SHA512 4a42985eb3cc9e5fd3c578ddd271efb3e2a1b51e3e969021253b589391691343173cb743de67f41faa589ab6144f6c9cb8d36daa6db11d736e84b493ee17df05
+EBUILD mouseremote-0.90-r3.ebuild 1937 BLAKE2B ced37f82189c285ea179684da7508d2cc43451154e646b52c438e4cb2a6de51a6a78f4a8d46a85a93afc96f0cee278d037b1501f551d740eabf55c40725e10aa SHA512 941fe811ffc83975aa0665f8106bf8c295d1e1da396210b5e5d48838c6e936d989832ea31b758a81bb28be12fc7dba88fb71ec4d87da8b66282d3671e3d28623
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mouseremote/files/mouseremote.start b/app-misc/mouseremote/files/mouseremote.start
deleted file mode 100644
index e149dd8eb70c..000000000000
--- a/app-misc/mouseremote/files/mouseremote.start
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use modules logger
-	before xdm
-}
-
-checkconfig() {
-	[ -z "$DEV" ] || [ -z "$DRV" ] || return 0
-	eerror "You need to setup DEV and DRV in /etc/conf.d/mouseremote first"
-	return 1
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting X10 MouseRemote Server"
-	/usr/sbin/multimoused -${DRV} ${DEV} 2> /dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping X10 MouseRemote Server"
-	kill $(cat /var/lock/MultiMouse.pid)
-	eend ${?} "Failed to stop MouseRemote Server"
-}
diff --git a/app-misc/mouseremote/mouseremote-0.90-r2.ebuild b/app-misc/mouseremote/mouseremote-0.90-r2.ebuild
deleted file mode 100644
index ddddb1fbdd1e..000000000000
--- a/app-misc/mouseremote/mouseremote-0.90-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="X10 MouseRemote"
-HOMEPAGE="http://www4.pair.com/gribnif/ha/"
-SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="virtual/perl-Time-HiRes"
-
-S="${WORKDIR}/MouseRemote"
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-makefile.diff
-	eapply "${FILESDIR}"/${P}-gentoo.diff
-	eapply -p0 "${FILESDIR}"/${P}-fix-warnings.diff
-
-	eapply_user
-}
-
-src_compile() {
-	cd MultiMouse && emake \
-		CC=$(tc-getCC) \
-		PREFIX=/usr \
-		LOCKDIR=/var/lock \
-	    JMANDIR=/usr/share/man/ja_JP.ujis
-}
-
-src_install() {
-	dobin MultiMouse/multimouse
-	dosbin MultiMouse/multimoused
-
-	dodoc README MultiMouse/README.jis MultiMouse/README.newstuff
-	newdoc MultiMouse/README README.MultiMouse
-	newdoc client/MouseRemote.conf MouseRemote.conf.dist
-	newdoc client/MouseRemote.pl MouseRemote.pl.dist
-	newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist
-
-	newinitd "${FILESDIR}"/mouseremote.start mouseremote
-	newconfd "${FILESDIR}"/mouseremote.conf mouseremote
-}
-
-pkg_postinst() {
-	[ -e /dev/mumse ] || mkfifo "${ROOT}"/dev/mumse
-	[ -e /dev/x10fifo ] || mkfifo "${ROOT}"/dev/x10fifo
-
-	elog "To use the mouse function in X, add the following to your XF86Config"
-	elog "Section \"InputDevice\""
-	elog "	Identifier  \"MouseREM\""
-	elog "	Driver      \"mouse\""
-	elog "	Option      \"Protocol\"      \"MouseSystems\""
-	elog "	Option      \"Device\"        \"/dev/mumse\""
-	elog "EndSection"
-	elog
-	elog "Don't forget to add the new device to the section \"ServerLayout\""
-	elog "like:	InputDevice \"MouseREM\" \"SendCoreEvents\""
-	elog
-	elog "Enable the daemon with \"rc-update add mouseremote default\"."
-	elog
-	elog "Configure the daemon is run in /etc/conf.d/mouseremote."
-	elog
-	elog "See /usr/share/doc/${PF} on how to configure the buttons."
-}
diff --git a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
index a64b724d8b6e..84181af43e85 100644
--- a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
+++ b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="virtual/perl-Time-HiRes"
 
diff --git a/app-misc/mvcase/Manifest b/app-misc/mvcase/Manifest
index bfd7964ec934..c668bf62bce1 100644
--- a/app-misc/mvcase/Manifest
+++ b/app-misc/mvcase/Manifest
@@ -1,5 +1,5 @@
 AUX mvcase-0.1-flags.patch 531 BLAKE2B be56f4ebf49427f3d6202ca78bf76d40419055235bb85f0a0f3856928a8f62d68600da7daedcb8d32497e06ec66c723c51c93b36ce2d84049caf3330ffde3398 SHA512 1731eacbd22438e4e888750ba5550b5d95365e2f396e3a59326c86d3cd8c20dc7a46490fd116ade13e6191a86966ebb77df4a5a2e10fb2961f45a0f9664a4b77
 AUX mvcase-0.1-includes.patch 526 BLAKE2B 1ae38fd8c03a82694fd57c9af033443d3e0a09a794686ca87419167dfd16697addb57a2f73923a8435c88fd82c5555b0715bc541f2eb377aa9f2e6389b14d311 SHA512 1860cf88e66a4bc219546a87e337056f66a344d6ec400c21bf37c7d7d5b34fdddf3cf2ac7c05274f2c6f313ee7fd530240e1d2089e598b5154c8eb2c4dffa30f
 DIST mvcase-0.1.tar.gz 9467 BLAKE2B 4f73908cb549af143582f2f046096b5ffc82bd68a7be9d599bcea159d2182a52d37b9afb7e6e5e3fcb2ad01fd647c3649dae56ed47258166884a20e81b00d40b SHA512 1b6030d51cd0da7bede43f1b528c2b2cc713b3c6ca0ccbb4931672185998957aad1b2e0e78a78148c412b6a36052076caca3606016ad1404e6028442dff8648c
-EBUILD mvcase-0.1-r2.ebuild 640 BLAKE2B 12b93a85c6e13863e9d1ba3783ba78c5ab59f51d489c1589f365e9dbee47d2ad49a24260f3155940d9c9447a641cdb1fcc596e98a5e704ea47e3a6b86cb6151a SHA512 ddb49575202acdba13e9a1309ff2642c8c0d4f61b8f05a2ed6b7dfd2b041990584b067be6f552f6bf9a91ea7390c6534096e0e9042ef0677603db070df0867d3
+EBUILD mvcase-0.1-r2.ebuild 630 BLAKE2B 37a723ee8187751ef50fb7c29ea33ee928a3d368c660fbf997186efdf9f425274cfad4028942c4b5a18c7966176be9bb5d207cc4625a1b08f9af311d6d2cb509 SHA512 62f696a98a3b0b93eb07b3c33ad349e5f9edab25653c28fca875a4efbf5838c13f818e22aed22e8430a6f94add0954f4f7541ade1a93108faeb783c7f76a21be
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mvcase/mvcase-0.1-r2.ebuild b/app-misc/mvcase/mvcase-0.1-r2.ebuild
index 870ed73f8977..43e76b753d12 100644
--- a/app-misc/mvcase/mvcase-0.1-r2.ebuild
+++ b/app-misc/mvcase/mvcase-0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A modified version of mv, used to convert filenames to lower/upper case"
 HOMEPAGE="https://www.ibiblio.org/pub/Linux/utils/file"
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 969ebddc9858..5adcd2fbd57d 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,4 +1,5 @@
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
+EBUILD neofetch-7.1.0-r1.ebuild 1147 BLAKE2B 12a4fe99b0c45f980d0452a4b96288a8543beb03f94eb81195dd11a1b87129506f7d9bf5a6a54380d4b6289988e7f2098680804924fb9cf32a7386fe1e6efaa7 SHA512 753c3e6ebae6688c78246d2276dfadd37baeb004763e5d9d26cd04dcafa1b77f48304456df92e3ca78eefb0d419bde969eb438d1bd2d80674ed5d8504bb3a7ed
 EBUILD neofetch-7.1.0.ebuild 937 BLAKE2B 72424ef48458c2c4c0a70900f42f597ebaf0ec659b3fadc9e860262b336d066786b078412c363394c674250d52fcb2ab267c665d2778b98cea96a1baf759134c SHA512 568336106a81b75f35e657c7f494e6b1b7683dbba29085bc28c0e7b441d288c5a013ba3c6ebd1ad62b3862ec8ad835b6fcea07eb0dcd590b907c38f4427d79aa
-EBUILD neofetch-9999.ebuild 939 BLAKE2B a9e42345b9a4a07ada01f8f5a3b38749c58673059fc256506cb73334e632237e7824caf3b33c5b4d2b1aecfa78bfaf5f010b6babd5efd3ebef3ebc6ba7cb842e SHA512 c4d7d5aa941269102ef16f071a0ce92717f3975d41d89adf2a986d47e848de5fe912cdd1c3739bc2325b2d60d86ec8c9d2eacd53d687a1baed5b4950676e31a2
+EBUILD neofetch-9999.ebuild 1147 BLAKE2B 12a4fe99b0c45f980d0452a4b96288a8543beb03f94eb81195dd11a1b87129506f7d9bf5a6a54380d4b6289988e7f2098680804924fb9cf32a7386fe1e6efaa7 SHA512 753c3e6ebae6688c78246d2276dfadd37baeb004763e5d9d26cd04dcafa1b77f48304456df92e3ca78eefb0d419bde969eb438d1bd2d80674ed5d8504bb3a7ed
 MISC metadata.xml 862 BLAKE2B 962450327b7dcc5718d64b88ce3d8fd1b68a276d17d347fb7e7729bd8181b4c3784b2d8444d9afaec4c64082ad74cac77ac381976b404b5350c4013b041c60db SHA512 ba333d9291f5d56e1d942eb40278c13d2bf2cad13c0eeae0fe1d83cf516810af7086b9713aca2ed3a580bf9ac33b328bece3c52a1bcce1e197430ece8549e94b
diff --git a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
new file mode 100644
index 000000000000..b0c0a070de9b
--- /dev/null
+++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature prefix
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+
+src_prepare() {
+	if use prefix; then
+		# bug #693526
+		hprefixify neofetch
+		sed -e "/has emerge/s:\${br_prefix}:${EPREFIX}:" -i neofetch \
+			|| die "Failed to adjust for Prefix"
+	fi
+
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
+
+pkg_postinst() {
+	optfeature "displaying images" "media-libs/imlib2 www-client/w3m[imlib]"
+	optfeature "gpu detection" sys-apps/pciutils
+	optfeature "thumbnail creation" media-gfx/imagemagick
+	optfeature "wallpaper" media-gfx/feh x11-misc/nitrogen
+	optfeature "window size" x11-misc/xdotool "x11-apps/xwininfo x11-apps/xprop" "x11-apps/xwininfo x11-apps/xdpyinfo"
+}
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index b5f654d39b3b..b0c0a070de9b 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit prefix
+inherit optfeature prefix
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
@@ -17,17 +17,6 @@ DESCRIPTION="Simple information system script"
 HOMEPAGE="https://github.com/dylanaraps/neofetch"
 LICENSE="MIT-with-advertising"
 SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
 
 src_prepare() {
 	if use prefix; then
@@ -43,3 +32,11 @@ src_prepare() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }
+
+pkg_postinst() {
+	optfeature "displaying images" "media-libs/imlib2 www-client/w3m[imlib]"
+	optfeature "gpu detection" sys-apps/pciutils
+	optfeature "thumbnail creation" media-gfx/imagemagick
+	optfeature "wallpaper" media-gfx/feh x11-misc/nitrogen
+	optfeature "window size" x11-misc/xdotool "x11-apps/xwininfo x11-apps/xprop" "x11-apps/xwininfo x11-apps/xdpyinfo"
+}
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index e85c31b3913d..c545ab5c1151 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -16,6 +16,7 @@ DIST nnn-3.3.tar.gz 148795 BLAKE2B 71aa01c6882b3ea95331cb97d309218b65b8a1ab515a0
 DIST nnn-3.4.tar.gz 194844 BLAKE2B 5b41196af67720a3485bd68b6c08e4ab41e8308d5ed0e279ed4b215acf1cbe0e10ee3a39b47b74115111003ef5a3d9871c71bb54e3778bfbc6597eb7de751deb SHA512 91b19e9a4581c6367b5c90b8294232fb77d86df348a6b4bce0df2336cac14493bf48cad52e02e5b6b0027c2ea14e3b9f15cc70d78abe82687172169b958ca918
 DIST nnn-3.5.tar.gz 205980 BLAKE2B 4c49fb0feb4f04075fd64d0b42643256cceec84185df2fa78d5d1fc04177b446b443ea3843434d844206ebc120820ff97b33f7703a76aed85af044f14f985621 SHA512 87710ca251906d22afc8d329675675c81fdf1d6e71f4f4991ab36868105906b6d45c2c84dd118beafa79644a0677a66bfa346ffe9a4516082d899c5148c5cffd
 DIST nnn-3.6.tar.gz 204688 BLAKE2B 475bd783333bbb55f0c64a3028712792f9376f6a604ba18a7aef3735f1afc5aa91f419f3f41b2c14d525d02fb30db6ca7078fe56f4c7cce2f97c32079be129ea SHA512 e997e2279c495c7235fdfd51ffcc36949686889424686f050329c7f127c62f3ddc807a758ee1b18b00a1884eeaf9f94195d02b2d0e2d76ae1523b8bf2cef1232
+DIST nnn-4.0.tar.gz 214555 BLAKE2B b0490662bad07213ff79b8865b8d9672d1ff98d93e3705e0aa45d103c151274934dc0cff66731f7b157007a81b9dbb5d9f3edb6a17daddcfb265f73b6faa400e SHA512 fde552a31674c9bf50a2e98de4456621bdc97aee36cd5efd7ad0cc33959965d01469fb20b12868ebffd4c8da79990b502e26895cb5b047ac8821e2ca09b0a234
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -33,5 +34,6 @@ EBUILD nnn-3.2.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc
 EBUILD nnn-3.3.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
 EBUILD nnn-3.4.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59f62e16477ce2f42144e43e8b0f0412fcc7d7f4bf04054e539ce3f86eb791c0ac0f314d4de7fbc83be2 SHA512 01fddb20ef06517970f9af68bf87a2cd79eaaa5da312f6a6f811213ff64a952bae3aeb095150adba3596b2b255d4979c6f43547e891e2d9b4e3338afc3497efc
 EBUILD nnn-3.5.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59f62e16477ce2f42144e43e8b0f0412fcc7d7f4bf04054e539ce3f86eb791c0ac0f314d4de7fbc83be2 SHA512 01fddb20ef06517970f9af68bf87a2cd79eaaa5da312f6a6f811213ff64a952bae3aeb095150adba3596b2b255d4979c6f43547e891e2d9b4e3338afc3497efc
-EBUILD nnn-3.6.ebuild 925 BLAKE2B 7cc045f7c53e61b9b364c540f6b6e1807f0948c972d20c86fb0080bb5002f2b35d2fa2825dcd6d3d07ed3324c9827008efd74f94285deb1b66a5ccbbdea97b18 SHA512 c7bab0060018e802c9e196e426ea9fa93aa8ee09a6a9d30568b6de44945e279aaf056b69dce76e7600fa890791d16dbeff9a4a3fbfcddbaab0aa45894d097d9e
+EBUILD nnn-3.6.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
+EBUILD nnn-4.0.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-3.6.ebuild b/app-misc/nnn/nnn-3.6.ebuild
index 90a0ed062b70..0bd65a6f5bf1 100644
--- a/app-misc/nnn/nnn-3.6.ebuild
+++ b/app-misc/nnn/nnn-3.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit bash-completion-r1 toolchain-funcs
+inherit bash-completion-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="The missing terminal file browser for X"
 HOMEPAGE="https://github.com/jarun/nnn"
@@ -21,13 +21,12 @@ src_prepare() {
 	default
 	tc-export CC
 	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
-
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
 
-	emake PREFIX="/usr" DESTDIR="${D}" install-desktop
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install-desktop
 
 	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
 
@@ -39,3 +38,11 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-misc/nnn/nnn-4.0.ebuild b/app-misc/nnn/nnn-4.0.ebuild
new file mode 100644
index 000000000000..0bd65a6f5bf1
--- /dev/null
+++ b/app-misc/nnn/nnn-4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install-desktop
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-misc/notary/Manifest b/app-misc/notary/Manifest
index 244ab0ae8295..6a4e299968ec 100644
--- a/app-misc/notary/Manifest
+++ b/app-misc/notary/Manifest
@@ -3,5 +3,5 @@ AUX notary-server.initd 568 BLAKE2B a38ceeadc4d3bd663dced340da3040b352081dce6d27
 AUX notary-signer.confd 103 BLAKE2B 461b38b6c8d97e7c8cedb88e48eca0342174434a819d99883496a9622fd04c19d097a498195c9e37246420f4f01fef07219bd4c9e76dc26cf8b70d9ce43ab1c7 SHA512 088bbd2eabf1e9be673b35a4a481c270ba2ccea479ef1164804ecead730a61465862888e7cbff53976056826d4ff066e1e2ab253cd6e3287109d03873c11777b
 AUX notary-signer.initd 568 BLAKE2B a0041a57049a1709ffb0906e4cef2e6cad32172c52bddc77917e7f6293a4deba79ae0d965db53fb537d66d91dc6b06230f91d14971c408f60182b350b6a672af SHA512 325614982f75f33a9fd59a6183255fa61158c4b2288f2d06e4d88c8f1f43dc5df83c85e8ecdf40cf19f9a00b51ba641fc024d863f220b6aac8e530e17e7eb3a2
 DIST notary-0.6.1.tar.gz 5741924 BLAKE2B 125e1e09178f090de9d73bb97170737d03c8f43927cf070a2c78e0c5eff3cd56a58aaf703a4ba60aa3e1bd7e22d2ceb0921abaa98e6f871ed1131249e44c622d SHA512 76e223c0c5c59796db924f0e52ea59d2bdbb101a9a059cd70d336928dcac616943d75fc9b8d7703de8609b2f694d2fc5627deb341971dc9401c00974261d57c3
-EBUILD notary-0.6.1-r1.ebuild 1645 BLAKE2B 5abcaff1cc0c1b032f81c1323c6b1df602b5882cda7dca4d19d9aca7e3ed2b7a3260d254b89a0cdf6b10b7c5dcd40a079fe0ec898a818d6c2aa4e218b6dd0e0a SHA512 83cd343051ac05b4be4443cf8a41356c89d543710e8efe580e4e260370be8cd3d4ea4e554d47b16a1521609d2bc529cbbd3bedde6435dd4bea197014f1a9f77f
+EBUILD notary-0.6.1-r2.ebuild 1638 BLAKE2B 1c8dcfb00ae808840cbf75499659c3c6855d4c2f84ab976694645008b4208fef84ce2aa26f6ebce6279c0c89b1e611dd4ed8b9130c237faad20000db5879a305 SHA512 535dfbf3a57f8f3e08f600d3badb02c4b3dd07e90713887bfc1f93ea5f597eac528c1fa77e9c5f999f62d94483bb02405147f132619b36ff13cc7c5cf8d71910
 MISC metadata.xml 262 BLAKE2B 597c3ea2ec2e6106554e720aff9b70c04b0651ebf448d86468b07eef6e07112c3b66cb38296f0eb467e0442b81fcb0e72fc1ad0dcbef949cda8bf400db947649 SHA512 c7d1d7c1af64b0ed60d30a70bea37c9c60030744273c21aef968e5655cc118bcf3a43d3590ea0e162f4c97568c7483e3e86ce59de3673e451e66e62b177e060d
diff --git a/app-misc/notary/notary-0.6.1-r1.ebuild b/app-misc/notary/notary-0.6.1-r2.ebuild
index 5def4a774c57..840f089bb574 100644
--- a/app-misc/notary/notary-0.6.1-r1.ebuild
+++ b/app-misc/notary/notary-0.6.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit golang-vcs-snapshot golang-build user
+inherit golang-vcs-snapshot golang-build
 
 KEYWORDS="~amd64"
 DESCRIPTION="A project that allows anyone to have trust over arbitrary collections of data"
@@ -14,12 +14,12 @@ HOMEPAGE="https://github.com/theupdateframework/notary"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
+RDEPEND="
+	acct-group/notary
+	acct-user/notary
+"
+BDEPEND="${RDEPEND}"
 
 src_compile() {
 	pushd src/${EGO_PN} || die
diff --git a/app-misc/nut/Manifest b/app-misc/nut/Manifest
index ba14e0ff65cd..6101f1e017ac 100644
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@@ -1,3 +1,3 @@
 DIST nut-20.1.tar.gz 1441077 BLAKE2B 70233f6bee4df5c9eee91a313506e545accdd68e10b0ef71dcf42d83082fe44dc9d48e049801efb7e7f26458dfb079cc824aec3e314d63b27a4b06dc75950528 SHA512 2ed79fb345f029f5deaed4e23531256f2f76f5ca05ae46d3d5f4503fef663cde81f6695a9b5b741d02c5880ef611fa8495fcce3bcadf1ca8abdbc2b395bced6a
-EBUILD nut-20.1.ebuild 550 BLAKE2B 44b60b5c6a9df83cb564b9df6efb96e281fa73102c5d4880f67e4ac8768a8398b755bb6854a59eb6837d4743bf8a9e78f45801c4a58d67e6ef2cb05437a2b934 SHA512 642b0ee3dfb59bfd56aa4c4f628a1b1a5105ebac8651868f60c732e6dc8e60542bd9ed53e2feb4ebc451624e2e686d6bc37d0dbdff4b6d5cf3fe3b2bfed0c66a
+EBUILD nut-20.1.ebuild 552 BLAKE2B b8bb484fd4231cecea505e685e69b608914fb22aa594c88d21d4124a1dd845087716a0c74fa0af7a0c2857f03dbcf76d0f997a0cf2bd5eea6bb6a70565af5f74 SHA512 b87ccc9a85a619773225372aa4ba10d1cddc0e6081c308609b46a71a585298d847a46b854f5b1c2fbae4f3c6cc21c37c40c834193cb5a7c8167778f0639fb03e
 MISC metadata.xml 240 BLAKE2B 466e0fb40b32dadf0d9da30dd0f76744e00ad50624d7af31496897906fc02b13f506a438c6f96cd90dcd6fc7cabb537e6c55fa1bac98d46ca46b191af3f974e9 SHA512 e15cb3ce921cd91bbd35380b54275fb316cb61e132a7d11f679afe1b191c54e117953b1102ea1c86d73b59f6f13613cab9c37b0c077a21f2715aff61a413cbf9
diff --git a/app-misc/nut/nut-20.1.ebuild b/app-misc/nut/nut-20.1.ebuild
index 3c028aa44a87..bdf69006e68b 100644
--- a/app-misc/nut/nut-20.1.ebuild
+++ b/app-misc/nut/nut-20.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Record what you eat and analyze your nutrient levels"
@@ -15,7 +16,8 @@ KEYWORDS="~alpha amd64 ~arm ppc x86"
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\" \
+		OPT="${CFLAGS}" \
+		FOODDIR=\\\"/usr/share/nut\\\" \
 		nut
 }
 
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index 8ae36cb77d06..1c3e637e2040 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -3,5 +3,5 @@ DIST oneko-1.2-cat.png 223 BLAKE2B 35eb9a8aa7e49aa00a7a689187b598ee837b9236715ed
 DIST oneko-1.2-dog.png 236 BLAKE2B 8aa4bb11d75283784e7bef8eb6d887706d90cf6370cfa41433d32bffbb23db0b775e5a23fe9b19ef0d9426d5e98e583b599e477427c3223f4a225f1904da7ad1 SHA512 11e4a4ecfba26a0ea782846ca288da7ba3f68629dc8f4b0d7987923f06afe57971d53c9161ed13711a9a1f737ea3d8ec76f559311dd10234dca49cfa9d20f533
 DIST oneko_1.2.sakura.6-14.debian.tar.xz 10996 BLAKE2B 4507243c28371d99976a3ef4d015b53f6dc1e28a0e841c55da18710bfc3825786dc8ee8ce06b5af1ca41445661d6f5c10225b80c6802ab5d2de06dab09de10e0 SHA512 35656ade57e57ba400b6e2d0f9dcfa1b41a7002f874f1113db080d9e75e390ff0e1f4ec169fbcf1cbea135988500501c65a2f520eaab196b8d92ef4feb993baf
 DIST oneko_1.2.sakura.6.orig.tar.gz 64623 BLAKE2B 262f9373b1739c0181a52377dd72c5f35bd9d8e4e54364304704bb6794216585a7617525ccf439cef4783556aa732ac84f60a45424021b5963d69485c21a15fe SHA512 3f06b1c23ac6e3d9864530904bccbe0fdbeebb512233e35555ae44d2b45b2e6e50480081f46b048994c9415dca05691a0796357d86b4b7e8dc0bbcf1642ae348
-EBUILD oneko-1.2_p6_p14-r1.ebuild 1665 BLAKE2B ba72f644daa7da6cc82980f2e90dbbdd99c49fd062b5905bf3fd006538a4fe5d74e9fce01221300f7c9a6ef21332e0d3368164509b27bc16c3d57834c1d3b08c SHA512 79573887ae7bccdc8980a6ae067d3aa0bb5562c56a36350253f64c8d92a416f9fdf52182a83f3e0f0d84cfcc901f089221da65c50b3455adf4046688244b347a
+EBUILD oneko-1.2_p6_p14-r1.ebuild 1653 BLAKE2B ff37fb9dfad5a82655e1014fced9b5207e90631c17d3c16bf708bc378b9fe52406e85c6344094f14a5f8bccaecc443bcaf05c4e8292870576bd6c2f505527691 SHA512 5cb5a14a9ed2ed4702dfe4497a79b156c182a611bde9dc58c2cb40f405b9f79fbbf7074c8d89d94578206f2d4243ab14b35c52fde1f1c114eab6c29387b6b590
 MISC metadata.xml 623 BLAKE2B 91065c4a60354be6d48ad0f26450d0c1d79358b61555b31deebf7186c39cbd6750291691de9ace29316db5b3437d6cb11fa50df971c07a88891b744dbe1bb4a0 SHA512 9a73ce96bb6c2ed05230cb673c3f7c22e97919aeae95e60fe8df4559c908a4553d6f8eaded6625952b6da20d9ba428b6fcc4f8a3a0b38a6ad3c3675bd5640fdf
diff --git a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
index 262843e5b3d9..6e1677c1aeee 100644
--- a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
+++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 BDEPEND="
 	app-text/rman
 	x11-misc/gccmakedep
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 PATCHES=(
 	"${FILESDIR}"/${P/_p*}-include.patch
@@ -41,20 +41,17 @@ src_prepare() {
 	done
 
 	default
-
-	printf '#!/bin/sh\n%s ${*}\n' "$(tc-getLD)" > "${T}"/ld
-	chmod +x "${T}"/ld
-	export PATH="${T}:${PATH}"
 }
 
 src_configure() {
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		CCOPTIONS="${CFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index a5f61ae5247f..3330767d1b16 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,5 @@
-DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
 DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41
-EBUILD pax-utils-1.2.6.ebuild 1890 BLAKE2B 5178e5c8495e24305743efd40f8a1a656efa0673b46854fe32c2c6cd2fadb6d7e51b0ae9a67a3e1ff5ab45d5f60f681699d52426c1b7b767ebf14cb709a6a8e8 SHA512 f3534814ed8b649c568e00de1c1c1aa01759c715fe5228bc6f00f990e973840e48108dac2ce6a3df25783d8441d7d651e91072a2c1a2c543bca7a6692ee3bab9
-EBUILD pax-utils-1.2.9.ebuild 1895 BLAKE2B 0993bbe0514d2242501c53637ce8bb4c5dbe326e1e02c4ba95b394b9b82344dd0728ea8efb32ff816ade88a7b3844231871f12bae743de048fdfdeef096de77c SHA512 d8c6b880cfaf6a6a2ebd41cc3cffcf9f87d7b271f78ce039ab610fbb48ca010b720851e2ae65ed8fe731b1bc135281d9d67c2a60b4d6b0be49c30b1644c8cbdf
+DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
+EBUILD pax-utils-1.2.9.ebuild 1887 BLAKE2B ba4f47fff5eb0e56bcb845a04a7cfa61c655503878d66c6684b32a3fd15a19a2e30757c560a1ddecc1e49ace6540b420b2adc6d542c60e2285d63cfba0179d4b SHA512 dad5e4f7c102a6f4a490c5cdcb80759d0e71784081d8e363183d37970ddaa5bdf87a0bae66d010f88ce092cf74a328e719a5b0bacfa579654e8f7c06f99ed48c
+EBUILD pax-utils-1.3.1.ebuild 1880 BLAKE2B 35d4f74bf83d2bf0292a0d45e7b8e78b337b866237352973b85deb8690c53b4ce795da8d3ccbab7b971184ef219b51436c961010fd3029e6278e824b39425a7a SHA512 85ecc69ee4d80491ca654c89dc7918f22c92d72df89a03e5fc1f04435d121e0d25557ad8c2ff36a4d5e3c0af34bd5db6d745fd65527fb09d81875d4bdf77258a
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.9.ebuild b/app-misc/pax-utils/pax-utils-1.2.9.ebuild
index af56cab4443d..277c9f68fa7e 100644
--- a/app-misc/pax-utils/pax-utils-1.2.9.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.9.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit eutils python-single-r1 toolchain-funcs
+inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
index a3e63fcd1d5c..474efb8559ac 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit eutils python-single-r1 toolchain-funcs
+inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
 SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
@@ -24,16 +25,14 @@ RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	seccomp? ( sys-libs/libseccomp )
 "
-# >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+# >=linux-headers-5.8 to pick linux headers with faccessat2, bug #768624
 DEPEND="
 	${RDEPEND}
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.8 ) )
 "
 BDEPEND="
 	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
 "
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index 4860ad030414..6ec3e56d9847 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -3,5 +3,5 @@ DIST QLC+_4.12.3.tar.gz 10954027 BLAKE2B 9a188e2bc2cce1a0a5170122989d5ee1194a83e
 DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db699946c0969cb0f0a0139f82a421a9a4957ab07612db7aa047fe6650a642479282f6cfe0d124a41a935dd853d09b7253f SHA512 e703747aa243bc4c6b2e9fc3cf1a4e67524fa13fa64a59054e66164e879073b1bd69756a42bb423ff05dcb7da946cbcd99bb9edc3fde9a70d75b8a9f164a71d0
 EBUILD qlcplus-4.12.2.ebuild 1217 BLAKE2B bd8c0c256e255ff88eed2f6f9e9f5d9f6af0011f1a5b540f254e8b068dcc7246cc8b08ef8e5ef12b7bfd4f2d9275929701f6dbff946aa37e888f2c4bdf4d45ab SHA512 f31e8a8572b0a6bb49576aed423449e33d6ea8bda937cbee4f4456202eb5b5b96e26d21a061c925f04f8e2364119827bd707ba7a8bd3215c6c7b86375e523e3f
 EBUILD qlcplus-4.12.3.ebuild 1217 BLAKE2B c4c507caf1551d22815ed9f2a863b5860fdb9e0aaaeef3e5dd7038e6e220c092bad8c3ac17861c3c13bf9df0f0c0a01088e9a3fc96d42715e84eced2ff4d33cf SHA512 4e10f5121e8d3c425c1a1c29ef7e72141cc3cbe5cdfe1273c83f6c63ea8e670a31259eae25f509847b4da8cfa424aa898e7c92d95d045f3aa8b6c3af617d2c80
-EBUILD qlcplus-5.0.0_alpha3.ebuild 1509 BLAKE2B 4c3267f85207c1f763ad5c4d7be46df95845e5a30b6769df7dbafe0e9f65b80c4fdb75f3435ea5296934c3b355a79680c6dcdafb90ace5791d5c17b1a6cacfe8 SHA512 06284d1b8f216915031a6974de5070b0a266a1e3cc9ca80399bf377fa8bbb744d593d9427760dc614dccd64253a4d2474aff8cd9ae6b2d587b88a6e2fca30231
+EBUILD qlcplus-5.0.0_alpha3.ebuild 1550 BLAKE2B 2d6eaf0b2bbc348903813f202bb42f841d2f3da045827bc5b91cf9e6f27ee013e17b5b3c14d7cf45989af7f29dbd86d748eaaf69999df7e4a3b57f0c2c093f52 SHA512 dd496c3a3beba8fe9212bea0fb1b8e446ea9c5733df93133bbeeddd5180d6dd5004a57238bcd228da1cd2bd80dc9dc8da95f0ab41a0ff6b0d1e6bd3c9d98bae6
 MISC metadata.xml 485 BLAKE2B 4666f9cefe8331b06dcdace276a0abc7d69e9aa91d98f62db4b9cf35929bb0fb58bf7008914ad4e7808fa2f165e650cf5729863f72bbea7e2fc5f8de05291095 SHA512 925b1d7228135ef55a3c455821638fe8b2ea2f3eb591cfeb2576ad9c6f3870ecf9e9718fbc1f87aee7bebb0fbd0bba1e904fcd1cf5daa1d343d33448dc744c1d
diff --git a/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild b/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild
index 269ea246700c..23abfd174edb 100644
--- a/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild
+++ b/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,9 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets,qml]
 	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
 	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
 	media-libs/libmad
diff --git a/app-misc/razertool/Manifest b/app-misc/razertool/Manifest
index fb18eae2a73e..77133a39719f 100644
--- a/app-misc/razertool/Manifest
+++ b/app-misc/razertool/Manifest
@@ -1,4 +1,4 @@
 AUX razertool-0.0.7-ar.patch 347 BLAKE2B 8225103a88e2fbbdcbc23546c06b6052c4d148dbde8151648fa9b4aa563c815296a7801c8b10a5337aa762cd8e2eb76aff3329b261033dff0082a5d1df9a12f2 SHA512 70c570cf089bd165b76adc4242d39b484333931352406d32324db80746151f6722c5a4fcd718b875d9cfae34ffd0d17bf02c63c94cc0f0b1addf43028f0f1734
 DIST razertool_0.0.7.orig.tar.gz 192274 BLAKE2B 415896f9f6ebaf653be9ede84985b13149f27d4471a8aa53089d138f4f7d58a10ade2aa5f46ec88951572bc7ca1c222db5f88b3df6b37e3ef2ad544a2a7ff28e SHA512 0221ec90b55f4459f5a772eb651e9807423d9e3c82ebd680ee835167bcebf2552e1d7767d294c5392b1fbc58558084e7022cb67f529c033eaff33b4fb3eb1017
-EBUILD razertool-0.0.7-r4.ebuild 1760 BLAKE2B 5372848aa026321c7f9f62bffc6b4a1d33526713852ae5a0e47c3563eb7bd8a2c3f0ab88a4a8407bc6dc5956ee6f767cc604a038d16eff0c819087fbd714cdfa SHA512 76d01f704a4ed0238820d865f5bc522c907935d72608c52e8e97e2916edd4aa38380731f75aa591375448f4c2b20c443a55face93a32f21490dce757a17fa610
+EBUILD razertool-0.0.7-r4.ebuild 1762 BLAKE2B 8219eee8ab8ddbf25cddc3ff9d458a7cf7a2c4f7487fe90e0f5a0c41cc889d027826616808691bb5059aa5a7dd0c26fd24b1dc115a5125bc4fd3f8b2be44289b SHA512 3ad75bc24804ac6e0ffd72e186eaa6b0c352d510011eeb6ae23fce6b977ebf13f17c79818f2ba18cd49f0d5563bea3461f5c65701dd00513aca65e4f20ecd73b
 MISC metadata.xml 669 BLAKE2B 033318e57004d253f5cd774cbe6163ef84e800a04c75c9115dff3877857e36d5062a0ea898fdabb2bdc5edbb3c3c3682989f76168051ea1cc1091b54c9c38749 SHA512 e14e8d1b8af18a78314722909095c39d5db6edc0c87a0eb15cff01afeebf7739e6d8eb5b96089ca4a4138b207d8de7a95e6dea76954bf4026682f65659403b12
diff --git a/app-misc/razertool/razertool-0.0.7-r4.ebuild b/app-misc/razertool/razertool-0.0.7-r4.ebuild
index 5255af99c271..c4a446040f4f 100644
--- a/app-misc/razertool/razertool-0.0.7-r4.ebuild
+++ b/app-misc/razertool/razertool-0.0.7-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
+
+inherit autotools desktop
 
 DESCRIPTION="Unofficial tool for controlling the Razer Copperhead mouse"
 HOMEPAGE="http://razertool.sourceforge.net/"
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index 97b5a53a8f17..d0889ebb4b76 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -1,8 +1,8 @@
-AUX realpath-1.14-no-po4a.patch 288 BLAKE2B cafe4fc0db905b3f9af36b256e392196bc37f1ec01150007590e022a231e38bbe89439419ccbbcb04c23154a2d43159bbe1e81d229d41fa0a8f24365f5849158 SHA512 db19ebcab412ee5b4229657e9745a76b8ad83bff70e3f8f6b939edfbff3aa389436d10fd7d8641bf6a0747630c2d1afcc3ff0d6fe2faeec55e8d4f4a79596cc6
-AUX realpath-1.15-prefix.patch 1443 BLAKE2B 3c62720d908dcb7ab29291e4029dd1923c2114649cc1c115e097e72193a4e9c1734a596434383b67b186796e605323f579e47c5f80ef9138f7556c9b9b965f70 SHA512 0e4980d60a4fff42823443ee9b8e9ef49a4f34ed031a3b01849f2d87b893f7205a4b7de2d6e090770aa2a3f7a31aab8f47d4f99c79d02d03fd5105001fdbcc5a
-AUX realpath-1.16-nonls.patch 685 BLAKE2B 84e67f77ef5263e860dd74b665377279b81853b9a9bff7266e2902673f6d86344ad79b3cbfcb42454a536879d696d32c86b3b895a478f13f8385900c1f931a47 SHA512 b27e44c1313e2c0dd0dfed719c373a3fc6f907a44cd1a9457c03bf1d83ce55b2aafefae84d2053f358e7dfe99dd7e4274137082c64c748e34680f324fe676719
+AUX realpath-1.14-no-po4a.patch 187 BLAKE2B db92ae9baeeb76245f34653277b0ba9cc315e0d02512296bcdd3aadbaafccf3096f1aaefe52d856e6f9d17b44af8cb7701bc548731e21243f032c540739d4fbe SHA512 5e8068b6d88c63bd5b39d36e786f69d4ee2b9575568f09835baf9b2ac7c8006d42d240042317a966e3355a4b2c3df84f413db0573d467e1d637bf91e3e5fd71c
+AUX realpath-1.15-prefix.patch 1378 BLAKE2B b4a60485715366a9b8077d4662ea2fa34149e1809d256b2cef21aa6cb71cbcf79088e14552cfbeceb19d2fb91587c83eb8e5a1e6a50e2be995048fb4d1a1ddf8 SHA512 64841163f0fb281c679b62268289ab81b86e96120d17a4bc01e1ccef1eb7fe01fd7326cfb0891b48ab820e11e8a4277dbe8caa8089427011706062929653cd68
+AUX realpath-1.16-nonls.patch 529 BLAKE2B 0ae255f9011e4b3e493bbb34e0bc7ea3b7139d42b9cc71fcc9d0c88b9014f8b572093e3b81db876c3ab86b559e7b41956954f1fa53cacb34090f4b91647e6309 SHA512 aae8f78398398ac3f6e93757ef6682ff3d31998dad165093098b32735e4bf3b506a4d3661dcc6049cf6ef4bad5d0e77f4e96ddfc2568ce4905afb389114a6e69
 AUX realpath-1.17-build.patch 1161 BLAKE2B cd5821e86f048bae80b224b8db2322170e40638fcbe2d4582a2f21ef6a5218a576528446422d8363ca2e6b4a7cf209de9ff355ab229a683382d095436a22845a SHA512 507df6759deaf43c7973c8d9bb1faeffc22003308cd2fc4f73270eac9ba347e605093f55110b5c86170597eba4f2c80ea7d15b5ccab4b3d0b75dcef09203c09f
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
-EBUILD realpath-1.18.ebuild 1883 BLAKE2B 53260f09ac8392ab74561d7c1db34cb1e19d594cd028f18e42f3b909c6979a5417d551ab4096704f40d398787b630757e81a0b291e3c91c8f35d4e5a1a4225d9 SHA512 722d6cd29f29c382521755f3ae6be5d0a022ee557004e094ab8a6ac0fe7d4fb4953fbc1f0dae2f884ed43b717d1b3f4abcec66baa75f7d84727d2ced3234aa2b
+EBUILD realpath-1.18.ebuild 1869 BLAKE2B 47716013172ba06f710a9fb37fd1ca65b2a8904ffc92081a013305f6b46a434affc4d557da0b17ffb7ba7249050650c2217e76fcd53750e5f7ea164364a8ce19 SHA512 16d2b4035f35dce524e1a139b571582d9ae3a517c3e35d3d50734e3bbc878df583d0bae983ec92970cdfd1654ea4125d865245de2de8cfbe38fa6a912b3db2bb
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/files/realpath-1.14-no-po4a.patch b/app-misc/realpath/files/realpath-1.14-no-po4a.patch
index cfa780553646..44e13286bfac 100644
--- a/app-misc/realpath/files/realpath-1.14-no-po4a.patch
+++ b/app-misc/realpath/files/realpath-1.14-no-po4a.patch
@@ -1,8 +1,8 @@
 Don't require po4a at build time.
 http://bugs.gentoo.org/269905
 
---- realpath-1.14-orig/po/Makefile	2009-02-22 12:56:47.000000000 +0100
-+++ realpath-1.14/po/Makefile	2009-05-19 23:45:26.000000000 +0200
+--- a/po/Makefile
++++ b/po/Makefile
 @@ -4,5 +4,5 @@
  #
  
diff --git a/app-misc/realpath/files/realpath-1.15-prefix.patch b/app-misc/realpath/files/realpath-1.15-prefix.patch
index f9534641382f..3e0837a8bf38 100644
--- a/app-misc/realpath/files/realpath-1.15-prefix.patch
+++ b/app-misc/realpath/files/realpath-1.15-prefix.patch
@@ -1,5 +1,3 @@
-diff --git a/common.mk b/common.mk
-index 2443a40..0a342ee 100644
 --- a/common.mk
 +++ b/common.mk
 @@ -8,17 +8,19 @@ override TOPDIR   := $(dir $(call getCurrentMakefileName))
diff --git a/app-misc/realpath/files/realpath-1.16-nonls.patch b/app-misc/realpath/files/realpath-1.16-nonls.patch
index d758d03ff89b..c1963ae46014 100644
--- a/app-misc/realpath/files/realpath-1.16-nonls.patch
+++ b/app-misc/realpath/files/realpath-1.16-nonls.patch
@@ -1,8 +1,3 @@
- src/realpath.c |    6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-diff --git a/src/realpath.c b/src/realpath.c
-index 76fc909..e2cf86f 100644
 --- a/src/realpath.c
 +++ b/src/realpath.c
 @@ -23,10 +23,9 @@
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index dcaeab4fe8b0..c982935ecdbd 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic multilib prefix toolchain-funcs
+inherit flag-o-matic prefix
 
 DESCRIPTION="Return the canonicalized absolute pathname"
 HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"
@@ -13,14 +13,21 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	nls? ( sys-devel/gettext )
-	elibc_mintlib? ( virtual/libiconv )"
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.17-build.patch
+	"${FILESDIR}"/${PN}-1.14-no-po4a.patch
+	"${FILESDIR}"/${PN}-1.15-prefix.patch
+)
 
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
@@ -36,18 +43,22 @@ src_unpack() {
 }
 
 src_prepare() {
-	use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch
-	epatch \
-		"${FILESDIR}"/${PN}-1.17-build.patch \
-		"${FILESDIR}"/${PN}-1.14-no-po4a.patch \
-		"${FILESDIR}"/${PN}-1.15-prefix.patch
+	if ! use nls ; then
+		eapply "${FILESDIR}"/${PN}-1.16-nonls.patch
+	fi
+
+	default
+
+	# Don't compress man pages
+	sed -i -e 's:gzip -9f:true:' common.mk || die
+
 	eprefixify common.mk
 }
 
 src_compile() {
 	tc-export CC
-	use nls && use !elibc_glibc && append-libs -lintl
-	[[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
+
+	use nls && ! use elibc_glibc && append-libs -lintl
 
 	local subdir
 	for subdir in src man $(usex nls po ''); do
@@ -61,12 +72,13 @@ src_install() {
 		SUBDIRS="src man $(usex nls po '')" \
 		DESTDIR="${D}" \
 		install
+
 	newdoc debian/changelog ChangeLog.debian
 
 	if use nls; then
 		local dir
 		for dir in "${WORKDIR}"/deb/usr/share/man/*; do
-			[ -f "${dir}"/man1/realpath.1 ] || continue
+			[[ -f "${dir}"/man1/realpath.1 ]] || continue
 			newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1
 		done
 	fi
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 6643599d4235..ccea8b316fce 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -2,8 +2,8 @@ DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb
 DIST recoll-1.27.12.tar.gz 3184471 BLAKE2B 60bcdee44259fa7f8b9decb9258ca0dae4edbf0cee1e8b1353cb59418503f0fcea9b439ecd6352500ff5b4cccfae08fc2a3f7f786fbd096cf18fd21fb809705b SHA512 3701dff056b8200f3b3c1bb2acaa69356c0def00959a0b74c14e1d500bd9e05fc81d82ce8b7db59d7e5b85617a8a7197700031aab65b31e005a4fedeaff59e97
 DIST recoll-1.28.5.tar.gz 3261816 BLAKE2B 6bf9daab0f97ee6fdb4033197d3fa3f4296b2df8a57566195fca3bf170fec621c27e7da00a1a5a8493fbbadca103a0db7b8c3051abe95d5c2aedb7c289c050a5 SHA512 df4c7a5e624933ccc7ce257a767a4621728a4dbcdd5b551b47845ed0fcffdd5a6f7f617a466404c5e8d8b62c81e57986e1f21e01d643899755623a2dc597d712
 DIST recoll-1.29.2.tar.gz 3871580 BLAKE2B ae6ef5628dfac67a192a3d133d5b5d8ddec079ac79be2e8aa7e744669ed0478cb41628a0ed46b4ff2364823f367815b1eb4bca0a6e4b56a9e12d4f78c6842473 SHA512 c87fc054a0c34f1b6bcc10a4f2c84268a51df02b8ba84634c51f9396befe5b2b84fc93d363876158c9d117a164613e91d9c63b228fec5e0e07d234c97c4680c5
-EBUILD recoll-1.25.19.ebuild 3621 BLAKE2B f787aa77079ffe6bf6c1465222f09c68cb2bb4e81059dc6aba164abf8766ae9b04b24c228a6fddd21afc329da306ebbfea18271b5206f8e8f722e53ff6e67f6b SHA512 dde44347da9a0492d33825262da6d786f1df04be0dd11878868a2e012e40bc00b18f4927cbb0e8577215eababe387be4f130b1b10500efc69b689d08b981bb75
-EBUILD recoll-1.27.12.ebuild 3644 BLAKE2B d220d7ccc4750b0752d06b88185edc1ce710e4e1861caf5f5b662a61ae1d84ae75ee54d61ca1f10a4196089ddc3cc998385290059061bb75827e23e8df188f82 SHA512 8d59f7ab78c48f4b61039b3db7f1ec911082eb3d4c54be1c8a702a2badcb5a08401a1580d12484717c8abc3f3cb5974c0d96131f33f7865dafa0ec0aaec78265
-EBUILD recoll-1.28.5.ebuild 3652 BLAKE2B 258c29084765f4e3f356ad6ef82459152c15e355623fea2be3feca6b4e4bcb75356b0eaa9fc8e246159024fac17b4fb164e658b4169b337dcb7e69bd06fefeb1 SHA512 65595a84dc48d64a72cee75cb4346e8033b1f40905e1c82ab2f9193b7bc070452ba16bc09e650206d4fa52f3056c27f45c97a3666c908e8f1b369062b36f8017
-EBUILD recoll-1.29.2.ebuild 3652 BLAKE2B 258c29084765f4e3f356ad6ef82459152c15e355623fea2be3feca6b4e4bcb75356b0eaa9fc8e246159024fac17b4fb164e658b4169b337dcb7e69bd06fefeb1 SHA512 65595a84dc48d64a72cee75cb4346e8033b1f40905e1c82ab2f9193b7bc070452ba16bc09e650206d4fa52f3056c27f45c97a3666c908e8f1b369062b36f8017
+EBUILD recoll-1.25.19.ebuild 3454 BLAKE2B c6850360c618f928644ef8f4b2bb3d8c3b48bb9f49a44e9519800a44751a68a84f1727bf6a30347a66f72fdaa74c78cc42204411d61d34ec7b3a9b85c8825eee SHA512 82869a6a5041bf2f5e5bf431f9ed16fa0ee19981e7b1025ab34b54ce5838f3f1d7ccce149bf75bc04d87fbcde266b213ba396a534c7f48c7268f2ac301214c67
+EBUILD recoll-1.27.12.ebuild 3477 BLAKE2B 95fa8b50e3e2036c4fb6ef72a69f394f04d5aacb9919d41c33782ae8e9688de7b993f9386b0a96e8b8b1a6ff5a0be8d49f21900b69a939e200131fdf7b439198 SHA512 e33fd31fc1e9ba7bb0eca7fe82237d94a8db3049fbf442de72f49f23bf2f7370d5b5e933a5d23a85bf93628247ee7180e3830da2c98b9b83143af09102cd01fb
+EBUILD recoll-1.28.5.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
+EBUILD recoll-1.29.2.ebuild 3485 BLAKE2B 1bceaf054aa3c9cb71994ce9fa590c4adefb24be79896ee91436583587c3664f232693a9dbece75548f2b5b3b59f42cdb5ed23a08005e7a83e91986d7b1e3674 SHA512 3807c9ad45374b444ff5c2886f78d411c368d62c723406e286a5393bea5220b0b1c8d486469750dcc287b81fbc6d2f62141cc400b56f482f27e5a6c840df3201
 MISC metadata.xml 1412 BLAKE2B c76bff8f2b5483cc9525a1806b7136a7414b4944c54cd1953bacc6a353bd139fb53f0692042d94500308629014f222dad80c9fb79c640d80927a4f3eb31c4775 SHA512 0f0c368749d42f60845b7d81e20bee3cf9fc83e696e6463e42b2c925b230b8fa1da76088a9e41ced0327f6db05beac3127b1739b421143255fda22b3db1a0ba2
diff --git a/app-misc/recoll/recoll-1.25.19.ebuild b/app-misc/recoll/recoll-1.25.19.ebuild
index d1e6872bedf7..33f7f1b8c6b9 100644
--- a/app-misc/recoll/recoll-1.25.19.ebuild
+++ b/app-misc/recoll/recoll-1.25.19.ebuild
@@ -109,10 +109,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "In order to extract the full functionality of "
-	elog "recoll, the following packages should be installed "
-	elog "to get the corresponding document support."
-
 	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
 	optfeature "PDF files support"              app-text/poppler
 	optfeature "PDF files with OCR support"     app-text/tesseract
diff --git a/app-misc/recoll/recoll-1.27.12.ebuild b/app-misc/recoll/recoll-1.27.12.ebuild
index 775edac87521..45520266093f 100644
--- a/app-misc/recoll/recoll-1.27.12.ebuild
+++ b/app-misc/recoll/recoll-1.27.12.ebuild
@@ -110,10 +110,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "In order to extract the full functionality of "
-	elog "recoll, the following packages should be installed "
-	elog "to get the corresponding document support."
-
 	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
 	optfeature "PDF files support"              app-text/poppler
 	optfeature "PDF files with OCR support"     app-text/tesseract
diff --git a/app-misc/recoll/recoll-1.28.5.ebuild b/app-misc/recoll/recoll-1.28.5.ebuild
index f72ea0e76f09..3beec1b6fe84 100644
--- a/app-misc/recoll/recoll-1.28.5.ebuild
+++ b/app-misc/recoll/recoll-1.28.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="camelcase chm doc +inotify qt5 session +spell webengine"
 REQUIRED_USE="
@@ -110,10 +110,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "In order to extract the full functionality of "
-	elog "recoll, the following packages should be installed "
-	elog "to get the corresponding document support."
-
 	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
 	optfeature "PDF files support"              app-text/poppler
 	optfeature "PDF files with OCR support"     app-text/tesseract
diff --git a/app-misc/recoll/recoll-1.29.2.ebuild b/app-misc/recoll/recoll-1.29.2.ebuild
index f72ea0e76f09..cb1c72bf0dee 100644
--- a/app-misc/recoll/recoll-1.29.2.ebuild
+++ b/app-misc/recoll/recoll-1.29.2.ebuild
@@ -110,10 +110,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "In order to extract the full functionality of "
-	elog "recoll, the following packages should be installed "
-	elog "to get the corresponding document support."
-
 	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
 	optfeature "PDF files support"              app-text/poppler
 	optfeature "PDF files with OCR support"     app-text/tesseract
diff --git a/app-misc/regionset/Manifest b/app-misc/regionset/Manifest
index efd16cb49059..5433dc098b91 100644
--- a/app-misc/regionset/Manifest
+++ b/app-misc/regionset/Manifest
@@ -1,3 +1,3 @@
 DIST regionset-0.2.tar.gz 19063 BLAKE2B e96c014effa78d7c5f636d80edb7d74741107dd11728ca7f52c2d41919960986d37fd4245bb7975928605c6a06e7e2c31d050b847771e60af837e3f2286edb27 SHA512 7d7fa92a2031a1d18032ba0979fe0ee27ff84c02977dc03df394383a2d562925b38eedfd478ee08d60e84de60914278f7880c10a43552345fe36af0c0fee6431
-EBUILD regionset-0.2.ebuild 1013 BLAKE2B 840e01afd9ab775c8265253c820ba522c904d97d2f1b1dedda86ee8076e648ae2a0bc2d45ef1b06ab4fddbf32a0efa7c555eafee8fc0970efc3d9efa09ffefd8 SHA512 18ea86944db5cc359b0ea8bcb27a47d4378f6b5d0e82473c7a639aec231527a826c7706f163e89ae5b06b696b927a3f6222cc2f9a577bec3c194ec9f3f982b4e
+EBUILD regionset-0.2.ebuild 1024 BLAKE2B 0b9774f936f2116df332fd048cb51d03c85742dfc41d5f183a0375ad1379468ea8885aa55e154c009acfbc9cd3d7c5bb480c05006858a58b38a338b02c62833b SHA512 30fec2435732339f9ae243596a7e001a3e7fa7979b0b51f226a16a6c4e3ad0143f06d8f41952806dd927da87834c18e2ff493ace53897d9239b5d933da37be09
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/regionset/regionset-0.2.ebuild b/app-misc/regionset/regionset-0.2.ebuild
index ccfb8796d511..6986cf9d3f32 100644
--- a/app-misc/regionset/regionset-0.2.ebuild
+++ b/app-misc/regionset/regionset-0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,14 +12,14 @@ SRC_URI="http://linvdr.org/download/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 src_prepare() {
+	default
 	sed "/^\.IR/s@${PN}@${PF}@" -i ${PN}.8 || die
 }
 
 src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c dvd_udf.c || die
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c dvd_udf.c || die
 }
 
 src_install() {
@@ -29,7 +29,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "By default regionset uses /dev/dvd, specify a different device"
+	ewarn "By default, regionset uses /dev/dvd, specify a different device"
 	ewarn "as a command line argument if you need to. You need write access"
 	ewarn "to do this, preferably as root."
 	ewarn
diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest
index 359b57adcea5..384f88b0bb35 100644
--- a/app-misc/reptyr/Manifest
+++ b/app-misc/reptyr/Manifest
@@ -1,8 +1,3 @@
-DIST reptyr-0.6.2-sysmacros.patch 598 BLAKE2B 12e024efd3a7c2e07f1930545f2c5ee78212ac0f30095208c7cd2678c66f48038576d32b1f969cf9018db12b8fcd27f900257701bc66873326cd820c2ee57c14 SHA512 2d6c711a1d1268557925d15cf5d8154bc4ce47b5475ad05a5d358fd94a882991f33a8d99608e511d15dea6c08dcac615467f52bedb46330868540b03302e0cc9
-DIST reptyr-0.6.2.tar.gz 28533 BLAKE2B 305aeb5619c1780bbc189a64786ba1148c730e518ea8fe3c5daf715fcbe0de3ad7bd107008fb2471b8a3b61e75406ebb32d99b2eb5323badbb9e5f10ed1e65dc SHA512 ad0b378d3c30bbfaa30dfcc06c405c375c7e9bcc3bae2e7fb97b8c3f88f482f461c9c846df0064cc842149b07b8a6b616d95f74cdf38f1b2a5011f6b9328c327
-DIST reptyr-0.7.0.tar.gz 30718 BLAKE2B 7cdb3c95deeab82898d41dd5047cd15ff288229145b64fce8efc5360d205a575a4f421ed52885c6491d56858fb7d1f09f0e8588a3be62d021bd26e554bb1ed25 SHA512 d95a05634f7e4e55f487577baee50fc773f0d9957be5ac1a678bd0434baffd994c08a884496f6400ee101333c310eaaf2150f9053d3b4b6e525820a7ed24a8e6
 DIST reptyr-0.8.0.tar.gz 32239 BLAKE2B eb3d966c06df710ea27a421bceaca0c91e342cb981567eedc9125e5dd2dc937be294dc212ed9b3021d5e5d75e1011fa4a39eaf93c152c24ef7c5098f8edd9018 SHA512 880d899a2b6df3c33909dc70ce0a58f413b2e2eec2e212abc709348345d48294cf2e39f5891ab4b1fa24e69b54effe99c1b8ab03b448bfd7097e20498e7e85dc
-EBUILD reptyr-0.6.2.ebuild 952 BLAKE2B d3b5e34cc1989043a47e8d13eb066fb588688a588c256efc29991f625c01409a3e01178342a4373f2996467643395031ea30187cf1efbf80366b095677fc884d SHA512 6b70da39e56db290e52af8589437452214f458e8d28487f796000ddb4036427a798f0b38f4766860e3fc0cabdc26248823d18deb78ce80ac9a073a0b4d0cb57d
-EBUILD reptyr-0.7.0.ebuild 778 BLAKE2B f91b1ecddaf2c744a7e62aee5fd3c52aed826588260fa5fa781334fb010321bcf1a222646eab5b8381fed9f2e26e339f0fb17505d9825907da312db49adccaba SHA512 771bcf91f3b194d9a384aa487bc5021871d767b689ba78b29f3c55f50ad0f46a243276614cfe6e8898d82dd83eb5204c504fc12918146a1fb53b27372e39d301
 EBUILD reptyr-0.8.0.ebuild 776 BLAKE2B 17db2e3f67a28123ceb2eef5c577da50606da81f807aa2a29c687f229bd29c034eab78197a69e204749826675fae44d508f498cf690f73bc723f8879e420a5fb SHA512 5d6185fbfab26f2ee59dd3d6fd3158902305b243cd6f3dd4ccedd82f2ce1409af2a3d5761be839b70c6ed7b893cad28597487e9b7e5e8f61ecbff256c5993749
 MISC metadata.xml 472 BLAKE2B 60fe70a0a1d8761764b853a0b6a05656019e3e4c9d04a7b79b884d35b9bb112a0aa66ae4b7096d91c25fafc34dd6ea248119887eb0a44c132b7b38c6fe993d87 SHA512 6b0c72aca4cc7c33cc37aa366292889fb6907d10c6e31bb140c98b30b1bde79a81dd188d5b2b5a1eb338ca8ebb41d05c2fe9d5158d780fa4cf3ea772476166ff
diff --git a/app-misc/reptyr/reptyr-0.6.2.ebuild b/app-misc/reptyr/reptyr-0.6.2.ebuild
deleted file mode 100644
index 40892b3d1a67..000000000000
--- a/app-misc/reptyr/reptyr-0.6.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic vcs-snapshot
-
-DESCRIPTION="A utility to attach a running program to a new terminal"
-HOMEPAGE="https://github.com/nelhage/reptyr"
-SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="test"
-
-# https://github.com/nelhage/reptyr/issues/81
-SRC_URI+=" https://github.com/nelhage/reptyr/commit/b45fd9238958fcf2d8f3d6fc23e6d491febea2ac.patch -> ${PN}-0.6.2-sysmacros.patch"
-
-PATCHES=(
-	"${DISTDIR}/${P}-sysmacros.patch" #581974
-)
-
-src_prepare() {
-	default
-	# respect CFLAGS
-	sed -i '/^override/d' Makefile || die
-}
-
-src_compile() {
-	append-cppflags -D_GNU_SOURCE
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	dodoc ChangeLog NOTES README.md
-}
diff --git a/app-misc/reptyr/reptyr-0.7.0.ebuild b/app-misc/reptyr/reptyr-0.7.0.ebuild
deleted file mode 100644
index d6e4db1d9cc3..000000000000
--- a/app-misc/reptyr/reptyr-0.7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs flag-o-matic vcs-snapshot
-
-DESCRIPTION="A utility to attach a running program to a new terminal"
-HOMEPAGE="https://github.com/nelhage/reptyr"
-SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	# respect CFLAGS
-	sed -i '/^override/d' Makefile || die
-}
-
-src_compile() {
-	append-cppflags -D_GNU_SOURCE
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	dodoc ChangeLog NOTES README.md
-	newbashcomp reptyr{.bash,}
-}
diff --git a/app-misc/rl/Manifest b/app-misc/rl/Manifest
index f35c7b0c7fb2..277326274b15 100644
--- a/app-misc/rl/Manifest
+++ b/app-misc/rl/Manifest
@@ -1,3 +1,3 @@
 DIST rl-0.2.7.tar.gz 131028 BLAKE2B 06db6d6e9c2dd88bce3145d0436544b5f5b848bc2e985db64ccc2146cf61be1b76b02bfe071169f6e346ad4f5ff9b9089c940ecf02e3c68efcfa2f74a9fe131a SHA512 c9db8564832494148ed8e60df844a2a383e52b9d293564cf46b393e57a88f773b7307a1dd749d4e5e2daef1632b5350de00ab2585478ff3c18bffa1c5c573f8d
-EBUILD rl-0.2.7-r1.ebuild 667 BLAKE2B 1f23d3f31c48b45bd25f7e0d4a558ecf4eb58d95b60bb35ede7c819d8aa6dcd87898f05f24db99a8ebd232c659cc19ea9fc5ff2b6d6887c3c0923aea4485422f SHA512 f0331652f2cd6729ae5dc517a70224a349e765047e0bd13e197caaadf1c3e4ce026c156b7f48218e6af484256dc562a1b587bed7600d02ccb98ac826422968b5
+EBUILD rl-0.2.7-r1.ebuild 665 BLAKE2B 721f97fb86b3b9bf385644f5c5f494ee88ca783020155496ddf072a7d6d5ccf3430384ea9f87551ea463db605c0cdbdaa1069124e363cf1c6eb34a4e1061acc6 SHA512 cb81f4940575f12179c8a0dea4abb5bdc820cdb6d778de013f6436ed8326e4fb0d47249ce97129b579ad34a7a8069c46a65cc0968e38514f4ce68dd90c40a74a
 MISC metadata.xml 345 BLAKE2B d9d62b5d814ad0d01c87bf7561708d2bb4924efab4e514830ac5e9791924d6ba26aee9f0974f36fedbd1445909aee5de079bba52de05f0f618b15a6fddcdae07 SHA512 95bf677226356a879a65b5c77b2134ec8efe29dcf194f7e01bda205eb90717b33fed0fb1559021eaf234996368d1f47c8a658161c69e587821c71c19fc66f765
diff --git a/app-misc/rl/rl-0.2.7-r1.ebuild b/app-misc/rl/rl-0.2.7-r1.ebuild
index 25fd63c8898b..1f1c47f2ee0f 100644
--- a/app-misc/rl/rl-0.2.7-r1.ebuild
+++ b/app-misc/rl/rl-0.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://arthurdejong.org/rl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~mips ppc s390 sparc x86"
+KEYWORDS="amd64 ~ia64 ~mips ppc ~s390 sparc x86"
 IUSE="debug"
 
 DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index d147f94912c7..2daae551cfeb 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -5,27 +5,26 @@ DIST approx-0.3.2.crate 14288 BLAKE2B 601eb7b83c6f0e41a4d64db5669b7058b403831941
 DIST approx-0.4.0.crate 14280 BLAKE2B 8508006fd4b31290b4a3e0b26f521af94d5014774b7295705ac5d03099de1d9e22a26c4a1ad3fc0e70d1c6642c30034a7971ed4d57e0de766129213e2d025ac9 SHA512 eb63504a72065362067cd213543f74206fd6ee93d94d12ed5da9d430341b20cb51c860890465a4118ea0ea30baf84013ab81468b73677742af8a6dbb16121568
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
-DIST assert_cmd-1.0.2.crate 25037 BLAKE2B b7fe731a66ce7270b165e30da774420ff17f29a881e738b8b8a9ed37170edc6d0c27f1b052553c408c93b832f879742123b1585abccfde9c7e4b5830d0f327a6 SHA512 1d17d4ac5748a3a44ed25c8788f17bb5edcc15ce0e3f2232dfcb0c88cf735406e1048752473ae76fb033aad6d544c142c699c49e0398d2625e59b36526417f7a
 DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
-DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83 SHA512 de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
 DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
 DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
+DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
 DIST csv-1.1.5.crate 886773 BLAKE2B c5da00c6d81b3cc1336edbe462cbca59121c3438d41c55148de21a538c5a3a9d81d10da44177c51898dd6b9d027f794fa15779cf0c01861183efed54fd6b95a3 SHA512 d878a953fd1079b1aef7f23108c1bc5db3cadc2e1a1dc1ceb4e26508e4249db01f957f6626eef721153d3b0cc47f5f3b25380e4c943adbdf28647b9bb7cd8f05
+DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
 DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
-DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
-DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST downcast-0.10.0.crate 4923 BLAKE2B 3e69a1dcd0f2ad487273775b304ea6fa26f225eaab012219072cb5ef3ff60931ff3ffd616e09f3708895b2d01538c8e46e3e91aa1f4a288bdf910bdc7043acba SHA512 f618ec81bcdf74e8851703c6dfe92b36c9a035214635fdae598af20258549ef31a1c23a4d220c67505aa403fcc8a0b99a990fda01305a71b801acd5044f91c12
@@ -34,16 +33,15 @@ DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5
 DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
 DIST fragile-1.0.0.crate 10315 BLAKE2B 5f81d144012372be3504f151e9740d422edb9e29224ce2be4105d7aebc8bfc0b882e1a3a8a0eb6ff1f314264e3c70a6054196703cb69cf43560dc9711340fc69 SHA512 bbdd87f97c494495f4db10c68121f4b6f76e3752b9e4b363c0dde24a96a1344868faceeaf7e6df1edfee6ec107f10b69fd26bf271519675463c0235ecec3780b
 DIST generic-array-0.13.2.crate 26715 BLAKE2B c0ec536cd455b82fedcbc201820090db78c798ab69b3bf4e185a5b4860dfa560e0b9d6d87d991cf99ec406867b98e3cf0cb48761b0a91bc25833e12cd59fbe2e SHA512 7039c1d0e4f8f9b0518ddd807adb7e0e86ebee056bc8562eaaa3f7360b6a953b8be4d5c2660ad62a68e42eb242111ee98fa961c0e8a74bde532970bcef3dbe4a
+DIST generic-array-0.13.3.crate 26956 BLAKE2B b8df2cfb4b37543eb1d2803ab7c6d2daf4a1dfe7d652513c259f93e26ab3049aa033072ea486f83744effd188cc53fc785c3e4f3c256677f0fcb221603221ee4 SHA512 d66ea808aaf085c9162fa8c96a5655bc60b42df764c5dc17226e0aa24792d48230d51c9df61db6f551d491cd173da48a5e06d5e4e010901b14c3f044c7f38fcb
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST getrandom-0.2.1.crate 25459 BLAKE2B 2b3eb82c444d15a770691e1c312e4e694292de6b8a0eb8f6b3e19e0ceadc2d44a6cabb93f2a309e7ee388bc0d9a4b323800d863db7b7e7460e98e4ef6156eb6d SHA512 3cd15d52c5821972d1777cf2249a5f55ca0705ac2ff688ec45c21b70e3e956b538133a529e229d778cc0d0b48f293466d1bbccd0e18d43b9b6646daec4b08480
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
-DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.82.crate 515967 BLAKE2B 60c1ebdf659f1eb37f47a068e778567412bb133526df28fee1d20b3fd58dbe7fee1abbdd21c5445bc1022f2cdc39847244dcb7412114037a0be64f5a2a383978 SHA512 25eaf390acb409d329b9e32008078824eed4ca3a10af851f5097b653793db316419a395910c23dff293dfe2bac051a51871281a6bf2487937121b403286630c1
 DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
+DIST libc-0.2.88.crate 514138 BLAKE2B c9c6cd0b5456ee2706e7b572ba8df644abeb2d1297abe4f5d2b480e7b7b6b1024cfde98adea2822045b605949505c133538c74b0676c3ab5a2db8aed04605b4b SHA512 c1ad5dd0efd8117da798fcff84082e3b831cb1ae04c26ca8d87936057155e2ca08f0a693cf2c79c5db2c2dbe6b64e254328439b303ba952559f4c524466ad243
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
 DIST matrixmultiply-0.2.4.crate 32929 BLAKE2B bd3c6b2d11202ea9390760ca59b7452beb4094b4a95314c1a1c596ff623eb985ae5cf2b3821d365dd2e2912c1bd25713188de07b4555a996a667cb4d6b0cfb11 SHA512 3ec6846e1342d6dddb81f5bd4495e940f011a3e048c712262cc413318c087aaa137550cff6d969873ac96bb628f6a460e92536674c0d503d5c609d9be5d9d184
@@ -58,25 +56,19 @@ DIST num-rational-0.2.4.crate 21694 BLAKE2B 6e8dbb873b1c62046c3fc45eeea0533a8375
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
-DIST predicates-1.0.6.crate 26093 BLAKE2B 20eec0af0b3464931f486938fd7a058d4ccd15fc12d7842387906f142897b929ec79068ef410853b6008b71945424930064bafd84ead7afcdca29f35b9624926 SHA512 0e971a05e1ada5ffe61054d551330a6bcb1c9a5df541d19b442d7a06842ccfec9db981d347e3357f83b1cad750e8af1f90cc9130df94f417267063e7954c529e
 DIST predicates-1.0.7.crate 274733 BLAKE2B 5275012b3759356882fc1256119b52526eb8a39f3670d8e38d10ea96918bdc3bd13fbdfc841c6784aa3dbe8147777048f751886427c1ee8c4380b5084c5a70c5 SHA512 6d72f940714d698f5ff92f16a35e26675d995ea94c82de9bddbd386e7783ce0ed726b21c85bac3dd21e8f8a92cd2d4ee37dafe1cbc42e8e6b30ba13f06858b40
-DIST predicates-core-1.0.1.crate 8186 BLAKE2B cef5cbdc252e3f953fb9417bd5a439f226f627b2ca6a9c537834ee8ee59cf3a252ad92ef5ee40f4e544e388757e5dba6b07b6807e95dd89eb35bf45f612d09b8 SHA512 3addfc4f6e3f549125eddc9f1aa11072e17f48909f53ce8e476ce783cc690c0b52a1fe6416d87816d8b558350fb8b4666adc6b79cff880956bf258f646459da0
 DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
-DIST predicates-tree-1.0.1.crate 6355 BLAKE2B b79f756d9f1822a037c05a65f90cf01592ec6ba83bde2c44aa6fc8a3d476f9e4e3d0ac13afdcd3936b0d43244e8e7ab1eeaf0223cecc3f7941af96e44c45366f SHA512 f97f6e05b3edc1faf82931ab47541b3e459066e0f5181f77a4ab885e10bdce43f71021bf2c848993125a4feef13c3290a312a74ad1d2b4a2cb55fe7d24492a19
 DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
-DIST rand-0.8.2.crate 84288 BLAKE2B 406820e506cb3dfd2529703ff4ac42dc1a693fc4c12023ab46fd69c5517b3136f02b580d850730855493a69ce31f8825bd9fb1905717178b1221f6c6c9aa3788 SHA512 573090e4a3501df912b04e5cecc40b1c61a46602f790a8f6068a06fc28acb40ff760882cb1c65eda073d33b4ab74691ca84456e5f1744bd0fc2bc9990ba894f3
 DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
-DIST rand_core-0.6.1.crate 21634 BLAKE2B f059ef57238977208711b2b25f96682f58a5e935406b24a91cbbfca2cea918e764c512efa8ed8d77ee8df1fa3aae1d887148c5dd54cc0bd82ff14ee2dfade0f9 SHA512 546c1cc6064f22fa2b0cda1e42329aa7da1ea3be9b6aa277ef97de13067f28c473fe7f5bae4cf4151693aff31df3e57d6e99c6ff10d8fc79f94154dc26d19bf3
 DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
 DIST rand_distr-0.2.2.crate 40805 BLAKE2B 9c4ff7770da3e04798c5de17a43e7943cffbc3adce334e7bd8ed3720787ad029c5127523bc3128b54736e4071d2ccf7b699bbf00d9ff9c1d39d47a988e5b22b4 SHA512 15c710f3ec4e06fb4c356ef1016431c8b7e6fd6d7f03f2fe56b7ffd34cfffd728d3b3a9c92ddca36fb4920154f92589dc9c91b1735bb32d5b61eaedb24d702cc
 DIST rand_distr-0.4.0.crate 51930 BLAKE2B 67731792f82d012cdde89b8d67b444ba06727675b384e52ba7ede682ec247c8c2e6f956e00bb923f37cfce4c2d584ba8aa3af1d72de5b84ed4ed0cee5e1c5656 SHA512 e4670482a411be4257a7b3ebe4fa13a1f63acafd3a4bcc95a54c2e84183491b2539b02952b7ba654ed30e0c4e589ec452accf4c331af118285e26ac535278190
@@ -84,52 +76,53 @@ DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6
 DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
 DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_syscall-0.2.4.crate 23234 BLAKE2B 2190c072fcc0d5be9823353427e5ebb3277a9452dd9c2320f7b46168a3d764f8a2e9215f333a72e272b6d021de7141c76d25e65210e70a6b0da6a7cc987a281c SHA512 622f38ed962f7647299bcd4a742dd137c63450d5eb85d74adfa4b72951144b9920eb04d4af87e9c679c4bd47a985c528a8e56bdc31b15f4c8cd85e6b1bbddfe3
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
+DIST regex-1.4.4.crate 241266 BLAKE2B 1f5877002d9fb2eb83146207232ba53fba02e8f19de9afd9f39d7c25acf7fee1be9bde0ead5211a81846ff52f595bd2b6885d68ed2c1e43466de38a323ff844a SHA512 1d7a0303c8a8106278516ecd3dbe3dca331f1a91fecd4bfed6d9744654447cab597f7dbfadf6b0e7ef7b4fcf357a6258bf8d517e5bef71f6e6dc46f7a9b1b2d9
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
+DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rpick-0.7.2.crate 37916 BLAKE2B b13612c1cf46b4a96efff68df59fedf2ef83d9582ecaade75b107d28e5aaf13fbf60921627a476c4c8a4858e32cea5f72605017f7e8af360abac4d5655835d2d SHA512 8b5072effd68d10a556607900c546deb652d9a7a7420842578c1f97e6a913ecb5d3a71811e94d4324ae472b97ab09bd1b709830396d933e402e167dce047ca89
 DIST rpick-0.8.1.crate 40723 BLAKE2B 6fc98b965f392c1db82056096265528500eb84f16d480db476f412ae4a38d23be19b9d991fa71b038d1f3540272238b89b961895a94cf4e8a835995b688656f8 SHA512 e713b1b322f8ea552320f1d4f004a0950ccd09d23605cb95569fb85522b4a5e4383ff30894d2b898c6a47bd8419a2e305123a276518c6bf02bf7c506941d5c8d
+DIST rpick-0.8.2.crate 40556 BLAKE2B 7bd2216a30ec8a8e81c7f1081455460a59875ec304140269df2927ce464e63895ceb2160c3326c89f22ccc5bd26b2ee9f59f437afc30939b1c25aa67aa001480 SHA512 8362e89c6601d6fdc5f4d1c8548e8359625d8f8225399bad6650035fddd3fe6c3e52c25d5eb83dbad7f10adc92cf3e013f851ee435d307bf6d586c266ac2973d
 DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST serde-1.0.119.crate 74321 BLAKE2B 334922cb9b3115a929c7b32ee7ca3356de1f7cadbda224bffb7044db9ec0a6d949c415e10ffc7cdae356da749e779185072e965162ac036987ab997b40cf761f SHA512 7bce4d7c836c3d65f8d63e1200ea28e11f7b43c4c72e3d9576e2493699b2cc1dc88908a1086310a46961f6cf2e1191724f0a6f1fb137030659280dad434a451b
 DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823
-DIST serde_derive-1.0.119.crate 50617 BLAKE2B 71520b2b83e55129b901876fcaebb4e7a1717f89d573b9b7780a9a27e3f50915eafa9a0fbd803af31f17ba2de7e7708b8357cc915827217ebb0f227f2632f087 SHA512 6fb88db514c30f4706a1f535fb0997a753601e2f6a4d0c7546b50b9d5febde4b982bab172101973232784cb8a8ba54ecf8584ac0f980f339b6578bfab41001b5
+DIST serde-1.0.124.crate 74508 BLAKE2B c2201c9f1aa7d3f72bdb5ca56b888d40d7606d019d86f3b2dafa93d67e768a8f79ac281c3e8442a4efae676de3b3556c55ca7234fd962809e035631a7f824191 SHA512 3106e446875b6a45f59f23d5619e62e6b97ba5462f38f768b68bd33a3679ee22f4821f460646133eb626a9e529b704e405388425ee2353a4027b48f7e36623ea
 DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
-DIST serde_yaml-0.8.15.crate 37877 BLAKE2B 31cf453a3b04332f9ef3ecc7366c1a6e4017029767ff2484846955d8dca8ba1100d8cd5eac6c2367bdab8efebde987345ab0b7802629b8bf96effa3933646052 SHA512 8697f445ff13a93aa584afe1b91829c6dde86239751ab71f6b3b088b0506249268eda3e1cf507095a4ffda5ad78d589f92ab908117050a0bd70311867e0d031b
+DIST serde_derive-1.0.124.crate 54147 BLAKE2B 313a601e7fba1d23a4029fb40946cd0c54ee100d5eb76e81d33d289debd96b63c862d2797b0b4de49df8b417d711fbebeba7660b4243dbd147cb75d04a2f78a3 SHA512 6da069bd2ffa101bf0c83748417e14cab93b898313a33bbb2584ef4bb85924a92b24c54f61906a42797d409ad47c313089a31549c2e6be1513220e3145a76c8d
 DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
 DIST statrs-0.13.0.crate 123300 BLAKE2B 2c4c0f608c261ff6feea282fa28aa4d7bdf6b8dfbc5c8b927c0253bd1ea49e7038513c2f3cd15237ac11a01978c2d5794dc4e104ac6d50b882fb5cda6cf9f485 SHA512 3ce6f35dba25e27535dcff6985ebd2b24093b9b9b1911e151be740da3c1ad0722a3c35fba1fc6ef105e9d1aec122c56e0d3a9f223c3327cf970e3c720d16a996
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
-DIST syn-1.0.58.crate 229250 BLAKE2B 28df7854962f46339d1f993d2e1dae4c142731c3d7f08d03015ffcbf7eb307c1da9d35eb603d6efe653ff80bb0108bd5faabe1d7c68cec9476eaa0b710a27586 SHA512 b6bd101a455b77c2836384d7346f79b651f41c7685667b64032905cdd4026ee673c24de16a2acb2b8005af743a6d1b40628b30cd09c8454a39cc7d131ce71487
 DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
+DIST syn-1.0.63.crate 231524 BLAKE2B 43398bc3ca9069db4d44af3b28e5e48034d6ac4f38bd1e3da8c77c9d1468d3d9f6f7b7c6711d1dd232d5f2d9477c5929a18368a003be42f6254f270cf5d6a74a SHA512 a0da342e44dc6509f35dad8534acd93bf1a9e3104c2d9eb9d66c38a25036c5aae0503bfee3e09d2e42cc117022b328b6d966444dfb434b780c78fea64dfb14b6
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.23.crate 16423 BLAKE2B fd257d34da829c8d0fd2cdce9910e0b5e797ec233af3a6b3be6b47a4fa3f39bc0170edd08cde3fb546d8f3c7be63049ddd94400b602dc73262fba2c323229650 SHA512 e6b6ab7a4a23f3c50e765a16071b65007441ad3f1eb5566e91bc19755cd019fb8efb358cea5663bf7c83cb3be63fae9ee0d019cffb3fddae58233c84b93aea9c
+DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
 DIST thiserror-impl-1.0.23.crate 13269 BLAKE2B 7b570c1a0d122a11fcbb7784e6c0620bee0e4644e6e8e988de6936ba23901ef6549585d1e14afa8240b199e3c92a6471af3e4b63fac902292f46ab7ff0a7a6f5 SHA512 72098ef63a73986c8d6a0f3fff6d5b23e29da0dc8eb4eddb410b7bdfcedb303e73418b2a3518d9315772b0c2c1b9c3d86d6a67bc7cdebd45f4488c13a5b62162
-DIST thread_local-1.1.0.crate 12222 BLAKE2B 4d19e85f5e342cdad8bcb33ab4c54d19563a831128c0d98dd79906f1096d3665a2bd0bdc114f11f51bf517dd5f401b2788a16482e38895610b080d1e2eba6dc7 SHA512 4681b69e471f2b90091f51422358cd86d1e851cb7118613d7e791b18d7464cd71e9d21d50223ccaa9dcca1c54b220474d3d6739634f57666938baf4dc174e621
+DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
 DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
+DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
-DIST wasi-0.10.1+wasi-snapshot-preview1.crate 26898 BLAKE2B 658d12823fdff936f3205917a2370a6d2dd87288f4b9b93956298a58ac6ced8da1081d6f024505b5532655329dd437557b3e56319d742d791bf4108173c7a6a3 SHA512 7e40e580df3707681e3d31c7058234549f036628a6bbfae301bdffabf5c36133ba2f20a6c0f5ddb4c7129500b3bce57fdc9049f0bc227df8fab4d8ff398fb9a9
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD rpick-0.7.2.ebuild 2476 BLAKE2B 29fefdc7f27dbcd9ddd05e48011a5efb6d59b47eab35f27d5e8816127c3bfbc340adad377cdfb769f514456d6a54ce400aa139a16fd411e00247fae57cb4e08e SHA512 a0d08a5566ef9af7d7e1a921c463a85771b59533bb2609010bea5b1fc3ffdd2f97f62e806b47df7f81b3aca490d22e5f1b98c580b13cee534debd93079de5768
-EBUILD rpick-0.8.1.ebuild 2685 BLAKE2B 5608cdaec2a48b9f9fef324d49bf2d199c56904ae5f088bf196d8101fe8816a5e1f378699abfe02e7cd061fa170419f1bab416d33507918997e26195975d4626 SHA512 e178e5906a8cdf27d0cafbccf118f045119f9c52fad17221ef842dee8e1c6ea23f4a6c3bbb6195efa2dff18d75f299ce1fb5dec2b437c2e8938600b9f8ac7f8d
+EBUILD rpick-0.8.1.ebuild 2682 BLAKE2B d26c4f13683788bf7c2f5fed23c90dfc172c0754fe9e8906ea5825774b7c0e3ea94f5906859f203f2f09517ae5181d531256482dfab55ca6806ad3693e009559 SHA512 672ff9eedd557555ae5ab8e80c703e0442e2e7fc4197b45d8ce60bbc5166d73947ba9378c48cd58f07de7047d53e7a6019cc99d7724cfff0c59999e4fb5c868a
+EBUILD rpick-0.8.2.ebuild 2650 BLAKE2B 223f80211d3a4720ad371f4b1f62b8456fa3981b8c4401a0029c5ff7071e3f7fdfa3d292d3c163508db394701e7ad734b0117f92c1a5f8f1bcbd9d1c363c04bb SHA512 5931a3494184fc4ef963cf875bf4dbc542ada88ea11c3fb0306b0c47877a5e27f303b584c35f82269d8109b6273b297dfdf16cbad8e1a4939ebedc960073d2e9
 MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/rpick-0.8.1.ebuild b/app-misc/rpick/rpick-0.8.1.ebuild
index 44535b416930..fd35b49ae5b0 100644
--- a/app-misc/rpick/rpick-0.8.1.ebuild
+++ b/app-misc/rpick/rpick-0.8.1.ebuild
@@ -129,7 +129,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
 QA_FLAGS_IGNORED="usr/bin/rpick"
diff --git a/app-misc/rpick/rpick-0.7.2.ebuild b/app-misc/rpick/rpick-0.8.2.ebuild
index 3f192883a59e..9271423c73aa 100644
--- a/app-misc/rpick/rpick-0.7.2.ebuild
+++ b/app-misc/rpick/rpick-0.8.2.ebuild
@@ -10,97 +10,106 @@ aho-corasick-0.7.15
 alga-0.9.3
 ansi_term-0.11.0
 approx-0.3.2
+approx-0.4.0
 arrayref-0.3.6
 arrayvec-0.5.2
-assert_cmd-1.0.2
+assert_cmd-1.0.3
 atty-0.2.14
 autocfg-1.0.1
 base64-0.13.0
 bitflags-1.2.1
 blake2b_simd-0.5.11
-bstr-0.2.14
-byteorder-1.4.2
+bstr-0.2.15
+byteorder-1.4.3
 cfg-if-1.0.0
 clap-2.33.3
 constant_time_eq-0.1.5
-crossbeam-utils-0.8.1
-csv-1.1.5
+crossbeam-utils-0.8.3
+csv-1.1.6
 csv-core-0.1.10
 difference-2.0.0
 dirs-1.0.5
-dirs-3.0.1
-dirs-sys-0.3.5
+dirs-next-2.0.0
+dirs-sys-next-0.1.2
 doc-comment-0.3.3
+downcast-0.10.0
 dtoa-0.4.7
 encode_unicode-0.3.6
-generic-array-0.13.2
+float-cmp-0.8.0
+fragile-1.0.0
+generic-array-0.13.3
 getrandom-0.1.16
-getrandom-0.2.1
+getrandom-0.2.2
 heck-0.3.2
-hermit-abi-0.1.17
+hermit-abi-0.1.18
 itoa-0.4.7
 lazy_static-1.4.0
-libc-0.2.82
+libc-0.2.88
 libm-0.2.1
 linked-hash-map-0.5.4
 matrixmultiply-0.2.4
 memchr-2.3.4
+mockall-0.9.1
+mockall_derive-0.9.1
 nalgebra-0.19.0
+normalize-line-endings-0.3.0
 num-complex-0.2.4
 num-integer-0.1.44
 num-rational-0.2.4
 num-traits-0.2.14
 ppv-lite86-0.2.10
-predicates-1.0.6
-predicates-core-1.0.1
-predicates-tree-1.0.1
+predicates-1.0.7
+predicates-core-1.0.2
+predicates-tree-1.0.2
 prettytable-rs-0.8.0
 proc-macro-error-1.0.4
 proc-macro-error-attr-1.0.4
 proc-macro2-1.0.24
-quote-1.0.8
+quote-1.0.9
 rand-0.7.3
-rand-0.8.2
+rand-0.8.3
 rand_chacha-0.2.2
 rand_chacha-0.3.0
 rand_core-0.5.1
-rand_core-0.6.1
+rand_core-0.6.2
 rand_distr-0.2.2
 rand_distr-0.4.0
 rand_hc-0.2.0
 rand_hc-0.3.0
 rawpointer-0.2.1
 redox_syscall-0.1.57
-redox_syscall-0.2.4
+redox_syscall-0.2.5
 redox_users-0.3.5
-regex-1.4.3
+redox_users-0.4.0
+regex-1.4.4
 regex-automata-0.1.9
-regex-syntax-0.6.22
+regex-syntax-0.6.23
 remove_dir_all-0.5.3
-rpick-0.7.2
+rpick-0.8.2
 rust-argon2-0.8.3
 ryu-1.0.5
-serde-1.0.119
-serde_derive-1.0.119
-serde_yaml-0.8.15
+serde-1.0.124
+serde_derive-1.0.124
+serde_yaml-0.8.17
 statrs-0.13.0
 strsim-0.8.0
 structopt-0.3.21
 structopt-derive-0.4.14
-syn-1.0.58
+syn-1.0.63
 tempfile-3.2.0
 term-0.5.2
 textwrap-0.11.0
-thread_local-1.1.0
+thiserror-1.0.24
+thiserror-impl-1.0.24
 treeline-0.1.0
-typenum-1.12.0
+typenum-1.13.0
 unicode-segmentation-1.7.1
 unicode-width-0.1.8
 unicode-xid-0.2.1
 vec_map-0.8.2
 version_check-0.9.2
 wait-timeout-0.2.0
-wasi-0.10.1+wasi-snapshot-preview1
+wasi-0.10.2+wasi-snapshot-preview1
 wasi-0.9.0+wasi-snapshot-preview1
 winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
@@ -118,7 +127,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
 QA_FLAGS_IGNORED="usr/bin/rpick"
diff --git a/app-misc/rundeck-bin/Manifest b/app-misc/rundeck-bin/Manifest
index 9f4c94448569..526471d848c4 100644
--- a/app-misc/rundeck-bin/Manifest
+++ b/app-misc/rundeck-bin/Manifest
@@ -2,5 +2,5 @@ AUX rundeck-bin-2.6.8-profile.patch 1584 BLAKE2B e173e1b3688ac03e03c1c1c94285b7c
 AUX rundeckd.initd 452 BLAKE2B 991239e09590f82b0b5f45c2f17700479f2e5fc8f0922bb255ee77cb64474c141d882a3f208ccbca8f81e1373238a06aa1105c47418078311e2224891b39ac01 SHA512 2c63e56f291a413c0328d036d8e8172112d1ce58a133f8b7e3a76aced774e0640e03b0b2f365870bec38faf753aa0c4090dc4813c1cde13a2a444d465476554c
 DIST rundeck-2.6.8-1.20.GA.noarch.rpm 101053077 BLAKE2B 44dc66ebbeb105e4ed5c198ca2cff9e69a03a226e43c0e68898a225955aaca471d1ada163962e25dbd3de097aa7582a3fae351d44a9740f1e46fc64526575620 SHA512 15620e306c10cae09eec95c43207cf88ebce69d4c7fd70289fac7f2f580343c623d77605f3dd5aa98cc882ec3512196aa431a2ff72e453780b415d19ee8bcebd
 DIST rundeck-config-2.6.8-1.20.GA.noarch.rpm 9460 BLAKE2B 97f943904ecfaa6d7a07bb7b8635ce13184f78fa3f042b5db8a4509d558836eda05772724e5fc58864a776900afeab790bbb6c86754e0f19dab12de827fda2a4 SHA512 ab4b9933bf942706cc1b8184375122d3e122e960761582d7b00b2a8981dc9b6cd6442ad8e65699db9e80e0a64b921f2916527f4c2263a58f70363e63a99b95d7
-EBUILD rundeck-bin-2.6.8.ebuild 1277 BLAKE2B f5ed62450c7331c9e21981258ee1b2ab67c8a04c442cca015279422189473d6654342a08819b2df3fe64e9bf1c1d3bab9280d7bc7d452a9cff27346780195d9a SHA512 e8174725622e3a8619194c50918ac68e97dcecf312d0d1dee3596e0cb23df1f195c1dedd5a162d75385dbfcbf3e87801b0581e4be7baee2c806d8a200ce93f49
+EBUILD rundeck-bin-2.6.8.ebuild 1274 BLAKE2B 566193c6d33f18dc26499d421a79462351c95e183cbabc8201f71bb00f5340cec7a8c5f7838a5430d6a56c1b9cffd5540643214daa79376631791cab8a0e668e SHA512 8e8f96396a18f4958696c35dbc3614d626c2a611d635cac76bd3cb672a36db3eeffc5739983991cb94acc900654b372832ef80b00eb0548f71423fc4fb47d61a
 MISC metadata.xml 357 BLAKE2B 12dd8fa6e9f2fde87a1099ccfff29321cf82cb73617fb8c173f9ec3f28171b41f266a8a5a12224bef3c3fa56c830ed961630a640c1299a75c71b69ec6ecc0549 SHA512 381f317e07e399bc38d3b6eb773d9d8846fab3644deead6401f525cdf9d64987270edf4b38a2a82b0197fc2998ef825cec2d789ac84365d066271f0b16c859cf
diff --git a/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild b/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
index 2241a0bfea34..7c0b4f11d35f 100644
--- a/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
+++ b/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils java-pkg-2 rpm user
+inherit epatch java-pkg-2 rpm user
 
 DESCRIPTION="Job Scheduler and Runbook Automation"
 HOMEPAGE="http://www.rundeck.org"
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 7522714f774a..091aac6c4215 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -3,7 +3,7 @@ AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd
 AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f3cd639dd274971393420ccf45e8273539ae020f8a1a6e4063e741e75dcbf8cecd4e35b26c6d04ffca108ddea7bd32 SHA512 419f4d10b23369fccdadfb024b6ce268794e7f76188b25dd9051ff8cd6080dc0c70f66b9c2480095d655bb63f20ba1fdfa1ce0c681c9b8aff4d4918764018516
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
-EBUILD screen-4.8.0-r1.ebuild 4115 BLAKE2B 5d9bff693395a3a104253585b30561dda21444540420a68d74ca7d9ca753d79fbb26f82164bf222a659545dc570189db0641f1437f329edc3066630fb0c69f95 SHA512 60d6fdf67117a025cedd504bc109cb519f96defeb7cdded86b5a473641d89969cbdcd939c51849249dd43e1e24ce07ecefdabf9f74f469bf1458d54defa6317f
-EBUILD screen-4.8.0-r2.ebuild 4157 BLAKE2B 13dcb91f276d83d8b90b6877e38aaace35c57413178f40417f961cb99bf55f9bab6992ee60d8ae15eadf50ecd0d3ec8d38bd18ad7b2453d47ebe86132a85caab SHA512 917984a3d3c2f3d3e83eeb388fab95a3333c0a6a514705a1c44ea0bd067d8c5781f51efabb20849b7cffb25eda2a650ad3801eca31ca43ef42b810e61e2692b3
+EBUILD screen-4.8.0-r1.ebuild 4116 BLAKE2B 6379bf40480069dc89f62c11bf6eb74d1f2f0a437437b93a277a825a3b344baff2b589c41f09ecee6a0d703269ea95e834accebd3d869fe6fe99be26f868302d SHA512 a99f93b9e4127129ff3258e79cf5cbed5357919289f5c77e72aa9ce51c7c65c8e79286b4ff857e7656bf47d2b241f7b4a302294e18d46c47f1b64370bb9f7922
+EBUILD screen-4.8.0-r2.ebuild 4158 BLAKE2B 05754b07214cbdbef6569408e697e503b171639bb795f4f2a00902ab539a33fbf25cf7e8de4bf3effa1e8eadce6f95c4a4cdedb4541e215a0c29cf27be140a17 SHA512 b16dbfa0934cbf58e72989dd30b5bd19abcb4bedd81aa2169d88f7bb06995b368ab57801212b6b114b69e163489446803547bd2b07a26f6690af3b1148f5566f
 EBUILD screen-9999.ebuild 4221 BLAKE2B b3156a67b9708e22c231e902ee005bf034c118cf610f5461b6408d17694601bb00e4b3aaccc670247aae6b762241e6375324db184cd1410fc3baca8a5bf22e13 SHA512 a8b839ebdbc262851c3725c7099bc85b444b8b00ed40badba7c240a5810eeb22aa0714971b2f116e1860de2c1204b403ffe3bda1200e86ecad2dd5c667a98ba3
 MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/screen-4.8.0-r1.ebuild b/app-misc/screen/screen-4.8.0-r1.ebuild
index 30a4c5053768..e0b624d80bfb 100644
--- a/app-misc/screen/screen-4.8.0-r1.ebuild
+++ b/app-misc/screen/screen-4.8.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild
index 8c0c7cfd6710..589b58f29346 100644
--- a/app-misc/screen/screen-4.8.0-r2.ebuild
+++ b/app-misc/screen/screen-4.8.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index ca71486cf8d2..1e832fafd756 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,3 +1,3 @@
 DIST sl-5.02.tar.gz 5353 BLAKE2B dd8513bf22cf209fe69e28b4f3de5b11db6cdb8afe375fd32ef40c7b21b2ec39dbf2d71a260c13fd440219fb1209957beb1026d065628af45f6f2ebd0437956e SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
-EBUILD sl-5.02.ebuild 951 BLAKE2B 380079532d539d86db6e90b7427e303e42684f7bb85e19f51d414aa7b12b446b07df42e4c35ceb7071379e8afa61c31055fd560e3d1c4b32068a51034a1d045f SHA512 a3a38c6c5954cbaf6e05f2d2cdb0d172d75254d1c301e6dc36aa0a6fbfbb2e5d6e36afd360a8d6ce7f897dfaaeee69b272c8cfd33a4df188d237f0960a808089
+EBUILD sl-5.02.ebuild 973 BLAKE2B cab834639abba851e1d58117a76176a621de3c9bbd19f8e7ae70afdb33408d02c26c80fa3047b282c78cc60d14a57e37f27da9a5203b72dc574bef9e652bb86e SHA512 d49a16145230b4c86b69f96c0b5105263bf1ea6e33423fb843a85db9a9b7568fa37d756d1f2c09d3a42e4b3489a05ef90f27266a0f983487251be8420c997dc8
 MISC metadata.xml 607 BLAKE2B 1db8886c5fac75d14c249826c1f3aa4a084005ab925b9d5066f9ed9a858ec4eec184e7bb967c076eedc7806a7698fbb8db0cbd99608bdd5a4189c9112a5c09b5 SHA512 61bb5d5e147d4053e91c01a1431d5e55093e77e0df78f3882a5bdc553a5d8e593126d433a8bec0849c82a20bf84b3eeba76a158fe86ebe75dee25483ff08ac90
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 757ac7f1597b..155164f1eaaf 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,10 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-l
 IUSE="l10n_ja"
 
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 DOCS=( README.md )
 
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 4446b218a21d..28530817fd78 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,10 +1,4 @@
-DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
-DIST solaar-1.0.2.tar.gz 1540722 BLAKE2B 66c6f7c347f5eba538d3d48ff1c1137c1c71bf84dfb1a306a94e3cb24810378864066644a82d27eaaee2d80d30bcd30bb71ebe80fdb12363e9b194df9054946d SHA512 5f97b51e7853386311c5b9ff968a72529d55837f7262786e86085e130d219ac22095c20c984e340f619a15b8242f90e66a6c678c5e0c507c261d0430b74eacd6
-DIST solaar-1.0.3rc1.tar.gz 782803 BLAKE2B a4dde7238f2616d98cafafa775050fd0c3a3aaf8a11b0eab333993a9246c321c45ebe4d30adddf82d826e1909a8e90cb0914472ab40f9ed5560d380931aea591 SHA512 845c55865ef93c163bae80dfe6e8e3013363cff1be03b167dcd4f30c541ae16e1828ed6e51c8c77aa8b067e3a75cd8e1980fb8847b308d067a816598f83c8d83
 DIST solaar-1.0.5.tar.gz 920452 BLAKE2B 44aa0f9abd63629a5a4e737c14e468922c4aa501341717d595f045c5f40369ade6ff296120931557f1e8f04b99aa4f690454aa8f6bceaa526f370f93b312f6d6 SHA512 28603c30f0e9f2f0fe2549722062548031c69a0d9c98f732fdd8fbb51ed1d55ef033262113b2f88044a68f8b26c8c51fb0b45d4f4689fb3619e143d159618c47
-EBUILD solaar-1.0.1-r1.ebuild 1116 BLAKE2B 86891cf9c89c9bb87eb511387ffdb0c3ec92f02d9e3e18fc6b973ef2ec2746873293c964e8f579d7dde2bec679dfc4e15820d44acd3b67799f4ddf37ce12ef88 SHA512 dfb02b757c7815c0dc6abe7d9e268dca1b5777c9994766b49c02de43a0d16129076cab85afa3e9c8a4aaa01b92dd00fb87306cd1162e669f77833e01caafb885
-EBUILD solaar-1.0.2.ebuild 1423 BLAKE2B e669a6042537d9eace4d98fe2f87df9d7d9e3e4749ee2e4688d787aafbdb9308cf9612613e5ee06be9d6eeb58aacd504e3211e519f55ebc15e68f2f39801a2ad SHA512 04bfcbe65ab40091d0d0ff1ad786084ab24b1b674727156bf8bd35489f7208a5ac09807c5e671b0adbd97718f69353dd86648c3c657c0548f0fbcfdd87a30e4c
-EBUILD solaar-1.0.3_rc1.ebuild 1495 BLAKE2B 188e5ff05ff51cca97c2b16feb0b089d0e75e934e7f985d74070376bde7013281e81ead81e8fc14900b992ed75f0a0be86c192ca190148c67164949ea5fb90b4 SHA512 368a0fa8448e39eb4ea2620562945e40723c6ddb46fad17a2db3cfccf8bebd76259fb5abe80dd8b8a24a396f0c1717e4dada033c9c5ced9fa008f7c6b16ba1a5
-EBUILD solaar-1.0.5-r2.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
+EBUILD solaar-1.0.5-r2.ebuild 1776 BLAKE2B 3413685b7eae0f5030f11f6944b36750f53eb2eaf4432c0e505390a3c695141006df4b4a8ddb66a8dae63940e42cf55f63cb0c5662ef4ea2dbdf9f556de2a5f9 SHA512 b153a3897b8e3bb0f442c7f08530c3e676631197c9367b0f6a8575287a83be285796e28854101ef9012910d8b27ab09809f3fae2d890a3f5302e9eaaf8ce4663
 EBUILD solaar-9999.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 MISC metadata.xml 301 BLAKE2B e1a95f23856b0daa09eba917e05537d4e423ca5d36ef0af029c240cff5186125868c54bf70981005b9b26bc57d5d6118972836ef4ecc1dc73131b46da9106724 SHA512 8af96a19368452eb3396e6d33ed62f4702d82d99995cf09cd55da5d55154e43422f3da527ca2101ee352392af2be5e5a521d254b99682184d68ade9da1196acb
diff --git a/app-misc/solaar/solaar-1.0.1-r1.ebuild b/app-misc/solaar/solaar-1.0.1-r1.ebuild
deleted file mode 100644
index 76839e200c83..000000000000
--- a/app-misc/solaar/solaar-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_7 )
-
-inherit linux-info udev xdg distutils-r1
-
-DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
-HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc"
-
-RDEPEND="
-	acct-group/plugdev
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-
-S="${WORKDIR}"/Solaar-${PV}
-
-CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
-
-python_prepare_all() {
-	# don't autostart (bug #494608)
-	sed -i '/yield autostart_path/d' setup.py || die
-
-	# grant plugdev group rw access
-	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	udev_dorules rules.d/*.rules
-
-	dodoc docs/devices.md
-	if use doc; then
-		dodoc -r docs/*
-	fi
-}
diff --git a/app-misc/solaar/solaar-1.0.2.ebuild b/app-misc/solaar/solaar-1.0.2.ebuild
deleted file mode 100644
index 3fd7c0cbe1e4..000000000000
--- a/app-misc/solaar/solaar-1.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit linux-info udev xdg distutils-r1
-
-DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
-HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc appindicator libnotify"
-
-RDEPEND="
-	acct-group/plugdev
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	appindicator? ( dev-libs/libappindicator:3 )
-	libnotify? ( x11-libs/libnotify )"
-# libappindicator & libnotify are entirely optional and detected at runtime
-
-S="${WORKDIR}"/Solaar-${PV/_rc/rc}
-
-CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
-
-python_prepare_all() {
-	# don't autostart (bug #494608)
-	sed -i \
-		-e '/yield autostart_path/d' \
-		setup.py || die
-
-	sed -i -r \
-		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
-		setup.py || die
-
-	# grant plugdev group rw access
-	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc docs/devices.md
-	if use doc; then
-		dodoc -r docs/*
-	else
-		newdoc docs/index.md README.md
-	fi
-}
diff --git a/app-misc/solaar/solaar-1.0.3_rc1.ebuild b/app-misc/solaar/solaar-1.0.3_rc1.ebuild
deleted file mode 100644
index 9f3587867282..000000000000
--- a/app-misc/solaar/solaar-1.0.3_rc1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit linux-info udev xdg distutils-r1
-
-DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
-HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc appindicator libnotify"
-
-RDEPEND="
-	acct-group/plugdev
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	appindicator? ( dev-libs/libappindicator:3 )
-	libnotify? ( x11-libs/libnotify )"
-# libappindicator & libnotify are entirely optional and detected at runtime
-
-S="${WORKDIR}"/Solaar-${PV/_rc/rc}
-
-CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
-
-python_prepare_all() {
-	# don't autostart (bug #494608)
-	sed -i \
-		-e '/yield autostart_path/d' \
-		setup.py || die
-
-	sed -i -r \
-		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
-		setup.py || die
-
-	# grant plugdev group rw access
-	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc docs/devices.md
-	if use doc; then
-		dodoc -r docs/*
-	else
-		newdoc docs/index.md README.md
-	fi
-	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
-}
diff --git a/app-misc/solaar/solaar-1.0.5-r2.ebuild b/app-misc/solaar/solaar-1.0.5-r2.ebuild
index cad0500253bc..de5cdd6f8439 100644
--- a/app-misc/solaar/solaar-1.0.5-r2.ebuild
+++ b/app-misc/solaar/solaar-1.0.5-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} =~ 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
 else
 	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
 fi
 
diff --git a/app-misc/sonypid/Manifest b/app-misc/sonypid/Manifest
index 1ade3bf66955..b8e99f3baf9a 100644
--- a/app-misc/sonypid/Manifest
+++ b/app-misc/sonypid/Manifest
@@ -1,3 +1,3 @@
 DIST sonypid-1.9.tar.bz2 9710 BLAKE2B edc68ffe6649b6ad7f8afa41666be514b34593bf5f764f29d1ea0d94c335e2f497b7c31b9f0946210b008d6c37e0647b3327476cbc628db24ba7179dc2c25360 SHA512 fcd2b2d2a9db94cd59b8d0f23c41aca2e738e433ecd6818ce84cc1298f5609c84aa16b75e0ce1323e24bf6bb59feccd28c5016549d0690e6dd2f3aae1244e3d0
-EBUILD sonypid-1.9.ebuild 566 BLAKE2B f72d06446e930e4fb6d3d642778ccf1943ebc2af86cafd6581ab405bf22771ee403ed8ace5aa61965abbf3010973036d4471a3845ab7761e6f7c04c9910fad23 SHA512 16335d49a97f2b3238869c6d39fa791d0db8e88f451110e38686b1d8a39b5fb1eed3d22b43fded02eec79a3f802d4f01ee4e810c86817da831e53532b2ab774f
+EBUILD sonypid-1.9.ebuild 558 BLAKE2B 79709696bf7bb5c86f9a7d9453118c660eb7fa98053517b178fa3afc4fa83b826b8541f22de6050f35d917b8c285dd1443bf4b52ebfacfe4a0e5e0175acefeb1 SHA512 263a0496187dac19b099487656a2fdfc25086d9c743377942df5765c9c09e1d76218f952fc0f0352e1a18877e2887af472b3a4e9bca490fddd922d7aa2654fa0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/sonypid/sonypid-1.9.ebuild b/app-misc/sonypid/sonypid-1.9.ebuild
index cb8e02458bd0..29fb9b0745ba 100644
--- a/app-misc/sonypid/sonypid-1.9.ebuild
+++ b/app-misc/sonypid/sonypid-1.9.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="tool to use the Sony Vaios jog-dial as a mouse-wheel"
+DESCRIPTION="Tool to use the Sony Vaios jog-dial as a mouse-wheel"
 HOMEPAGE="http://www.popies.net/sonypi/"
 SRC_URI="http://www.popies.net/sonypi/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
 RDEPEND="x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 96ce94ce772a..c87eb411e44e 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,7 +1,7 @@
 AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3ba593e71cc26f17042d037fdd5e298acb7005f1a7767f38e49acaa62a0f1eb34ddea1e14f657 SHA512 0b24b6dfe10a99c9bb18b7acdaadf2f5d7e3fab2ea80a719bd65b9ea6f6dc83f249d4c2ecb52c48eed73e515f8e76bff294ff39b1ab6375a947a9a137211949c
 AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.2.11-r1.ebuild 2638 BLAKE2B 2f746ed6cce0629eb57189fa541281e2e25f5e8baa2be1482726247af545d57578f3b3bcece8e378d227c5b7ebf319866f1077aad3886fd19e75f47e3e349ebc SHA512 b671bd57206ad47d9d972ae4f38d0f8dc89247819ee1f03894783606a5b1e151609f465d9d5191364a3c967de346cfdc4a275e31f6d869a615ea3418a68fb886
-EBUILD sphinx-2.2.11-r2.ebuild 2705 BLAKE2B 60603138c2123c66537b7e6575cc5b5097850e52aac2d95ddcbc0ae34cdca5839fadb3a3639db7e2d9a9bc2973f763879c9670be83a7e5afc0cc5174632df80f SHA512 19a19e8d6e77214bc6cf06eef6395250a7b2f4359f6eb236087bfc2973cac6238669faa70c84b6985a51668d3a01ed1c19eb7d0bf6c5b72ded21567c3a17ffe3
-EBUILD sphinx-2.2.11.ebuild 2268 BLAKE2B d10791de531783cf46c10802081ff964e1e939c646b7496cc20ab2faee497303a665baed641acb9e50cac472f6e1ae84273c7dc1028c73fbf5f7a6240b8bd727 SHA512 841df368c88a9b704979e78610eb056f7deb3fa56f91f9f8413edd2d00084d1df64e2c388066e4e84de023456c9f1830ea27f516076e3e5d2eaaf2ed27c72dee
+EBUILD sphinx-2.2.11-r1.ebuild 2638 BLAKE2B aef6a8d8e2edf129f40e2ed2aba6d312ae8ba0c739c4d259e09db0b275e9e7dbf0edf0b1720053baf38918212639e8682337d3fb5c9a3bf3b012d45a630da74a SHA512 be59d45ad13b7396597de13f4eae25e5d0156b4e5e198b87b745a5e8cda2ba6cefcc1555a6c60e8a52c85f2f06026bac680ad241da934da126a65bd357123495
+EBUILD sphinx-2.2.11-r2.ebuild 2705 BLAKE2B 8a3d28f62d1c5a52bdd668b45fe7b8447c9bc5e6c852eb80becc91292d57b50c88a7b508f89135adb9da09f0e1601c1e96e4641e514aec5f160aaed264f01581 SHA512 730337c6df180d2215bbb402817d69c82603b2e07af7fb649ab4a9733728b9232ddfc4b5a4da0112ef2b752febf876f89ab87b9ccf2c561601c874efa1c32bb3
+EBUILD sphinx-2.2.11.ebuild 2268 BLAKE2B 9d0c49eaf1019bd076664c214b22a7b49851deb055078cdd233e66f64e4ced68b2bc72d60fd611df95544c1ddefbd20d869a70d9536e1378714a84b38f74609a SHA512 362f2f8b50349540868744d1f1e20780b821a96b4fae954994b86a183e26541e276b826435264327a62b094055317b625005c781ee44616acff68f33398b1911
 MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index c19dc6ab4eee..ae063ea14f8f 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 WANT_AUTOMAKE=1.15
 
-inherit eutils autotools toolchain-funcs
+inherit epatch autotools toolchain-funcs
 
 #MY_P=${P/_/-}
 MY_P=${P}-release
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
index 70c69baef6f5..4275fa3b36bc 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 WANT_AUTOMAKE=1.15
 
-inherit eutils autotools toolchain-funcs
+inherit epatch autotools toolchain-funcs
 
 #MY_P=${P/_/-}
 MY_P=${P}-release
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild
index 59e47ea3505b..7b6c533c457e 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 WANT_AUTOMAKE=1.15
 
-inherit eutils autotools toolchain-funcs
+inherit epatch autotools toolchain-funcs
 
 #MY_P=${P/_/-}
 MY_P=${P}-release
diff --git a/app-misc/splitvt/Manifest b/app-misc/splitvt/Manifest
index 8f12bf5bbd06..56685a9a729b 100644
--- a/app-misc/splitvt/Manifest
+++ b/app-misc/splitvt/Manifest
@@ -1,5 +1,5 @@
 AUX 1.6.6-ldflags.patch 1048 BLAKE2B 0e67a86bf33ffb3513263f58ec8ad9d7764af054eef60c5c5d1169cbf0d6e142db79b81c9e1faf4f374866ddc0f7201846c3eba4a99ef316eac5c5371f86d106 SHA512 032092bdd9c99917a7a446f4dc66f3fd4d91329eee9992d3026525c969d6a01420eb9131bf51bb92afe79bf2e194ad9ac039e16ac168686b7e534591cfe90307
 DIST splitvt-1.6.6.tar.gz 64797 BLAKE2B cc867fe7cf57b541f5d124bb3bbac111e0cd4a4ef835df7c8abfc7e73c1d172f0a75512e54245b395d815308b6bf94d79c8b896099a4af51e8947ddf177e88bc SHA512 a0a0ea2251489f14e2ba7af9bb1b9d309d6fa310f434090d97af2a0805c398731dec45a5cc15c2074af4d3f33b02c5bab019743530619755382af80ff86fa670
 DIST splitvt_1.6.6-7.diff.gz 11073 BLAKE2B 595381265ecd1d7a654fbce4afde5f872e7ce35d3cd44936f78a3c714b7964586d7ec0ec17d986a0f2e6ff9c3e01cf3563b54185f2fa10bebc9ababd174d4879 SHA512 620f3f6e7f22284ef8054e371a87421beeb2ef355b7084748cbd1f7a3a128c9da11f291fdaf1d393010c0f7affce8d6e56a7ae0977d9831b9d3b98963c55c71f
-EBUILD splitvt-1.6.6-r3.ebuild 1113 BLAKE2B 73a0ce2f017283f0bb780ffc1fd01d4258dbc4284d42179b73fc714fe5e4229c28b776877b8798da8e4e78819e70862a5ca055cbef36d00d7087128d97396314 SHA512 e606f052cb7182998e4aad7a3fbb594017839c33f5757c6686b54faff2297783be38d6fe7ac002f48bae84d388f34b9316ded90b9adcbe8352cb655bb695d5e5
+EBUILD splitvt-1.6.6-r3.ebuild 1103 BLAKE2B 6590f0e6f0aedd4fdc631c4309c7ff2aca166fbdb6ce2848037a0f3beed4efa7d9c4b48c2cd99bd724d31cb4321335caea1b3be3f9c6231b869411e4cbbf8f45 SHA512 5d815fcaee597e5033e778b17c4b7b54822958bbfe1f9b63f7a25f3280768c49667328f9591887ee3851329ef0f324b03d395e32927cfe234f26af380d48fe7c
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
index 36a898023ec5..43359996a8e2 100644
--- a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
+++ b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${P/-/_}"
 DEB_PL="7"
diff --git a/app-misc/srm/Manifest b/app-misc/srm/Manifest
index 9f6c0d5d4f7e..5b6aa0f7bc5d 100644
--- a/app-misc/srm/Manifest
+++ b/app-misc/srm/Manifest
@@ -1,4 +1,4 @@
 AUX srm-1.2.15-cflags.patch 343 BLAKE2B e6159fdc6211273859215dc2a90fe598a1c956bef5aa69c02cb6bef54129873e71189d1646d04cb89f3be8bf968cc23631452e089a819d57d4fe3681ff3e4dd9 SHA512 81196944b68b0bff7b32a16dd749cc15ce73c125dba6bfa175dbc38b4baf3a291702139ae63f900e94c3babdacf769fc943992e192371c5c7073275320f0f9c6
 DIST srm-1.2.15.tar.gz 132031 BLAKE2B f01fd8fce0095f5d2247026d3627fc8100b1bc9263f947f2d8500c999220c781ff109283c25b480fe295deb7e162f246afbad68c0797e0fec180ff57f1ff87be SHA512 a8ec78473c55b70557fca88f525998ed51df3be58618b9da220e1bb73df013163f4e1563cbe2062b9cf1512152afeb9004b5be0be69cc1278c0d28597310dfd2
-EBUILD srm-1.2.15.ebuild 825 BLAKE2B 1f94efecbfd09c9689e09c3524c804938d2348a1ec2a4e2136140db5164ab382fad14d048905d6450fdd44c86dfa7ff34b984a46f0c9928bb06dec8ad5c917af SHA512 cd3ca3a093d981c404b22ae7053545ab2e2090b1c843198b20a23c338d174956aa50970802fbfc429c7296691d5dffbfbf88a5aa5a511ceeb458f768c45c13f3
+EBUILD srm-1.2.15.ebuild 822 BLAKE2B 8b82bae77a52035b8a0b09123eb0c6cd45e722ad3a5988224953752d5c5733740f22839842a254739cef88c3af5cd98f635f6366c2b5127e9f51245f1b7a43aa SHA512 54c1b081bb8f02f75846615458c49e71c14ea6ceeb6fa26190b3af49b0e836060c73f42917b165e408baed3df0b5ca309497ed0ae4c270ca889ca15d2362ed92
 MISC metadata.xml 326 BLAKE2B 636855bc40c79e71abaecf65d197fd8f963e639bcf150cbb8afb9426b76ae73b4104e1c3a9d5cf0c10d3f871c137a55afeee0a3ddb04f4b79cbef7f187f4e04e SHA512 721014538f226f65a6d673e52715b7802e714f87fb8c98c74e610ea603f1cd72504da9229d72e15012fee7fc3d17f6c1b702e1ad5ec300b9696f8b717b492293
diff --git a/app-misc/srm/srm-1.2.15.ebuild b/app-misc/srm/srm-1.2.15.ebuild
index c4fef52773d4..a086636c2048 100644
--- a/app-misc/srm/srm-1.2.15.ebuild
+++ b/app-misc/srm/srm-1.2.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools eutils
+inherit autotools epatch
 
 DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking"
 HOMEPAGE="https://sourceforge.net/projects/srm/"
diff --git a/app-misc/symlinks/Manifest b/app-misc/symlinks/Manifest
index d8bd2e8101da..0ae239eb5e5c 100644
--- a/app-misc/symlinks/Manifest
+++ b/app-misc/symlinks/Manifest
@@ -1,3 +1,3 @@
 DIST symlinks-1.4.tar.gz 4942 BLAKE2B 983c16bd5dedbca3f3544756a1e5de4939eb31e871c72110224f7e63821cec69289d9a1e152081d9895230670b96ed813ef0692ea0922d9a52d5050ade723893 SHA512 d1efb1ca553cc9eb95f1d113e453acd22c9f0964eacec985c85c125de23ae9d636b9ced182c2673f455e5d897ad15a978a424170fce767ccc492443eac7f972f
-EBUILD symlinks-1.4-r3.ebuild 830 BLAKE2B 3feebce839e2449f839e8867fd2a25027c08ad6a9f5ea273ddf22dbacd3a9bfde8fec42d335ecf77971fe987ac16042f4d2141c8c107e935cefa0a1e2094282f SHA512 ce63229f8c2b53f168dc6192ff5fe29ab2e14cfc63164e5be3f33e36a24b1fd3ac3db058d30f40face450f2068dfea0ef2e5353d4e2cb351a17d766548122263
+EBUILD symlinks-1.4-r3.ebuild 823 BLAKE2B 94e695f63e0631fd8047c5bcc71bc676934352d438f4c31a9c0dbc1962160490c0e4255f698b9922c7fed21796838d12b7e3534eedce6832bb483841c3c19ffc SHA512 5a09722f3dadbe0518cc60d7f42f9513bdcbd6e9ffc19d5d5483352bb6d2251e883800c2859b9971985be558a8de675305257509caed8c3d1fdc9345406c4ddd
 MISC metadata.xml 631 BLAKE2B 426a6a4bb3909963d06f6e33a29a5944dc436f9951d77ba4e63f322b70d74243f317f3fd4fdfe35ee0d767f16448473177b2fa22edb8746f35786bfc988ff217 SHA512 69594f3511101cf9f9b3d172b0767a3b6de62a22157517ee8d55fd6dec41ff942c54563058eb0a3fd49f024ae331b143e177c026ab778dbc86f7081b6ab3051d
diff --git a/app-misc/symlinks/symlinks-1.4-r3.ebuild b/app-misc/symlinks/symlinks-1.4-r3.ebuild
index 25019d1e13d9..c50aa8ce4c6c 100644
--- a/app-misc/symlinks/symlinks-1.4-r3.ebuild
+++ b/app-misc/symlinks/symlinks-1.4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Scans for and fixes broken or messy symlinks"
 HOMEPAGE="http://www.ibiblio.org/pub/linux/utils/file/"
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index de32e51cf256..d6df0d9233d9 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -4,5 +4,5 @@ DIST task-2.5.1.tar.gz 903428 BLAKE2B afa17364984237ea589921afb4379297b128ea1bb6
 DIST task-2.5.3.tar.gz 788760 BLAKE2B 3e8a4f2ebf6c39d3d51dc9b044cf1c8fbce23ab8178b6645405f26522bbb6f29e9f78247fe52601f6c8f87f966a3b7aad130417d0f416b9d969e9e396c10eafc SHA512 e906c8f42ad4b9a7e20a82defe31b89194d72957f18dd5129ecc41a2a60a9d8b0d01abb9b44ecce79b65cd9064af4a4a4c9dd695f98152e77908f130dc3f9677
 DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
 EBUILD task-2.5.1-r2.ebuild 1166 BLAKE2B 726572a3998040ea2b48f50aeabcfce2c7ce4538c99c9b1fe4d960fb1f0d76e6804a8625a618d54c9c1df643fcc878d56563202524cdda4c70c2de32c37a2840 SHA512 a7785cb3b81097e69ac3fafbd7586069f35c305b6ae6e29ac75b57d9e896d66e6c7099948df7985560bd0f509425351f6240862716f54413b4846057bc703015
-EBUILD task-2.5.3.ebuild 1372 BLAKE2B 732b1e4334475946e54f18e798d2671e9df7ea3f2225dff6c0cbd44ead6b7b212fa26ee76a2e29c7e84fa3f8e0dedb50d3c9127ac72291e76c7aecb7d1700368 SHA512 dc94c3845672c981536013b521904354ee64928b87bc37fc20060681744f34df5adde9b5bfcb1427303ab45b3f049cc139b8524cccdab71f9cbd4820736da968
+EBUILD task-2.5.3.ebuild 1371 BLAKE2B b22ef6dcef1c571d1d7f750cadf40a2ece291b5856540f57ca4e85b5ac99ca065638d01e4dcfa94c1d191404dc4c34b5001b884751a8e5805141909716df197d SHA512 803c3e8e17e4b82bb91adbabc2be903ab360799fc7aee563e56924a060000e8bba862cefc5aaa071cbdbde14f7bf6bf97706dd307edbb0460d3b389a851e61e4
 MISC metadata.xml 465 BLAKE2B c3932c8c436b15c3222e07e7102364c30008fb2b36354f3da1d0ec5c8a9cb29a992a39ae9e329404166c1f7220ef29d5ffed1e10401a84782b79773072add441 SHA512 16416c5221952dbcc52b47312b9277d6e6230e1686816fb3c56db6dfd576459f39ded1e2eec7d43a14956373a090b7fcbb045fe285c49a65a0e0339ff6e789cc
diff --git a/app-misc/task/task-2.5.3.ebuild b/app-misc/task/task-2.5.3.ebuild
index 3b3b987763ac..1116f0710464 100644
--- a/app-misc/task/task-2.5.3.ebuild
+++ b/app-misc/task/task-2.5.3.ebuild
@@ -18,12 +18,11 @@ IUSE="+sync"
 DEPEND="
 	sync? ( net-libs/gnutls )
 "
-
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	# move test directory into source directory
-	mv "${WORKDIR}"/test "${WORKDIR}"/"$P" || die
+	mv "${WORKDIR}"/test "${WORKDIR}"/${P} || die
 
 	cmake_src_prepare
 
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index 26626d08fe7f..cd6bc61980c8 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -2,5 +2,5 @@ AUX tdfsb-0.0.10-asneeded.patch 2009 BLAKE2B e4e496814fcd9aacbe4e51a14c8432d683f
 AUX tdfsb-0.0.10-debugging.patch 2106 BLAKE2B 27d00c7a5bfee66126417c336d43890c30b034530cc51fc38e57afbd5b3c0218d50a328cb1a8eac5a75c40f1c24c29afe555db06c96dfb9095e0a7b431666e5f SHA512 eda59ad82597f819ea6458c096dfdb2c27ae35be99961cd72135f98f189ee428aa5f198bc4098350cbd0690852f8693003a074fe73e904f16827be4b2ebe931a
 AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606cf1bd6a2d8c7b15c928402ac1d9f1a37413beaec464b5da867d1ef9cfba35baf2b17f24a57c06b894c468b0e961481cb05e3b SHA512 17543c4edcc09adc21a1dd8787eef2c7e57803d2ea490e4d0f259275e40d8619009ca1f5bd22970d1461078f998d3334ce5af9667f00c31b40a7c41841b151ca
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
-EBUILD tdfsb-0.0.10-r1.ebuild 912 BLAKE2B 3a9a2806a72816b007deddf1b37c4330eeeb82619185fec145bd1fde5b88f56e03e8ed9ef96dd1a7f664763162e309a58f95eb3730d72ba980067786975c3218 SHA512 a7b58dfac3ba0ad33291cf1e04ee7c042cd0ba6184ab64fe26db8941247ef1f1e2d778b732089a7eda31ecbe1dedb353bddea2e6c5268dc6adb8d3e53508804d
+EBUILD tdfsb-0.0.10-r1.ebuild 912 BLAKE2B 443a10a1f4d1c809a7621825dfff9c971c1e0605d9e4e202ddc66ea05948b721663ded0b0544bb3ae058d218f0e9616f79b4fd531aea366627940fb7055be480 SHA512 663d753dedbee16270eb526f8f3f6b425b475fb8f3288fc523d506054c10fcef32d0ac9e8e3a5f80bc7c39095870286cc7270ef75e8d0d5bebc6aa3ad30bd453
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
index a624e018c08c..fdae4089bf69 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="SDL based graphical file browser"
 HOMEPAGE="http://www.determinate.net/webdata/seg/tdfsb.html"
diff --git a/app-misc/tdl/Manifest b/app-misc/tdl/Manifest
index 722c7021df99..e224eae1e767 100644
--- a/app-misc/tdl/Manifest
+++ b/app-misc/tdl/Manifest
@@ -4,5 +4,5 @@ AUX tdl-1.5.2-main.c.patch 4967 BLAKE2B f609c3a44996ddf4bac91f65e28e3dbad4600284
 AUX tdl-1.5.2-man.patch 11004 BLAKE2B 849601edce8452c3ca590b6b10f211ee81355adc121ff878fee165758bde10cc58b4a72a0bb71855b58093ff45a21d51761e24563b50c8be88ebb61d9d1a50eb SHA512 fef2ca8f8c6db0b61037ad10269fe185f2d5cb1ffdee0560acdba61be87d71d2195471412d26a5c6e7766332d9a13bf95774b0374de14b6df7b4a97ad27e8d32
 DIST tdl-1.5.2.tar.gz 66057 BLAKE2B cc2d5581126d995098b5dc3032c97213614acaea3b984a507a824da2ba4d3be9afff954722f29acf0b9bd26db42ada22d67fc9110496961c2cb3104d9b4b7ece SHA512 8c07a5b6a5434bb567a2d68b6e0215bbfa7be3f7176ae1042652ac18684289117230af25d8d161fcf1ba27d9b740fd3fcd43c3213467b533de64390686481fe0
 DIST tdl-screenshot.png.tar 20480 BLAKE2B ce9284501ba1550179e1c3da54399a802aae3c0fb23b9a1ea25a1adb0f5c0404fe7694a360435913bb91cc1977d71561050ec0fe4e1681db775cdc7ec5fa11b7 SHA512 caca9793626b320ded4c7f16425b98e4bfde9ab0ca3c1bea60ecc8aaa8db080ab6fc3c474aef4d56e394b6415ec1162671329912aa22452dbd5dc72b50c7c8f6
-EBUILD tdl-1.5.2-r3.ebuild 1542 BLAKE2B 83ec6dcbb3d28efbea9806e66d1f05329d38112621b18a57f487df61086dacb1a6329dc7c2963d6206ee4eb0ad7ac724120a4f4680967beb2d4984e7d5238983 SHA512 bb33f735fd3272d14070fd2c544f0db5da402979122cd487eb215ee9b63f5d81b3ad3f51caa38e4876f019bf72f07e4015ecc50b13229b423687c6fcb363b549
+EBUILD tdl-1.5.2-r3.ebuild 1535 BLAKE2B 494cc0fe3d5cc7490c6bcbab33ab412ce688834412ce5ecbbf8c8e8fbaa36fa62cfd7948155c7674382d3e943c2830028bbe9c09393a4e0a23d1f62693a30233 SHA512 0e591794f384544c46a23e9e926d8dd841b9f5858bb18a89b983529187a6a8804139e1a696ab75873d52591390fa30add3ef66d85c641400dc05e220fa96af98
 MISC metadata.xml 507 BLAKE2B 9887ee368ca6f3409ee7da8a1fe98b0b6bac98f3b6949a1a263c9a8966b95d73c33c2b496f98732824e08d17af45b12a12916707e6932be88a947e9ca46d416e SHA512 ce0e36e0dc95b3c050f17e33220bb85c07946127337ae766b7c3af2d9d0891187bb9ab73d8cb01f91bad4f061620d19a403f3af85c801e3194f0a9dc6a0b6ce2
diff --git a/app-misc/tdl/tdl-1.5.2-r3.ebuild b/app-misc/tdl/tdl-1.5.2-r3.ebuild
index 6fdd2918c492..075f1712868c 100644
--- a/app-misc/tdl/tdl-1.5.2-r3.ebuild
+++ b/app-misc/tdl/tdl-1.5.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Command line To Do List manager"
 HOMEPAGE="http://www.rc0.org.uk/tdl/"
diff --git a/app-misc/tek/Manifest b/app-misc/tek/Manifest
index 06950c7b3314..11ee6f100e60 100644
--- a/app-misc/tek/Manifest
+++ b/app-misc/tek/Manifest
@@ -1,3 +1,4 @@
+AUX tek-1.3.0-makefile.patch 799 BLAKE2B 6b9ee90e2974c2b0e7c54a353e7bf3e81a3c7f3cd6b0e66a69351679eeb9e6bda610bd09b66ed5614de6695d3358dbdc653f3e7ed36f53484b4a9e83b2477731 SHA512 e018f2148fc6c250c42682ff20adb0c40e0d60f3402279e912b39df5060e6a9fba88ec64d8301477636771ad2546286bb298e2c9dcb76a21767409246ae6ce03
 DIST tek-1.3.0.tar.gz 99399 BLAKE2B 191fec7992ea4b79aed5833012cb22ac3ad399eced53e74467139aa05e2dfda08af220b35cb191f5f1bf706186a8460f3d80196599f43654d5de05e36b5df84b SHA512 20e3e704db71a7c0fb7a7791c8ebbdb348d370b06bea39f2ee77cae72ac4b71873884c6ec58712c9bf85d7d0785310f33189ce977a77b970951e39c8803d28fd
-EBUILD tek-1.3.0.ebuild 935 BLAKE2B f3e3402447b1b3fb451389018fd16497bfe2eb52be781eace5bf5fe907fb86370283e23fd16572b56fa1eb8798ac46172c7c8de7f359901bf3a3f12b8864af1d SHA512 24f9cc5e5b8a8859a9f9a1de0fbd10c7deab048b40e2723fe65e0279f0c3eea345621a3bd386ceee482b5d9a5fc41dd293da5ba12378a73b903ea31c0d0ea13e
+EBUILD tek-1.3.0.ebuild 848 BLAKE2B 7d97437a8644ae69c956db7e041653100eee8d7ac6c7b75c084b68c9f7a59ef08fde129b5c33fe597a55cfe0c9ecdd9115ef3ed88ec333ab7c403b0b2bd15577 SHA512 0496f8b802c9d0dd2bf91ddf6764a3742824915685d9205e39f2af13d1a12a7b251f0c71550fc21c0b0e98822f6f84b340a3465e2dc8dbf43104b3c823ec35c5
 MISC metadata.xml 243 BLAKE2B 32baf4172680828d109bd212048ca921186236135d4ae1dc76411ea32307f919cf0b8c89ced23b4df6e446dbb3c2b1b1553a3588b3e61a2309405de3070fc313 SHA512 37178ea2c1bbaa0f40a3a2895aff57acfedb9846873e52248235023252cd3d3621457927ae54cadc797f3cedd71866a620e2c2ef627831a29512038b84c43012
diff --git a/app-misc/tek/files/tek-1.3.0-makefile.patch b/app-misc/tek/files/tek-1.3.0-makefile.patch
new file mode 100644
index 000000000000..b04985235e49
--- /dev/null
+++ b/app-misc/tek/files/tek-1.3.0-makefile.patch
@@ -0,0 +1,25 @@
+--- a/Makefile
++++ b/Makefile
+@@ -15,11 +15,10 @@
+ 
+ SOURCES=gui.cpp ihex.cpp usb.cpp
+ 
+-CXXFLAGS=-O2 -std=c++11
++CXXFLAGS+=-std=c++11
+ 
+ tek.lin: $(patsubst %.cpp,%-lin.o,$(SOURCES))
+-	$(LIN_CXX) $(CXXFLAGS) $^ `$(LIN_WXCONFIG) --libs` -lusb-1.0 -o $@
+-	$(LIN_STRIP) -s $@
++	$(CXX) $(LDFLAGS) $^ `$(WX_CONFIG) --libs` -lusb-1.0 -o $@ $(LIBS)
+ 
+ tek.mac: $(patsubst %.cpp,%-mac.o,$(SOURCES))
+ 	$(OSX_CXX) $(CXXFLAGS) $^ `$(OSX_WXCONFIG) --libs --static` -lusb-1.0 -o $@ -v
+@@ -30,7 +29,7 @@
+ 	$(WIN_STRIP) -s $@
+ 
+ %-lin.o: %.cpp
+-	$(LIN_CXX) -c $(CXXFLAGS) `$(LIN_WXCONFIG) --cxxflags` $(filter %.cpp,$^) -o $@
++	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) `$(WX_CONFIG) --cxxflags` $(filter %.cpp,$^) -o $@
+ 
+ %-win.o: %.cpp
+ 	$(WIN_CXX) -c $(CXXFLAGS) `$(WIN_WXCONFIG) --cxxflags` $(filter %.cpp,$^) -o $@
diff --git a/app-misc/tek/tek-1.3.0.ebuild b/app-misc/tek/tek-1.3.0.ebuild
index 69421b1eaec1..644b9e272307 100644
--- a/app-misc/tek/tek-1.3.0.ebuild
+++ b/app-misc/tek/tek-1.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-WX_GTK_VER=3.0
+EAPI=7
 
-inherit udev wxwidgets
+WX_GTK_VER="3.0"
+inherit toolchain-funcs udev wxwidgets
 
 DESCRIPTION="GUI tool for upgrading the firmware of a Truly Ergonomic Keyboard"
 HOMEPAGE="https://trulyergonomic.com/ https://github.com/m-ou-se/tek"
@@ -13,24 +13,20 @@ SRC_URI="https://github.com/m-ou-se/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="all-rights-reserved GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror"
 
-RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}=[X]
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}=[X]
 	virtual/libusb:1
 	virtual/udev"
-DEPEND="${RDEPEND}
-	app-editors/vim-core"
+DEPEND="${RDEPEND}"
+BDEPEND="app-editors/vim-core"
 
-src_prepare() {
-	default
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+	tc-export CXX
 	setup-wxwidgets
-	sed -r \
-		-e '/LIN_STRIP/d' \
-		-e 's/LIN_CXX/CXX/g' \
-		-e 's/CXX=/CXX\?=/' \
-		-e 's/CXXFLAGS=(.*)/CXXFLAGS:=\1 $(CXXFLAGS)/' \
-		-i "${S}"/Makefile || die
 }
 
 src_install() {
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index abf8573c5116..f94887e96539 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,6 +1,8 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c7cbff15febbca6da9f7626c675fe1820b344637ff0fbe94ae6d0da7f111880ce5d74f97c4b6a90ceef802 SHA512 aad2e6457dd350369f245f711f1936a575d0588b72e660d10e7abc7d373da0d322903b451ad00b96a3e0e6847ca855673da6a4c5447cea91fa756edd23659397
+DIST tmux-3.2.tar.gz 646457 BLAKE2B 64896c4f76f3ea02a7fa2d9a8e6c67779777265e450d5576bc6254f824512826a3a2ce2abb9e11b82b707bd18c70688b69a162c23287d6581874752fec27a51c SHA512 63165495e838871c7f42ac1a6229ec2404acfa7d42c7a0070c89cb38712ac933676930392b0a10cbdd6059910ae46129257b90135c5846e85142e786482fd75e
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-3.1c.ebuild 1665 BLAKE2B 091cc18c5cedb4e56b2241494aedfce527424f12a169b4c986d811706a52bc8fb52397621d2df7359aa891e6a0a0bd0b8e40cd1a591af09cf4055bd1b0634da5 SHA512 4e3fc11adbf6978aa75a57d0d950465212fa6e2d69d899036d5edef7669d71677b60e0994223fbf32fbb82208798e4eb28df26371d8b45f58dffd3182da30844
+EBUILD tmux-3.1c.ebuild 1666 BLAKE2B 4e4a0a6cbc7a1976647d5272f7a479b06667d49d496567bcfe38ac8d8575b80bb41231a8e34b98c1ec85871dba2381a8ce875250a99052309b2482446837ce2a SHA512 17cf8aa479294119573612d233a5cbba52e4027d5e6a5707f02b2cec4f8408e898a0a095f8cc7e8421bfcedc8f96c06582400f0ae5117f819c517a8abf600cb1
+EBUILD tmux-3.2.ebuild 1673 BLAKE2B 331abfa3e092d90fa73692fa06c310e69f70500ccaea3ca6ef200a88b43b1bddee5766486b850fcb9bb7bb00aec20b45f8af79aaacec0f787ea046626afc808e SHA512 11bacbb5d5e18a8dca5546b29ef09f2718ac9bfd1cc692db2a72498d7de9152ce789d39c62e3e379306b13551dddacb945ac689657a297ab5055f157b9f88751
 EBUILD tmux-9999.ebuild 1675 BLAKE2B dd1f1b897f0d4f01d42a2457c3129bc770aab3071c50d62419fe1f7a417c7268498bbb3587f151deb9b969c270a07d954ef3f647c7d359959c65f53e6bfd22c4 SHA512 334b04203f906c529679e1ea082b7ed7c9756ba81a424dec393924d05b4b6643ec8d12d0e831590d33533e80ec89f2d24dc74c2bb76501146cccb86d33217019
 MISC metadata.xml 816 BLAKE2B 57b1d27728b6fb3557e53a27bcd0f116fdcfe88175f3ceee0064beaeb14568852b15275051cd6ec8ea5cc3ce9efa7e1f084d74791b60eab12a5e6c835321deec SHA512 d459641a31d19297ef85b8dddcb487221eebd25e4f3d8d0e88c7c394654e9b60e58a60433c21b32ff24226f5c4d16e9e059b5af6330bd0698367019f0740e2e8
diff --git a/app-misc/tmux/tmux-3.1c.ebuild b/app-misc/tmux/tmux-3.1c.ebuild
index 398b9ae47ef7..83e054ebd04a 100644
--- a/app-misc/tmux/tmux-3.1c.ebuild
+++ b/app-misc/tmux/tmux-3.1c.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tmux/tmux-3.2.ebuild b/app-misc/tmux/tmux-3.2.ebuild
new file mode 100644
index 000000000000..bbd5c65d4559
--- /dev/null
+++ b/app-misc/tmux/tmux-3.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+
+DEPEND="
+	dev-libs/libevent:0=
+	sys-libs/ncurses:0=
+	utempter? ( sys-libs/libutempter )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )"
+
+DOCS=( CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4-flags.patch"
+
+	# upstream fixes (can be removed with next version bump)
+)
+
+src_prepare() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable utempter)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
diff --git a/app-misc/towitoko/Manifest b/app-misc/towitoko/Manifest
deleted file mode 100644
index 839a08b8256e..000000000000
--- a/app-misc/towitoko/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST towitoko-2.0.7.tar.gz 280177 BLAKE2B 0a58abc81a8106415d25d82a9eab4338d8a1cb8dc04b2d7b1d3790ae1c8429d0fdec2641dae68a9f38b3ce9aa9f14fa5ba1fb4fa9281e75e87a308024ba59873 SHA512 e2e21bda3b1dad55dee1cfb4063e114394a21973b4b2409b9dcff1479fc312fb93bf6e634d38e1f7a30e6f835d87af8268a478b534f65c916eeb13d5dbd07b86
-EBUILD towitoko-2.0.7-r3.ebuild 686 BLAKE2B 80de278e1eb33da81d1e04c87bf505ef4447173521818c69fac60d57d3e59d87730c2674da7f5480bd3ebc752b97af87f0b10a45d9c5b4619911c494bb0aaf4b SHA512 e9746bca522052452df3242fb5367c9845aa3105d97a789dc1562442837eecdacdb29ab7fadcc0447d3e4a399a8250e767dd8656b4d59b00d9a129863b509a14
-MISC metadata.xml 278 BLAKE2B 6cb5d9c1e26e7c00636842a387c8b772f44a284cd24fb44e8133edd04d4d37a2fac01d0cf77768b88137ea7ab302554adf4a32e41df5246b2ab01ac21476f8a9 SHA512 4d69e222be58da2fefd590fa9cdfa2dd6e7108c3f663fb0f491d49609b0ebb8e10b4dccf22966d09f83b81074f0543723837b60015e7d4102b7a7085744c770a
diff --git a/app-misc/towitoko/metadata.xml b/app-misc/towitoko/metadata.xml
deleted file mode 100644
index 7fbec1b41d1c..000000000000
--- a/app-misc/towitoko/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="moneyplex">Makes libtowitoko work for the moneyplex home banking
-    software</flag>
-</use>
-</pkgmetadata>
diff --git a/app-misc/towitoko/towitoko-2.0.7-r3.ebuild b/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
deleted file mode 100644
index 57800e76649d..000000000000
--- a/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Driver for Towitoko smartcard readers"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-
-IUSE="moneyplex"
-
-src_configure() {
-	local myconf
-	use moneyplex && myconf="--disable-atr-check"
-	econf \
-		$(use_enable moneyplex win32-com) \
-		"${myconf}"
-}
-
-pkg_postinst() {
-	if ! use moneyplex; then
-		elog "If you want to use the moneyplex home banking software from"
-		elog "https://www.matrica.de"
-		elog "then please re-emerge this package with 'moneyplex' in USE"
-	fi
-}
diff --git a/app-misc/tpconfig/Manifest b/app-misc/tpconfig/Manifest
index 01f4484607c6..c33fc7d5c186 100644
--- a/app-misc/tpconfig/Manifest
+++ b/app-misc/tpconfig/Manifest
@@ -1,7 +1,5 @@
-AUX tpconfig 426 BLAKE2B 8ef3bef0ca0e50d6f220c4ab7cefc9002bdfffb6c018173d181c3e1dab6cc0fca07c3e8fca4c251efc308f24324e382c7477267a18ca792c993a1247e8bf75be SHA512 09c0a954b765404eeee569040b832883f85b2451c41ca4465ef5febf80745fb9a65fdabadff9967f014d064134c353c66953c26e7295b4ced3dbc172975d536e
 AUX tpconfig-r1 435 BLAKE2B de3e2f28f81c59690f910ac0706c9e5df239a44150ea5924969ab7cd13676bfac5c680ed6771acce2fc249755867a1d9bfc038bf1634f0d5365fde7cafead5e9 SHA512 a096eaf1b287a6206829f09c40b578045bcdbdbf4d44e9ed3f3a0e691a119ba16820c243eca5ddb06f4cac5b5cdee73fb82bbf7ae1bf0b9a9997cb9fb7740638
 AUX tpconfig.conf 132 BLAKE2B 9d5f6490eee22c619d458a5190889867c1995f294aec1ed60bc6edcb2c83b3c47d94c473ec52d367eadf441e73258bcb5e2a0ceb0e578b6c0df6069231514649 SHA512 314f05fb3211790e9c5de47f99d14bcf96788f8baf1d5258eb17d71dea05f0bde7b249a99321f472e4339c066705d9f18b529f97b1c03a72da4f21c14b91f77a
 DIST tpconfig-3.1.3.tar.gz 106789 BLAKE2B 1a02a1c91ce2174ae406888a73ad488d79e60941d0e904f47c9ff1cc82319780cf9874ede6ec4b18cc9176bcaeb465c201fca1bdf5840029565e5a3c5cac85f7 SHA512 b10b709f113dcd526c7521f519466677a1dd37b5c3bd4adf7a0fdbf95428bf56777a726b85e158c4842d406e7659f1b6e161c68bc6f6c6739d376ab84351efc9
-EBUILD tpconfig-3.1.3-r2.ebuild 534 BLAKE2B cb4b2411fadb25132ac0e55ddda395a152642b4c570c72eae6e31b9de20b26d3f0981a3474741d6c793c7db56dbc51765c6d738aa987ecbea7d900a351e67ce1 SHA512 8822a2319a4445a1f9e17468d418cca8fb41196fc1490fc863a0a633f4155f76ac9aaff8a71271e926a066df5522e04170af8d2cb881c069b0642a3c2ef8e3aa
-EBUILD tpconfig-3.1.3-r3.ebuild 548 BLAKE2B d3c0b52f0787a0be78a319be3279fd3f0d657755d589ade5dab2a69b3a93e9c1da0cebd71d717e782f3c6c905615e4745e3dfd9e5be338a0a268d93e79bafac1 SHA512 02eacb3139c1b2f158720b18247eded141f424357e9137825913129bc3e2aaa317e6a92d052c5d921a7ab817f4b2ce5025994f30ff91733ba4d5436cc08d6fd3
+EBUILD tpconfig-3.1.3-r3.ebuild 546 BLAKE2B 2d8ac89a3372d579639a04421f66bcb9c611b32e3c4bd34a3d19530654ad20858a94ce8059f6a9f47c4e47afad5caf72d127b393ede6ce29afb574bb3af63097 SHA512 db73ea1f35aead904e9cfa14d34460bb266febb91b1022231f8d9244ee2b862a8afbcae048642865282e218027740bcde971ae1d763e322b14d201382253aece
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/tpconfig/files/tpconfig b/app-misc/tpconfig/files/tpconfig
deleted file mode 100644
index 6eafbb5803ea..000000000000
--- a/app-misc/tpconfig/files/tpconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before xdm
-}
-
-start() {
-	ebegin "Loading tpconfig options..."
-	/usr/bin/tpconfig ${TPOPTIONS} > /dev/null 2> /tmp/tpconfig.start
-	if [ -z "`cat /tmp/tpconfig.start 2> /dev/null`" ]; then
-		eend 0
-	else
-		eend 1
-	fi
-}
-
-stop() {
-	ebegin "Stoping tpconfig (this does nothing)..."
-	eend 0
-}
diff --git a/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild b/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
deleted file mode 100644
index 94932d5acd86..000000000000
--- a/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
-HOMEPAGE="http://www.compass.com/synaptics/"
-SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	einstalldocs
-	dobin "${PN}"
-	doinitd "${FILESDIR}"/"${PN}"
-	newconfd "${FILESDIR}"/"${PN}.conf" "${PN}"
-}
diff --git a/app-misc/tpconfig/tpconfig-3.1.3-r3.ebuild b/app-misc/tpconfig/tpconfig-3.1.3-r3.ebuild
index b80c3d28c2fd..f170bc089e8b 100644
--- a/app-misc/tpconfig/tpconfig-3.1.3-r3.ebuild
+++ b/app-misc/tpconfig/tpconfig-3.1.3-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/app-misc/tprint/Manifest b/app-misc/tprint/Manifest
index 685f5a8ce6b4..e40c601060d9 100644
--- a/app-misc/tprint/Manifest
+++ b/app-misc/tprint/Manifest
@@ -1,3 +1,3 @@
 DIST tprint-1.1.0.tar.gz 14089 BLAKE2B 5cba4162ec111c9eb41b883e9e1582b1885117000189e63a1c3d529df695fade156228318d7b86a5c2eb69ecb8d9ec70ad40a4deb624b5474a052f3d0557dd15 SHA512 828135ba52a163b00257e243e683f0f01b3a47b161785c70aa2b43f227859a6a4e629687d07190c42941ab03012d6bb1eddeb3767f177af6302a873cb7713831
-EBUILD tprint-1.1.0-r1.ebuild 611 BLAKE2B 8e5cb9d3446a68e9f3e097b816c45b7042a0292e7d4465ff49363643dda354d8d411f887a852687d705a04fc16b777293b4469848159ba47c9adcbf18bbd22aa SHA512 afb0cce8179978308ef74572081f07238c11797d2bc9db55ef858a9507417a6eb167224b8052611358032f252d284332c7dda8e9b77c21fd6bd06ab2f2dc187c
+EBUILD tprint-1.1.0-r1.ebuild 612 BLAKE2B 507e85de5feaf11ecc1a2bd44ce29c2c58f7b599476e46e0f608237412cdaea0655a9b2a8c8f62a77d9680590eb3dc9a21497955ab663fe5bb3c9753b2640a62 SHA512 51e8a795947b489a173fb696d9c52e6d391e4d5c20aa05e9e8df31d8c6411465f862b92a9553ed657e3303eef2f0045ccb30030a101f985deee7ec197fce86e6
 MISC metadata.xml 421 BLAKE2B 73570ad9de56bc18aacba474b07f49edd35d562f1d5220318b0200d14ccc0c5a2ac12f6a9b5c0d7c51ccaba31e53671838c924dbda322db376cd6dc0bb1d755c SHA512 2cd028ad4b59baccac477041c36891bc3f3db16c76aae0495864ae29e31f61f53a280eaff170c9ba0acade5beaf1a632524a770b08fb11ebbf8ec90dc2cc09d4
diff --git a/app-misc/tprint/tprint-1.1.0-r1.ebuild b/app-misc/tprint/tprint-1.1.0-r1.ebuild
index b473dcc73077..fc7e22cc6f76 100644
--- a/app-misc/tprint/tprint-1.1.0-r1.ebuild
+++ b/app-misc/tprint/tprint-1.1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,9 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE=""
 
 src_prepare() {
+	default
+
 	sed -i Makefile \
 		-e 's:cc:$(CC):g' \
 		-e 's:-g -O2:$(CFLAGS) $(LDFLAGS):g' \
@@ -22,7 +23,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index e38dd9576e00..e3cc3abe7833 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,8 +1,8 @@
 AUX 2.3.5-fix-autostart-build.patch 3518 BLAKE2B e41b39cb8576a533bb4e1bae9b96daf3d2614109a94f4cf6edb8968a7a17b3788d824f3b3b156a17eeea7232ad720306f5c081c3beb4c891ddfbb911af5ed3c1 SHA512 4b325b89675c3e2f470c6be48da4f2598bdfc8be5b44ea55e09e161428b041ee8b7f3ecc3b6c3a9dcac612b46f3f05511fabbaf8ed2b17ed589349f103c0fae6
-DIST tracker-miners-2.3.3.tar.xz 3144712 BLAKE2B a5789cce89dedd7cf35548b730acc80eb9b8bcbc8338c4ee55b07c97af4b9fbadc46bf0fdc552a3384e995d71aca0defe2d57dc21d99f775dee6f33f69e0aa9b SHA512 1e845aaa5412125df84298a05f29888b3872c0f4d9251f026dd51846831fcd4aa0c6965c85752d7b6ed6548268d21f0fd2a8427c922a5dc0afcd294286c607e2
-DIST tracker-miners-2.3.4.tar.xz 3128484 BLAKE2B f52c46123c95252f8f16df824ff7498a8f44698cea13fa78653d7733590bef0a502139fea686b4fd9012f7569a6f946e1dbf8e053a16c474230c733d37103a3f SHA512 ceddddfa6c3151b5caeb197a4ae4dbe24fa2674e807bf66a9cc72227b60ee295171b52c2edb35236a3fbf9d8803678f55f8b990864a7a3a32bf362b0739d03ba
+AUX tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 857 BLAKE2B 25e6a69bf2d868b5ab9045e4f890079a1edf81fb737e74beef7ac3037366bdc0986991aeb94053f0f027287e824abd2a4e0cc6a9ac94be680f1494bc0c4abc20 SHA512 112772fcf646a4b4c81473ac28a74f31706f41340c3867cd8272ecfb5b512158fdf4ed4756fb2d661883faa8478f51ebed897744582b42891e78039eb170139d
 DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
-EBUILD tracker-miners-2.3.3.ebuild 4635 BLAKE2B 11c4b5662fae132610db03cb86c9ca78e9630a5fab1ab6d1a2fde5ec3193afb5937416ec20ac2f95a13be25ff821ab67fce0667fa9ee97cd422e82eb44bbcf0a SHA512 9d8cb95df031b25f3e0eef61c6d40f68e8fa872c52235057ce834cf563a9a3fc35370fd4272a5775bf4cc65d4e22e61d9c7ebc2e66502f210589034b82639596
-EBUILD tracker-miners-2.3.4.ebuild 4638 BLAKE2B c017180ddc7aa6131d802f2acd8f38fe92d375d1c4dd1607808194fbf998626a96bd8ac18ce493d75765d32fbaf0944d9a6355a3b8c7ef574361eb5c05e91639 SHA512 7fb21ad11dae03de02fbc9770c98c809da9f98161ea9c437f22dacfef33958ae797495a4ca53be9885f7afc528be3a6c4d2b677b46e7d22654e88e4ab748ac92
+DIST tracker-miners-3.1.1.tar.xz 4066784 BLAKE2B 60ae0141b295f08f9fce92b2697adcabfa1c7dcadd32759a5283771e6c98aed03a2f9a2afc8c60138a3c3590d96b59fbeb844dfbd34acb89d83dd40d1476858c SHA512 d7935fd02e0971a377106c65005b6ed4fdcc2c147f698d3cb36fea8e78019050e8b8ae5a407dea9809196c0186b8969c923767445249a85ad8b81a10e07c242f
+EBUILD tracker-miners-2.3.5-r1.ebuild 4731 BLAKE2B 97db115174c1a24648c1902c504c1cb3ecfae2ddd311b78f648badfa129bba7ad614577deaaec1b5babea2bb0bd58e51889480453aab7fa372c339f137aaca4c SHA512 761ff76fdd2eb02e46de77c42dcca2205d99db82240cb310d303d9af908f0c466b3599758c40e7d16d5a5058e81ba0bb97a48f721622e8054b14f82da78d0089
 EBUILD tracker-miners-2.3.5.ebuild 5001 BLAKE2B b683e12c111b42c22a1703d14490809af17d54e1bc2943c2f208706eee6b715261a2e39a923d4d622a224f402c32bbae41e0eff45065dcd63848358976c1694d SHA512 ab5f4f7bcb7577ee88d96c19ebace33c85e4b71b54bcaf903a54e837d99e59575ae0c426bf61f9e93e2a85053c4e9609d80d514d2ce85ca1e343bf2ced27f8f5
+EBUILD tracker-miners-3.1.1.ebuild 4671 BLAKE2B 15ae1d63bef54b574a4510dc4ce7f80d10437bced6f708fb46cf5604d1a4db065ff5602b0fabd9c54da24830210bfd2895e8fe8e8b23cb67d4a2929e18b0ac56 SHA512 3d08035334401017d36d62ae386a20db75bbb899b9ce9df515001847ded8bf05ffbaceadf21c2b192663b4aad6f2187383fd4a275b8626d97619acae44ab6ba3
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch b/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
new file mode 100644
index 000000000000..26bea773b284
--- /dev/null
+++ b/app-misc/tracker-miners/files/tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
@@ -0,0 +1,25 @@
+From 24a47894578f48c54cb303c8a11ad8df29fc93a4 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 13 Mar 2021 17:35:17 -0500
+Subject: [PATCH] Fix asciidoc manpage.xsl location
+
+---
+ docs/manpages/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+index 0b8a64863..831d08597 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_manpages
+     command: [xsltproc,
+               '--output', '@OUTPUT@',
+               '--stringparam', 'man.authors.section.enabled', '0',
+-              '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
++              '/usr/share/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
+     input: xml,
+     output: manpage,
+     install: true,
+-- 
+2.26.2
+
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
index f8bfdeb8dd65..417aa39630d3 100644
--- a/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
@@ -21,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
 	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.2.0:=
+	>=app-misc/tracker-2.2.0:0=
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -68,7 +68,11 @@ BDEPEND="
 				media-plugins/gst-plugins-openh264:1.0 )
 	) )
 "
-# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
+# intltool-merge manually called in meson.build in 2.3.5
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-autostart-build.patch
+)
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -133,6 +137,7 @@ src_configure() {
 		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
 		-Dgeneric_media_extractor=${media_extractor}
 		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dautostart=false # false to co-exist with tracker-miners-3
 		-Dsystemd_user_services="$(systemd_get_userunitdir)"
 	)
 	meson_src_configure
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
index 9d0204ebade2..1142f92f8000 100644
--- a/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
@@ -10,18 +10,18 @@ DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
 HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+SLOT="3"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
 
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.2.0:=
+	>=dev-libs/glib-2.62:2
+	>=app-misc/tracker-3.0:3=
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -50,31 +50,49 @@ RDEPEND="
 	sys-libs/zlib:0
 	gif? ( media-libs/giflib:= )
 
+	networkmanager? ( net-misc/networkmanager:= )
+
 	rss? ( >=net-libs/libgrss-0.7:0 )
 	app-arch/gzip
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	app-text/asciidoc
+	dev-libs/libxslt
 	dev-util/glib-utils
 	dev-util/gdbus-codegen
 
-	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS}
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
 		gstreamer? (
 			media-libs/gstreamer:1.0[introspection]
-			|| ( media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0 )
-	) )
+			|| (
+				media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0
+			)
+		)
+	)
 "
-# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Fix-asciidoc-manpage.xsl-location.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
+	# https://gitlab.gnome.org/GNOME/tracker-miners/-/merge_requests/323
+	sed -i -e 's:environtment:env:' tests/libtracker-extract/meson.build || die
+
 	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
 	if use gstreamer; then
 		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
@@ -96,24 +114,23 @@ src_configure() {
 	local emesonargs=(
 		-Dtracker_core=system
 
-		-Ddocs=true
+		-Dman=true
 		-Dextract=true
-		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
-		#$(meson_use test functional_tests)
+		$(meson_use test functional_tests)
+		$(meson_use test tests_tap_protocol)
 		-Dminer_fs=true
 		$(meson_use rss miner_rss)
 		-Dwriteback=true
 		-Dabiword=true
-		-Ddvi=true
 		-Dicon=true
 		-Dmp3=true
 		-Dps=true
 		-Dtext=true
 		-Dunzip_ps_gz_files=true # spawns gunzip
 
+		$(meson_feature networkmanager network_manager)
 		$(meson_feature cue)
 		$(meson_feature exif)
-		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
 		$(meson_feature gif)
 		$(meson_feature gsf)
 		$(meson_feature iptc)
@@ -124,7 +141,6 @@ src_configure() {
 		-Dpng=enabled
 		$(meson_feature raw)
 		$(meson_feature tiff)
-		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
 		$(meson_feature xml)
 		$(meson_feature xmp)
 		$(meson_feature xps)
@@ -133,7 +149,7 @@ src_configure() {
 		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
 		-Dgeneric_media_extractor=${media_extractor}
 		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
 	)
 	meson_src_configure
 }
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 816ec310ea08..949c3af75cb3 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,6 @@
-DIST tracker-2.3.4.tar.xz 1607928 BLAKE2B f0285480091fdac3aab1d258496643b7644f2d58383eb0d7cdd10f273a79e75a36507285db4737bb270dda8cb195482d6f8e2770b24fce13c72dd32325c3976e SHA512 8b8ffc33962a5dffbae83dfb8ea73b0d2ff6ee002fbd9e4b574ef5f8e562338e359caab290ab804f2801a14e04d2c76eb0a52cf06be4d236ea043de4fc39dadf
+AUX tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 835 BLAKE2B 70e949f1e385b237a154cbd7c3f3130acdb53761f6f6eb265ec591d43aa951db538765fb8b6d16f73a8ba99a53691610434a54e491cb85c8fb9350d5a00e8456 SHA512 adaa1d7f468186de0ec3d5ddecbf84518f08b3802c2d62d2f6511c68ae2b455c154e7fce14b57cb091f4a221a7fe32042ceeffa5095c22f8ec70ffbfe49f7de9
 DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
-EBUILD tracker-2.3.4.ebuild 2618 BLAKE2B 4bb5b38390812608d2f1331db79cdecc273e632986aadb29ee009ae90104eca8aa3a10c242c779eea8a9d69d69a10e5450664d8823cf8b4bfca4feeff59f6c0b SHA512 3eb5fca780e09629d86c8c0ac00040ec3d50cf37d35839be5cdfd654c01bcbdc72dc0f76633c45fa20f38389141bcf86e4f9514a9186a95b7222e93e21db8ce4
-EBUILD tracker-2.3.5.ebuild 2590 BLAKE2B f5fe092b79880b45882747be8225efbbb7dbf7e12c7c3889277c1985997a4c3616c1fe311b21109ee3ec614d92f814b7e4f44b256cef1d3d6ef8bea5511b243e SHA512 b98e80469d53a0b984a587a7097a588391d02265342eb8577bec6312fb1e895c6de3b36c2075399f87e79c1c1a31ed6fedb31fd6b0317c2a7d0dffc47cc0d477
+DIST tracker-3.1.1.tar.xz 1434784 BLAKE2B fa73420736e82bc7a43ef9dd9dce9096e50a22aca3f83737a0c77802460fc307630403bb836a799ff2d03a838cd1e71fbb4a17a54fa0a7c823e122800530e050 SHA512 87e6cc6dbfb34cc17bef42defefc51fc9d9586bffebf7a282a89ec3b294e911c504ea862bb05e5a269e438a83fbeb8938670eb32fa11d0d09ba805e0b02e6dcd
+EBUILD tracker-2.3.5.ebuild 2591 BLAKE2B aa8a651907b383dd6b52ce9097ed0fdab39434245538141b76a8e6fe6bc1bcbc79cfffd607acfa67883cea86b6e55433e4cf5ed552aa97d53ab10d534b07205f SHA512 5578c76065635b94c67319261f7b66d4f222bf12c922b157c880bfc3a15a7ac47d1c389888550981f083417cfea3768aa609f914889eedd2004e973afaac12e8
+EBUILD tracker-3.1.1.ebuild 2509 BLAKE2B a18706f1f022fb677dc39ef357d4353e37364328ca9d83e69ca8051c0b7d81050181df7fbf284e554db8a196e700993c65e7963a8fc7b1384663e7e1fb700970 SHA512 3f8a8c1e670ffedd73adde7d6975b8f5af122ebb8db88fd7e2b3c09f398a0b130c1ff821fbcf5c33798c3e36c25765aa97396398e9a1771a9a9d2b7716026204
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch b/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
new file mode 100644
index 000000000000..3383e2be28e5
--- /dev/null
+++ b/app-misc/tracker/files/tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
@@ -0,0 +1,25 @@
+From c14fa25f2b616b170b453861de87ef21c05dc6c4 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 13 Mar 2021 14:29:58 -0500
+Subject: [PATCH] Fix asciidoc manpage.xsl location
+
+---
+ docs/manpages/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+index f90c757cf..101cbca16 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -32,7 +32,7 @@ foreach m : manpages
+     command: [xsltproc,
+               '--output', '@OUTPUT@',
+               '--stringparam', 'man.authors.section.enabled', '0',
+-              '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
++              '/usr/share/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
+     input: xml,
+     output: manpage,
+     install: true,
+-- 
+2.26.3
+
diff --git a/app-misc/tracker/tracker-2.3.5.ebuild b/app-misc/tracker/tracker-2.3.5.ebuild
index 4a430b59490c..0c98fe546103 100644
--- a/app-misc/tracker/tracker-2.3.5.ebuild
+++ b/app-misc/tracker/tracker-2.3.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.40"
 
 inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
diff --git a/app-misc/tracker/tracker-2.3.4.ebuild b/app-misc/tracker/tracker-3.1.1.ebuild
index d11fc2711392..0593bbbcb0c6 100644
--- a/app-misc/tracker/tracker-2.3.4.ebuild
+++ b/app-misc/tracker/tracker-3.1.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="0.48"
 
 inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
 
@@ -12,42 +11,48 @@ DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/2.0"
-IUSE="gtk-doc +miners networkmanager stemmer"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-#RESTRICT="!test? ( test )"
+SLOT="3/0" # libtracker-sparql-3.0 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +miners stemmer test"
+RESTRICT="!test? ( test )"
 
 PV_SERIES=$(ver_cut 1-2)
 
-# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
-# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
 RDEPEND="
-	>=dev-libs/glib-2.46:2
+	>=dev-libs/glib-2.52:2
 	>=sys-apps/dbus-1.3.2
 	>=dev-libs/gobject-introspection-1.54:=
 	>=dev-libs/icu-4.8.1.2:=
 	>=dev-libs/json-glib-1.0
 	>=net-libs/libsoup-2.40.1:2.4
 	>=dev-libs/libxml2-2.7
-	>=dev-db/sqlite-3.20.0
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	>=dev-db/sqlite-3.29.0
 	stemmer? ( dev-libs/snowball-stemmer )
-	sys-apps/util-linux
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
+	app-text/asciidoc
+	dev-libs/libxslt
 	$(vala_depend)
-	gtk-doc? ( >=dev-util/gtk-doc-1.8
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.8
 		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
+		app-text/docbook-xml-dtd:4.5
+	)
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+	)
 	${PYTHON_DEPS}
 "
 PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Fix-asciidoc-manpage.xsl-location.patch
+)
+
 function inotify_enabled() {
 	if linux_config_exists; then
 		if ! linux_chkconfig_present INOTIFY_USER; then
@@ -61,6 +66,11 @@ function inotify_enabled() {
 	fi
 }
 
+python_check_deps() {
+	use test || return 0
+	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	linux-info_pkg_setup
 	inotify_enabled
@@ -76,15 +86,11 @@ src_prepare() {
 src_configure() {
 	local emesonargs=(
 		$(meson_use gtk-doc docs)
-		-Dfts=true
-		-Dfunctional_tests=false # many fail in 2.2; retry with 2.3
-		#$(meson_use test functional_tests)
 		-Dman=true
-		$(meson_feature networkmanager network_manager)
 		$(meson_feature stemmer)
 		-Dunicode_support=icu
-		-Dbash_completion="$(get_bashcompdir)"
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
 	)
 	meson_src_configure
 }
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index 06f7fbd73129..33dd58dcc27b 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,5 +1,5 @@
 DIST trash-cli-0.20.11.23.tar.gz 69229 BLAKE2B f3650a037f00e6ce8cd7bd1ff5f3e11c794ceb09563193e2930eb9b81cd40120dd48f117e8c96d900a8221db9a68360ff633e591367bd544ad07045b1a505304 SHA512 d370687da706677de61c0d234d4cb4db4ff4d9da8cde60c361d11eaccf319e2e418969a7d49ec6edd456524b1275b63d1fcd49bc9a9012afabda1c7a8ad7de78
 DIST trash-cli-0.20.12.26.tar.gz 74542 BLAKE2B 558e3cc043cdaef44bf68317e666c6f757daf9feeb6b731a57aba91ec983e1adb1e404f7e8428a7bd1225d83df6e94e8b9b793942bbb233f09a44127af0a42fa SHA512 d0b0a97014c888ddda95759dc82837385a2809cae04bdf6a84dcf0233dc2cf9370253110bc5fdbc5c4452ebb65c5e7836fe1cfaa9aaabe38d34269724456cd1c
-EBUILD trash-cli-0.20.11.23.ebuild 586 BLAKE2B ee96ab281f9d8c27d5dd22e67552de0084f32a1fa26c3385465b3cf8f8ea95fe381179fbbaf7589f4d2de9370b6242df8e6e702531f8624d18149366dd0462ea SHA512 207d7a1cf4215dfc2e53b673cdbb74d74ae1703a083075a0af31ad4d7f0e6314ae6206bdf03ebee5a7287393aee2ab5338a940bf2fc983f19f83a465b552c384
-EBUILD trash-cli-0.20.12.26.ebuild 588 BLAKE2B ee7f364004b6b2c35f8aed8f94186130e4308f3a3111fe0b25e4cf5870ada6ff6d115d8be57ec58018ce078422bf55651fdee9a84b78d52278a92c2c1d8a07da SHA512 0c350f5d3899070e8c16f3fb99d5c3aa210b4559c61603023240d46f04ecc7c5699e05a12f0db3d2476c8a6edad7dc68480a41fd1a73aca613af45168f75a9c4
+EBUILD trash-cli-0.20.11.23-r1.ebuild 598 BLAKE2B 1fe9975c5b1f7a8646cea9f25c487ab4b84095c4a010d80ec8bc21dc77cf283ad726d09ee0c13227cbd145aeeae25d2444f6ec0e7510c3c8356992809eb6604c SHA512 8449369b777c9460106660ce57929a67eefb1a3f3e247f020070c5b863340c48c2b79f825eff77a783fb5a44a3a3f0a883c963af22de0319427d9c22ead88c3a
+EBUILD trash-cli-0.20.12.26-r1.ebuild 600 BLAKE2B 9fedf61aa8d64d4a08c80782e504ab367eda5744a532c4542430262ce7bc6bb8a71b087eb6e1013ff73c5d2d6285fa290fd31703dc8aec7fdc5a143d5aede533 SHA512 44810de0d465d94fdcc81106f8ad801148070acafc02fe9bf04da60cd187e45271b90e6faafe065dfad5aef4b7327f0e4d220bca1ed15913fa6e142f57c70c83
 MISC metadata.xml 1094 BLAKE2B 25187a31e5ffc666c680bc9970599affa08b76be31618489fb698e9a4581c75e75385c32c1ff65a10c6749222f813e4a783e657f9b142cfa2283ab863be3deec SHA512 81dda2f222de76ddf74f37e19afb498b0cfd37ed6583dcf92adb2a8ce64566c2b8360cca535bdbe9343c04563894257a74fdae3df2d9bac20e486f3aa7c86417
diff --git a/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild b/app-misc/trash-cli/trash-cli-0.20.11.23-r1.ebuild
index fac401424dc2..c27b8153f31a 100644
--- a/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.20.11.23-r1.ebuild
@@ -19,7 +19,10 @@ KEYWORDS="amd64 x86"
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
 	)"
 
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
 distutils_enable_tests nose
diff --git a/app-misc/trash-cli/trash-cli-0.20.12.26.ebuild b/app-misc/trash-cli/trash-cli-0.20.12.26-r1.ebuild
index 4c1b99fd98bf..55b4d0268f2e 100644
--- a/app-misc/trash-cli/trash-cli-0.20.12.26.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.20.12.26-r1.ebuild
@@ -19,7 +19,10 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
 	)"
 
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
 distutils_enable_tests nose
diff --git a/app-misc/vcp/Manifest b/app-misc/vcp/Manifest
index 8d17fcc7aa1a..509afe237a5c 100644
--- a/app-misc/vcp/Manifest
+++ b/app-misc/vcp/Manifest
@@ -1,5 +1,5 @@
 AUX vcp-2.2-fno-common.patch 905 BLAKE2B 8c38e14d3b90176d196d30bae5f2770b2b13b5f95d02f78180eebfce283819d8d9cbdb2795128bf41130e6772b8f3625d1e238a83c8603a2cd8b8611802f119a SHA512 92d229db834ec3c26405d037a80b42a0404f74034ac9c23925ff0320b70e5060148dffed0a96c7090b14a4ae5479c1168741175b70342ff21682dde5af8aabb3
 AUX vcp-2.2-tinfo.patch 310 BLAKE2B 31ebbb498615f7eb9c0472cd99f85643a44a84e94dcae7d671044cc2aea9001e31e925506958db397516074f45d62ea834b28302448d158ab87038c0208244b8 SHA512 886a20474591c5fee3c70bf978977b2bc19f362dc38898eff6f44365b6edebd2eaff1cf09befc764163d32f0f2a84a80d032647266af0e7fb343b9ee6c5f82d3
 DIST vcp-2.2.tar.gz 20075 BLAKE2B 862ed1a816c45e50374e17d387d33bda3d758e155e6a38c1636000ce87de3b54928acaac5f89b0580098acb9b796e803406c9d95dec76c029fdc580d65a496b2 SHA512 3f9f60bce875f16a825b935fd241b11cc75d45b85b66133b27d16b86644c4bbfe69fa5f22571703e0ed6d235498f920a8796f6d74259db51a1abbd626c6f5137
-EBUILD vcp-2.2-r2.ebuild 771 BLAKE2B 7e4cf68db4ad7481b59f6fdeec875698eb2fc0a25c31db032fc95c3248ad0d87ef2e5b642bcbad4ee2d6b89d94beb821269e15d64ef0a53799b5925c83dfab37 SHA512 10e549a432bd571b8c3763e4a28f1d8bb7c1e0b6296afac1ddd0ca759487d6ff6a3b58f7481638df95d65dfe51d521176569a4510208af96935e0fd86c4efdfc
+EBUILD vcp-2.2-r2.ebuild 799 BLAKE2B c2a1328f335b5605281d15ce4ae34c1b3aa35a13aba1eabe05805615353aadba87beabd406af819ab1b61960ce3c9e926fd7bfae84a1034f801970818d85f740 SHA512 38598da6e032add683baaf9c02bbaec02ba17a8e8d9e98db08186ba9dd0d7fb8d4a54295fe0bbc2f174b07269daf6159c1ce76cba9510df548ccade8fa613d8d
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index 686e5ab2df44..5717fc48d193 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( Changelog README INSTALL )
 
diff --git a/app-misc/vit/Manifest b/app-misc/vit/Manifest
index 1797baf1c9b5..d92c8507ceaf 100644
--- a/app-misc/vit/Manifest
+++ b/app-misc/vit/Manifest
@@ -1,3 +1,3 @@
 DIST vit-1.3.tar.gz 56035 BLAKE2B 871e29767dd5aeb39e6876981246c7d42cdbe45320e3a2524bbc3c2aa055b65a04a54ee4a2bc122c3bf689fec93f117ec7b238dd5462a9133c35cf177cf454e7 SHA512 45ae4a1d08560d534a02a046d2fcf55c5401f9aaab0abcfbd13070fee28854268ba327018aea40317a184b9e28b074973f5d3e4169a479227e94b8401f066527
-EBUILD vit-1.3.ebuild 542 BLAKE2B 97207896147fe063c0db68cf95bcf14fbff6c5e99e69b467b0d5c3a8b2b8b9175696d0a825013818ed5a397a9150e820f4f1ccaf17f4c33b0a45a7102f04e3d5 SHA512 938f1702d874f62c48ebf4112fd70aba802345e5fd580db213e0481ac7ebc6d5884a668e67c69fd2ae68c0288ea94b3f75aff8d1f7e2ebd8a598a43fe3606a1d
+EBUILD vit-1.3.ebuild 518 BLAKE2B e13c61cef45143eca4f7344897eb4061cb90f6acd2e6ca0a765e0fba27661bf6dd45453de88d559ded7455d2bba77f5f5f4a87488ca9c1615e5af94cdb9ca9a9 SHA512 45345b8d3925141f43f80b0adb5288445a73dfa26f998573879d0c54a1bf11f95debabe72dcd09579728134c90d72151bfa8fb30a44842e73f76eb743eb14e44
 MISC metadata.xml 545 BLAKE2B e38ed1468698bb0a7125db2cdc313e015c04ca519e057edbd62e032eb2a43817b3ef6c065afe67d564be1f08a4dbc8f4b5d84da5a0bc35454793ae9af2787fa6 SHA512 85f31a91748127ce4af59ad39d072abc0b7e81fdbce1d56155ceb4bdc3b4bfeff5e4832072895192afd9fa2076dbf4604b6fa579650f079f5f43911efb982ce5
diff --git a/app-misc/vit/vit-1.3.ebuild b/app-misc/vit/vit-1.3.ebuild
index d259efed3a62..39987374585f 100644
--- a/app-misc/vit/vit-1.3.ebuild
+++ b/app-misc/vit/vit-1.3.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="Perl/Curses front-end for Taskwarrior (app-misc/task)"
 HOMEPAGE="https://github.com/scottkosty/vit"
 SRC_URI="https://github.com/scottkosty/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -12,7 +10,6 @@ SRC_URI="https://github.com/scottkosty/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 DEPEND="
 	app-misc/task
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index dbcb3a074341..7a66d43962bd 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -2,5 +2,5 @@ AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 AUX vlock-2.2.3-echo-printf.patch 375 BLAKE2B ae93fbf307dfd0a911a38b2426d89d0a7a864c47db4c533af01bf2b12f89227e4af38e1eba00dac677b1c467bf688166647681265b3ff7006a323cc91e971306 SHA512 30d1f3d20e7e7881b0fa759f0cba1fed3249cd27c91a784624de23df07db821b2c0ec73b5ae54ce90bb8f58d9d68c4cc3bf10f738d99fda6d7bd1f16a429de7d
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1353 BLAKE2B 384daa1edbe974986a04d13a4a44a212abcc318d7a94359d2913e1dd57363ca56dde58496c38b6ac25f11481c95a3b8821a2039bbe4b0fad07e241f3e70f2cda SHA512 b98529fc2c2085192f6a193b4eb37254f39bf8c446833495a77b55795ec8aca0657d8ca040e0629f564b1746aa678a0175161352c33744218ca88c9dd65f21dd
+EBUILD vlock-2.2.3-r2.ebuild 1422 BLAKE2B 3cfb8fac05d527bbd93515bdee3f6e844925d5b297fb43f49c93c612d332043b47c56f6788cd72f7e2040cb67930f5159c7328a0718fc6c81fbe79126beb638a SHA512 c1c8e656279e529374011aee9c00aa663848155bc6197aed838c59ab9a8250a5c892b164bc2f417a99d165e076ac8729ea21681f1045106e44834265035d2ccc
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
deleted file mode 100644
index 63003936c4cc..000000000000
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pam toolchain-funcs user
-
-COMMIT="f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"
-
-DESCRIPTION="A console screen locker"
-HOMEPAGE="https://github.com/WorMzy/vlock"
-SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="pam test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!>=sys-apps/kbd-2.0.4-r1[pam]
-	pam? ( sys-libs/pam )"
-
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cunit )"
-
-DOCS=( ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.2-asneeded.patch"
-	"${FILESDIR}/${PN}-2.2.2-test_process.patch"
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-}
-
-src_configure() {
-	local myconf="--enable-shadow"
-	use pam && myconf="--enable-pam"
-
-	# this package has handmade configure system which fails with econf...
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		CFLAGS="${CFLAGS} -pedantic -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" || die "configure failed"
-}
-
-src_install() {
-	default
-
-	# See bug #637598.
-	epatch "${FILESDIR}/${P}-echo-printf.patch"
-
-	use pam && pamd_mimic_system vlock auth
-}
diff --git a/app-misc/vlock/vlock-2.2.3-r2.ebuild b/app-misc/vlock/vlock-2.2.3-r2.ebuild
new file mode 100644
index 000000000000..eef753337853
--- /dev/null
+++ b/app-misc/vlock/vlock-2.2.3-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam toolchain-funcs
+
+EGIT_COMMIT="3542ef58a2b838cc8294fe82c341fb671c38611b"
+
+DESCRIPTION="Allows to lock one or all of the sessions of your console display"
+HOMEPAGE="https://github.com/WorMzy/vlock"
+SRC_URI="https://github.com/WorMzy/vlock/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+IUSE="pam test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!sys-apps/kbd[pam]
+	pam? ( sys-libs/pam )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-util/cunit )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/vlock
+"
+
+DOCS=( ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.2-asneeded.patch"
+	"${FILESDIR}/${PN}-2.2.2-test_process.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS} -pedantic -std=gnu99"
+		LD="$(tc-getLD)"
+		LDFLAGS="${LDFLAGS}"
+		$(usex pam '--enable-pam' '--enable-shadow')
+		--prefix="${EPREFIX}"/usr
+		--mandir="${EPREFIX}"/usr/share/man
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	# This package has handmade configure system which fails with econf
+	./configure "${myeconfargs[@]}" || die
+}
+
+src_install() {
+	default
+
+	# Bug #637598
+	eapply "${FILESDIR}/${P}-echo-printf.patch"
+
+	use pam && pamd_mimic_system vlock auth
+}
diff --git a/app-misc/votrify/Manifest b/app-misc/votrify/Manifest
index 1246306e66b9..8573b27101b8 100644
--- a/app-misc/votrify/Manifest
+++ b/app-misc/votrify/Manifest
@@ -1,3 +1,3 @@
 DIST votrify-5.tar.gz 9192 BLAKE2B 5df0ccd0b5a843b384e002c2bd1001df06cb5bcf039f10c689abeda07f1a05c545a917b0a42bd78c06c537eacca58ef7b4c2920a0fe6809f4450d4c98ee2fade SHA512 3d441eb42f860e4e571541300a04c1a52a01abbe20f76615adc1c9764bafbff35faf0f1dbe9f9267ad3c4dc0e4cb4bc715b87e2104cdef8997e7918ab834bb5d
-EBUILD votrify-5.ebuild 1357 BLAKE2B 88115b307c65390412796036c5523d6c0e0d7081e8d3704f9e8138ed60dcab2de48ac464debf8a7f8f0e6c95a66f0078b5f926b30e318fa31a297286b3074b6f SHA512 18c0bf666fcbe8bf38617cbfc747b680879db2c29bbd23297d0907370afad367fd8591ada118209b73f6803f7c3400f9a54e1bf3634d6bb3e360c2254a95fc99
+EBUILD votrify-5.ebuild 1358 BLAKE2B 058a6a5bc20dc1dd54d946d3786e23590ef7595a4464e9452bdfc840a63118a5e06af22199ccada7500edf5dc39fe920252634d26a8b25d02db10b8b20bee64e SHA512 9dd64daf1a3022dbfeb48a52a689193b841914874413cd238c4eac535f26c3efb3a3343b672390128b46bea3fb4183505cf1f1e1b023eea866e39829561ab73f
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-misc/votrify/votrify-5.ebuild b/app-misc/votrify/votrify-5.ebuild
index 4815b6699fac..4c03ed94d293 100644
--- a/app-misc/votrify/votrify-5.ebuild
+++ b/app-misc/votrify/votrify-5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit python-single-r1
 
diff --git a/app-misc/vzstats/Manifest b/app-misc/vzstats/Manifest
index 99ca8506ac56..ad5fad65cd00 100644
--- a/app-misc/vzstats/Manifest
+++ b/app-misc/vzstats/Manifest
@@ -1,3 +1,3 @@
 DIST vzstats-0.5.1.tar.bz2 17548 BLAKE2B 91e431ef2fae5f63fe544b9ffe87e0bcc4d53be3e38eb5e261ba4ef00ce56a7a6118ef213837f48050e2d291fb9ae8576e2aa24c1df0425ba758866f00b64d84 SHA512 ea58ba065fda6f1e1bebcdd273e231d1da46934d0c5217e1acc0a3ecb2ce5738975d3155939c6f74ba407796ae94af4ba405efdb0c808e9bbbbded48285a6663
-EBUILD vzstats-0.5.1.ebuild 605 BLAKE2B 9e1d84e4b3e4e6911a4216528a306af1e6f89e69fe38c0134548c4639d3dad21c944ad1d08587370392e4522ca710456b806279fb472c4f0c3bdf647c0eb3212 SHA512 e15f8b5d0d9d2f051e3bec3bbd80aaf68b5cc958e3a4558a35c7f5d0499f82a677cdbe755b730c8084d55be4d55cb8512bce4d82923a24bb16e2447bbe10c18c
+EBUILD vzstats-0.5.1.ebuild 580 BLAKE2B 8eed59600d735678093962819e9a1ff9cd3c911348c4f73913e1a156045a9610738f384bfd63258a661ba770b8c823341ab7060813162ae3b9ece73c608894c3 SHA512 959b3aca10642a7acee8afa216f58db9a870886c9a301643ff78ceb29fa82fa20c2a04169fa80f249d250ab66e86253c2af3f314ee4d41198f64e1421f60e112
 MISC metadata.xml 767 BLAKE2B 4fc236d574509666fc9e2a364c9e675b3ce8f4d9ab7212489961aec8eeaf6c3736d26d18b8d307276d7dab7ab7fd2ae71908763a06f847a5cde6fc47a7a07f5c SHA512 e186ed96257d933a92e02fbef6efd3d584015aaecb6efa07c3f37f4d684a270d8f395b2df0445b4b847013c254018da2252169b74f2ee2f0d5989579112343b7
diff --git a/app-misc/vzstats/vzstats-0.5.1.ebuild b/app-misc/vzstats/vzstats-0.5.1.ebuild
index b4f566ccc487..2d1ab2058c46 100644
--- a/app-misc/vzstats/vzstats-0.5.1.ebuild
+++ b/app-misc/vzstats/vzstats-0.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit bash-completion-r1
 
@@ -12,19 +12,17 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="
-	virtual/cron
-	sys-process/cronbase
-	net-misc/curl[ssl]
+DEPEND="sys-process/cronbase"
+RDEPEND="
+	${DEPEND}
 	app-portage/gentoolkit
+	net-misc/curl[ssl]
 	sys-cluster/vzctl
-	"
-RDEPEND="${DEPEND}"
+"
 
 src_install() {
-	emake install install-cronjob DESTDIR="${D}"
+	emake install install-cronjob DESTDIR="${ED}"
 	dodoc README
 	newbashcomp bash_completion.sh vzstats
 }
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index c24851403f9e..ba9f70c95e81 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,13 +1,4 @@
-AUX wcd-5.2.5-gentoo.patch 1468 BLAKE2B 4c1e0998173ca2104fef5f44e206f37c2f7685a518af162f61a6e1aa30ca5f8687bb3a5f1c8cf91279f2865016bedbe676ddf4d21f0c9a7700abaab0551e9a14 SHA512 427befe8be99ca4dc633f4c0e3cb130924027e452d87f3d9463d4edd7418f0864d6b5bd1cd3526734a55e28745db3e93a101c45255bc285c9abd324a6bd27108
-AUX wcd-5.3.4-gentoo.patch 1293 BLAKE2B e60a4da12941d78e4f94ae2e12ddbe2828dea13ebb1ad97fc54b2ec44799446d3fe464e2380086016843f13c8431c0b9d3fbbce1914bba7fb107ba1ebf93ced7 SHA512 2a5508ce61475dff6606a81df9de609d8ff270914ae1b40ffd831dee49d643afbb9654fb807ae6536531c95bfdb5f76a194bed250986b4881504b63e2fb21ddf
-AUX wcd-6.0.1-gentoo.patch 1503 BLAKE2B 0c17f6085ad12b7eccd768ac394ac7965f7fb299aaa7fc3ce2a15341dffc420321534083e253dab3ff673bbee983a063d4698121ab41e7de271de02f99dc8ebc SHA512 0d99727b6b5ae3c665d122ed84fcd3f2a57de3740564acab765cc075c7e05ff9c00e27bc0644eb6e49a7e02b56fd988921b68a5d05894f4ae77d544d6502d952
-AUX wcd-6.0.2-gentoo.patch 1476 BLAKE2B 3c94e459733592c0d90c4fca6cdad936333cdfa7f1347df5780baa667e17ece877318225f818b3cd2a488322e2b78dfec58c08969232378e359e8ca14fab1c16 SHA512 ee464b51e508e863d9cefe22179a39aeed8bafd7dfc6bb435ba1d9e01ca5e254e1121d47f50d9119684fb28d904ea5746b8f433bf52ec82bc221c7778f089f48
-DIST wcd-5.2.7.tar.gz 622613 BLAKE2B 85c473ad607022953338872a46251b2010504608d0385a17c6188e76975058af7370fbc393b0a9a1911b6c200f7397fcf45c4426aaa48f5a3f31a696657c444e SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e
-DIST wcd-5.3.4.tar.gz 610630 BLAKE2B f460de38b0ded0da592df31c12d8f28f890555750f972e395b5178665bdd2bf0514b258f5c2c1338e6a7699224c04153e67d088642626b5611abb9b685d305fd SHA512 fdb6e000876fffbc7bce6e6157282c2b8ef9929c896e5dbd8533314d575cf31656df76cd5c408bb2e495a1fda7f179b122ea2a58da94d5d55d1e2b9c658adc94
-DIST wcd-6.0.1.tar.gz 705577 BLAKE2B 9af2c14bae8cce50ad69b230897f2ae18c6ce899e9ed5d2f9b014ffb5b104c9fd136aa0d8a14110ae08fb1b9d4cc5f7819f42f5f23f5adf34780d16adf801790 SHA512 7a1a97b1dee220f2a425fcd7669ee9a3ca144992fe18444866269499b10bdea1671a5fca13eaa77c12c807d901e7831701e00a35c766021533a922b84b68247e
+AUX wcd-6.0.2-gentoo.patch 1466 BLAKE2B 2e6834d2f8f742b1582667c0ee3b0ca974600dc26a1e270bb1ea7be39ac266c019c8464f61d332c2919a5543581c9b07000ef8bdcbece7684d1046b808af920a SHA512 33ed7d9812676b5cd478351fecc31e12dce29c8e4c5b28d44b3580ac01074b631906fcd0bcea0ad66a6fcb72ace3cf13004f492c96d8a5533af7c8500ea5e703
 DIST wcd-6.0.2.tar.gz 713062 BLAKE2B 13a745fd698b009aedb19e688a5deec7d62c42acf2dc430b7f586f300712ad684e8530a9b2477cf2d7a6540769efc98c245215cbe756b78c3902d03430b034d9 SHA512 587a52efaf0a585e4fc8a04a0eb08445cf4c78d38abd7592658f61827aa6cc0f1e8af8643c411d22d74145479c9970b018b11fc7a2a08b4ba7c850097813b06f
-EBUILD wcd-5.2.7.ebuild 942 BLAKE2B 9ee88dbe9fe9bb3ab1f1810a9f4897a06e18fff8f35b21201fd2b1369592f6e22f5aee66634dc65a5244c3c7df9bb5820cc8c9190edd7ea098fa58874704e4ee SHA512 49cac153d0cb70845500bd789ba3b0927730518abec498767a4d3f9fadc6d333bebe76f72ba86f1d5fd06daaef1fbb1680fbc694649977b46de4ca8ccfe0bc0c
-EBUILD wcd-5.3.4.ebuild 1054 BLAKE2B c0beec9a9b544f6d25492cf17e2e1397ba1d0d0f554cc21c85c9811c1bf2300bec6f2be1085f927efabb48d59d05ab4f293370edebe3f27e73b0428c703bcd12 SHA512 264a5eafe29249dc3d063f4de88e0270cfbed1312e5e3d6f564cd8b1f6e6eb609df52638bbe154d121a53dc65c90df2a2da9819d9df16edc6c66ab1d487eec12
-EBUILD wcd-6.0.1.ebuild 963 BLAKE2B 365293927af0deb49ae842696e610d5e5f061ebbc888bf34f8286ec2d449a2680e63c0da50216bf56cc5718a146ce16240cb8dc97e91c5f5d1c36250ed10125d SHA512 11cdef28a30d7fc63b23e9ba423af74d3f71d9bf4dd28f468a9c4ba2c263defe0bc8b6b3440c28c12a46e9892d4e013ecd67a466067d5d651e17cc1e73b39e63
-EBUILD wcd-6.0.2.ebuild 937 BLAKE2B 203a297cca3c7da36cba1f6c2a62052c80b071dbfff23be95b0bceefe592a9dde79a039de47631eeb29e6b1cbe92eb1ec45309f06c8bab6a8252eab8bb27cacf SHA512 22b0db024a63aa5e30ca1e52771191bd7af8669ead3dfafcdbb76dd8cbbe0da4831cefb6c36f20bf16fa60f37530b444569ef704028061b3cc7f481107d4b522
+EBUILD wcd-6.0.2.ebuild 957 BLAKE2B 51c8469cbb8aa1e8963424ccbc695c6e0cd4d00b4a3053d17d9111fab43d0df59f4ba6462ac298d054529ddc7a2440eb1e50878628d0ec0d5dcf9861f70dc149 SHA512 e8526905b7d8a0a8f623247bad7ab61a5f0cd21f152cb0fdd5f0f3609fa89dff4a1f600a6afdba7fe391b9fa48d49a49136e90c39d8a87841c3ca93ed5b0a5b9
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/wcd/files/wcd-5.2.5-gentoo.patch b/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
deleted file mode 100644
index c838e131aa5f..000000000000
--- a/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
+++ /dev/null
@@ -1,72 +0,0 @@
- src/Makefile | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index d4120cc..4505b8d 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -46,12 +46,12 @@ include version.mk
- 
- CC		?= gcc
- STATIC		=
--STRIP		= strip
-+STRIP		=
- 
- ENABLE_NLS = 1
- 
- PACKAGE		= wcd
--EXT		= .exe
-+EXT		=
- PROGRAM         = $(PACKAGE)$(EXT)
- BIN		= $(PROGRAM)
- 
-@@ -188,9 +188,9 @@ endif
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
- 
- ifdef UCS
--	CURSES = ncursesw
-+	CURSES = $(shell pkg-config --libs ncursesw)
- else
--	CURSES = ncurses
-+	CURSES = $(shell pkg-config --libs ncurses)
- endif
- 
- ifdef CURSES
-@@ -201,7 +201,7 @@ endif
- 
- ifneq (,$(CURSES))
- 	DEFS_CURSES = -DWCD_USECURSES
--	LIB_CURSES  = -l$(CURSES)
-+	LIB_CURSES  = $(CURSES)
- endif
- 
- 
-@@ -406,15 +406,15 @@ ifdef ASCII_TREE
- endif
- 
- LDFLAGS_USER   =
--LDFLAGS		= $(RPM_OPT_FLAGS) \
-+LIBS		= $(RPM_OPT_FLAGS) \
- 	          $(LDFLAGS_EXTRA) \
- 		  $(NLFLAG) \
- 		  $(LDFLAG_STATIC) \
- 		  $(LDFLAGS_USER)
- 
--LIBS = $(LIB_CURSES) \
--       $(LIB_UNISTRING) \
--       $(LIBS_EXTRA)
-+LIBS += $(LIB_CURSES) \
-+	$(LIB_UNISTRING) \
-+	$(LIBS_EXTRA)
- 
- DEFS_USER   =
- DEFS		= $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
-@@ -470,7 +470,7 @@ status:
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-5.3.4-gentoo.patch b/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
deleted file mode 100644
index 0839bdb069d9..000000000000
--- a/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- wcd-5.3.4/src/Makefile
-+++ wcd-5.3.4/src/Makefile
-@@ -46,12 +46,12 @@
- 
- CC		?= gcc
- STATIC		=
--STRIP		= strip
-+STRIP		=
- 
- ENABLE_NLS = 1
- 
- PACKAGE		= wcd
--EXT		= .exe
-+EXT		=
- PROGRAM         = $(PACKAGE)$(EXT)
- BIN		= $(PROGRAM)
- 
-@@ -334,9 +334,9 @@
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
- 
- ifdef UCS
--	CURSES = ncursesw
-+	CURSES = $(shell pkg-config --libs ncursesw)
- else
--	CURSES = ncurses
-+	CURSES = $(shell pkg-config --libs ncurses)
- endif
- 
- 
-@@ -366,7 +366,7 @@
- 
- ifneq (,$(CURSES))
- 	DEFS_CURSES = -DWCD_USECURSES
--	LIB_CURSES  = -l$(CURSES)
-+	LIB_CURSES  = $(CURSES)
- ifeq (os/2,$(OS))
- 	LIB_CURSES  += -ltinfo
- endif
-@@ -456,15 +456,15 @@
- endif
- 
- LDFLAGS_USER   =
--LDFLAGS		= $(RPM_OPT_FLAGS) \
-+LIBS		= $(RPM_OPT_FLAGS) \
- 	          $(LDFLAGS_EXTRA) \
- 		  $(NLFLAG) \
- 		  $(LDFLAG_STATIC) \
- 		  $(LDFLAGS_USER)
- 
--LIBS = $(LIB_CURSES) \
--       $(LIB_UNISTRING) \
--       $(LIBS_EXTRA)
-+LIBS += $(LIB_CURSES) \
-+	$(LIB_UNISTRING) \
-+	$(LIBS_EXTRA)
- 
- DEFS_USER   =
- DEFS		= $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
-@@ -521,7 +521,7 @@
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-6.0.1-gentoo.patch b/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
deleted file mode 100644
index eca95856ca33..000000000000
--- a/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- wcd-6.0.1/src/Makefile
-+++ wcd-6.0.1/src/Makefile
-@@ -45,12 +45,12 @@
- 
- CC              ?= gcc
- STATIC          =
--STRIP           = strip
-+STRIP           =
- 
- ENABLE_NLS = 1
- 
- PACKAGE         = wcd
--EXT             = .exe
-+EXT             =
- PROGRAM         = $(PACKAGE)$(EXT)
- BIN             = $(PROGRAM)
- 
-@@ -329,9 +329,9 @@
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
- 
- ifdef UCS
--        CURSES = ncursesw
-+        CURSES = $(shell pkg-config --libs ncursesw)
- else
--        CURSES = ncurses
-+        CURSES = $(shell pkg-config --libs ncurses)
- endif
- 
- 
-@@ -361,7 +361,7 @@
- 
- ifneq (,$(CURSES))
-         DEFS_CURSES = -DWCD_USECURSES
--        LIB_CURSES  = -l$(CURSES)
-+        LIB_CURSES  = $(CURSES)
- ifeq (os/2,$(OS))
-         LIB_CURSES  += -ltinfo
- endif
-@@ -455,15 +455,15 @@
- endif
- 
- LDFLAGS_USER   =
--LDFLAGS         = $(RPM_OPT_FLAGS) \
-+LIBS            = $(RPM_OPT_FLAGS) \
-                   $(LDFLAGS_EXTRA) \
-                   $(NLFLAG) \
-                   $(LDFLAG_STATIC) \
-                   $(LDFLAGS_USER)
- 
--LIBS = $(LIB_CURSES) \
--       $(LIB_UNISTRING) \
--       $(LIBS_EXTRA)
-+LIBS += $(LIB_CURSES) \
-+	$(LIB_UNISTRING) \
-+	$(LIBS_EXTRA)
- 
- DEFS_USER   =
- DEFS            = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
-@@ -520,7 +520,7 @@
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
index ecd7c530f156..eddeee89e046 100644
--- a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
+++ b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
@@ -1,5 +1,5 @@
---- wcd-6.0.2/src/Makefile
-+++ wcd-6.0.2/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -45,12 +45,12 @@
  
  CC              ?= gcc
@@ -20,10 +20,10 @@
  
  ifdef UCS
 -        CURSES = ncursesw
-+        CURSES = $(shell pkg-config --libs ncursesw)
++        CURSES = $(shell ${PKG_CONFIG} --libs ncursesw)
  else
 -        CURSES = ncurses
-+        CURSES = $(shell pkg-config --libs ncurses)
++        CURSES = $(shell ${PKG_CONFIG} --libs ncurses)
  endif
  
  
diff --git a/app-misc/wcd/wcd-5.2.7.ebuild b/app-misc/wcd/wcd-5.2.7.ebuild
deleted file mode 100644
index 36a9d04865f5..000000000000
--- a/app-misc/wcd/wcd-5.2.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Wherever Change Directory"
-HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
-SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
-	sys-libs/ncurses[unicode?]
-	unicode? ( dev-libs/libunistring )"
-DEPEND="${CDEPEND}
-	app-text/ghostscript-gpl"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${P}/src
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.2.5-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	local mycompile="LFS=1"
-	use nls || mycompile="${mycompile} ENABLE_NLS="
-	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
-	emake \
-		${mycompile}
-}
-
-src_install() {
-	local DOCS="../README.txt"
-	default
-	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
diff --git a/app-misc/wcd/wcd-5.3.4.ebuild b/app-misc/wcd/wcd-5.3.4.ebuild
deleted file mode 100644
index 01d10fdcc1d4..000000000000
--- a/app-misc/wcd/wcd-5.3.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Wherever Change Directory"
-HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
-SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	unicode? ( dev-libs/libunistring )"
-DEPEND="${CDEPEND}
-	app-text/ghostscript-gpl"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${P}/src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.4-gentoo.patch
-)
-
-src_prepare() {
-	# Required for stupid eapply function
-	pushd .. &>/dev/null || die
-	default
-	popd &>/dev/null || die
-	tc-export CC
-}
-
-src_compile() {
-	local mycompile="LFS=1"
-	use nls || mycompile="${mycompile} ENABLE_NLS="
-	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
-	emake \
-		${mycompile}
-}
-
-src_install() {
-	local DOCS=( ../README.txt )
-	default
-	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
diff --git a/app-misc/wcd/wcd-6.0.1.ebuild b/app-misc/wcd/wcd-6.0.1.ebuild
deleted file mode 100644
index 2cf0a5de0ec4..000000000000
--- a/app-misc/wcd/wcd-6.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Wherever Change Directory"
-HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
-SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	unicode? ( dev-libs/libunistring )"
-DEPEND="${CDEPEND}
-	app-text/ghostscript-gpl"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	eapply -p2 "${FILESDIR}"/${PN}-6.0.1-gentoo.patch
-	eapply_user
-	tc-export CC
-}
-
-src_compile() {
-	local mycompile="LFS=1"
-	use nls || mycompile="${mycompile} ENABLE_NLS="
-	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
-	emake \
-		${mycompile}
-}
-
-src_install() {
-	local DOCS=( ../README.txt )
-	default
-	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
diff --git a/app-misc/wcd/wcd-6.0.2.ebuild b/app-misc/wcd/wcd-6.0.2.ebuild
index a5b1dabb2ee3..13c99ef9436a 100644
--- a/app-misc/wcd/wcd-6.0.2.ebuild
+++ b/app-misc/wcd/wcd-6.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Wherever Change Directory"
 HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
@@ -11,14 +11,16 @@ SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 IUSE="nls unicode"
 
 CDEPEND="
 	sys-libs/ncurses:0=[unicode?]
-	unicode? ( dev-libs/libunistring )"
+	unicode? ( dev-libs/libunistring:= )"
 DEPEND="${CDEPEND}
-	app-text/ghostscript-gpl"
+	app-text/ghostscript-gpl
+	virtual/pkgconfig
+"
 RDEPEND="${CDEPEND}"
 
 S="${WORKDIR}/${P}/src"
@@ -26,7 +28,7 @@ S="${WORKDIR}/${P}/src"
 src_prepare() {
 	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
 	eapply_user
-	tc-export CC
+	tc-export CC PKG_CONFIG
 }
 
 src_compile() {
diff --git a/app-misc/when/Manifest b/app-misc/when/Manifest
index 81acde86a6a7..a1c48385a937 100644
--- a/app-misc/when/Manifest
+++ b/app-misc/when/Manifest
@@ -1,5 +1,3 @@
-DIST when-1.1.37.tar.gz 51020 BLAKE2B 242d7833c91279bc7a73effc108a0f7d5edad9838006d8ff632c46215b7cd2a2187660075e2525a352a458a494abc648a9518945cdf18e2e7d58261e428efd8f SHA512 b1f0cb9cb797a5a32263ef2851498dfbf6a769d3e708b79ca1c5b37c7c877124194dd9b5ae78bfafebc0e73e82f306b3ae734a5ef7140fe3bf0e6b2cfcc4bb18
 DIST when-1.1.40.tar.gz 55306 BLAKE2B 3d4bdc962ccff64b09f5dda7a2c7be1daa0fd5fed2039f784ea6279e9aac495823159098f6a05c281de40d7964cc244a76c6b3bda1c4227748c04c98effac54d SHA512 0d70f2c9c4d44bbd922dc0d6b1a4e1eb90561a81add3ad4f1e1fc467a6331ca856d66725361d4e5ea3f1ce9ea1ed59d91ad18178e022b029c04c0c15747ecbcd
-EBUILD when-1.1.37.ebuild 883 BLAKE2B 6c9dfcb07bbb0952a21d2394af310032d98069cbfcce5467ea85c80b76114673d49b2aab91b399e029151ed22676bbcc8ab980cd8030ebef7ce117f0305b26dc SHA512 904b9f973b8db0fbd57f09e9a1620e8b0056ddb2e2be5674ef8d8045c8470b30290d2858bce9e44c15fe194f0767ffe0ec5b75e73bbb1f0ee42d2b0231751bcb
 EBUILD when-1.1.40.ebuild 900 BLAKE2B ec3e9967163ac70897ae0b8a96dda7f379ee694cdc400caa70b3fa31fadc1ddf3adf9466df9834a1fcf1d0e1199a9bb25cbfe18759f0f89ff14c8b68c73445e2 SHA512 5d799b94f8751c4030caf276386f856325d04ea9e15c688a756fa3a72f9a320c1d6975700bd7081621ea67bbbcb151ff60ea9d779295757ced70da0069e4ea76
 MISC metadata.xml 296 BLAKE2B a32736982613d5d7d4c99169fc5bc6af3607a89fef7351aee4230615611df20107c0ab865192d7c5bdc7ad84e41887a4ce34c8eb9c3a4228568fdfa8d4f92050 SHA512 8a2af01ba19649adce33f89067295923c603df7c8a14eb1563e4024ab0a41d55a885d95c020d263d6a8ad5e9e59d9c00ab79a809f79fc9f6d6724f1671807783
diff --git a/app-misc/when/when-1.1.37.ebuild b/app-misc/when/when-1.1.37.ebuild
deleted file mode 100644
index 251c08dade9a..000000000000
--- a/app-misc/when/when-1.1.37.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Minimalistic personal calendar program"
-HOMEPAGE="http://www.lightandmatter.com/when/when.html"
-SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/when_dist"
-
-DOCS=( README )
-
-src_prepare() {
-	default
-
-	# Fix path for tests
-	sed -i 's,^	when,	./when,' Makefile || die 'sed failed'
-}
-
-src_compile() { :; }
-
-src_test() {
-	# The when command requires these files, or attempts to run setup function.
-	mkdir "${HOME}"/.when || die 'mkdir failed'
-	touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
-	emake test
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-misc/wildq/Manifest b/app-misc/wildq/Manifest
new file mode 100644
index 000000000000..8ddd0338bb69
--- /dev/null
+++ b/app-misc/wildq/Manifest
@@ -0,0 +1,3 @@
+DIST wildq-1.1.10.tar.gz 16049 BLAKE2B ffb365e7dee7770a0ab52d189b59f1a8a9e6b2c8a63439d884b29fc7182b523eb38e2ada0ce9581d637fed9035dc5f7fc0197451bb4fcafd1d54746b0c0112af SHA512 cf10cd10757e6b933ecc11167c5ad4c548dfbfa9edad030458736ba6d29e816bb214c111fa96fa2625160d6403758d936c8374d6dc26b528e6ae22ed947de5bc
+EBUILD wildq-1.1.10.ebuild 822 BLAKE2B 28cc4ae9496983ad7a9626a2ec5bf751e9935148d8d41ed2e66b23dd7e6c290ebb367fa9f917a341c3f57e290a2f2ec54b36ebfe3f503455efb66b61e1d7f46f SHA512 3f7bcb6e6f621fdddfe459e9867d81f0bcc6035c476eb3102968ada1c07be2d89e46bdaca7975034e5678edc95be4cb6e7e146b30a5b5c0ae56280a087ec817f
+MISC metadata.xml 507 BLAKE2B 096ed38445471b3baf7e5ac6cafec06ed5ecf542dbc218b21165a45bf77f66203338658b5a7b16ce8de94b2c123dc006f73410132a9cabe7d3d94fa243ad20e1 SHA512 d3284d1f0493f1751ae882ff7d247f286858eb28f6d0ab32d16e8636edbe43b696d3d4c35fd19e233ad4ba78b3413d12722a09121074bf0474e9a4f583456ec6
diff --git a/app-misc/wildq/metadata.xml b/app-misc/wildq/metadata.xml
new file mode 100644
index 000000000000..215bdfd0e991
--- /dev/null
+++ b/app-misc/wildq/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">wildq</remote-id>
+		<remote-id type="github">ahmet2mir/wildq</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="hcl">HCL support via pyhcl</flag>
+		<flag name="toml">TOML support via pytoml</flag>
+		<flag name="xml">XML support via xmltodict</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-misc/wildq/wildq-1.1.10.ebuild b/app-misc/wildq/wildq-1.1.10.ebuild
new file mode 100644
index 000000000000..ccc4444aac82
--- /dev/null
+++ b/app-misc/wildq/wildq-1.1.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line TOML/JSON/INI/YAML/XML processor using jq c bindings"
+HOMEPAGE="https://pypi.org/project/wildq/ https://github.com/ahmet2mir/wildq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hcl toml xml"
+RDEPEND="
+	dev-python/jq[${PYTHON_USEDEP}]
+	hcl? ( dev-python/pyhcl[${PYTHON_USEDEP}] )
+	toml? ( dev-python/toml[${PYTHON_USEDEP}] )
+	xml? ( dev-python/xmltodict[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	# Unpin install_requires versions.
+	sed -e "s|^\\([ []'[[:alnum:]]\+\\)>=[^']*|\\1|" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index 52ac3d2c2ba9..1b3f71735457 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -1,10 +1,5 @@
-AUX xmind-3.4.0-config.ini 1671 BLAKE2B 1db0351ca78f06ebd2966d32c402334ceca45cc99d087d7670895bad8b6e68b2dd9fc880b41fc877db19e8b1d864364f1219c17bc03bd3b1d36e3cc78f9c1bb0 SHA512 dc6e054839eeadd6aab4abd41f42766567404b44b5d7fbaaad785a45f1b9c1d92e4eeaafb936bfff8d827c6ebfbccf4b02f3f417c2a8280300f377608913f763
-AUX xmind-wrapper 488 BLAKE2B 5880ece73df047121bbda1eb8f6b891685bba3e704ac9d47f79970a81be8f8e20c35febd278278a2825692c12ea34a4d24627ef8b9ba91f1c6ea8f602fe8eddf SHA512 f400d3f527897f087d5e20bce43299a20bd64a458f7c95a47447c78bf0c2b951a8f38d29e4a6ce028a9b421c41880fb5850184cb0b190de79f712ec807dbf9d7
-AUX xmind-wrapper-3.5.3 493 BLAKE2B 82aa49de2c90e2f943550d328253749310032e95e1dbd33e092383240950698ccf61bd85e1b9315275ebacc89cef78c518152e6e70f9f3246af8d41f850d7aad SHA512 555e1103dc5714bb5924421899262f1112c83807233c9969afdaa0eb0cba631b13e4fa984af7c2029fe57fb7e135f51a1d00e3dd3fffb8bcf3bb96eb93dfad80
 AUX xmind-wrapper-3.7.0 504 BLAKE2B 3528749643f3686d11afc7817e6b3e3228e3ef22105a013046aa8dd8c0c5463490918182a52d8fbf476332265685a9a80785dfa431dd912ff22145a13a00b99f SHA512 452560c9b1ab68df745616ac032089fb05f1aab61c7e1b247eb241195dd38e11b69459abb5e2b6696db76e2e421291de4dc41030f525f77f0e30522b52540248
 DIST xmind-8-update7-linux.zip 119918223 BLAKE2B 83a7c11e9eda40ac5f89458673417cdf98aacd793de66cca91e6b1f8429eaa0dfb276cc5a11a0eb00f055cb1b66e69bc084fd29abcfa6cecd2811de4f7d7b57f SHA512 0f59201f44b23436c7e6e3fd4dd1427337e5a262e5d4f25dbc836c2f4fd42b99232c1988138ba7015523ede50e0ae829ada6359698d5af0eee529ed19cd347e3
 DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f7321ff23139c7f1b69c3fdc662902a95714bac240b1962c26210f3edc41752f315c885581e9ba03efa9069e6 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d
-DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
-EBUILD xmind-3.5.3.201506180105-r2.ebuild 2139 BLAKE2B 219105f6cc823877aee66e25c32cef49ed171f1d009c99d937b0337a6e6dd1e42e6209fdaf205231f8764c960f3540a962c41bfdc03c54a78bd9753901ff7c9f SHA512 ffb2376e0504c90a8e55b346cf70410d50d41150d043f187ec80f3e6bdfd54926ab83e38ebb422b29ea9de68e30db9afc9903b498dea00cbfc7736833f281220
 EBUILD xmind-3.7.6_p201801311814.ebuild 2088 BLAKE2B 0180c2846ab2ae85ae03d7d6b8be46917a57d31dd3f15b2260b92f079c10f7da1b6156846f3097da53e9785ad33ca52e54bc39c62b7642821293a58ad69769ee SHA512 1cfc77297cb8d94d8107d9dd11e813e6c38d5b8a9b47f1a4d492bb67aa3aeb001d61f4f2a0a706b700cb5ab68b23cd3e017c1da81bf1e0190fb367d3f17e5869
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/xmind/files/xmind-3.4.0-config.ini b/app-misc/xmind/files/xmind-3.4.0-config.ini
deleted file mode 100644
index 62abbd1f31ff..000000000000
--- a/app-misc/xmind/files/xmind-3.4.0-config.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-#These configurations are shared among all installs. Branded For XMind 2013.
-#Tue, 05 Nov 2013 22:06:37 +0800
-
-eclipse.buildId=3.4.0.201311050558
-org.xmind.product.distribution.id=cathy_portable
-org.xmind.product.license.restrictions=
-org.xmind.debug.core.workbookSave=true
-#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser
-#Tue Nov 05 22:05:55 HKT 2013
-eclipse.p2.profile=profile
-osgi.framework=file\:plugins/org.eclipse.osgi_3.8.2.v20130124-134944.jar
-osgi.bundles=reference\:file\:org.eclipse.equinox.simpleconfigurator_1.0.301.v20120914-163612.jar@1\:start
-org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
-eclipse.product=org.xmind.cathy.product
-osgi.splashPath=platform\:/base/plugins/org.xmind.cathy
-osgi.framework.extensions=reference\:file\:org.eclipse.osgi.nl_da_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_de_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_es_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_fr_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_ja_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_ko_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_ru_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_sl_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_zh_4.2.0.v20121120043402.jar,reference\:file\:org.eclipse.osgi.nl_zh_TW_4.2.0.v20121120043402.jar
-osgi.bundles.defaultStartLevel=4
-eclipse.p2.data.area=@config.dir/../p2
-eclipse.application=org.xmind.cathy.application
-osgi.requiredJavaVersion=1.5
diff --git a/app-misc/xmind/files/xmind-wrapper b/app-misc/xmind/files/xmind-wrapper
deleted file mode 100644
index 728edce3e24a..000000000000
--- a/app-misc/xmind/files/xmind-wrapper
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#XMind wrapper script, copies configuration stuff into the user's local config dir if either 
-#the files aren't there or are older than the set in /opt (indicating that XMind has been upgraded)
-if [ ! -f ~/.xmind/configuration-cathy/config.ini -o ~/.xmind/configuration-cathy/config.ini -ot /opt/xmind/XMind/configuration/config.ini ]; then
-	mkdir -p ~/.xmind/configuration-cathy
-	cp -r /opt/xmind/XMind/configuration/* ~/.xmind/configuration-cathy/
-fi
-/opt/xmind/XMind/XMind
diff --git a/app-misc/xmind/files/xmind-wrapper-3.5.3 b/app-misc/xmind/files/xmind-wrapper-3.5.3
deleted file mode 100644
index b38ef1476246..000000000000
--- a/app-misc/xmind/files/xmind-wrapper-3.5.3
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#XMind wrapper script, copies configuration stuff into the user's local config dir if either 
-#the files aren't there or are older than the set in /opt (indicating that XMind has been upgraded)
-if [ ! -f ~/.xmind/configuration-cathy/config.ini -o ~/.xmind/configuration-cathy/config.ini -ot /opt/xmind/XMind/configuration/config.ini ]; then
-	mkdir -p ~/.xmind/configuration-cathy
-	cp -r /opt/xmind/XMind/configuration/* ~/.xmind/configuration-cathy/
-fi
-/opt/xmind/XMind/XMind "$@"
diff --git a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
deleted file mode 100644
index 1851c251719c..000000000000
--- a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit desktop eutils multilib optfeature xdg
-
-MY_PN="${PN}-portable"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="https://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=virtual/jre-1.5
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/XMind/libcairo-swt.so
-	opt/xmind/XMind/XMind
-"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_Linux_64bit"
-	else
-		XDIR="XMind_Linux"
-	fi
-	mv "$XDIR" XMind || die
-	mv XMind/.eclipseproduct Commons || die
-	cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' \
-		-i XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r Commons XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper-3.5.3" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "audio notes support" media-sound/lame
-}
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index 233780b720e7..cfe9a312acd0 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,6 +1,6 @@
-AUX ytree-1.99-tinfo.patch 460 BLAKE2B 9471b3a8e935595c888e3a57e425e1f285cf3d6ab558f73690ce8ccc60dcf3ba2932dacb850b869241c8812822a1a867d70f91b78bf3cefe0ac1fb883caff1ea SHA512 37b4ff2d81c9f5821b927003261e1ce59cb1dd0e3920e7fc24930f9c3788d1cc4e7a98414e629cc4a2820936707f8e5c429cce87cfff5ff0e48f9d3efb11dab0
+AUX ytree-1.99-tinfo.patch 463 BLAKE2B 019338b07eca07f4e9e0ef1c8db2f2e44312a990028910e75cb97d1a40980584a0eb6049a0f9602f7217637f3c1a2286550f2cc7fe52afe5a22f2dcd82a9b8cb SHA512 66ae18b332134b48ec903bbce2ae4c1ca56c25f8d262e9fb23d95c14f62a266c10996ae355cab1e914a64e8f26124a7d105b34840b71da2cb2c032a2644e5141
 DIST ytree-2.02.tar.gz 124868 BLAKE2B e0b9b4251617df9d851752382e695657eb3bef5ce58deff00604ded14d6d29dad1c50b2d9f394defdabc3338bcdf491a9cec5821022e1171f2aa2b6887b274cb SHA512 31a425e9acd81921c111f1ef72f9e2d9342c04cdd9121d9cecd81893518b6f9579bfe22c3630d4d117783aed536cfafdf09866eb80bace3e5cbd59fd393e77a1
 DIST ytree-2.03.tar.gz 124768 BLAKE2B 51c0c00bd1223c8ca21289a00d1e06bd7934cf1b247baf8920d1de0c70778dfda9dddfea19dcb3e8fc601e6e50b0ac9c2aded385dd665bfa2aa9b36d30b53193 SHA512 39566827aac4c505b46deddce02fcc1fb4432442e327a40b1e3c18084db126264604adf0235970c3800a2b365a0a8b01d1f87ba6f045a2ab77f672026087a097
-EBUILD ytree-2.02.ebuild 615 BLAKE2B eba52702d30fd8e1c829771d8edf8d3c9e522d93d0e46378fc9ea5e4c8f010f03d2a789c349e95d941a6d0cdb8a61b56177fa00750027a6304872cacc30a9b33 SHA512 118e154f6fe99ee6c95ea84c704881faf497da262b62f3dc69a3476c3fc1095c548af5a3b25ec6bd9c75b044e017a76775f6a9e89c6fb36f87dea1ff566237de
-EBUILD ytree-2.03.ebuild 566 BLAKE2B 78401991a069d1e5916ed8c6d08dc361ae907a1a7516177842bd8372226f865a661cffcffb9c08454f3bdd1cf41cf4483fc9329017f8b2f514a1ecf7d8efd8d4 SHA512 b418cb480ddd874a49b0126441dc8e3dbee63c7e523e26a604e51ceff927e7d9b65fd3e380edd66d8ce4763ef1605000708bdcff89d2d697699ec7df7448f70c
+EBUILD ytree-2.02.ebuild 640 BLAKE2B e2820373acc5ac102d42ca42d43b8d781b4b7abfd0d3486776140b08ac32217875f1187e8690c55f36eee53ee243f8717c66ee5ab051728b0c8cc087b96d22af SHA512 0cb439cf671a123c3ae7dc7bf9dbfc646aa66d346ea1e4438ef25d1ebd881dab315882a8c6707d8b5111546d15b7a17a73a45ebbdf01a6502f9184dc10f715ca
+EBUILD ytree-2.03.ebuild 591 BLAKE2B b2bedeeb7551480734547adbd8be55ef7274e62c125b9917234ecefd03f0ca4ea7f2c7c0cf37c8d2ad2ff76d5988a8c5656c37323c85ab2bd58bd9b7990588ce SHA512 701d747b39162bcf6844edffb9026329c74092b741c85e6ccb466a50277434648efdfdeca67b39603506cf89a8571d0e872d4c9bd9753b78e845189c3f1bdba8
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/files/ytree-1.99-tinfo.patch b/app-misc/ytree/files/ytree-1.99-tinfo.patch
index 9656cce88d51..47b5f2924a56 100644
--- a/app-misc/ytree/files/ytree-1.99-tinfo.patch
+++ b/app-misc/ytree/files/ytree-1.99-tinfo.patch
@@ -9,7 +9,7 @@ Bug: https://bugs.gentoo.org/690348
  READLINE    = -DREADLINE_SUPPORT
  CFLAGS      += -D_GNU_SOURCE $(COLOR) $(CLOCK) $(READLINE) $(ADD_CFLAGS)
 -LDFLAGS     += -lncurses -lreadline
-+LDFLAGS     += `pkg-config --libs ncurses` -lreadline
++LDFLAGS     += `${PKG_CONFIG} --libs ncurses` -lreadline
  
  ###########################
  # LINUX with Wide character support (testet with ncurses 5.4)
diff --git a/app-misc/ytree/ytree-2.02.ebuild b/app-misc/ytree/ytree-2.02.ebuild
index a3a24fd384af..b44c98a5a576 100644
--- a/app-misc/ytree/ytree-2.02.ebuild
+++ b/app-misc/ytree/ytree-2.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,10 @@ PATCHES=(
 
 DOCS=( CHANGES README THANKS ytree.conf )
 
-pkg_setup() {
-	tc-export CC
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	default
 }
 
 src_install() {
diff --git a/app-misc/ytree/ytree-2.03.ebuild b/app-misc/ytree/ytree-2.03.ebuild
index 719e4443d480..e0c2c496a3a4 100644
--- a/app-misc/ytree/ytree-2.03.ebuild
+++ b/app-misc/ytree/ytree-2.03.ebuild
@@ -22,8 +22,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( CHANGES README THANKS ytree.conf )
 
-pkg_setup() {
-	tc-export CC
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	default
 }
 
 src_install() {
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
index d984ec652094..fa0620977f61 100644
--- a/app-misc/zisofs-tools/Manifest
+++ b/app-misc/zisofs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
-EBUILD zisofs-tools-1.0.8.ebuild 630 BLAKE2B ddad39aec227ea71004a692811f0394a5f30dcaaca6bd590076bffc17f014f84d582228cd40cc0315dad3a50853d418fa5bd6464291ffee443b024c390c7af37 SHA512 24b2c314082a54fd3d9ada8bc08761e1e1658aa0efbcb7db15adea08a97ba4eb9b742eb083b9487b2be740ab8c0d6d26a35b992979ff1ae6f0c70817ce2a260d
+EBUILD zisofs-tools-1.0.8.ebuild 631 BLAKE2B 0db9cc58951ddaff09ab44100abf60bc507f462b7f7d15ac8b1e453ceab03b60dbfc98ea3ead216a51a492e75613daf39f76e1aeb0204326ce2cf58fa28f8332 SHA512 02298c008249c853156ef2f460204dfb9472065bf187346a2370d97b70d3544e027f562fc6ec6e45c98e91bf6c5c35d0fe84861ff6c1f82e410c488d6f9020a0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
index 288ff1329e49..f5604a4dac31 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 RDEPEND=">=sys-libs/zlib-1.1.4:0="
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /app-misc
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)