gentoo resync : 05.12.2021

71 files changed, 1110 insertions, 565 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b82327d7b1ec..eccef34196c6 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/away/Manifest b/app-misc/away/Manifest
index 1fa6bcb9e5b7..6ac71861cb95 100644
--- a/app-misc/away/Manifest
+++ b/app-misc/away/Manifest
@@ -1,3 +1,3 @@
 DIST away-0.9.5.tar.bz2 16909 BLAKE2B 80bbdf50e565c94f37a51dffaf3650eee05c59c1e0ef499c15be13b7e8c8d90defa689b36489a532007d9b018cebb4c4ac9b791c60678dd34375d7ff286cae01 SHA512 9cb0ab5caf80e337ce524ec88ee0ffc5305080be807494ababd122d7c5a00b7e79711537d74d930eb3768a71a31156e9abe5e0d9d424a201a9af31aa1bbc1c2a
-EBUILD away-0.9.5-r2.ebuild 785 BLAKE2B e515a7767185ff96de05b4e9aef5b014dc9e74d9c71977ae8f3f2b68cc1b1de300c3256da923af91979dd3b64c85c62f4f074012094caf60cc3a0469bb123df5 SHA512 c17b180d59c151d307ced058f3d5d13966c828c6bbe75a46cffa92f6bbfe4cbb8a9fa2f99d2ff9f0f428d6a5a1245c1df187b726fc7a932020e06a931b7788d7
+EBUILD away-0.9.5-r2.ebuild 776 BLAKE2B 5ab17955609f8a78e89badfa21fa88bdc3a692a917f404ffb32d9a88802063cb6873d3f9fbf301bf5ff15ea5d48559898aea195641c39332d7169859f524722a SHA512 cb7217a14a090b04205396f941e1cbd9bc67e1a7185508985578f41a9a5226d87e6d508c3889e589ddbad88404b93d8c2ace0c5625a7d1801f19f921aab1f53c
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/away/away-0.9.5-r2.ebuild b/app-misc/away/away-0.9.5-r2.ebuild
index daf7c44d333d..c22675d3d0f0 100644
--- a/app-misc/away/away-0.9.5-r2.ebuild
+++ b/app-misc/away/away-0.9.5-r2.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=6
+EAPI=7
 
 inherit pam toolchain-funcs flag-o-matic
 
@@ -17,11 +17,12 @@ RDEPEND=">=sys-libs/pam-0.75"
 DEPEND="${RDEPEND}"
 
 DOCS=( BUGS AUTHORS NEWS README TODO data/awayrc )
+
 src_prepare() {
 	default
 	sed -i -e '/-o \$(BINARY)/d' \
 		-e 's:LIBS:LDLIBS:' \
-		"${S}"/Makefile || die "Makefile fix failed"
+		Makefile || die "Makefile fix failed"
 
 }
 
diff --git a/app-misc/bb/Manifest b/app-misc/bb/Manifest
index 585206d6617d..d0c428a45741 100644
--- a/app-misc/bb/Manifest
+++ b/app-misc/bb/Manifest
@@ -7,5 +7,5 @@ AUX bb-1.3.0_rc1-printf-cleanup.patch 2826 BLAKE2B 26ccbf74ba95f2d695d56a788f340
 AUX bb-1.3.0_rc1-protos.patch 183 BLAKE2B 61112802cba379eda21b293270b2bf61e6be892f8cd36ce494f31284ff7a92ab5e6c828f5cd7365868128d40f2711aa099f3148989151875025ddbb7f24fb0b4 SHA512 bcccae0c1838ee89a62581c25a4896e468cd1fcd5dd4bf98bbe2395aa40d15a39ea8408bfad31517ff57385d8d0b2e65ced8c7a93fd17cc7f9039390805229c5
 AUX bb-1.3.0_rc1-zbuff-fault.patch 1048 BLAKE2B bf8729e1654bb44bfc32ff9bb857e5aef082d7e2ba40494304696f399fe43bc82540f1f323504a24afc003c408e6b73d8decabb1599dd5ffbfa186cc3a19e89d SHA512 bce66400732270b9b4957cbcfe83d97baa9ff011876517ce292949c1fe23945fb02768542c8b4b59b350403a0a3f8b1dae998800b64d84f34b8c37e5e3ba0cc2
 DIST bb-1.3rc1.tar.gz 1416292 BLAKE2B 342a11002a94f160de23739c5578acf685ff886ae66e182b33cd971b74b258bae6ecd7e9e795f1e6a53a062a4c0ba5296bdbb6f41dd8cca6be4550bb49943023 SHA512 f05eb741f1189038a5a63016437f8eaeb25eb001307561bfe8827701bc246873fec14462e586d5966dcd1c74cddaf346f4670254b712713625e139300817c0a9
-EBUILD bb-1.3.0_rc1-r5.ebuild 1923 BLAKE2B a67e3d5ccaa96037ad26ff61e3a3f88755ba3adb904e516f7bd960a60a59883178eaf107f735793f6aca8fb46f2604db17dd08befd59d3675a0473b47362b2d8 SHA512 05e77175ba12faa69ba4ea05e613ff83b8411397c12d1fd40e75dc9a8605e75c2440d3d574cb9ef7f49958e03f381917c062ef803f9daf44f8cf3119e39c1a0a
+EBUILD bb-1.3.0_rc1-r5.ebuild 1905 BLAKE2B 0db2b7a9779aeb7a315bccea6178181a4595e89b467413dda5aab695f6b0dc3cbd122f76d2767bc6c74641e74a555f43af274c51cf5bfd4f20443a3ce46497d4 SHA512 f740867712966e7f4b309dd8ef8e5ef2cebb7893d1afeacdaf886cb58f9880596278c126009ea0521263f7f56ce6f25eb9eba7746e4bff0c9e8ec640f4a86259
 MISC metadata.xml 248 BLAKE2B b8dceef6470332781bec2164b91ef9025e088c052fb5df0116460fbe97f5c72dc760e940f20897f2262f4c5a565d30142ad77a182b531f3fe07fd760764ff161 SHA512 fecc0bb3d7321c47bfea890b67859c9378e7720c36d62890958584ad0f771c10bf512e9d59e6628399acd49745030db48cf7bf09b675db3cb06360818ffe67a0
diff --git a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
index 23d546b2831a..1c34daad7812 100644
--- a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
+++ b/app-misc/bb/bb-1.3.0_rc1-r5.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
@@ -7,7 +7,7 @@ inherit autotools
 
 MY_P="${PN}-$(ver_cut 1-2)$(ver_cut 4-5)"
 
-DESCRIPTION="Demonstration program for visual effects of aalib"
+DESCRIPTION="Lightweight ASCII art demo using media-libs/aalib"
 HOMEPAGE="http://aa-project.sourceforge.net/"
 SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
@@ -42,13 +42,13 @@ src_prepare() {
 	# unbundle lzo, #515286
 	rm -v README.LZO minilzo.{c,h} mylzo.h || die
 	sed -e 's/minilzo.c//' \
-	    -e 's/minilzo.h//' \
-	    -e 's/README.LZO//' \
+		-e 's/minilzo.h//' \
+		-e 's/README.LZO//' \
 		-i Makefile.am || die
 	echo 'bb_LDADD = -llzo2' >> Makefile.am || die
 	# update code
 	sed -e 's,#include "minilzo.h",#include <lzo/lzo1x.h>,' \
-	    -e 's,int size = image,lzo_uint size = image,' \
+		-e 's,int size = image,lzo_uint size = image,' \
 		-i image.c || die
 
 	# rename binary and manpage bb -> bb-aalib
@@ -57,9 +57,9 @@ src_prepare() {
 	sed -e 's/bb/bb-aalib/' \
 		-i bb-aalib.1
 	sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
-	    -e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/'     \
-	    -e 's/bb_SOURCES/bb_aalib_SOURCES/'               \
-	    -e 's/bb_LDADD/bb_aalib_LDADD/'                   \
+		-e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/'     \
+		-e 's/bb_SOURCES/bb_aalib_SOURCES/'               \
+		-e 's/bb_LDADD/bb_aalib_LDADD/'                   \
 		-i Makefile.am || die
 
 	mv -v configure.{in,ac} || die
diff --git a/app-misc/beancounter/Manifest b/app-misc/beancounter/Manifest
index f9b48096b21e..f80a302131dd 100644
--- a/app-misc/beancounter/Manifest
+++ b/app-misc/beancounter/Manifest
@@ -1,3 +1,3 @@
 DIST beancounter_0.8.10.tar.gz 88658 BLAKE2B e2f848289398e45066375f80a0e7e2d0e93e7bbaa1d957acff95e67c2f8ecf482c3fae9cda7c64735974f7228d15308e99b841716d26a5847ee4de2bd5e81e67 SHA512 6d1270f0846987fe73480e0f6b46d1c27971d70ffe2622dee9a907f852249f7d30459003cc560c95dff9e6c973a88e81c4f6f63af8f8aa278861962bba703c1b
-EBUILD beancounter-0.8.10-r1.ebuild 878 BLAKE2B 5da0358bda2b97afa349fa2100f05b6336f44cf6bf2e2eb92c730abd379eddac7aaabffdd995f890e2f6ba7ea1ebabd6ced55f2fb41ccfb04700b7f7cf760f05 SHA512 467645c90cfeb26bb6a011e422c3e7def9e000aec30fb90aaef0a6e5e852303cee4da4a351af75317de84c79582057b829d70f801528221e3f303c60ab49e83f
+EBUILD beancounter-0.8.10-r2.ebuild 880 BLAKE2B 840267ad5d72c197fd8e24143ef9be6fe48be1ff6322fd04658526444a12070a2464f38395a33e9bb3ce3c057da4216858d77547a1e3fe057b4f056f690972ac SHA512 eca001a8cf74d54fb846009bf9c8ce85e818fb57824bdd87b1ce4bc6939a944ce5e376af0ad6978a91fee83ad890215ed013543e6e2842191018a9eadb5aaa7c
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-misc/beancounter/beancounter-0.8.10-r1.ebuild b/app-misc/beancounter/beancounter-0.8.10-r2.ebuild
index cfcb888f6d28..7435d61063e1 100644
--- a/app-misc/beancounter/beancounter-0.8.10-r1.ebuild
+++ b/app-misc/beancounter/beancounter-0.8.10-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit perl-module
 
 DESCRIPTION="Finance performance calculation engine with full data acquisition, SQL support"
-HOMEPAGE="http://dirk.eddelbuettel.com/code/beancounter.html"
-SRC_URI="http://eddelbuettel.com/dirk/code/${PN}/${PN}_${PV}.tar.gz"
+HOMEPAGE="https://dirk.eddelbuettel.com/code/beancounter.html"
+SRC_URI="https://eddelbuettel.com/dirk/code/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,12 +21,13 @@ DEPEND="dev-perl/Date-Manip
 	mysql? ( dev-perl/DBD-mysql )
 	sqlite? ( dev-perl/DBD-SQLite )
 	postgres? ( dev-perl/DBD-Pg )"
+RDEPEND="${DEPEND}
+	dev-perl/DBI"
 
-RDEPEND="${DEPEND} dev-perl/DBI"
 mydoc="README example.beancounterrc beancounter_*.txt "
 
 src_install() {
 	perl-module_src_install
 	# rm unwanted READMEs
-	rm "${D}"usr/share/doc/${PF}/{README.Debian,README.non-gnu} || die
+	rm "${ED}"/usr/share/doc/${PF}/{README.Debian,README.non-gnu} || die
 }
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index 2017f1d490b0..3002c273c5b1 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -22,14 +22,14 @@ DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST broot-1.6.6.tar.gz 8714930 BLAKE2B 8e0a649dc7d022c4be12eb7c7ba5925de46a59c739f1b7a0c3b238bde8edcc3ea226ddeea5b553376b198c66fd6d745b516afcb2ae49c0df1c3f8c732cd492aa SHA512 c1e3b375904c5589fda5950617142675a9f7c16656c954cda141b3bf32acd3bb1db0fec095bfe77f648be48865b3c7251e3b6ca94da7f5ff0f72915a3a1eb90a
-DIST broot-1.7.0.tar.gz 8714656 BLAKE2B 2ebb0f26973765cbcc97461b4221bcb02dc80f5477998bbb6f8479bb29bfe553431c0b2cf7afc21449b622fb859d6d693cf29c2627c7f3c2254200e4b9da1b4d SHA512 3d6a286322858fc65169798eda5c602ef87fff181aa75ad5ecbea06bb6b0993ad796b2783cb604ed7d99f4f8be4cc191dfc3d9a270948e69349a92e01f2e4235
-DIST broot-1.7.1.tar.gz 8714471 BLAKE2B 298b9a505f5226cab5c5983c857e0c9b50e2fd77fa7c627afa9921ef47bf4726ecc7d9eff02041132e732848a23efe28ae5ef087c022573f0fccfd02ce47a56e SHA512 a32f37577f8d5e6b173df758872387ceeccdbf8c157320494cfb9792342eed455abc238bdef9e1423c6ab3f35eb8bb4f7c723325291feedf025f49f13181ce60
+DIST broot-1.7.3.tar.gz 9416268 BLAKE2B 7d1836e6d60693361aba0da25a51919d169e0d4701c98dbaac46bb36c51c0cf7c209b80c96b785f9693eecfad55a645b68620734320671fd269258ba26a9e2c1 SHA512 c3eb6c4444d5bab5bc38888b20844fd4c86b8f7c24646811e8b9a3f36fac36ccd7a96d94838e21ca02f292d879d2a04f03b1d44a48ba0eef8b239130b7c5712a
+DIST broot-1.7.4.tar.gz 9416319 BLAKE2B ff9605379f9bd881ea5dc3710f1b03c1be6cbcebe2baaa45b73a430542fed1043e2cbfa646a0f374b7f12cdfb22309c895da1d9be7bbde2de279dbd233669330 SHA512 832c792a3a905040c5e7915b9defa82d2bd70b113025d3357d8ba9b521fb93617bbb17a6b74f7320365ed3a703c864e1e6db887c74f347ed669cb2c950334e44
 DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST bytemuck-1.7.2.crate 27489 BLAKE2B 2541a7561eb34351f58266451a020858d8ac1ad30ecb95b97d576e72532cae37ef0b747e2259aaf6052b65f951586425044f824a00dfabf54bba9462edf94c2a SHA512 fae361f5abe67215a7591d421a0b713b77b437123c56e21dd00421e95ab86d9dd9b0bf1daa6623b833ea65681fbeeb58f6feab9d323964304a3250f24df1ace2
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cc-1.0.69.crate 56044 BLAKE2B adcd10bf4faf6835ae8feb79ce5e7a4895700d9714fc4322dd52e37bdd8db66b849d5e59aceba6ef0edcf9a5c7c0e2bc616de4acd98b71999bd63592c1c69dda SHA512 ba2b84fb61b4097a96f9013f9925b1985263ccd75274186f5d37589444e390ae8d5d1f88c210822a9e9dac2db551c24aee2b12bb61801aef8b31a72b2ac77437
-DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383
+DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST char_reader-0.1.0.crate 4559 BLAKE2B a347e612e1291bd26fc56996e1f6cbb617c6d8b6549aee049428689297b61a20efd068179f887bceddb538db28e172c3e9edb771ac7ebc977d4e5069a21f268f SHA512 a1aa8c3b46af6a2a7a4084723917e0b77939c2836c00d5a399d33625fb71755b2ebd78405bca252dfd611643fcb8b376e8cc85343171b6daad8c71fa1cebc66a
 DIST char_reader-0.1.1.crate 4896 BLAKE2B 8b13d1b09a2a9f7f323e82c5ff2920be3ebce1429a2789f663f7e7c75ff374bfd15af115832f80b71a6d62e58d6f248d7020d3f48f19213c8bf41081a3a76f49 SHA512 4608b588620848333bec37a45a8cd605a935bd56d2a1fa5ea819f16aa32305aba7325af02ea3ab6821f6e981beac4e62c59d745a7f2f869573b90cb79b3c3d2d
@@ -40,6 +40,8 @@ DIST cli-log-2.0.0.crate 5302 BLAKE2B f36b117e4b2e89ca54132c9227236dd663256ccb16
 DIST clipboard-win-4.2.1.crate 12142 BLAKE2B 6818d38ca338b91263d0f2149c6657dd34d5499879d407c265ff7c0734a67d92bb3334175b4dc738e12aaf335d7350844225ba874877ef891e266edf1b2982ae SHA512 77a0bc140dc614cf763968d60e0ef8407ad7758891e08377f16031e5df783c9338aa0a3f4da1402f815a14818de074a9bfd8a273b07ed5724532335e177b0584
 DIST clipboard-win-4.2.2.crate 12188 BLAKE2B 00cf14f4e98f3a430abc8db75697b58dbedcf52d1ebb633d857f5310f0cc11a4fe4e9cb165d97caff5265f8a5b132faca5e82877e8f0162b87259bacb817d7fc SHA512 7b2495ffdc4333c642657096d4b60bff915750ef1bdd434d3f0496aa9392f2b5409f78830eae42c0e87eedaa21f1e7034c36b403cbb169b024232112c80763af
 DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
+DIST coolor-0.3.0.crate 48181 BLAKE2B 69409fa80c7c09b910706f905805ee0b6517b23120ca2e95370d34846229751eb54d9e0b9466c4044d89dbf626faf8f13cbe2975f27bf55256221ccc514fb923 SHA512 f7446b78fdb6ec452fef7583bd213ce705028f9b5191f3bec0076c9db07fe46b51a1ad18e70542a961a53c67833fc40b440ec8f37032214ac19add151cb9849e
+DIST coolor-0.3.1.crate 98306 BLAKE2B eafdcdaa221d173d0ab32062d7a83cbdc7e26ae35f6ab618ebb7a64d5a5da6128a11a1f676be2f7aaf90c45bb6229ec72a9f26a4038d4b49fd882027aace0584 SHA512 18efa3d1a96839d0e0007d674e1a8dde5ee00068877c6e8165db93f5605775de01ab1c3879628300eadabc50da23c3f5c9a2e94c31f77bc37cef1d69cf44293d
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crossbeam-0.8.1.crate 10429 BLAKE2B 4f915d623533a226370eeceefa5c196438b1b332a8b5eb6223853e416385ac4e1a207bf1989646478b219f7a68c8ca0656a808e87db58361f1d77a5554cc2a76 SHA512 564f5623d1a4da7b0253f14946f2e71d14ac9195d80ab3b0ad8e2ba6fc7229745c8c70c2899852d48fc93cef009109d7d7cf2dc9c875273cb8ce9223b92b0beb
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
@@ -49,8 +51,10 @@ DIST crossbeam-queue-0.3.2.crate 14993 BLAKE2B b22d68d0bebcee8eeb53fe431f54ae219
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crossterm-0.19.0.crate 104572 BLAKE2B 13b341870516c5ce4f3ac1d4f40567a2a465d65f9dbe9f627821bd6dde994fa5f8d9802a1b42f19ff91d5511ef7d03a0b62361fe8addbb18e74c624dbe66c9e9 SHA512 c46c095d73be48a3c1875806547ba708a40abfc8e5cd89514162e0d1636675c4f4e2857ac3b4b32239d14f7ab57a61018b6a919160b2136ae761dbbde726b932
 DIST crossterm-0.21.0.crate 105045 BLAKE2B f79ca91006ed619a3e7a0fa1d5bc9acb2ca76809a83c17dfa351cf6a21ae53b29abf91c6788fc9c22f0a643835fd65fa26cd36a5b58fecce75691e18f88af209 SHA512 b45ffa4b303b1e8733e5ada4866c60184bd2095d6383cde42f5cb0508c5f2d639060d946f9da77d95de5cee4ebb588b877ff0ff4a2fcd41f40928c3fd1f8fde4
+DIST crossterm-0.22.1.crate 105450 BLAKE2B 4e90dddf5da88dd94c4ae82d0a6d989126b063fae56e5e0963414f196d779f4fdd265d528ecfda387a604866efb41943db8ceee124c2e97dfdcb1f092678f76b SHA512 2a8534a12bb119be583d491b3595259d164de6922ce2a17bbe6f19fcff93339a6d0d8c08398958a7592d6aa765eb2ebc6e61b54211080785357c711b2c454d91
 DIST crossterm_winapi-0.7.0.crate 15187 BLAKE2B 5407aca29ccb36473b34527d977fd3fe9d190d2dd940da7077535351458fc0a06af114c145a0f3e741402f2df98a98605a8fb02e2e07c5bb107679a24260fc96 SHA512 5efbe7992b4a19725b5992e0b29a77673e8ecc03d28da35580a5cddaeb32b7e30c7bdb53a2392ebb5b1218617045c306d78451f109d5b836f0e00dcab59e0dfd
 DIST crossterm_winapi-0.8.0.crate 15531 BLAKE2B 663d08cffbf1996d585922ce09d486afa288b998b6509958ee0c89f8ca4ae316c8d404b326961a464435d22bfcb91e9c3fd26a48e90b8b267c40a7ab6f596c17 SHA512 e246db39c7adae89ee1699b6a0ca2f5aec2dd053db0698ee25c320eb315c59be51d6db2193493ebecadeebee5a4b6f3c52c2e9ede8088da7f9d102ff7ac1e936
+DIST crossterm_winapi-0.9.0.crate 15561 BLAKE2B f84604f1da9cfdd0fc69742eef8088e7d0959073c6f7f37507b065b8537faa20bea8e349bcb1d6836be97f06b4a2c55c4dc63f50eb2f2aba1f34df9b8c9abf1a SHA512 b8c32a82cc83244e8991931e3fe0d85527ee2cc5e6b4a0839d633448dfa8a137c87684e8e079f44edf5a994355e0106bb573b36b57c7420ac5cb6fb0ce20ce8d
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST csv2svg-0.1.5.crate 166306 BLAKE2B 09fb46340d24e08838d521b0b86e7819449c80990c727337c3b70c44f8fdac86dc2b36891ee34e3a5b04f6aeaf49b7074d52eda088231a0f55c8db3f3a2d96db SHA512 194bd4d44790872f348af34a043ce4ff1f5747239c5cd290cca02b40180d53ac6d96847ba11f904eb94ba8b51a5033c01d18589bfd9444e3ba4912eb76da8c62
@@ -74,7 +78,7 @@ DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927
 DIST gif-0.11.2.crate 34068 BLAKE2B 607b96e55a606137f25fe2bcbae52f3a708d7507de8c0b1e3546644f6ba94210571b32d2029f9ddc32ecff755f6869be7fff286b2c8539bf44062174a7bfb16b SHA512 02f2bacda1e4f43ddbb4f7c6843478056ff01cb815a7c8f9c4d14618781bbafe113cacb812c3788454e8a4241efd6a90792a00cfe84c334349331258bbec71d7
 DIST gif-0.11.3.crate 36151 BLAKE2B f90cbde636ff16ccaa0e83e31936d7d926aca06dc6e42c726e1caeb9655f3aa8b062a1997bc0a7280a276b836a24c2de6b2dc0493cfa937db892453573612405 SHA512 e581ce1e9099a7ebc913e20ace1cacb2c87a7fba178bce43bf7285fc1dc9b9eda55848204923cd18eaab9012a814232f9e587e4c0db6bad89cb91bf197591e46
 DIST git2-0.13.20.crate 190365 BLAKE2B c4f3420f19cdfb420576bc8c38dc45d1c7f3b74b5a2d23c85154dec35916d3d588c86aaa50eca52b427e5d044a07ede7cd1445ef1ba53ce08c70ff39f7ac56bc SHA512 2c0a9cf3391f4ea5eaa48c8fcc08a1cf27b877cc4960332bfdbb95620f9b161f720c35f87bf98e3771749a01444bf8e2337e6d8fc1a34962d4b041473115293f
-DIST git2-0.13.23.crate 192186 BLAKE2B d3bd3c54abc7b04c2948edaf35adac671a391c03ecc80c53e6ad0c9f14798d0d9fcd308a9a30424ffe5b1f6da1e6e20751d98eb47c62e123e3bbb16cb11ca32a SHA512 e60f21affcef26aac16181d48ecaa67b6a9578ce5fe9e62b6c460b21bc02feb858fe25f07f7d7443b8eeae88974f1ad76a998972e002a6c5da5aec4c1172c401
+DIST git2-0.13.24.crate 194130 BLAKE2B ff3fbbb1860d6630714fbce6c750853209f43fd906c5e199bb72cd200b3a26790414c9f5529046efdeb8bae9ae9761a20775c78834595995ca5ead413ea553d2 SHA512 34d74a3102b752c6dcf7d3fd60888ce07abec5ea16e9ad9a3aa3381151474475e502362dd2b8ef661b46ed08098cb5ec9505a2c0f1642dfb6eda495e04db0371
 DIST glassbench-0.3.0.crate 1256368 BLAKE2B f6d0bd7993271f6d035a964947da2bbeb486d4b07c39d41b2d644ef72ee3092b040f763a1509c9e3538740fb9dfbb641ae072c5dcb18c8867a5a83b7ea8e2387 SHA512 325d8d71bc6aef0e618d3d662d9dd775e7d8aa88475b5331149869d11a13b0cb944161427d2aebc7385bc0ae19ca45884a75f9ed6d9621e9c5db541b4b31ff31
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
@@ -102,7 +106,7 @@ DIST lfs-core-0.4.2.crate 6384 BLAKE2B 0226e53626bbbc42c3dca8279b5a8ebeb28a04565
 DIST libc-0.2.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
 DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
 DIST libgit2-sys-0.12.21+1.1.0.crate 1443245 BLAKE2B 794ff535a97d051cd12993f135e61e391e1d8406f8346dc9d1417a1ba433c0e1400f17d7e5bd90674110a3502ba7a38fffac8da008ee350a47061846ed2764f7 SHA512 fd6acaaec704fb2d159cbaf0bd1b81c7afe4d22aecd836b174001b017ed8421507739fd99da968cfb1d46db16a64fe6568f53e872aa5f9a9dd7fb2cb51b02d74
-DIST libgit2-sys-0.12.24+1.3.0.crate 1476766 BLAKE2B d1164bd49ac122692141ae6f2a38fde941582668169960e9af98bee7a4a26e57b34522057c8503146fc5b7fb1ab646fbf2548c7a3994299fd078e5b835041ff9 SHA512 9d738c318a15b70c749aeef777aebaf59a40912da5e4f23fade1e84a6425acdac6e6a59030811f5cd974edddd965c0c9514f7b5a0286d32d4d7f6ebb6e6ae21d
+DIST libgit2-sys-0.12.25+1.3.0.crate 1476839 BLAKE2B cd9f75aa62331c51976e9a3415bf2b33b1731a56870eb1647b56950d1366ee97f1bbab0aa79188ad304f9e884f8ee394b0ede98922acb1ee77ab38689017f4cc SHA512 b97e69aa44e4c5f5b4ada9bea71fe12cf3613f37e68064200af08acd84af5355825629ac572f4f25fa81317a2593c445d942fe8a6bad3704ea385e6dc79e8142
 DIST libsqlite3-sys-0.20.1.crate 2306064 BLAKE2B 9e0276c36311a7aab2613735c13b91f8dcd77c02f98bf38bce5f84852f1139d9c8dcd077bbc6ab55560fca69b27e08d4d1a0a7ed17152465267cf1cb4477d5ef SHA512 8ba1e7c7a6a5dc11ee4a2c817879478c7e3d349b237b418edf72489a232d39904537abfa2274553b06ae2dc909f4f9e2b3d8ae91a4c75768a3215ebeb5c057d1
 DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
@@ -152,7 +156,7 @@ DIST phf_shared-0.9.0.crate 4111 BLAKE2B 04d4344d7f07a8116ff7ac2497d64e60eb527d1
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST pkg-config-0.3.22.crate 16145 BLAKE2B 346b67a2000eb91ea8867e5a861c87a7728909d6b20dd00c9b4571d89e5308a108906fc80fe3a2d014fff0411d9bb30fcde224abf8f4aaf37164107861083bdc SHA512 435b9d99a1975692db3efb3bd0e92899c43ba4003aecc4859dc71cd2175521973d5cbe1be06fc3b40af2a7bbe1b0a845be73586c0cd96dc218bc4fc7dce11107
 DIST plist-1.2.0.crate 41056 BLAKE2B 9d23b210569eddc25da3cc6632b88345fec54f7a725617d7b71f90abefff4ea4a0ab58dec044fdfbca817c08bfcadac9bed3bab1e9f63890cf4535196d48d67f SHA512 545ebae943341302edd992f7937f43fa7c931e3b9e499b2a933901549b9dc16a8398216b5aa50b3cdc8175519769af1662996513085c4711400eb9cbe6fbe0e6
-DIST plist-1.2.1.crate 41144 BLAKE2B f9a2960ce8e1f53af482759863e5f9121c0edf6c68c272981b10f20429b60d1351898642b31e27b7dd3445d0f208c54860dc6822fadd946e4f11b48b2fe1c472 SHA512 0e7217e40e16a97637902732c0846c46144c042094f2482fe46890e660e9c41f09f5d57c9606e3374c6d74829f982ead460515a2221f5eb196a49bcb731ea12c
+DIST plist-1.3.1.crate 44772 BLAKE2B 2e2b869b4543d06830b54a873d6d5da572502ff0409aa723a5beda5121b0ea8c8aa3656aa70299ef32532f948ed82ccde05f4bbcc9cec6a7288e7fc79eb27536 SHA512 4cf962af14b4218502eb4aae5507d93c58c4a0b716f923c3f0e53e37225940c5ab6847d7d9ad5004f77dc2dbbd28f73412cc114fd231e515f23a4ade3f969e86
 DIST png-0.16.8.crate 52598 BLAKE2B 03f706591182a89b0566f8a793163372a4db3e7a742f3aadf06fda93068c42a4351722796ddbbb013fdc1be5a88dc02debae50ab1cc3ac81d72d07a814b456ce SHA512 df96f8580d8cc11df54788ff64ab3269b14369a467d7c29964a5b19add5e7a82258e6bfda40eedf135bffa98a2a86afbb725cd085cf37f6c433abf9a7485edee
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
@@ -188,7 +192,7 @@ DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdc
 DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416
 DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
-DIST serde_json-1.0.69.crate 115218 BLAKE2B 3ee34530b19cdace9bfdf6417553a53465bde10c049fe4a66db327683e164d14a28eb55dfe82ccd0dbe9d66e02a9d364d6573b933fb888d536aa271df5eecc32 SHA512 4c74ddc935b905708ccd09e8c4ce9e6d4dbb3b0b978228d7947df4659620ac9fa74e8a5e87626ae7e6c79b77b0ac00666888ee62273a13168b53ae55ba1da941
+DIST serde_json-1.0.71.crate 115468 BLAKE2B f026211992b5c6638e0451f556084d9acc56362b27abc466d1561ab53894f140d2ac58463bc9b5f64b2ffdf6d30048a9eededac554f89bc395faeab5b7b13ec4 SHA512 cbc5fc4a824c6911a2d60545bbc05f51258466d288dc991001df37af594c221c1c53b5e4119bb786a63c9ee17e132e73da1220312685129d472d3ee03aa01036
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
 DIST signal-hook-0.3.10.crate 48491 BLAKE2B bd962fd39589084ffdd05701340674b7d4519c6ba1a90d61f07e50d5eac6bdd1ca5b5e278c7f76f1e62139e8d13af29aaf9f377e84e53684091c23c2356388ea SHA512 3b6949f4cad0a77e6cfba2fb16d7edaf52737419ebd525d5d1905152cc1c73e81d4adb676077b9b6c144b0812ac5059a0f1032fe2c5ed450be2c451b7cf32e9b
 DIST signal-hook-0.3.9.crate 48416 BLAKE2B 1075d4b767f3d3c2e556ad1ca2511eee4eea8674989ee76cf4234ebac78f1351291f3dfff72605ec9fe92e978fc9ba25298182564e5a17676fb14441de6bb6e4 SHA512 bcb6cfd4d062ed4a2a83a7fbb35ec90f7dfa5e875807fe6b7c65d0393447b56fee613eac2b3dd08dae0cf2e3cdee920f2c3b3d27ccd1f6f8dbec849c3e6e4261
@@ -209,10 +213,9 @@ DIST syntect-4.6.0.crate 750938 BLAKE2B 9c53e142093f6d9fb703f4fe3f56db15c0bb7eba
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termimad-0.10.3.crate 316247 BLAKE2B acda7abe193eeb015c9e144e765b3fe075fda1fcba410a41ecea84f72d3ba455f528267a7300c5e5ee626a1c1f87a9bd7ee7ab336812718c66fe2877f3ff855b SHA512 c25aa79fa0053c1e7ac88405b45742d3e34d58f4293405699e601122451e18ac9532b80413df9032850d983e3abcb1b1656de3428bface46efd2505d2a2137bc
 DIST termimad-0.16.4.crate 345687 BLAKE2B 1551814ed21af200e3102e16dfd233060f2deba8bc7fe120bacfb9d520e4d5c3fc26031a3f346e2fc3ae70900ab91c303ecf09b1c80ab0c2cfc696b3039ae56d SHA512 c1e825ffa5f6180b5acf18aef3863698dfdbdcdb2b800ed77a9bc62cc5ec0eb42d8ace7e36c11ffe7a07f75e3b24137baf583cc8388ee5934bc79ebe0763bd8d
-DIST termimad-0.17.0.crate 349670 BLAKE2B dd7ad312706bd459443cc6b4bbef4b60203e12e3f7f8e245668cc2259b56ba9e703d58eb0c0b5720b5e7797263f500594ac72ff27a49418887ed5a3390187034 SHA512 a226c5cbd868df9b656c5913e5e369ae7ea171a6e27524e24916cb342bd8b457e781a6c004bddc2a4ca7b481f8a3c87e1befb2c24fde2dba48eb1719f939d76a
-DIST termimad-0.17.1.crate 349529 BLAKE2B 5c4bb66bd28c29bbe88190b5aed590c10eae96bab408b03a06cae49ddc9224f7eec37d0f261e90d5964ff94b5830a1f2312fa3b4fb0d4a537b1d9c8d4d36f7db SHA512 479650db2bdf6f8ec8c4fff99c68391de8d2ebd305fcfc29bec5ee914ce7bea0fba12bc49d4b119f7a40ba68bc1ad26f2cbf93993757c78d1d502d8a10f51034
+DIST termimad-0.19.0.crate 351222 BLAKE2B 98f31f0946f54e7557dc7210cef36ecb962c86c893588188449c8a4c9229a33c18db2ca51ac19d3a9d26f57ac9b90ec6c0b827d2905d8b3598e36e2a07027c5b SHA512 6e6a960962a9fe27d58571c8b4e65e26458ea8b6d6218e3efd9ac5767f6cfb2edc3e92c96fe78db043ad2f3dc3b4a67cd77206c6b14678843181e1cfec3b034a
+DIST termimad-0.19.3.crate 352106 BLAKE2B 158eddf072732f2329df40d90a960a974669373631dfd7db59bd60034997c4dcf90fcfd1c3c65bd4b491d86ba7c05011d1fdbc029cb5c47c8bd85677e2d1ff18 SHA512 4b6fcd9e2c801ece36334252faaa716227ca3f1b483a06246ff0966559adf1f2298d38f6296d327b7506dcfd498ff4860e6072c53956a56a2b2a2cefe1753a2c
 DIST terminal-clipboard-0.2.1.crate 4056 BLAKE2B 638662ebf46e0cb67df5a33905b5384b9270276c243b6f53a66415509eabb4da48c2d8257b5f67518712911395698cd02a745b6daf42d1cab30a1253a7dd98bf SHA512 10b6d024b24fb236954a981c17dec25b4d4b8f06c4cef3edb9137cf291099453926b5793c6f19bd3b69a9db88e38ed4ea72bbf8aa6f57434a30974b9fb9ab763
-DIST terminal-clipboard-0.3.0.crate 5529 BLAKE2B e9d8e1492b515e7571e919f20765dde240f85503920e93b8ac48f4f4e4473d2c31c448a89f4165cffa9e275dff2ae88b7d0677e145777effe3d985d3d1621070 SHA512 9f484c4c512776e398c83403759af4baa31279efcb149f724fb77d8d5ad3da9a0a73d4dfee03c3f76143052ada86859e8cb4ced55d7745b0eb0c81377b308b33
 DIST terminal-clipboard-0.3.1.crate 5597 BLAKE2B a05f67c1ebce2129a2b8130cd84fbed579c67ae4d46bc4f233e6ae647a2693e5c1257ce3882a21345b596c487cbf5b339ef907f417aafea4bb6f980113aa31eb SHA512 b29a81d2737271cc4e60115e473ea3af80ce45f078c99fee573cbd35da8e27c939ff1aa86dd86a3e2ea9352a28f2fd3492e28be63c3eb0dad53974d06b43c346
 DIST termux-clipboard-0.1.0.crate 2033 BLAKE2B 33003b25e6236370b2423472e87deaac8ee282c375e02faa3575aaec7ef547674f0218a50f0a2d42ff75dcf088ef31d94f44c4b05c0f526dddbaef2e06a8c722 SHA512 acd972d9c9eaa20dfadf1ec01274ed27fb33d16d97b504d8f41fea9c6598557a32d939d0a8a8585d919ee9d1b411d714851d662b5bc7d1a5f3b97d8cd423a434
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
@@ -222,8 +225,9 @@ DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST tiff-0.6.1.crate 1399263 BLAKE2B 4a0bec5d2f2d254505c3492e519c584e2f80f77a6429f44da36862b5d9fc1ef9f7396689005b136c92f6786ac64f9418ca7bbf49f36afdf3f10e8d2c77cf0f51 SHA512 ece5aaef610e0a7bcdea8c40571d497cd3ec79931e25129060b4f51cb40a28ef03fc131494bc841fa5b08eaa49a5acbc9332553cbc542019f1ec5eb5945d3538
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST time-0.3.5.crate 72732 BLAKE2B 7e7e90cdaca05f60e79b0858826fc59ea6a6e3113051c0a2cb7e0b7e7963e6c410595c8c524a97281f754008f5ad3090c7cb2a5098b00b922c0e898441f02171 SHA512 751afd33abf9879b7bc524b50c63ca4722aa39d5bef3ddb371ec4d6efc9acbee9033c5813ec7d31e5e627e3c7fcd491ad4e7016130b7b09f931023e2bf395574
 DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
-DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82
+DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST umask-1.0.0.crate 4380 BLAKE2B 3e1adf758039cf60d27d62417bdfd6b6fccc5fc4c2db483c81698e83d2689a7a6c89a9c45e68a8808d50f2481b0bdcb1a224d18eaed7ad9aafaecb5c2f199a1d SHA512 096b11f02ba12e0bc112481920d600d3e782ad296f6a287c4d2a36d78e35f0b4d38d13d32d73ccc58830711521f27e3d22f204d1e4474596973dc8fd8ef3c4b4
@@ -253,6 +257,6 @@ DIST xcb-0.9.0.crate 129744 BLAKE2B 5854662e87fc75e07ea707263808c8a5c6fd53a65e4f
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD broot-1.6.6.ebuild 4641 BLAKE2B 76d3feda454feaa5702d32df04941d7d3f763f7c13ae04689f277b53b3be4588fc9164f9fbf9b557ddb096fad391e49fe5e734aab8e2a3e1151f48661c19d6c5 SHA512 15df95cf92947c5c4a728bf3d52136d25dc3703e45753e258ee2a96eb830c23c4cb050963ab7d242f31af7518aa24bff184ad4d600a98b4476fe5fb6955c5778
-EBUILD broot-1.7.0.ebuild 4537 BLAKE2B 59e50c764df8fc3f74dd310556828a9d7ae343449d3805fda5c4503c828e843cdd2d2c5c44ab8e1e287e4b2787442489f4ed162bf5513bd925f39f040c04c69d SHA512 2485cb46d40fcc7d9252744ed7dbbc256d1f9c7bcd1f8d01c602f2cd6c1306d3bac08e188b9bc7c7fcb8f1e0aeeb6bab4bdd85efc6d94650661faf64b3cb402b
-EBUILD broot-1.7.1.ebuild 4541 BLAKE2B 87e8b72bcd96243634d89fe2531542bb6fc2b48ce42cb35cf21db105afbf1117fc28c6efbcd9b0a19c2ad51f15252b3e076d60f60fbbcba6e933c9b789e35c25 SHA512 b089fdab824cc5d50f840153560fd50cb79a3d80a23a4e82b896340847a5f1db83750dbe474566c0e235833dfa80ee85550f6c2ceca75603d035de1954c9996f
+EBUILD broot-1.7.3.ebuild 4565 BLAKE2B 801dc9e568488353d380df9a9ae15721cbcd7184498afa17afbc342cb40281bcaede4a3504198b6518d029c09e08ce672e771a14a76c93a3864a0a0f02f7a655 SHA512 3ccb697bb65c7a91e5f52a81776454a5b88f09db01e56f3203d9c2c462f049dbb0e5e417f376e5b5d18a6631616854535009d8915f7dc7f37ce55ddf7a5cf5e3
+EBUILD broot-1.7.4.ebuild 4565 BLAKE2B e5d55d14c4e3553966fd01bd6b352f5106fa874c248bcc6842cd094a5f452166605b0451768f7d11d3a1526be98f7fc606db30cd7ebc7ae856d2e4ea9aa48453 SHA512 a67771c36a527a8125cbdfdf2be44ae7c8c8de7cec51a4237e4eabab9766f726d3f6412946b9a65cb2b560f47b2e3029962de16d67dfb65b30c394d2f6578898
 MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
diff --git a/app-misc/broot/broot-1.7.1.ebuild b/app-misc/broot/broot-1.7.3.ebuild
index 2cdbc41759ba..82025d526226 100644
--- a/app-misc/broot/broot-1.7.1.ebuild
+++ b/app-misc/broot/broot-1.7.3.ebuild
@@ -24,7 +24,7 @@ bitflags-1.3.2
 bstr-0.2.17
 bytemuck-1.7.2
 byteorder-1.4.3
-cc-1.0.71
+cc-1.0.72
 cfg-if-1.0.0
 char_reader-0.1.1
 chrono-0.4.19
@@ -33,6 +33,7 @@ cli-log-0.1.0
 cli-log-2.0.0
 clipboard-win-4.2.2
 color_quant-1.1.0
+coolor-0.3.0
 crc32fast-1.2.1
 crossbeam-0.8.1
 crossbeam-channel-0.5.1
@@ -64,7 +65,7 @@ fnv-1.0.7
 form_urlencoded-1.0.1
 getrandom-0.2.3
 gif-0.11.3
-git2-0.13.23
+git2-0.13.24
 glassbench-0.3.0
 glob-0.3.0
 hashbrown-0.9.1
@@ -87,7 +88,7 @@ lazy_static-1.4.0
 lazycell-1.3.0
 lfs-core-0.4.2
 libc-0.2.107
-libgit2-sys-0.12.24+1.3.0
+libgit2-sys-0.12.25+1.3.0
 libsqlite3-sys-0.20.1
 libz-sys-1.1.3
 line-wrap-0.1.1
@@ -124,7 +125,7 @@ phf_generator-0.9.1
 phf_macros-0.9.0
 phf_shared-0.9.0
 pkg-config-0.3.22
-plist-1.2.1
+plist-1.3.1
 png-0.16.8
 ppv-lite86-0.2.15
 proc-macro-hack-0.5.19
@@ -153,7 +154,7 @@ scopeguard-1.1.0
 secular-1.0.1
 serde-1.0.130
 serde_derive-1.0.130
-serde_json-1.0.69
+serde_json-1.0.71
 signal-hook-0.1.17
 signal-hook-0.3.10
 signal-hook-mio-0.2.1
@@ -169,7 +170,7 @@ syn-1.0.81
 syntect-4.6.0
 tempfile-3.2.0
 termimad-0.10.3
-termimad-0.17.1
+termimad-0.19.0
 terminal-clipboard-0.3.1
 termux-clipboard-0.1.0
 textwrap-0.11.0
@@ -177,7 +178,8 @@ thiserror-1.0.30
 thiserror-impl-1.0.30
 tiff-0.6.1
 time-0.1.43
-tinyvec-1.5.0
+time-0.3.5
+tinyvec-1.5.1
 tinyvec_macros-0.1.0
 toml-0.5.8
 umask-1.0.0
diff --git a/app-misc/broot/broot-1.7.0.ebuild b/app-misc/broot/broot-1.7.4.ebuild
index 43b95782a76c..601332f18614 100644
--- a/app-misc/broot/broot-1.7.0.ebuild
+++ b/app-misc/broot/broot-1.7.4.ebuild
@@ -7,32 +7,33 @@ CRATES="
 adler-1.0.2
 adler32-1.2.0
 ahash-0.4.7
-ahash-0.7.4
+ahash-0.7.6
 aho-corasick-0.7.18
 ansi_colours-1.0.4
 ansi_term-0.11.0
-anyhow-1.0.42
-argh-0.1.5
-argh_derive-0.1.5
-argh_shared-0.1.5
+anyhow-1.0.45
+argh-0.1.6
+argh_derive-0.1.6
+argh_shared-0.1.6
 atty-0.2.14
 autocfg-1.0.1
 base64-0.13.0
 bet-1.0.0
 bincode-1.3.3
-bitflags-1.2.1
-bstr-0.2.16
+bitflags-1.3.2
+bstr-0.2.17
 bytemuck-1.7.2
 byteorder-1.4.3
-cc-1.0.69
+cc-1.0.72
 cfg-if-1.0.0
-char_reader-0.1.0
+char_reader-0.1.1
 chrono-0.4.19
 clap-2.33.3
 cli-log-0.1.0
 cli-log-2.0.0
-clipboard-win-4.2.1
+clipboard-win-4.2.2
 color_quant-1.1.0
+coolor-0.3.1
 crc32fast-1.2.1
 crossbeam-0.8.1
 crossbeam-channel-0.5.1
@@ -41,9 +42,9 @@ crossbeam-epoch-0.9.5
 crossbeam-queue-0.3.2
 crossbeam-utils-0.8.5
 crossterm-0.19.0
-crossterm-0.21.0
+crossterm-0.22.1
 crossterm_winapi-0.7.0
-crossterm_winapi-0.8.0
+crossterm_winapi-0.9.0
 csv-1.1.6
 csv-core-0.1.10
 csv2svg-0.1.5
@@ -59,12 +60,12 @@ error-code-2.3.0
 fallible-iterator-0.2.0
 fallible-streaming-iterator-0.1.9
 file-size-1.0.3
-flate2-1.0.20
+flate2-1.0.22
 fnv-1.0.7
 form_urlencoded-1.0.1
 getrandom-0.2.3
-gif-0.11.2
-git2-0.13.20
+gif-0.11.3
+git2-0.13.24
 glassbench-0.3.0
 glob-0.3.0
 hashbrown-0.9.1
@@ -76,33 +77,33 @@ id-arena-2.2.1
 idna-0.2.3
 image-0.23.14
 indexmap-1.7.0
-instant-0.1.10
+instant-0.1.12
 is_executable-1.0.1
-itoa-0.4.7
-jobserver-0.1.22
+itoa-0.4.8
+jobserver-0.1.24
 jpeg-decoder-0.1.22
 lazy-regex-2.2.2
 lazy-regex-proc_macros-2.2.2
 lazy_static-1.4.0
 lazycell-1.3.0
 lfs-core-0.4.2
-libc-0.2.98
-libgit2-sys-0.12.21+1.1.0
+libc-0.2.107
+libgit2-sys-0.12.25+1.3.0
 libsqlite3-sys-0.20.1
 libz-sys-1.1.3
 line-wrap-0.1.1
 linked-hash-map-0.5.4
-lock_api-0.4.4
+lock_api-0.4.5
 log-0.4.14
-matches-0.1.8
-memchr-2.4.0
+matches-0.1.9
+memchr-2.4.1
 memmap-0.7.0
 memoffset-0.6.4
 minimad-0.7.1
 minimad-0.9.0
 miniz_oxide-0.3.7
 miniz_oxide-0.4.4
-mio-0.7.13
+mio-0.7.14
 miow-0.3.7
 ntapi-0.3.6
 num-integer-0.1.44
@@ -111,34 +112,34 @@ num-rational-0.3.2
 num-traits-0.2.14
 num_cpus-1.13.0
 once_cell-1.8.0
-onig-6.2.0
-onig_sys-69.7.0
+onig-6.3.1
+onig_sys-69.7.1
 open-1.7.1
-open-2.0.0
-parking_lot-0.11.1
-parking_lot_core-0.8.3
-pathdiff-0.2.0
+open-2.0.1
+parking_lot-0.11.2
+parking_lot_core-0.8.5
+pathdiff-0.2.1
 percent-encoding-2.1.0
 phf-0.9.0
-phf_generator-0.9.0
+phf_generator-0.9.1
 phf_macros-0.9.0
 phf_shared-0.9.0
-pkg-config-0.3.19
-plist-1.2.0
+pkg-config-0.3.22
+plist-1.3.1
 png-0.16.8
-ppv-lite86-0.2.10
+ppv-lite86-0.2.15
 proc-macro-hack-0.5.19
-proc-macro2-1.0.28
+proc-macro2-1.0.32
 proc-status-0.1.1
 quick-xml-0.22.0
-quote-1.0.9
+quote-1.0.10
 rand-0.8.4
 rand_chacha-0.3.1
 rand_core-0.6.3
 rand_hc-0.3.1
 rayon-1.5.1
 rayon-core-1.9.1
-redox_syscall-0.2.9
+redox_syscall-0.2.10
 redox_users-0.4.0
 regex-1.5.4
 regex-automata-0.1.10
@@ -151,40 +152,41 @@ same-file-1.0.6
 scoped_threadpool-0.1.9
 scopeguard-1.1.0
 secular-1.0.1
-serde-1.0.127
-serde_derive-1.0.127
-serde_json-1.0.66
+serde-1.0.130
+serde_derive-1.0.130
+serde_json-1.0.71
 signal-hook-0.1.17
-signal-hook-0.3.9
+signal-hook-0.3.10
 signal-hook-mio-0.2.1
 signal-hook-registry-1.4.0
-siphasher-0.3.6
-smallvec-1.6.1
+siphasher-0.3.7
+smallvec-1.7.0
 splitty-0.1.0
 str-buf-1.0.5
 strict-0.1.4
 strsim-0.8.0
 svg-0.8.2
-syn-1.0.74
+syn-1.0.81
 syntect-4.6.0
 tempfile-3.2.0
 termimad-0.10.3
-termimad-0.17.0
-terminal-clipboard-0.3.0
+termimad-0.19.3
+terminal-clipboard-0.3.1
 termux-clipboard-0.1.0
 textwrap-0.11.0
-thiserror-1.0.26
-thiserror-impl-1.0.26
+thiserror-1.0.30
+thiserror-impl-1.0.30
 tiff-0.6.1
 time-0.1.43
-tinyvec-1.3.1
+time-0.3.5
+tinyvec-1.5.1
 tinyvec_macros-0.1.0
 toml-0.5.8
 umask-1.0.0
-unicode-bidi-0.3.5
+unicode-bidi-0.3.7
 unicode-normalization-0.1.19
 unicode-segmentation-1.8.0
-unicode-width-0.1.8
+unicode-width-0.1.9
 unicode-xid-0.2.2
 url-2.2.2
 users-0.11.0
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index fe8111cb4e5d..a6b0613a2d0c 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,4 +1,5 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
+AUX ca-certificates-20211016.3.72-no-cryptography.patch 824 BLAKE2B fb71347a7763e15f5a3fc3d63513346afcd0e74d7b01fb2e107d874eb314608fa5e2823826bf7adfc0bac83396a0828a8ad9eb680cad6f2034a32280f85e7e4e SHA512 b132682f54451c0a17073135c96153bb0de97496c9c5b1f3c5fe019a2dccf6497e7a88322b2fccec3fb7252100d1c2a9bd9e4e124d8774c6fd369ada0d600c9a
 DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 593352912d2b490e3f46ea032ac1ddf1c87a7ac93859d475461cbba490918cdec853b0bb30bb253a634d8d597ca6f0304bc81122b4b31b5b31fd6a80e1faaf33 SHA512 a824209fa0ff0865872a07d8e6b901d8407f599243810fd5c820e1f69226e05b0b4f1e25e5ff3d8d398ff952529084442f026e32220961f359f6323f6bf03373
 DIST ca-certificates_20211016.tar.xz 239608 BLAKE2B 9b4730b54fd9f472fe4e5427bf912d9a61d10d2c289d1e443b54cca469fa87f9e02b8f67e7e087aceceffc7dd2b4043cdb5380e2652bc619d51f3a224c64f717 SHA512 bedf072c8aa1b05b249ea272f5cecfe16bdcd762c02c712323f12ac7a278e8814453f5f3caad86a2581e451788b292ed3a76a6a81620926459bb890133cffde1
 DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
@@ -7,5 +8,5 @@ DIST nss-3.72.tar.gz 83928300 BLAKE2B d92889e27e99095a18090eff0c08b8653ef1f53f49
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD ca-certificates-20210119.3.66.ebuild 5729 BLAKE2B 621fa9f502341120c79456c777adc53bc5f745e30c5f0262f9939115d0aa689e050c1fa0804c60f576e6a6e4d551eed66ae1688fb1221f3df0457a5d1fc12c66 SHA512 ebc95de3a0c5d64927d6aea7399ed7d7d314ff275de0e8ffe3c62a26b86518104cdba475ca99b01de0967a0dcc807bd8e1b5fc7528f77d890a7f7d46b30f2855
 EBUILD ca-certificates-20210119.3.71.ebuild 5737 BLAKE2B 58d29e546924fffc92dbcea7b2758b5486c1338852d3d6794df12cd07770552ad961fcdf961bb2c486dfb0a15b12d234cd4e4ac4c127f1ac2fedf4b829daf0ea SHA512 5750aa5e1c62ad82dadac6a67fb847d4f6c18f30c2fd4eca0da9c798ef285a49784633f399f1df0cd4a3a480fa936f471c06e90a693b46ab7d943574dec9c7a6
-EBUILD ca-certificates-20211016.3.72.ebuild 5965 BLAKE2B f9001217538d1467841354b4098b9a6617dc2b9b238401c8d8863b1faacf4d591e25043cc9ac9037e2b3e9173d79db254d082aca4cf04fc0a048d41146fa0f7b SHA512 799ee21a47c0c0f7e8aad254e1188b932d908f12b204db9428e234f4ca520f7bb90af524c0daf92c41fff1f2b708ecb0584f82608978e38a34b863a4f7fa6926
+EBUILD ca-certificates-20211016.3.72.ebuild 5906 BLAKE2B f93d6e3a59c78016256a839849c2e1869225429276c30add1ce26399979cc57f4f45c1121560836d7b85f0d899e75d522d5d06e419cd17e15738775d431cef6c SHA512 d190a2b873aaa825a98b79adb6e80de12f1b7fb1eb3231c20bab79e1936f037ad8c29ecd0bbcc65a8c1f8b5cc989ee27e560ed5950cb4f201397ba9446749da3
 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954
diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild
index 86df307180a7..30183fb5044d 100644
--- a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild
@@ -62,8 +62,6 @@ CDEPEND="app-misc/c_rehash
 BDEPEND="${CDEPEND}"
 if ! ${PRECOMPILED} ; then
 	BDEPEND+=" ${PYTHON_DEPS}"
-	# See bug #821706
-	BDEPEND+=" $(python_gen_any_dep 'dev-python/cryptography[${PYTHON_USEDEP}]')"
 fi
 
 DEPEND=""
@@ -76,10 +74,6 @@ RDEPEND="${CDEPEND}
 
 S=${WORKDIR}
 
-python_check_deps() {
-	has_version -b "dev-python/cryptography[${PYTHON_USEDEP}]"
-}
-
 pkg_setup() {
 	# For the conversion to having it in CONFIG_PROTECT_MASK,
 	# we need to tell users about it once manually first.
@@ -126,6 +120,11 @@ src_prepare() {
 
 	default
 	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+
+	pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die
+	eapply "${FILESDIR}"/${P}-no-cryptography.patch
+	popd >/dev/null || die
+
 	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
 	sed -i \
 		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
diff --git a/app-misc/ca-certificates/files/ca-certificates-20211016.3.72-no-cryptography.patch b/app-misc/ca-certificates/files/ca-certificates-20211016.3.72-no-cryptography.patch
new file mode 100644
index 000000000000..fb98eb2828e7
--- /dev/null
+++ b/app-misc/ca-certificates/files/ca-certificates-20211016.3.72-no-cryptography.patch
@@ -0,0 +1,27 @@
+Remove the dependency on non-portable dev-python/cryptography.
+https://bugs.gentoo.org/821706#c4 by Alex Xu
+
+--- a/mozilla/certdata2pem.py
++++ b/mozilla/certdata2pem.py
+@@ -28,8 +28,6 @@
+ import textwrap
+ import io
+
+-from cryptography import x509
+-
+
+ objects = []
+
+@@ -122,12 +120,6 @@
+         if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]:
+             continue
+
+-        cert = x509.load_der_x509_certificate(obj['CKA_VALUE'])
+-        if cert.not_valid_after < datetime.datetime.now():
+-            print('!'*74)
+-            print('Trusted but expired certificate found: %s' % obj['CKA_LABEL'])
+-            print('!'*74)
+-
+         bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\
+                                       .replace(' ', '_')\
+                                       .replace('(', '=')\
diff --git a/app-misc/conmux/Manifest b/app-misc/conmux/Manifest
index 4ba93cf84224..acda100de36e 100644
--- a/app-misc/conmux/Manifest
+++ b/app-misc/conmux/Manifest
@@ -1,7 +1,10 @@
+AUX conmux-0.16.4_unexpected-paths.patch 356 BLAKE2B c7c100ffa9c7a2a54780dd45b917bb72216c56c55bc8d1f2af8b60cdfd2650f06e027e288b51002726398f3b2365c27cb2dfa280825e18a56e6bab7aab3bc5ac SHA512 d84070dafc0a4cfdd3b4ddef2d2abac9b348044da595a974a81e55ad9624e6275e263e95f45bc04882e156ba3f92b442320df84de4569c4280253299ad25bd2b
 AUX conmux-registry.confd 120 BLAKE2B ee736a35e4b05a71030a1119b9fefd1c2e206234547cecc9f378d614788bb1faf5d555c54a8681b230374aaa75c11c1092c263daf75a624deece5b6b9313c429 SHA512 aeae7f7d127d67e5ae96a63fbd694624d599fd329698ea72bd0fb5a4a0d29df3d60c5bdd750431acf13a36f53960af477b483a48324540eda5a4b55b266c081c
 AUX conmux-registry.initd 886 BLAKE2B 8d895a7743faa2868ec0ae301c9b727e9b1d4f02cb222dff71dedb12b169f1416af89494fd6cf4c80e9ac8a02234a657eeca52f0ab0f9919f6c2941a4a1a1b7e SHA512 cbe93f419d244eef30e5662d34de9afb683ba9e69107fb3d5a78e2c6f31b5868ec6e4b35ab23597650d9593ad60c91d9c839e85c6589ebf5e17a70129dd2b3a3
 AUX conmux.confd 432 BLAKE2B 6dd0169032c849f1c131cfa0409430689249919cd8015f7f59c2fbadaf3da3ec92ca67c7b0a738a8d243911e06909d831da711c5fc46f1725638c208afcdc30f SHA512 50c6640f231e878817f31f399e8345d82c26bacbc8648d78b444eb572e7fad4c19d1f5b517474c412031dc65345723bffe95358542a6dd4af99a3007d12a7bc0
 AUX conmux.initd 892 BLAKE2B 3a724a77e47f4e0b8ac77581fdcd8f2be0aedbe6a71557f19eaba1517948736263fa36192dd3fbd8a2eb3db4ec5ad90c964b94fa01b1a3c00a12152b14edad8a SHA512 68a15b73bef6ee90504fe5a910d587ae6aad5735082af3dda3f390b66d87ac121fc8b1a846d7fce0432b6d4f06a9c355d881303f9586ea6497c64c0080798098
+DIST autotest-0.16.4.tar.gz 14699617 BLAKE2B faae9fe2472ef6cde5868368d81eeb6b855af7684b407b307d14dbd7e8800506c4234b38b254a58b4d915290dcd61e6c9f2eb4d04cd3b929462b0a6d8ffc52cf SHA512 e209d008d7987610f20b7f0c932f8909a82bdde4c13f0362f54f5872464c76f1e3da5760d8eb0f42567249dee4db5f7802478be5c9798b46e2b421f31aa1cbdd
 DIST conmux-0.15.1.tar.gz 50713 BLAKE2B d764d63f03318614ad0d7088911dee02fbd36d24da7dc988bb3db03cda3e60c5b185f50b5545b086e2a3a7b278aa47af7bfd211c39c88f7ada32e83666eea0c5 SHA512 8138d6d10b4382709828277503d1c23c52fd43109ebad79073be9003c39a9e62c2b7d9d6e78a9e81797c22871985e50a58df0d538ff63e3f580c9a229b520107
 EBUILD conmux-0.15.1-r3.ebuild 1993 BLAKE2B 7c291575b489396038573dffbe566b1d901fc0376fd70636466410f729c9cf23557d834d03bcbcecc5b2e4389da8fb282af4a815c46c87dd163243f9a10c1d56 SHA512 e400f8f46f8a78c01d9bf90959351d5e681efde1398970bfc1d906c62c6584255c3bcb678f48d5caba32737988933fe434309f06f1fb9f8d48ba8f579a5d0643
+EBUILD conmux-0.16.4.ebuild 1992 BLAKE2B 994ba04d92fb2d65fb8f1c4650f38ef2abc30ce2788f49aa195f723f803f9d76787b409889c4e40c42fb6bd36abec9917eb0a610d499ea181e5d5ea3414923af SHA512 f4f5ec5e3569914c06c2d997abe24f9957db4f63a95423a1fc111136977ddb89111e363a728bad8c04ad47230e47a7ba51ae2107fde521a4838cc37142877528
 MISC metadata.xml 523 BLAKE2B 6dd2d358b9ce96e6f778d4af303be91b7e263d96642adfd4eb06e899556da99219c9a648a5f60bb4ebee232429791fc6126c7a75ead0618ce0bbc740d7d093b7 SHA512 f92c8a5595035b0ef1ef303ff612dd9674cf4c92de453b960887afcc37ce49f86cb50d71aa5fdfc9beabcf2d05eb6287ddd3b0af3b8020ba3877bcd472fe60a5
diff --git a/app-misc/conmux/conmux-0.16.4.ebuild b/app-misc/conmux/conmux-0.16.4.ebuild
new file mode 100644
index 000000000000..cd2a1cf087d5
--- /dev/null
+++ b/app-misc/conmux/conmux-0.16.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DIST_TEST="skip"
+
+MY_PN="autotest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A console multiplexor"
+HOMEPAGE="https://github.com/autotest/autotest"
+SRC_URI="https://github.com/autotest/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+
+RDEPEND="dev-perl/IO-Multiplex
+	dev-perl/URI"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16.4_unexpected-paths.patch
+)
+
+S="${WORKDIR}"/${MY_P}/conmux
+
+src_prepare() {
+	default
+	# manual installation of drivers and helpers
+	sed -i -e "/include/d" Makefile || die "Failed to fix Makefile"
+}
+
+src_install() {
+	perl_set_version
+	emake BASE="${ED}/usr" install
+	# helpers and drivers have been removed in src_prepare
+	insinto /usr/share/${PN}/
+	doins -r drivers/  helpers/
+	fperms -R 0750 /usr/share/${PN}/{drivers,helpers}/
+	keepdir /etc/${PN}
+	# no need to have the init script in /sbin
+	rm "${ED}"/usr/sbin/start || die "failed to remove init script"
+	# console is too generic. Make it conmux-console instead
+	mv "${ED}"/usr/bin/console "${ED}"/usr/bin/${PN}-console || \
+		die "failed to rename console to conmux-console"
+	# Fix up directory for the module
+	perl_set_version
+	keepdir ${VENDOR_LIB}/${PN}
+	mv "${ED}"/usr/lib/Conmux.pm "${ED}"/${VENDOR_LIB}/. || \
+		die "failed to move the Conmux.pm module"
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}-registry.initd ${PN}-registry
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newconfd "${FILESDIR}"/${PN}-registry.confd ${PN}-registry
+	dodoc README
+}
+
+pkg_postinst() {
+	elog
+	elog "If you have more than one serial ports and you want to use all"
+	elog "of them with conmux, copy and paste the 'conmux' init.d and conf.d"
+	elog "files as many times as you want, pointing each conf.d file to the"
+	elog "device's configuration file."
+	elog
+	elog "See /etc/conf.d/conmux for more information"
+	elog
+}
diff --git a/app-misc/conmux/files/conmux-0.16.4_unexpected-paths.patch b/app-misc/conmux/files/conmux-0.16.4_unexpected-paths.patch
new file mode 100644
index 000000000000..7b330158fdc4
--- /dev/null
+++ b/app-misc/conmux/files/conmux-0.16.4_unexpected-paths.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,8 +18,6 @@
+ 	@[ -d $(BASE)/bin ] || mkdir $(BASE)/bin
+ 	@[ -d $(BASE)/lib ] || mkdir $(BASE)/lib
+ 	@[ -d $(BASE)/sbin ] || mkdir $(BASE)/sbin
+-	@[ -d $(BASE)/log ] || mkdir $(BASE)/log
+-	@[ -d $(BASE)/etc ] || mkdir $(BASE)/etc
+ 	for f in $(BINS); do \
+ 	    rm -f $(BASE)/bin/$$f; \
+ 	    cp -p $$f $(BASE)/bin/$$f; \
diff --git a/app-misc/delay/Manifest b/app-misc/delay/Manifest
index bbba403d6969..dbec4832c931 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 690 BLAKE2B 04b7c3799db54ce555625040af1fd63e0241e2102614adca4e13a68377a39cb0d2d958bc859c57c8d7075c7af0fcb36fe913bdefdc5c9f530a47353e3a471cb0 SHA512 6e748f9b36cf3a7dd58f5581377d1a7cd1101ba46b29ac6045658bacdc3b17d55592ee9a974f28c30469842322467f414a17c58bb9adbaff441497dbf4ab8957
+EBUILD delay-1.6-r2.ebuild 704 BLAKE2B 966aec59b024f80731cc096717e02ee391b908132d8a3fe0c0f4f30175f516013c1554656d91baa9b3b8c7378cbf980a1e02d77942ddb3ee6ae4ed6e72646872 SHA512 c6bd714c667be35035dc99ffc5e10b94152bb1079d61f570179a895bb36d2dfaa9f1ce321fc4681b8284e67f23f1f09fa1db1187e4a9979ff5ac43604f3caf64
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/delay/delay-1.6-r2.ebuild b/app-misc/delay/delay-1.6-r2.ebuild
index e4feba5f19c2..963d1384a19b 100644
--- a/app-misc/delay/delay-1.6-r2.ebuild
+++ b/app-misc/delay/delay-1.6-r2.ebuild
@@ -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 ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index cbd123edc0d3..9ab2d21ea8af 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -2,7 +2,7 @@ AUX dvtm-0.15-gentoo.patch 961 BLAKE2B 611e19b936957c80eb234186a4199f32e83aefc7a
 AUX dvtm-0.15-stop-installing-terminfo.patch 474 BLAKE2B a2a1552592b51bc21d817039b3f09e8108c36e3cdb77c9b6f43f12ebc3f856e9a0d21e9ec8fc82f843166ad16ebf9644ccbd9fc8a80746ce9670d9b7ce191653 SHA512 cea8b8e6974ffc6d891fa176c1d7ef67dfb994bea779b3e7485094f4cd414b8be928ecb0db14e16ce5508b0454465084cde37ee4d09de21f91e18a5a2958931b
 AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
-EBUILD dvtm-0.15-r4.ebuild 1253 BLAKE2B 021027e4f943c8bb67625142de1627478fba15b815600a6f0a271e9bc80344b76c5c92b513c9baedac2bdc132dd51a3bf2ebb8c30ba47bf32d7ce35cec522d07 SHA512 4d905b73a10e2cb994ccc4ab7efeeda22f428567ec244c52623550626c2abaae89f8ee43a5c00a6e31fd3711ffe3fae544742c639884cd994e2576a017d77d77
-EBUILD dvtm-0.15-r5.ebuild 1248 BLAKE2B 487ff2af37a2cf2bc5aac83b785e4aacfa9b1b15c59e4d4ac312cf69b15e9aba2d683c9af68706fbf6046532ec5a32ffdf3880d7fb68678365b9f1d22fc593e6 SHA512 c5c1a7c7446f5c44de7837107fbf4df7cc45c2ef2792c03918d44d0340813b5ba1fdd91815e78c83b022dc798ba03a3aba7a940977e3b956acdaefb79134e823
-EBUILD dvtm-9999.ebuild 1252 BLAKE2B 62291128284ed3d07e655b643e31fb1105331a8dcfbe8ae6bc187d4fbb5120805afb12e06b185fe1d65bf8d8ae0a5333c5cd8f99df6531dd33d85c82bb7ef3ef SHA512 7213a5bde6d927907366a4103e6f1a863e85193ac00456a6268017bf947f2c405cca72193c658f532e7c28086748f5e9ac0f5f64dc4aaf223024a5d63bf7db6c
+EBUILD dvtm-0.15-r4.ebuild 1255 BLAKE2B 4c5c939fdfb29b9e6ffb9e53fbcd5c606c5001cb811c6d19a2160016021418996e8848b1ed747907c68fbd07a97403273dffe7a94d71671a69c3520f27330d2a SHA512 58d2d52abe7a055c8c8820a087bd6af749759d9bfca8f81d6ec72af3c1393305f616186c0fd0d7d69a6c834933d1d929321e2c350a27ee47be6f1a7c81996dac
+EBUILD dvtm-0.15-r5.ebuild 1257 BLAKE2B 32869128755dc419bf4390e32eec8cd87b028b27d5050fd1cd39034211f847b60dc64287cdf4aeb5e162e41383dd3657b01e1ab8796bfe033434b4bcc1544379 SHA512 7408a4e8dba3bd9c06b56d6e2aec088776f89ae4df979563f490bc868d521426b78823b255a5eba92f098928bd6a2978ab9725a6ba496c0ce28cc359b52c08d1
+EBUILD dvtm-9999.ebuild 1254 BLAKE2B d0d1bd15242cf412a8db216d10e1ba0e197ed41187552f62fcd93e024555a500f5bbbdc9569caa6709ded0bed761b5abf9d89dbb5448004b48a001d4347025a3 SHA512 3b1eade56ba262e4bb27583907acd4548eca7daa770814e6e8aa192111f029861626b087cebaf8298d6754cb8f2ea3a02c6c27859b761572244a770d61be5a82
 MISC metadata.xml 267 BLAKE2B 15dbae618f9047d37b671714f3615b968ff63cd013ec0dfe03fefd1b172d68c19f27276151efe8e005b7e59c4eaa017ec6693f2f03ec005894d8c67b1c8e47c2 SHA512 391ca69b1498920f9678a1e8cafbe14090bfdf6666fac4b508f11990f656de77717ce124cf435c2025474cc2034a22bc7df47257b5dec44c55d7bd99108fcf55
diff --git a/app-misc/dvtm/dvtm-0.15-r4.ebuild b/app-misc/dvtm/dvtm-0.15-r4.ebuild
index 3603e5c884a6..33e5a76f88a3 100644
--- a/app-misc/dvtm/dvtm-0.15-r4.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+	EGIT_REPO_URI="https://repo.or.cz/dvtm.git"
 else
 	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
diff --git a/app-misc/dvtm/dvtm-0.15-r5.ebuild b/app-misc/dvtm/dvtm-0.15-r5.ebuild
index a80b982cbbc7..d6047798edd5 100644
--- a/app-misc/dvtm/dvtm-0.15-r5.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r5.ebuild
@@ -10,10 +10,10 @@ HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+	EGIT_REPO_URI="https://repo.or.cz/dvtm.git"
 else
 	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index 1ceb143cf9e0..da58898096e0 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+	EGIT_REPO_URI="https://repo.or.cz/dvtm.git"
 else
 	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
diff --git a/app-misc/filebus/Manifest b/app-misc/filebus/Manifest
index 09c165846fe5..3237aa51ef29 100644
--- a/app-misc/filebus/Manifest
+++ b/app-misc/filebus/Manifest
@@ -1,3 +1,7 @@
 DIST filebus-0.3.2.tar.gz 17310 BLAKE2B 0f30aabcd316f52ea12d12b136befe643085dff5e283f65edf2a459b127cd3e2d48c472ae0dd8f302bb7211e4da5541a6fc7ac274573631ab03fc246bc8b566f SHA512 88ce3cd2d8aec7afd30d16315a6a8a37dee1b21d882571ef87c7dca56251e737d6500a5fad0124c62aea6383aae5ec30abd8abf86c2fac5d582f8fe96049eaa6
+DIST filebus-0.3.4.tar.gz 17404 BLAKE2B cf6a3fef2e7f3d69fb73df3f9134666e5d1d09d02cc94cd73c2818b1fc92132fafeb8b3b6f904316ab57a3aab4fa01ba00e0e5bfabf9a9c5194de3d6a8666417 SHA512 0619eda926ca77730558600d29a1b7811972b411b86d6c5374f1ccbcd0a4901f70eb87df7577690d72bb7eec4a4191f3b7b4bca237317352bdc0f0ce0f36f120
+DIST filebus-0.3.5.tar.gz 17373 BLAKE2B bd49f86e658bcc8dcdcc7cc0c5ca1a3c354a716137157753417b9b57294c14f058292650092e7e8bdb5563e041c009f36474508fb121e14487075cfc41b223bb SHA512 639b047be8fd3eba9cf97e57d7234f590aeb28e6e321195b435480ce0b334e14c236b888e79d14a824b16505e1c2d2c1fc04dd5d75b6f7ac1c8e9fbae6bf562f
 EBUILD filebus-0.3.2.ebuild 1409 BLAKE2B 27687f694af313868388843ae88037ea08b6192adcbb4c64ed79bab64d77c62f6208e356da0f4912f1c23f24640da20a6ac27eb53a6e6125c7c68a8e40412187 SHA512 90475ee64cbe90e844597461ea3e884c95ae12598e2acfeb78491a6accb7fe25be1b18f8cbbe97af174d8e95798f3635466cc6dee3b0290b1f269df98a603553
+EBUILD filebus-0.3.4.ebuild 1412 BLAKE2B 963f10896782b2aa97997058c6ca8eeea3f0d5a3f3573d2cd21486cba21574778961485b49a52a98e7aa32b2fce707a1ccce51c0c3664baa75b16ab6c2ee3fc3 SHA512 b4e2bbcba53747be06ee20292ce1c852ad1f495d64abdde5e6193a235c017261e1976eb1838394c6205bf426db57fe6b2fe91d891446152dc2f5ca474005b91c
+EBUILD filebus-0.3.5.ebuild 1412 BLAKE2B 963f10896782b2aa97997058c6ca8eeea3f0d5a3f3573d2cd21486cba21574778961485b49a52a98e7aa32b2fce707a1ccce51c0c3664baa75b16ab6c2ee3fc3 SHA512 b4e2bbcba53747be06ee20292ce1c852ad1f495d64abdde5e6193a235c017261e1976eb1838394c6205bf426db57fe6b2fe91d891446152dc2f5ca474005b91c
 MISC metadata.xml 344 BLAKE2B 5caade90b88d436416ff73af46b130b7b81e87f7c8850eac5eb6544432bec05da5c7d1f916f1f8306ff9dc13383dd6608667c8bc532712c57859ffd317fcde90 SHA512 4c172e9f8559f617647d0c6bf5b5408b53c5e26f9cfb96295584c594fcabfb768672c20ff4f16f4da738b391167aec2ea2f4929723f0167e8274df528c0bf561
diff --git a/app-misc/filebus/filebus-0.3.4.ebuild b/app-misc/filebus/filebus-0.3.4.ebuild
new file mode 100644
index 000000000000..aa9148dd2099
--- /dev/null
+++ b/app-misc/filebus/filebus-0.3.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A user space multicast named pipe implementation backed by a regular file"
+HOMEPAGE="https://github.com/pipebus/filebus"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="+inotify python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		inotify? ( dev-python/watchdog[${PYTHON_USEDEP}] )
+	)"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	if use python; then
+		distutils-r1_src_prepare
+	fi
+}
+
+src_compile() {
+	if use python; then
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	"${BASH}" ./lib/bash/filebus-test.bash test || die
+
+	if use python; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	python test/test_filebus.py || die "tests failed for ${EPYTHON}"
+}
+
+src_install() {
+	if use python; then
+		distutils-r1_src_install
+	else
+		insinto /usr/libexec/filebus
+		doins lib/bash/*.bash
+		cat <<-EOF > "${T}/filebus"
+		#!/bin/sh
+		exec bash "${EPREFIX}/usr/libexec/filebus/filebus.bash" "\$@"
+		EOF
+		dobin "${T}/filebus"
+		dosym filebus /usr/bin/pipebus
+	fi
+}
diff --git a/app-misc/filebus/filebus-0.3.5.ebuild b/app-misc/filebus/filebus-0.3.5.ebuild
new file mode 100644
index 000000000000..aa9148dd2099
--- /dev/null
+++ b/app-misc/filebus/filebus-0.3.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A user space multicast named pipe implementation backed by a regular file"
+HOMEPAGE="https://github.com/pipebus/filebus"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="+inotify python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		inotify? ( dev-python/watchdog[${PYTHON_USEDEP}] )
+	)"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	if use python; then
+		distutils-r1_src_prepare
+	fi
+}
+
+src_compile() {
+	if use python; then
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	"${BASH}" ./lib/bash/filebus-test.bash test || die
+
+	if use python; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	python test/test_filebus.py || die "tests failed for ${EPYTHON}"
+}
+
+src_install() {
+	if use python; then
+		distutils-r1_src_install
+	else
+		insinto /usr/libexec/filebus
+		doins lib/bash/*.bash
+		cat <<-EOF > "${T}/filebus"
+		#!/bin/sh
+		exec bash "${EPREFIX}/usr/libexec/filebus/filebus.bash" "\$@"
+		EOF
+		dobin "${T}/filebus"
+		dosym filebus /usr/bin/pipebus
+	fi
+}
diff --git a/app-misc/fmawk/Manifest b/app-misc/fmawk/Manifest
new file mode 100644
index 000000000000..924b86411b60
--- /dev/null
+++ b/app-misc/fmawk/Manifest
@@ -0,0 +1,4 @@
+DIST fmawk-1.2.tar.gz 23399 BLAKE2B f4c20c8f1569a6715710a5cef02a767152694ef7e216c9fe707c7ac57c20dd012189db14777d47a980008255c7f51b5c165cdf086c41835a7ce550b758a8f350 SHA512 86d56e1cc893c385a0bb338957a9ef698c0edef4587e6d3a21aa316fd996fa3b1416220e5c235d613876a3d19650e8e7a20bf991a4ce67ce9759a362d2aaac30
+EBUILD fmawk-1.2.ebuild 850 BLAKE2B 0c6584dbd70262c35e3a222d9d5903ab36058dc2328a9f5f90c470372f53476763500fded2b88c9143fbc75f487c95e751ce99f3bd6c8882c2704695114e39f3 SHA512 4623d9646449ea2ce4008b57b97d72d849ba25fedaf2ccbda99903113ad6ea6915f744082488e36465bb9211659f4152d390ed6302d1b433c1c3bdfc251d9ca4
+EBUILD fmawk-9999.ebuild 802 BLAKE2B 84f180c464d968452f9309242fa389548c1f48b316695494b2b6701d9721aa5568e22ce20c12e994ce1df6ffa2796e2855b46749efc2d50b0f6f4ef1f7c3b8a4 SHA512 c48247f94508f53520f0b0f065ac09ab2337255c3134d3f24faad1347802d1cb8cf9adbffa982345a11b0c4150701be062f28f686ee065ea8c9858834d6bdaf3
+MISC metadata.xml 689 BLAKE2B 91a0995c189c1ac4fd6852d1f49746faa8405c57476f6d6e3ea0aff99f36be3305e99b89185e102cb7ee1022bcee4c2645ff69a657ab7dd6ceed3f5dca4e2108 SHA512 893f05e792b8db41364c4a2accade8199f1f569bc521e2c078dbf2dc26f9f6d4b047d2208ed12c36f9b1e1d2a2e0ead9a3ecedd88d23f9d7eaf341d00aab41ff
diff --git a/app-misc/fmawk/fmawk-1.2.ebuild b/app-misc/fmawk/fmawk-1.2.ebuild
new file mode 100644
index 000000000000..2247b8c0dff1
--- /dev/null
+++ b/app-misc/fmawk/fmawk-1.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="File manager written in awk"
+HOMEPAGE="https://github.com/huijunchen9260/fm.awk/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/huijunchen9260/fm.awk.git"
+else
+	SRC_URI="https://github.com/huijunchen9260/fm.awk/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/fm.awk-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="virtual/awk"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local bin
+	for bin in fm.awk fmawk fmawk-previewer; do
+		dobin ${bin}
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "PDFs preview" app-text/poppler
+	optfeature "images preview" media-gfx/chafa
+	optfeature "videos preview" media-video/ffmpegthumbnailer
+}
diff --git a/app-misc/fmawk/fmawk-9999.ebuild b/app-misc/fmawk/fmawk-9999.ebuild
new file mode 100644
index 000000000000..9500af6a4ee7
--- /dev/null
+++ b/app-misc/fmawk/fmawk-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="File manager written in awk"
+HOMEPAGE="https://github.com/huijunchen9260/fm.awk/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/huijunchen9260/fm.awk.git"
+else
+	SRC_URI="https://github.com/huijunchen9260/fm.awk/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/fm.awk-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="virtual/awk"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "PDFs preview" app-text/poppler
+	optfeature "images preview" media-gfx/chafa
+	optfeature "videos preview" media-video/ffmpegthumbnailer
+}
diff --git a/app-misc/fmawk/metadata.xml b/app-misc/fmawk/metadata.xml
new file mode 100644
index 000000000000..88a2b065e2a2
--- /dev/null
+++ b/app-misc/fmawk/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription lang="en">
+    FMAWK is a experimental file manager written almost entirely in the awk
+    programming language. Though written in awk, in terms of features it is
+    comparable to other terminal file managers such as fff, nnn or ranger.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/huijunchen9260/fm.awk/issues</bugs-to>
+    <remote-id type="github">huijunchen9260/fm.awk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 97dd981d06d2..1d5fd4050b64 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,4 +1,6 @@
 AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f982294f18abd5297bc0d5cbd877ece2716736ce8dfcf044c823cb707d6ce8923177b3ab2bbf09a3d0e247b92 SHA512 b883702ed44bd8469255bbc43191bbf91da64ff0048d4cc3c7cc0c5103e01fe49f9017ad1723d041ab080dfa46b68f4bab0b9abd850b74b1803d5bcebb04c36a
 DIST golly-4.0-src.tar.gz 5579026 BLAKE2B fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32 SHA512 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
+DIST golly-4.1-src.tar.gz 14877727 BLAKE2B d9cac1250901a39d6a360b527c6f4872fc78d0426ea255b9f9129136b938a6655ff59f8c5b0204fd44f4ac0ae76e307c763ddb24a1d8a00bd4e548e4ac2277c3 SHA512 bc050a216a36091f0df42e61a19c34353c6306dc1ae86c194693c85a4489b118435da238b25017bde4b3d31a79e12a6988f7b7da5ae90cfcc9ca0795e66d4a99
 EBUILD golly-4.0.ebuild 1384 BLAKE2B 2957836bae7ffc4c2a17e6f5183dae6b7cd2d3a898a0fa823ad32f22f79e143bf943da5548f0bae315ec1fdb52cf11d9a937db207329eff34149fa6f2d3a358f SHA512 36750dd133c0d2dfbd203b58cc9162e164f773c14af0bc3d0a679bfc13f358fee9f778191fdf8428aa35cb6481087266c1b640c610a5670ce1189c966e91dde8
-MISC metadata.xml 243 BLAKE2B cc71d8a61768bc35e1d40dcf4bb0dfcf2f9ced6d2baad808c9bf28da0965e3a928fe61156ddf5e7c79fd3184b748500ed4f8514c1ea9fbd560003a4b3721bc1a SHA512 14aee5e4212dad88784b789507ea3bb2da083508e5bff21f6c4e505cadca9c4740aa5aa6e8bc3323d42dd4e8f095481c2b16c05b49946b4b49ab0f9ebf62d360
+EBUILD golly-4.1-r1.ebuild 1407 BLAKE2B 1762facc273ea881a859f99dc857b0c71fd958038dc2cc24a32fa2d00bfcef24dc0ea5b5024b896374e24e56595d962211d69d95fe96a984c61c992923b532c5 SHA512 29d004bca1fa573df9d6959b0300606546426fc4c7a4f9457e49ffd8378f0a8bf20f5ff3e05a74f2ed4dad22908f2bb8e047d04a6a9265f61bc792e4ea942857
+MISC metadata.xml 510 BLAKE2B e5c5d938e4500bde38e48ec132ac3fad49f700b49f43515f1595fbdf8e9f57075489869bc12e538bf1e886626d8cced9c8503e57b370e239bb178119b27a7f27 SHA512 b208332dc47ca3b8a52e6d28e1972cc9ffb662e2340f13dd239d7837802c0517c9608cb1b99e619c9b1fab3549fe39f183cdeeb3f4279540ea7548b220a409d0
diff --git a/app-misc/golly/golly-4.1-r1.ebuild b/app-misc/golly/golly-4.1-r1.ebuild
new file mode 100644
index 000000000000..b502a58b492a
--- /dev/null
+++ b/app-misc/golly/golly-4.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER=3.0-gtk3
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,sdl,tiff]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.0-CFLAGS.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_compile() {
+	local mymakeopts=(
+		ENABLE_SOUND=yes
+		GOLLYDIR="${EPREFIX}/usr/share/${PN}"
+		PYTHON=${EPYTHON}
+		WX_CONFIG=${WX_CONFIG}
+		AR=$(tc-getAR)
+		CC=$(tc-getCC)
+		CXX=$(tc-getCXX)
+		CXXC=$(tc-getCXX)
+		RANLIB=$(tc-getRANLIB)
+	)
+	emake -C gui-wx -f makefile-gtk "${mymakeopts[@]}"
+}
+
+src_install() {
+	# has no 'make install' Let's install files manually.
+	dobin golly bgolly
+	insinto /usr/share/${PN}
+	doins -r Help Patterns Scripts Rules docs
+
+	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/golly/metadata.xml b/app-misc/golly/metadata.xml
index 98448a9c4a04..344716a3cf52 100644
--- a/app-misc/golly/metadata.xml
+++ b/app-misc/golly/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">golly</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
+    Golly is an open source, cross-platform application for exploring
+    Conway's Game of Life and many other types of cellular automata.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">golly</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/jpipe/Manifest b/app-misc/jpipe/Manifest
index ca66e5828f8b..d773bea4d232 100644
--- a/app-misc/jpipe/Manifest
+++ b/app-misc/jpipe/Manifest
@@ -355,5 +355,5 @@ DIST mvdan.cc%2Fxurls%2Fv2%2F@v%2Fv2.2.0.mod 153 BLAKE2B 2bfaa583b85e6f7f8464961
 DIST mvdan.cc%2Fxurls%2Fv2%2F@v%2Fv2.2.0.zip 23465 BLAKE2B 9b0bea59e5b3acd7aa154d2b8cb59a6f16db6e0bcda97f61bd5270a44aec95cec99b261f59815a560bf7fe8f23489b8f9abcf14d5d4b0a6dd3ceb468abd5bb96 SHA512 c6513be73d9d6b8bc07b126b10747c51e95e0497327a17ec02de1ece61ea8fe466e9012094432f29752b778aa00362a54a3b80e433828a8396116ee625614f0c
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 EBUILD jpipe-0.1.3.9.ebuild 1020 BLAKE2B 99e7502f3790fc9fe2711126d6134feed3fabbb1898dcf2381d98c3a86bfceb5bc9a88c5433d708849cdaba72dbbc67dc32b43f0b92af27f64e098fbf4711d7b SHA512 cf3c1eadb5a1575aa39d50159f604b160b75d6f541248c7adbffae0c57b4ed83f0831bbaa495dce4b02918fee6a1c6a3559e506fe81491983a8209d1fccce903
-EBUILD jpipe-0.2.0.ebuild 20716 BLAKE2B c187f4a1cd7a03c9dcfb263a4ef1bae13c3f8d738bd3eef3a09e97c503ce900e2a6a476246c68baca1657d5a0af9b10808cdb5609bea8cd3b185148cd7198aef SHA512 5275bc36af5a024ad868462492c95510c9c0396c2cbea5f0e8c111004487457bc254ad61a86b55735786a8f7d54f2667e567ff6a6cccaac1eb702d265e5471b3
+EBUILD jpipe-0.2.0.ebuild 20795 BLAKE2B ee916533afdd35e1cc60d869e2631d9ad2143eecc9e52c62eef235f30885eacb5a264a572b38558f5f87cf31eaa924108052fded72b64c369b227d7e2973fd06 SHA512 9fb2f4a6a307702511a26ff264ed8947ae348eef7ac4f600830034cce4f1f16dbf4dc890a0bb809076c14372f665f90632fb0df48072d37441078e1eea63e302
 MISC metadata.xml 523 BLAKE2B 531998e8d9ced9d9230fc6b0bb7b66406223f0bac941757cbef18b70f3843063666ec47459151f21bc330106286d4a0899e773761712fa1ea8eb990e6c0a9545 SHA512 dc667dede0ab53da577e565255daebaad2a725a22c00a1a943107a6d6d0fb42ff59c9b732bde11a47b766272314c0910425258a4ae246c11d17f6f1c9c43880e
diff --git a/app-misc/jpipe/jpipe-0.2.0.ebuild b/app-misc/jpipe/jpipe-0.2.0.ebuild
index a6473d584262..bbab903965e1 100644
--- a/app-misc/jpipe/jpipe-0.2.0.ebuild
+++ b/app-misc/jpipe/jpipe-0.2.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+GO_OPTIONAL=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{7,8,9,10} )
@@ -378,6 +379,12 @@ RESTRICT+=" test"
 IUSE="jpp-symlink jp-symlink python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
+BDEPEND="
+	!python? (
+		app-arch/unzip
+		>=dev-lang/go-1.12
+	)
+"
 RDEPEND="
 	jpp-symlink? ( !app-misc/jp[jpp(-)] )
 	jp-symlink? ( !app-misc/jp[jp(+)] )
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 4e6c5a2f93da..10b2ee1da030 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,12 +1,7 @@
-AUX 2.0.11-Fix-installation-using-WITH_TLS-no.patch 949 BLAKE2B c85a92329e737d5322e4c888c0f89ccfe1a7a244f543422e441843f0dced56b9f6470484734471ea7e8d8092508e7e542bb26c1f50c632dd63789d8ed46b1c55 SHA512 08abbf563f920cd2c0dee2e340d45bfb5c2874e197a01faac6af68668f0302ef209e534dd946f01012e57a70ed22cf53b1902cf02b9ce1d2c61890da79ec0ac4
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
-DIST mosquitto-1.6.15.tar.gz 620117 BLAKE2B 0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00 SHA512 30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3
-DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e SHA512 d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710
 DIST mosquitto-2.0.12.tar.gz 783859 BLAKE2B 3bac953fc7f49e19f1914186044c75d7f8b5b23e656acfb7d4c306740d0add20c08760fc206fc871c5cecf8500eb1c88acc4905bddce159d1e8f0c4e2c28b818 SHA512 acf80980f124073fd2fdd99981bde840654fb40a6b6f1d6ef483e35880b45d029cfa9390a98753de6476f4ade068266cb4c6e3c753a0362c0309a5745ac4ebab
-DIST mosquitto-2.0.13.tar.gz 786806 BLAKE2B 83c5c93a209225a24812c494e6065fb4ed4c65ccb34ac60918e5c32683702a9d44f162ccc366d8c2612c6fa867b56e01aaea04b2387f44b77294259198439ad0 SHA512 f22331c0a5a501b3df50b5c4788b735599024837eec4f455d422253a20e6f4ac528044ff4a7611094af87a8059e9a836157e5dc092efedf958ed7c96e5b9f9d0
-EBUILD mosquitto-1.6.15.ebuild 2851 BLAKE2B 26a548e531174ede82c6c5e02477d3bb0b468e607265e9aec0c7fe65f216c728fe93b18686e1b64aa421f28f8f14413b07da4c00a7353955c67549bc2e8ed605 SHA512 20049ac366395029516de8e693f731e88ca10c30762ab03ba7f7049e0031a901696dd1868d410052e0796c1f26a50c6ab6125b149b443ea15eaf636984eb6088
-EBUILD mosquitto-2.0.11.ebuild 3268 BLAKE2B ae0bc1b791caeeaf623a1c908a278f42ee3a20e966cbd83df3a9042b293b667be2c19ac918fb08d83308fb6addee13face0ca42b69e36c1353ddd5ffd5da45cb SHA512 9426eb68a7b478cbad82bf7c2a515689542e8198446b7f27775d51ec584a9ca3a59c4dcfa7942855eb923a139ef924b5e4392ea4ae2143621a62d5e2a56338e2
+DIST mosquitto-2.0.14.tar.gz 787414 BLAKE2B 926e39756a0293404c8591e489e64e47cd95640d7884f2cfb687a0d548b709d8aff6d671a4941aae8b3506315d28567520c183b762639822d2d78afe323d111e SHA512 a9e4f41b9af679b30318570e86a465546024651373df10e3b132f4593b89d22d0dbac01bb7371a57132ba030a2e73971c612acb5c9ac12f5ccd06aa38d9444c2
 EBUILD mosquitto-2.0.12.ebuild 3023 BLAKE2B be6d1e74a65ffb75542f6f560411972e82fb9098c749d1c67f2d777b780e010a1eaa22a6d5ede4f42ee2f0c0b86abe11d428fc4ddd49a1411b61e5da0f801e89 SHA512 b0fb8fa9e1251ab8fab4c99b8ab1564a59ccd074655a02d6acaa6fecbd30a6d5114ed5d8aa261d184f5de8a6085af294eb6967ce1a894065ac13282c14643135
-EBUILD mosquitto-2.0.13.ebuild 3026 BLAKE2B 8abd72d5c31bea16f1f9982d9df512b255e214d8ffec63a5f6d1f2fdc368eaa191906fec61ec2c75e2210d64b948126ee297250a82b6206f46b2a3929574b7b8 SHA512 a3a5bcc9a4bfd6a51b68a1ae40d7995709ec0d17aa8d2c9d91ebabbb6f8edf637322e1a5a7cfc96daecf152e1eb35c187564981d34756d5cca8dc7b16481178a
+EBUILD mosquitto-2.0.14.ebuild 3026 BLAKE2B 8abd72d5c31bea16f1f9982d9df512b255e214d8ffec63a5f6d1f2fdc368eaa191906fec61ec2c75e2210d64b948126ee297250a82b6206f46b2a3929574b7b8 SHA512 a3a5bcc9a4bfd6a51b68a1ae40d7995709ec0d17aa8d2c9d91ebabbb6f8edf637322e1a5a7cfc96daecf152e1eb35c187564981d34756d5cca8dc7b16481178a
 MISC metadata.xml 612 BLAKE2B 414070cdd858c5fd76b266459ff7b2a66992e8b11e672212f78e366863cd221aa83516a546c69668217a06b087b7b81853fcdff332368355cd1ff8c1292f0c4e SHA512 64242d12473aad0f0d80865da2499679849f6b55f751d27c3cf38e0a5555a305a2cc59f8dfbe4b9d50f0a6b6bc85062b989511c7118045b2c9c3e1e0d1022747
diff --git a/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch b/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch
deleted file mode 100644
index 0a08e2997f0b..000000000000
--- a/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 342aa0ad1a645f468a24266f402d92541d4fd58a Mon Sep 17 00:00:00 2001
-From: Roger Light <roger@atchoo.org>
-Date: Fri, 20 Aug 2021 23:49:59 +0100
-Subject: [PATCH] Fix installation using WITH_TLS=no.
-
-Closes #2281. Thanks to Matt Turner.
----
- ChangeLog.txt                  | 3 +++
- apps/mosquitto_passwd/Makefile | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/apps/mosquitto_passwd/Makefile b/apps/mosquitto_passwd/Makefile
-index 3238cf3e..1fbf5e12 100644
---- a/apps/mosquitto_passwd/Makefile
-+++ b/apps/mosquitto_passwd/Makefile
-@@ -37,8 +37,10 @@ password_mosq.o : ../../src/password_mosq.c ../../src/password_mosq.h
- 	${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@
- 
- install : all
-+ifeq ($(WITH_TLS),yes)
- 	$(INSTALL) -d "${DESTDIR}$(prefix)/bin"
- 	$(INSTALL) ${STRIP_OPTS} mosquitto_passwd "${DESTDIR}${prefix}/bin/mosquitto_passwd"
-+endif
- 
- uninstall :
- 	-rm -f "${DESTDIR}${prefix}/bin/mosquitto_passwd"
--- 
-2.31.1
-
diff --git a/app-misc/mosquitto/mosquitto-1.6.15.ebuild b/app-misc/mosquitto/mosquitto-1.6.15.ebuild
deleted file mode 100644
index 63497c19ccdb..000000000000
--- a/app-misc/mosquitto/mosquitto-1.6.15.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-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 ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-	acct-user/mosquitto
-	acct-group/mosquitto
-	srv? ( net-dns/c-ares:= )
-	ssl? (
-		dev-libs/openssl: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)" \
-		CXX="$(tc-getCXX)" \
-		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
-
-	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
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The Python module has been moved out of mosquitto."
-		elog "See https://mosquitto.org/documentation/python/"
-	else
-		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-		elog ""
-		elog "    rc-update add mosquitto default"
-		elog "or"
-		elog "    systemctl enable mosquitto"
-	fi
-}
diff --git a/app-misc/mosquitto/mosquitto-2.0.11.ebuild b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
deleted file mode 100644
index 51e634414e8d..000000000000
--- a/app-misc/mosquitto/mosquitto-2.0.11.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 x86"
-IUSE="bridge examples +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? (
-		dev-libs/openssl:0=
-	)
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	test? ( dev-util/cunit )
-	websockets? ( net-libs/libwebsockets[lejp] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-Fix-installation-using-WITH_TLS-no.patch
-)
-
-_emake() {
-	local LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		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
-	insinto /usr/share/mosquitto
-	doins misc/letsencrypt/mosquitto-copy.sh
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ $(ver_cut 1 "$v") -lt 2 ]]; then
-			elog
-			elog "Please read the migration guide at:"
-			elog "https://mosquitto.org/documentation/migrating-to-2-0/"
-			elog
-			elog "If you use Lets Encrypt TLS certificates, take note of"
-			elog "the changes required to run the daemon as the unprivileged"
-			elog "mosquitto user. The mosquitto-copy.sh script has been"
-			elog "installed to /usr/share/mosquitto/ for your convenience."
-			elog
-		fi
-	done
-}
diff --git a/app-misc/mosquitto/mosquitto-2.0.13.ebuild b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
index 056871a3f293..056871a3f293 100644
--- a/app-misc/mosquitto/mosquitto-2.0.13.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.14.ebuild
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index c1bbbf943edf..24579b083442 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -17,6 +17,7 @@ DIST nnn-3.4.tar.gz 194844 BLAKE2B 5b41196af67720a3485bd68b6c08e4ab41e8308d5ed0e
 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
+DIST nnn-4.3.tar.gz 236606 BLAKE2B cec0a73a40fae76e478c3299e2ae8a613c2e1b16e009d4f69cc3c9c9f6ea5df4048fc7f941ae6369293cf56df9b91a496531f4b34bf05f1dbbf8fab9120ffe78 SHA512 588af174d86db14acf5d1e2ac42f88ca5c6f0e105996a58771e7e0f989f224616e7a12d74fecc96540a9782db0cf8857c21bf0f50df4ee3b4b5c641291c64575
 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
@@ -36,4 +37,5 @@ EBUILD nnn-3.4.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59
 EBUILD nnn-3.5.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59f62e16477ce2f42144e43e8b0f0412fcc7d7f4bf04054e539ce3f86eb791c0ac0f314d4de7fbc83be2 SHA512 01fddb20ef06517970f9af68bf87a2cd79eaaa5da312f6a6f811213ff64a952bae3aeb095150adba3596b2b255d4979c6f43547e891e2d9b4e3338afc3497efc
 EBUILD nnn-3.6.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
 EBUILD nnn-4.0.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
+EBUILD nnn-4.3.ebuild 1050 BLAKE2B f4c3accb8482ebec73a9af0768c20208866f527d4262e8a9127d03b1be42175dfb542ffdb1fc7e67908a57c700912532912029f332562cdc676bb1554d401a4d SHA512 db2c9a11d2a7e6d1fcdbf30e1aa948f180ab48b61d68cfc76f2ae6841b5c44953083fed8dfed7f53fb5c1a709e7f28ec732f7ce4e2b228480c16151c7ca8ac1b
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/app-misc/nnn/nnn-4.3.ebuild b/app-misc/nnn/nnn-4.3.ebuild
new file mode 100644
index 000000000000..866305d8ebab
--- /dev/null
+++ b/app-misc/nnn/nnn-4.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/physlock/Manifest b/app-misc/physlock/Manifest
index 3d35e1bf9b16..e5007a49d4b6 100644
--- a/app-misc/physlock/Manifest
+++ b/app-misc/physlock/Manifest
@@ -1,4 +1,5 @@
+AUX physlock-13-Improved-commandline-help.patch 2581 BLAKE2B 8f3db26a986af4f3ae84ef0c7621e96afffd5b9eadf991e4b845b09421d70bb82ecf12af01962914943a383ac2be767718e53f2db249d1dd6f5cdd4803c19277 SHA512 5da0a2955eb271e189690d95ba07862a867bf0c38b4934a655e34e1034e4613723de90128c9d2387fa5dfbb34f7c46ef98dc3b9b3e11e9e4e180f38fef0cbd62
 AUX physlock-13-Set-PAM_TTY.patch 2092 BLAKE2B e45111cd8c52234dda1ccc94403bfb8d11033681ed5d8460f0096776125d0aeddd1e369972a048f21f8777878a9919c0d7e65a4afdf17d73300198277cd1095d SHA512 1875b2318bf601ceb22c12ed1a36c2521604de6795a0925158ad7d5a7b4d4c20519bfc534a1d116634f926c4c6289aa3b1112ee4b63ec3870df5787b73908c0d
 DIST physlock-13.tar.gz 14123 BLAKE2B a43f151c1660c38bd028f80742637a51d5108e6769161c88fb269ac03c827e49bd20e521b8face6aa6a71a8ab65ddf8662e81e8251b74c13388070ed04d4e13b SHA512 85c291fb7b146fbd81aacbf94d8af07e727dd9b37b458988eaee5f7a51f9923871f9b19fd9438428635963864de67d3f2a72f938d99ffe6dc3015c3a1b99ea1c
-EBUILD physlock-13-r2.ebuild 877 BLAKE2B 277da86ba9f60e9cb34e8db56f32b6fa1b2457f3e0f9e20fc8701933d910e9202eacecce6a350876a163c439ddcbfad313cce8fbad281faebaeff47e2b7cf5df SHA512 ba74451596593913fe2c13c3bc4693acafe10c2fe875f9fbea1d415a53645b044d49ea92ea1d7431949f5b6269983e1c0f2048d6753608518d02cfdec77bb8d9
+EBUILD physlock-13-r3.ebuild 933 BLAKE2B 772019ad9836d88491354b9ee656bc7b1ad83baf853bf65e7f07e1512a5635fd6e33f6bcadd9c282c4f9f6e2c81d16e004a35b461720e86e8b092c66e1da3c96 SHA512 691f21e787d0dd3b7b7b8f253cdeae410952b5333fbc743acc0b9a603e974f08497ef0e8cd34067f4a20702ea9cdd570d41e8f18111b23997b33c845d8561ab1
 MISC metadata.xml 981 BLAKE2B e5dc78945499f68b27b3f5ccaccb28f1a60c64b535367779b1c29a0c307ce05d232f1242882aa484001c160699f918480c6aa933166bc3c7e878c46c6f013907 SHA512 9356f9a896d944dc1595ce3fffaf974ae8ffc144ee65ccc7e86ab56eedeba29e7a732956aade68500b496f4efdf5bd00efb4e5d32521636081885d7ff2ec0d73
diff --git a/app-misc/physlock/files/physlock-13-Improved-commandline-help.patch b/app-misc/physlock/files/physlock-13-Improved-commandline-help.patch
new file mode 100644
index 000000000000..680575410e4e
--- /dev/null
+++ b/app-misc/physlock/files/physlock-13-Improved-commandline-help.patch
@@ -0,0 +1,89 @@
+From e6c69762f5f555fa17659e3440d8392b6a47bbc6 Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Mon, 8 Nov 2021 18:44:25 -0600
+Subject: [PATCH] Improved commandline help
+
+Output the descriptions of the commandline options in -h.
+
+Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+---
+ options.c  | 25 +++++++++++++++++--------
+ physlock.1 |  2 +-
+ 2 files changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/options.c b/options.c
+index 6ec3634..ed21262 100644
+--- a/options.c
++++ b/options.c
+@@ -28,7 +28,16 @@ static options_t _options;
+ const options_t *options = (const options_t*) &_options;
+ 
+ void print_usage() {
+-	printf("usage: physlock [-dhLlmsv] [-p MSG]\n");
++	printf("Usage: physlock [-dhlLmsv] [-p MSG]\n");
++	printf("Lock all consoles / virtual terminals.\n\n");
++	printf("  -d        Fork and detach physlock before prompting for authentication.\n");
++	printf("  -h        Print brief usage information to standard output and exit.\n");
++	printf("  -l        Only lock console switching and exit.\n");
++	printf("  -L        Only enable (unlock) console switching and exit.\n");
++	printf("  -m        Mute kernel messages on console while physlock is running.\n");
++	printf("  -p MSG    Display MSG before the password prompt.\n");
++	printf("  -s        Disable SysRq mechanism while physlock is running.\n");
++	printf("  -v        Print version information to standard output and exit.\n");
+ }
+ 
+ void print_version() {
+@@ -46,23 +55,20 @@ void parse_options(int argc, char **argv) {
+ 	_options.lock_switch = -1;
+ 	_options.mute_kernel_messages = 0;
+ 
+-	while ((opt = getopt(argc, argv, "dhLlmp:sv")) != -1) {
++	while ((opt = getopt(argc, argv, "dhlLmp:sv")) != -1) {
+ 		switch (opt) {
+-			case '?':
+-				print_usage();
+-				exit(1);
+ 			case 'd':
+ 				_options.detach = 1;
+ 				break;
+ 			case 'h':
+ 				print_usage();
+ 				exit(0);
+-			case 'L':
+-				_options.lock_switch = 0;
+-				break;
+ 			case 'l':
+ 				_options.lock_switch = 1;
+ 				break;
++			case 'L':
++				_options.lock_switch = 0;
++				break;
+ 			case 'm':
+ 				_options.mute_kernel_messages = 1;
+ 				break;
+@@ -75,6 +81,9 @@ void parse_options(int argc, char **argv) {
+ 			case 'v':
+ 				print_version();
+ 				exit(0);
++			case '?':
++				print_usage();
++				exit(1);
+ 		}
+ 	}
+ }
+diff --git a/physlock.1 b/physlock.1
+index 32e8547..6243214 100644
+--- a/physlock.1
++++ b/physlock.1
+@@ -3,7 +3,7 @@
+ physlock \- lock all consoles / virtual terminals
+ .SH SYNOPSIS
+ .B physlock
+-.RB [ \-dhLlmsv ]
++.RB [ \-dhlLmsv ]
+ .RB [ \-p
+ .IR MSG ]
+ .SH DESCRIPTION
+-- 
+2.32.0
+
diff --git a/app-misc/physlock/physlock-13-r2.ebuild b/app-misc/physlock/physlock-13-r3.ebuild
index 0ae63dfa9ec5..907a87cae44a 100644
--- a/app-misc/physlock/physlock-13-r2.ebuild
+++ b/app-misc/physlock/physlock-13-r3.ebuild
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-13-Set-PAM_TTY.patch"
+	"${FILESDIR}/${PN}-13-Improved-commandline-help.patch"
 )
 
 pkg_setup() {
diff --git a/app-misc/rlwrap/Manifest b/app-misc/rlwrap/Manifest
index d002a9fd6aed..cd65bcfbcdfb 100644
--- a/app-misc/rlwrap/Manifest
+++ b/app-misc/rlwrap/Manifest
@@ -3,5 +3,5 @@ DIST rlwrap-0.43.tar.gz 313139 BLAKE2B d2aaf32abe69b0307321192542c88acbf5af00e23
 DIST rlwrap-0.45.2.tar.gz 182025 BLAKE2B 38e54ab87b0530e49cb736072825441f638aa4ed4b22b0f30c7243f5f8ac7b439e3a75784d6a4eed051bf367d15ac3b576109663ddf3fc082171a73c5af7c11e SHA512 77664bc17c4e6148037b8ae64c025b07c3feae91dfeff59f1846ce38e5f808a41005286daa81fd0ed01e0c789762e377cc48e6abdf124a7d4654f66b2b6c6cc4
 EBUILD rlwrap-0.42-r1.ebuild 495 BLAKE2B 5c0ffa2ade7e74000be7a5c7698ee329c0f3bd0d8bfb97890d9853538b83869fb0a2950ddc4a7f6ca928657a419a314ea416481525cc5b6fff8164ba6655a2f2 SHA512 65a0f5fe7183422b5ed4131516c3f42796b59e44ecca37af23b83155a65a85e9800ed7ae17465cb36bf0becaeb1ab0a5250833507adeb93c2fc6cbff56f8362a
 EBUILD rlwrap-0.43.ebuild 506 BLAKE2B bb1d7527de54b31993473b22376603f669d41bf4c688395be0245593d2245b1336abc376ba4a8333b7cfbade7f860aa05c3f5e3f58178e6f6bf0bcc389b28e05 SHA512 3acf5f5f5bfcf85cf563a37fe99bca4a86fdac0bb976d2ec40def3a72b21307dd7639515763c3140f6d2051db37f3f0b420f3a3a93ec25ff7c6e367cfc6a3673
-EBUILD rlwrap-0.45.2.ebuild 569 BLAKE2B 2035f1833287168e7dc6fb065e4a2c28b4bc0cf698ea29d9ca20e7df475377dca81cfffcf0f37bc3d2b644ac0ee620294a84860ffb222750811dd3a58c6f3b16 SHA512 4a04cc3599e056bc81824e898f6db0c8b1b59e9275e1d2316dbde908145455079bec440bbfdc7c569e6d5e4cab193e3e9e858ba3bbafa81c0aebe625f20c2b19
+EBUILD rlwrap-0.45.2.ebuild 576 BLAKE2B 03740d4830c4f176c65740bef6e51598d372acbcc3d9ffbadd9823a3599cfc2d2a81297d944030ded00fc2a7a05c583d62c6fa6f147f49029f5760f95c189175 SHA512 833a3e28c9785e66356dd2646338f5ee0408fa4be999c96838905e3e43193211b1a0918915f34631bb2d694130397f84864a4d78e1bce9f6e2953011541829ab
 MISC metadata.xml 708 BLAKE2B bc2ef5d5636159a7291fede5d7b84384e5fa714b33fe29f19eebf632dd4f2eae86d6edb62b074b62903727b2fa4d0fe3faf4abb22d3ba9b99363be81b5bcf416 SHA512 6fbb3167b1c064b75afb4c95c2ab31dcd53d99e2d12bde77d220fbfc8c213ab01ee178dd5e950d4983ddfb85e3ef870dab5e35e59dea4e73ec5c2bcdf823e456
diff --git a/app-misc/rlwrap/rlwrap-0.45.2.ebuild b/app-misc/rlwrap/rlwrap-0.45.2.ebuild
index e21320f88227..8a0f63a892b2 100644
--- a/app-misc/rlwrap/rlwrap-0.45.2.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.45.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/hanslub42/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 9450745231ee..4b477dabb2b1 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -3,15 +3,12 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97
 DIST approx-0.5.0.crate 14359 BLAKE2B d1811157cb560d24b559b5f4954654dcfe4d1d418f90ed98536c0f8c72584b9cc10c93c4e89fa376f96be043338964d07bc722ef16ebf3041e8c7eb755f2941e SHA512 4c7ef7d54b6a9fac11587fd16638d36d8738e5156f5abf77cd994056377427f12170b61c03d1acf591dbb897911babc852c2a4a12b3c5277e1065d952c9e7dc6
 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.7.crate 26777 BLAKE2B a27a6c59969b6202ceebc72b50331e056f02e05befe710f3f1fe77622a61ed4ed11e258cc2df43f52a7f57c18e4bc9b33c72946d012a4fd6f5417c1a5fedddff SHA512 9e0e67bdf14df8235cdd11d9c453bb2f0723188a39961d8aab26fd98f2c64629d085c8d3eb50ee88371ecdc2ea306bfe5dda1ca4872082b40f13a4cea99e05d1
 DIST assert_cmd-2.0.1.crate 28037 BLAKE2B e84cacea587e7423c364b69a140dc2aed79def5d13adb3c00ceed863640be7a16f63196edd83d6a2f217356fde740f80c415ce47d65e0e8529ad1b16dbe17ac1 SHA512 f8718eb2e0d87e55ec9cc6ad40f3cd112008ca519a53ffa8a46fe113880c20df066ae607b94d19e7c36f927eb77fa04fcde42fa1e1b3696147a4937e98c63a3a
 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 bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
-DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
@@ -39,15 +36,12 @@ DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb57
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
-DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.103.crate 540563 BLAKE2B cc99ae88783e6f3044ecec5154e0de81a7f792b89415cc2736eb4a436edd316277d690971c4aa0eff7935b5a355c8966805c4ee72c5fec8caecf65a29c13caf9 SHA512 79e1c99bfeb30283f85742cf17867000301bbe022c6b2ace415b4a767068dd64b09581bcc802d42150e45849f5adf8ee2720a0c695324d87d3d96a5c554a216d
-DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
 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.3.1.crate 40550 BLAKE2B e6ba7aef3ee1ff31da639492e3baf73c127bacedd20c9b08301ac6bc6baca92122d99f313fecc6cda955cb0e3c9f28d6ce26094d006e15afb3041e1c90348dc3 SHA512 d4db1b27a41078a49d6cff5a3d4a723bbd2029f8007b50a69800ab5de7952978d81749b6dde80706f62efb848c4d1577e039828183533a2b68db80b699cfc4b1
-DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST mockall-0.10.2.crate 21911 BLAKE2B a48f09488ee4d0da1b0c767f13b89fe70e1c35c1bf12501d31ee14f1e16d1c8fcc96492a931f5ec977adc80b84158f5972b518db69d3bcf3e51be75c3a166dc0 SHA512 7613d35f9ca12a895c00167f43385b19f7f045ce59b44157f72ad2a4dd5ed106b5c2f3fd03bc362c09f5f88b3929f61c0611d9c52b13cd039834b98c32b409f4
 DIST mockall_derive-0.10.2.crate 43024 BLAKE2B b2b65ed252b18f1537402ef78226366295e233ef7ad3b28ebefe99482732c42a32e71925072dafe62b63b051ef0c1a524c34fa233f7d2c267db2ed028f63d999 SHA512 01f9462935afd961c830b8a44d016d9461f3aa77534d7cad29723445b4b257ee19894006865bc38d63976b522502cc19ab8b78422e2f72b53542e79e66f88c5e
@@ -61,64 +55,48 @@ DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795
 DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
-DIST predicates-2.0.1.crate 27077 BLAKE2B eca1527c1734b3bbd674dd5fadbe040187b95f66480b6cbf322f225db0b47e49d5a510bb97e861fb28a6ddaf56a1f10ae8c3136a22953c86a491086d63c08848 SHA512 81d5faa0224c430d467d22edc20a02dc214852d937f948ca1d51eac61788f4340a279a93ecb8a9bea495f2a45e2c86a42b8b495c431f50e752c2ee0c422b946f
 DIST predicates-2.0.2.crate 27280 BLAKE2B ef00b721f1a51d182ec16a7c6d4dca0e8958138921842c4c4ecfc2308e997cd7154a7ef5073de10a43e71b6d919dc973a862530e545008f35507d110459640c1 SHA512 de7f8ecb28bba065eef3db7f22527384a2b209675c9d6c01cab34e864a136602688a90a3b280310dc584e6c3fb67146e0e77c4c8cb24f6241a056ea8c91750f0
 DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
-DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST predicates-tree-1.0.3.crate 6370 BLAKE2B 6e123197e18c5c08892a0e76de41285522253ae0bb8d477fde0bda0c64bc426615f8ac408d5b1f444957b6363750c3fce6f4551f940797c39f9582f9c79db468 SHA512 bcf05c9770d26c8c6407b8103f670cd6bbfa48683c19f37caeb03c11d16a56e5011b329d9af6eb59c930db376b7be2f436e1650b7c15e70817316f6af1163ad9
 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.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
 DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
-DIST rand_distr-0.4.1.crate 52510 BLAKE2B 7da4a2d3cba604542da016c177c500307e07ec83ffd32efc9b3e5724c8574ec1c2bd0139509586cc3fcadd05b784c262f8305d1af749a5614a97d5d8bee96f1b SHA512 e5ef15e3dd9d537310f59f33b7e76c789f724e20d2fb4e43b4972b1dcb91bb8feb91e00ec1172fe8e4193e089cca4ad07a58dcb940948b84d4f78c5dc0b6f63e
 DIST rand_distr-0.4.2.crate 58198 BLAKE2B 90b51e0b8121dd4855796b45933acfc2338b6bb5fad80447f4e056503a0c3fb19a13d6a11745afd96d9c8ffb11cf2393300c97392e3893783c3c3e0782546f3f SHA512 7651e1776ec2405240979a9090a9609410bf628dc7d0eece28d80b2e8e4047eaca4b3d1f277967e643a2395b62996ed6e3eae23b58251f02223d9642b41ff425
 DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
 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.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
-DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
 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.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rpick-0.8.5.crate 40588 BLAKE2B ee5a24934b3e9544bf020ea3672bbfef94eac621928689ca414e1d7de7019c94b448d4b1f6da34f5b54315e667d14096051186120e979d2d58de1bf1a2a27ade SHA512 8552c62c4b5f435092c28ab6456ed43c5b7faeb643323c1900cb0313af3314b286d184383f618357c6d795e8e7d17d780f3361eea5a4120a420c6cd2ae24810f
 DIST rpick-0.8.6.crate 40663 BLAKE2B c5a618277b422aaaa1c28c5e3471fcbb8bd0cc45fdc7b8370c921af7e8c287eb3ec4945e55370dd9106b1345159eff87af7a8a7888776cda58fd1dc49658fec3 SHA512 fb36cb74f3ac3ade7c0ae2b7d595f77ead9cc43aecf88b7a8c0ece4237c23e5efa1a0812d9e5c393f1e12664b9e88b2c940b2cd2bef1df5c7a790a86294a9c63
 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.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
 DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
-DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
-DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
 DIST serde_yaml-0.8.21.crate 42603 BLAKE2B 4556a2cb4f81a1cc3ce7487caed863eb6403c966f38d505fef6ddad0586813612b0b1d5d6c32ddfb3a7d8dab8a870bf4d2bd6b06321e28165ee0b14293ec2203 SHA512 82e5a6663392b2a3e049f735b88b35023bb9255167b0e396c2cc5982b014ad2e6804433d15ffd19fe2ffd6e423a6e04e9a32b4b3d2b012adaa1f4f44996a81ea
 DIST simba-0.5.1.crate 48512 BLAKE2B 51d513e08a6a7d8d1ec4530804852ce0e1494e9e1a405b5ba9525e51ba5fb92a8029a14bcf74a34651f257644a8e7b1209ef5e3dafc06ce52a90d517ced48354 SHA512 8e2dc3cfc60f64b307f9e9e6670cfdefdacbde24cb8f73529cb42ddefbbca09522f97972dc1567811b6d55f7bb6f818907f349c6584bd7063ebedb8d68c5cc5b
 DIST statrs-0.15.0.crate 131157 BLAKE2B 164d668cfc305c16f7d75581ed2345691af34fc000781b69c0505a8205e058e86df258cb19ebc9e662503445c93d59c30d50a42f500d5fe56ce2fc40a35c0e3b SHA512 e2eeabcec11fd5253695549f4dd953d71ec6e21bc982da5d74467bd241c87eb00140a56b68a3aaa306b48eea3d78c147f60cbbe0ffcb473242d90dd14f9aa111
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.22.crate 51665 BLAKE2B 310597cd82596b8a63501d122b20d845d5f9bdef0f3babcc53e9e6f93f9cc11f2aa4702bf2c20cb0b2105b4cda4ca0dcaf79c67454261424c3e5d90da4261a48 SHA512 fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
 DIST structopt-0.3.23.crate 52029 BLAKE2B ad87f3d2da5a4a972b2ed0dbd49830038ab6b46243561cabcbc06013d7088e7a44acf1a29137af11a53ee8720aa8cd69cd7200a388b0ec626a0c513b6390ce2f SHA512 6f6cb5e2ecb7bc2e1e7c58d98e3e9f54dd4ff4698d22aa32e2fe7ab6c51a8e9e8c418260321a3f4aaae1808a68eebcc40f619de28433949aa846c27f06ff5cef
-DIST structopt-derive-0.4.15.crate 20861 BLAKE2B 3c97e31f8f3c549af548a3c75eef06b50039e513171251162af08eb7a70d900e0fc533d5bc711fed489252e5102e5245d343197eb03161c2d03e4464c6319fed SHA512 a241cd02ee91195548759e6143f4c08eac70466d6e13fc5af59a09c15dec27816cfb766c7f2024d4a678a1a1fc8fe5d78b858b3ac0f53fda914ec9ec1d8abc8d
 DIST structopt-derive-0.4.16.crate 20996 BLAKE2B 3410095fd88bafba6d08d0aacdca295cf86f4d8f028103934c03cb16da334955c1334039d000ef7eed471eb8020046c56cafb00dbc7713ecc1f76585cdc6f22f SHA512 11c5fa7a0fdc35a02fba22c940260a4a5bb26ec431d92e032789731afd97576cfe63c988ca614747ac477433cad640c972b48f5c90cb9893be28ffc9774c247c
-DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6
 DIST syn-1.0.77.crate 233424 BLAKE2B 8738d1940d538c48d2ae469af1e48a33364a47a0b4af6edb4bb6de5d1fb1330757a488d6fbd6bf4711cb04761f37f9c2be13a09bded867b4b229e7123dc7805a SHA512 3e5ef87be2f3fefac57e011447c9902c779ed67c88919021e6d24540e1a22f4308acfe8b92bb78cc83069d8fa03429985f9b14c8bd185af8fabc6e78213322e7
 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.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
 DIST thiserror-1.0.29.crate 17455 BLAKE2B 7dda520f7227d638f223f039afdc1e8e0ed0000b8657bdfc0bda2694d26a01051d1c9464502721ffecdb4d3a661497757615880222b68928bb44ab5f1c74d909 SHA512 231ebaa6cb2250fcfa608500076a4d930f625acfafd824abc5e654e0b3faace884d83666633bf2bff61ebb9cc60b61faa234ab2719417bb32af4bf62b1241686
-DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
 DIST thiserror-impl-1.0.29.crate 15201 BLAKE2B f346e746fdb2ce83f2c8e7b58772b54721191470e0b5d771fbdff19f598fb8a1bd94038ab603370e037b751e028c79d85b56dae25a302c91dbcc643ca1d26cae SHA512 edcc1d7cdb7035f9a3667b8f9509e00f70dfd515ba8594cbb0562b8732380a0c1b405a47e7ec4d5fdc5bbe870be69332205f0dd15ff39396cbeacb798483f553
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
-DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
 DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c
 DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
-DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
@@ -130,6 +108,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 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.8.5.ebuild 2518 BLAKE2B 60bbd9787b8a431bbb4750238ee1407eb05447ccabf6a2b0be4393b01f85e84a45c89cd677abb80e1e970f8beea82006892dcd450292b76045f7a383a81732db SHA512 4a1c287edf08a978340a1bf81c50fd35ef763caf75a4c4a8807a33c847c5da82d425d589d069e8cc059d7d6d70c894ed367a56dd3a4dcf2bf9d5f11dc656fe87
-EBUILD rpick-0.8.6.ebuild 2557 BLAKE2B ad5901709b1ec56f0235f620c93573198425e7db93ced3e6d1c65d4eb4cd2ab5cbff7b7a0fd4cbcdc0fa961f20efedc04d409dd1f8fea0130aad0b0e7f40bc43 SHA512 145e4bc20f30502dce535fb63c3f3327c067d2c496fb00be0b2727acd24a26667bbc488f3d7aa8e2c379406de2f64025c5c2871b8da77d5b2c14851c89c28da8
+EBUILD rpick-0.8.6.ebuild 2554 BLAKE2B ca2ae9a988035a91e4c1239693996f64ceb7dd1c83ceb8b51fc5f0512ffa69a23017b18656ddfdda98e4e371a2d34552b167cdb074a1ab51bb3e914491760cdd SHA512 00eaa9d8fb5a26f43eb3e3bbb959951e5315021573a7948ecf659bedcaadab9cb89697143832d165edb977fb2bb6880acc2533ec618e33945cfd07b18cf36c68
 MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/rpick-0.8.5.ebuild b/app-misc/rpick/rpick-0.8.5.ebuild
deleted file mode 100644
index aace5e8b5bf6..000000000000
--- a/app-misc/rpick/rpick-0.8.5.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick-0.7.18
-	ansi_term-0.11.0
-	approx-0.5.0
-	arrayref-0.3.6
-	arrayvec-0.5.2
-	assert_cmd-1.0.7
-	atty-0.2.14
-	autocfg-1.0.1
-	base64-0.13.0
-	bitflags-1.2.1
-	blake2b_simd-0.5.11
-	bstr-0.2.16
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	clap-2.33.3
-	constant_time_eq-0.1.5
-	crossbeam-utils-0.8.5
-	csv-1.1.6
-	csv-core-0.1.10
-	difference-2.0.0
-	difflib-0.4.0
-	dirs-1.0.5
-	dirs-next-2.0.0
-	dirs-sys-next-0.1.2
-	doc-comment-0.3.3
-	downcast-0.10.0
-	dtoa-0.4.8
-	either-1.6.1
-	encode_unicode-0.3.6
-	float-cmp-0.8.0
-	fragile-1.0.0
-	getrandom-0.1.16
-	getrandom-0.2.3
-	heck-0.3.3
-	hermit-abi-0.1.19
-	itertools-0.10.1
-	itoa-0.4.7
-	lazy_static-1.4.0
-	libc-0.2.98
-	libm-0.2.1
-	linked-hash-map-0.5.4
-	matrixmultiply-0.3.1
-	memchr-2.4.0
-	mockall-0.10.2
-	mockall_derive-0.10.2
-	nalgebra-0.27.1
-	nalgebra-macros-0.1.0
-	normalize-line-endings-0.3.0
-	num-complex-0.4.0
-	num-integer-0.1.44
-	num-rational-0.4.0
-	num-traits-0.2.14
-	paste-1.0.5
-	ppv-lite86-0.2.10
-	predicates-1.0.8
-	predicates-2.0.1
-	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.28
-	quote-1.0.9
-	rand-0.8.4
-	rand_chacha-0.3.1
-	rand_core-0.6.3
-	rand_distr-0.4.1
-	rand_hc-0.3.1
-	rawpointer-0.2.1
-	redox_syscall-0.1.57
-	redox_syscall-0.2.9
-	redox_users-0.3.5
-	redox_users-0.4.0
-	regex-1.5.4
-	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	remove_dir_all-0.5.3
-	rpick-0.8.5
-	rust-argon2-0.8.3
-	ryu-1.0.5
-	serde-1.0.126
-	serde_derive-1.0.126
-	serde_yaml-0.8.17
-	simba-0.5.1
-	statrs-0.15.0
-	strsim-0.8.0
-	structopt-0.3.22
-	structopt-derive-0.4.15
-	syn-1.0.74
-	tempfile-3.2.0
-	term-0.5.2
-	textwrap-0.11.0
-	thiserror-1.0.26
-	thiserror-impl-1.0.26
-	treeline-0.1.0
-	typenum-1.13.0
-	unicode-segmentation-1.8.0
-	unicode-width-0.1.8
-	unicode-xid-0.2.2
-	vec_map-0.8.2
-	version_check-0.9.3
-	wait-timeout-0.2.0
-	wasi-0.9.0+wasi-snapshot-preview1
-	wasi-0.10.2+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	yaml-rust-0.4.5
-"
-
-inherit cargo
-
-DESCRIPTION="Helps you pick items from a list by various algorithms"
-HOMEPAGE="https://github.com/bowlofeggs/rpick"
-SRC_URI="$(cargo_crate_uris)"
-
-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"
-
-QA_FLAGS_IGNORED="usr/bin/rpick"
-
-src_install() {
-	cargo_src_install
-
-	dodoc CHANGELOG.md README.md
-}
diff --git a/app-misc/rpick/rpick-0.8.6.ebuild b/app-misc/rpick/rpick-0.8.6.ebuild
index 46656324bd07..8546b8049ec4 100644
--- a/app-misc/rpick/rpick-0.8.6.ebuild
+++ b/app-misc/rpick/rpick-0.8.6.ebuild
@@ -124,7 +124,7 @@ SRC_URI="$(cargo_crate_uris)"
 
 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"
 
 QA_FLAGS_IGNORED="usr/bin/rpick"
 
diff --git a/app-misc/rundeck-cli-bin/Manifest b/app-misc/rundeck-cli-bin/Manifest
index b72b912080cb..1b3b96c7b0a7 100644
--- a/app-misc/rundeck-cli-bin/Manifest
+++ b/app-misc/rundeck-cli-bin/Manifest
@@ -1,3 +1,3 @@
 DIST rundeck-cli-0.1.11-all.jar 3447560 BLAKE2B e840d3b27dd173244781d1c37a6c3348d89896d3e81dd8fd36e7c3a33911228e46fff460d838d6c8d9bd79c254c9e469dd8b8e26bb645bd7334d38e04e257512 SHA512 3390d5b6ece391a9cf7754cc4c6d79a7720ac1db2f7a555d0b8216eea23feecc7e4cc947fb4c894362ece3bfaddcb383b7b10558d2e499e364e023c65636aa33
-EBUILD rundeck-cli-bin-0.1.11.ebuild 539 BLAKE2B b8baa97a972f404a5d097aa8e79deb215ef13000d70175b5aacb8bf6a52f8017ce99ea8eadffdd167cf56ec05d77974a6c64085188eb5c4a7aad751cc7b6c6cf SHA512 098f2af034357d16c5397451189082a6d905fb4230b97569b29b06bb9613385aa4d62b3052a12d5474dfe650ccd9623a26968585f5c9eef99f9bd6131103c4b7
+EBUILD rundeck-cli-bin-0.1.11.ebuild 535 BLAKE2B 4cb4e976c07bc5970d2704f980a9402e00c316b03ac04b07c45b55fb4f05cc2c151ba0a1f3b44e09384f0b2b258126e0c457b852d4257153e0a034a2bd03a7f6 SHA512 030fe013d61473a25a95c9ef7e2d8af0628ceae12e56affc292fa444d238a32cbf8c624a29efc64c3b58803e0a9eb6578ebcd6e70e3801598e5b7f6815ad073d
 MISC metadata.xml 442 BLAKE2B aaa0c2b7d4294d7724e2c6935ba7724407101ea63fbf886d7dec25306fb92876aea276fcde9fee7ce8526935e812ae4e8e7795896ff1f34d04e6767ec2327aa9 SHA512 032b1e4ab1370674f6ce3783994fb5d3c35f75cc84dd0365c5992e03223b32100dbc9f44ab8afd3fd704fa9c87ecfe941c8cbb7838c2a213bef9bf0fdacc0e5e
diff --git a/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild b/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild
index d7bc4231484f..e886d1b70eef 100644
--- a/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild
+++ b/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 MY_PN="rundeck-cli"
 MY_P="rundeck-cli-${PV}"
@@ -11,6 +11,7 @@ inherit java-pkg-2
 DESCRIPTION="Command line tool for rundeck"
 HOMEPAGE="http://rundeck.org"
 SRC_URI="https://github.com/rundeck/${MY_PN}/releases/download/v${PV}/${MY_P}-all.jar"
+S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -18,8 +19,6 @@ KEYWORDS="~amd64"
 
 RDEPEND=">=virtual/jre-1.8"
 
-S="${WORKDIR}"
-
 src_install() {
 	java-pkg_newjar "${DISTDIR}"/${MY_P}-all.jar ${MY_PN}.jar
 	java-pkg_dolauncher rd
diff --git a/app-misc/smtm/Manifest b/app-misc/smtm/Manifest
index 55a040c84d53..eea9ea578c33 100644
--- a/app-misc/smtm/Manifest
+++ b/app-misc/smtm/Manifest
@@ -1,3 +1,4 @@
 DIST smtm_1.6.10.tar.gz 54033 BLAKE2B b740298d27949139e593102e1c96337ee4139d18499235cadd1f5030bcde465717adb51cd8b09f2272f286c1489392758f92ba69ded17768c5a91af5773c73cc SHA512 0cacafb8cfe1411b6b5db677bf15ad731b2e2181ee14ff8374e1fa01ad931e8f92efff29774e84950178f20805b18518067643e3c98d7990e1d1b93b7dd347d9
-EBUILD smtm-1.6.10-r1.ebuild 741 BLAKE2B c1092f3aca5a3551453cfac638bf148da688505e92a1036bea481df36a6bd01354826d2bfc29ec9554251dc53347aa9f903e61c2491fbc20b99223cc7e53cf55 SHA512 d9d756a73598140469a65a299361f04e02c2f2edaee61daef435cbae79489df6a9299557fd365b9a62bc18e578991b17f44ce0058acd12e736717d12fbd34278
+EBUILD smtm-1.6.10-r1.ebuild 740 BLAKE2B d768b6e312a0a478486be351b44c3916cbc4021a4956b838c447c9dc449a1e8a39d3c850e125212fceed6feab1e73310429f82361c35dd890d68efb43f14f693 SHA512 0a42d0ee7e03e13e0370a94303903b0a31ded78788eb2f50d13bb9fa9a82842f49cce6972a3cc6e115fcc2914255df079cfc8811a49f7dc096e9c5463b35e256
+EBUILD smtm-1.6.10-r2.ebuild 648 BLAKE2B 8629deef06b23f943ab916141930f84b0f8d8a20f9e9d6193cea39290cbc52bd15ce3fde302a37ff3790e0c1a62e0da7705220a65b1778e3a75add016b5fbdf9 SHA512 21ca06e6c4783b5020af64040a1ae35f614aa4fb0444b66dac89d67c5cfec5b844c86d35275ba21f79a77d55b9287331e30c36da5c0aca9b4d0bc012b1c40de3
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/smtm/smtm-1.6.10-r1.ebuild b/app-misc/smtm/smtm-1.6.10-r1.ebuild
index c309b8092b42..a0c0162b3e3a 100644
--- a/app-misc/smtm/smtm-1.6.10-r1.ebuild
+++ b/app-misc/smtm/smtm-1.6.10-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=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit perl-module
 
 DESCRIPTION="Stock ticker, profit/loss calculator and chart tool"
-HOMEPAGE="http://eddelbuettel.com/dirk/code/smtm.html"
-SRC_URI="http://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
+HOMEPAGE="https://eddelbuettel.com/dirk/code/smtm.html"
+SRC_URI="https://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/smtm/smtm-1.6.10-r2.ebuild b/app-misc/smtm/smtm-1.6.10-r2.ebuild
new file mode 100644
index 000000000000..66fe3e299677
--- /dev/null
+++ b/app-misc/smtm/smtm-1.6.10-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="Stock ticker, profit/loss calculator and chart tool"
+HOMEPAGE="https://eddelbuettel.com/dirk/code/smtm.html"
+SRC_URI="https://eddelbuettel.com/dirk/code/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+DEPEND="dev-perl/Tk
+	dev-perl/Date-Manip
+	dev-perl/HTML-Parser
+	dev-perl/Finance-YahooQuote
+	dev-perl/libwww-perl"
+
+src_install() {
+	perl-module_src_install
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 9f31277f4394..c21192ff371c 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,4 +1,6 @@
 DIST solaar-1.0.5.tar.gz 920452 BLAKE2B 44aa0f9abd63629a5a4e737c14e468922c4aa501341717d595f045c5f40369ade6ff296120931557f1e8f04b99aa4f690454aa8f6bceaa526f370f93b312f6d6 SHA512 28603c30f0e9f2f0fe2549722062548031c69a0d9c98f732fdd8fbb51ed1d55ef033262113b2f88044a68f8b26c8c51fb0b45d4f4689fb3619e143d159618c47
+DIST solaar-1.0.7.tar.gz 1265664 BLAKE2B 6bb221d603dc74bf21ac44ca6611d817889285c8711c565b7393b875a934bf9125fc366569c1f677d657463484f2ec5fa077703f311ef2aec74e9f6813a5f1d7 SHA512 24b6b861f90d5747f150afb38b32041885b61cbf7df7794d780b311aef50d334347d5c5c722a0a7d5de3f91b96228e90e2a61dc108054452f46750a04340df83
 EBUILD solaar-1.0.5-r2.ebuild 1776 BLAKE2B 3413685b7eae0f5030f11f6944b36750f53eb2eaf4432c0e505390a3c695141006df4b4a8ddb66a8dae63940e42cf55f63cb0c5662ef4ea2dbdf9f556de2a5f9 SHA512 b153a3897b8e3bb0f442c7f08530c3e676631197c9367b0f6a8575287a83be285796e28854101ef9012910d8b27ab09809f3fae2d890a3f5302e9eaaf8ce4663
+EBUILD solaar-1.0.7.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 EBUILD solaar-9999.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 MISC metadata.xml 302 BLAKE2B 55938561021d105894875ec5158bd1a744c91039744ff789bffed4ab483eebe73450a9cd62cb4a97c984213fa2f1e8799f8b0d97bd6202e826e4609434086f5e SHA512 3bff70d27a9934d48f848cf0131e01415e13426ea705ef7721a9b59e29ff7bf32718d015de9e4a4f89f23405a8f372f038d2f0c3485cf9a7939a33ebda9d1681
diff --git a/app-misc/solaar/solaar-1.0.7.ebuild b/app-misc/solaar/solaar-1.0.7.ebuild
new file mode 100644
index 000000000000..cad0500253bc
--- /dev/null
+++ b/app-misc/solaar/solaar-1.0.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..9} )
+
+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/"
+if [[ ${PV} =~ 9999* ]]; then
+	inherit git-r3
+	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"
+	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc appindicator libnotify"
+
+RDEPEND="
+	acct-group/plugdev
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+
+	')
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	libnotify? ( x11-libs/libnotify[introspection] )"
+# libappindicator & libnotify are entirely optional and detected at runtime
+
+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/task/Manifest b/app-misc/task/Manifest
index 16403fa99b08..ddabefcd5780 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -3,5 +3,6 @@ DIST task-2.6.1.tar.gz 836830 BLAKE2B 18531a462e9466d2bfc21af70c05ec75f504c82e67
 DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
 DIST tests-2.6.1.tar.gz 221364 BLAKE2B 6aac691ba1828abb3469dfa2a9c093b92431591ac21113f71550676f7f9c40394770ddd2c649bf6cda5655d5f1c25aa6c7ef174e9da7ea0c647109d25771dc2d SHA512 df252b252ac7e319d46ef7e72c587c52a97bf7b496ad401342611114db15b7fdab501b4fffc60ea6a8dca7820abc267120375a1aafd1da0a0c41b925e9fd62da
 EBUILD task-2.5.3.ebuild 1369 BLAKE2B 9a9697292649fccd81b763cb645879c7cd8a46ec8b7cf222ad3be528e2f9244e529fbf14a7a3151b535cfb2674daaae42a851821250f132216d305300b2a09b5 SHA512 6306303a1e824e13d14588d56f79559da8ae54dd237b64fc249dde94da842daf7ece3ea8ed7a5127261ac8e4f245adfd9de514a2d41e73c6248933c73c20a31c
-EBUILD task-2.6.1.ebuild 1403 BLAKE2B 9a59669bfcdf79fcf3c269bc309c994d9929af7b634f9324959460c323e70f08df3b4c4bf15c664e325463525a8ceeb4b876fd359d3ecb8a17e1f7dd3f0a3658 SHA512 ad38a0f60c2b2122c6494db7aef0b646bc3f78fec2fb13d07787b182b27a7297f373769d92913e4e57f67269cff869b3ea4a9ce7580c2408a78d4340768f0311
+EBUILD task-2.6.1-r1.ebuild 1443 BLAKE2B f6228b9e9f3de0220452bc7e3abdd7b4a3b5983d82b2474c9c5451b8338059958f608fa3140204035e038c1e57e54bce0912e2a36e83e382e62535d1c454a10e SHA512 619f60a1cceee92bac7db6c5c60ed82268d82deb82195e5bd11a9322fe19e24ac50d587c5f4a9bcc4498b17d5c293319b34358b820b34f02ee9384382472c0c4
+EBUILD task-2.6.1.ebuild 1363 BLAKE2B 194af9d8ec57b6ee79b11cbb1f9c8443a83b3fb27f777284515042bcdcec1a26ccbbaa258ae399dd12b53ed621ecde55e2ceb281b62519424092d323ae2f97b4 SHA512 db59c98871348a7d2baf95f36ec1cafd325287971a2bc677523c511433539e09a4d1d6a7778855e470067b252a6aed7939921219f04160e2c69d280830a87457
 MISC metadata.xml 466 BLAKE2B f2da2e60c939ef2864d1463434c7581457f8d05435cd428038f18fd00ce7cc24a92dc57430e35ff82927188f4a82f9e20f9f0da5272b7c63d0cf00901740747f SHA512 2211e19b9bec481fb3723596e8aba2c560071910c96f9225b4eb33da132a0563e36b2c6edb574c54061bcf480033cc5eecb3095b6ca1bd56fc7e8c3d38a08225
diff --git a/app-misc/task/task-2.6.1-r1.ebuild b/app-misc/task/task-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..d4f6942da292
--- /dev/null
+++ b/app-misc/task/task-2.6.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit bash-completion-r1 cmake
+
+DESCRIPTION="Taskwarrior is a command-line todo list manager"
+HOMEPAGE="https://taskwarrior.org/"
+SRC_URI="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${PV}/${P}.tar.gz
+	https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${PV}/tests-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="+sync"
+
+DEPEND="
+	sync? ( net-libs/gnutls )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# move test directory into source directory
+	mv "${WORKDIR}"/test "${WORKDIR}"/${P} || die
+
+	cmake_src_prepare
+
+	# don't automatically install scripts
+	sed -i '/scripts/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_SYNC=$(usex sync)
+		-DTASK_DOCDIR=share/doc/${PF}
+		-DTASK_RCDIR=share/${PN}/rc
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${WORKDIR}"/"${P}"_build || die
+
+	emake test
+}
+
+src_install() {
+	cmake_src_install
+
+	newbashcomp scripts/bash/task.sh task
+
+	# vim syntax
+	rm scripts/vim/README || die
+	insinto /usr/share/vim/vimfiles
+	doins -r scripts/vim/*
+
+	# zsh-completions
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh/*
+
+	# fish-completions
+	insinto /usr/share/fish/completions
+	doins scripts/fish/*
+
+	exeinto "/usr/share/${PN}/scripts"
+	doexe scripts/add-ons/*
+}
diff --git a/app-misc/task/task-2.6.1.ebuild b/app-misc/task/task-2.6.1.ebuild
index 220608c028fd..f1d4aba890f6 100644
--- a/app-misc/task/task-2.6.1.ebuild
+++ b/app-misc/task/task-2.6.1.ebuild
@@ -36,7 +36,6 @@ src_configure() {
 		-DENABLE_SYNC=$(usex sync)
 		-DTASK_DOCDIR=share/doc/${PF}
 		-DTASK_RCDIR=share/${PN}/rc
-		-DBUILD_SHARED_LIBS=off  # bug 764224
 	)
 
 	cmake_src_configure
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index 6181413ce8b1..55e066d32c67 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -1,6 +1,8 @@
 AUX tdfsb-0.0.10-asneeded.patch 2009 BLAKE2B e4e496814fcd9aacbe4e51a14c8432d683fb58c04fe3bf6f4fb6fd02ed98b7c8d2e4f5a768366bfec66a9d77b9575a7ce08fb68c526d69e922b758191a06c7dc SHA512 cc6daffb087df7cd75986de69240e19a762db8a8c42621d1b8b5fe869bdabe676e3748b2387212362eb2854d7f7dd74bd085671372d453eecaa8cd38f91962d0
 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
+AUX tdfsb-0.0.10-void-return.patch 527 BLAKE2B 8632b350581b0f0e1c2b2fd0e8fbe46bcbff4db2e301d8a8c6cc2d57221b597e4851727441f15e02fa2d1e32bfbac0f68f02a05f4b8ca42cb6fe2d39366e4a72 SHA512 9e0dc3a212bc2f85460e2427694fd1470641fd98d295de20134a2570d09d5e827e0dc518e6d23e816c32b046c6a7b786dbfdd5045f20aa8647f021df5e57e824
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
 EBUILD tdfsb-0.0.10-r1.ebuild 912 BLAKE2B 443a10a1f4d1c809a7621825dfff9c971c1e0605d9e4e202ddc66ea05948b721663ded0b0544bb3ae058d218f0e9616f79b4fd531aea366627940fb7055be480 SHA512 663d753dedbee16270eb526f8f3f6b425b475fb8f3288fc523d506054c10fcef32d0ac9e8e3a5f80bc7c39095870286cc7270ef75e8d0d5bebc6aa3ad30bd453
+EBUILD tdfsb-0.0.10-r2.ebuild 949 BLAKE2B dd4c7d4a78ddc0aacadd17705fa8f6143f7d198d235551c57de3f4f113f45d4c25b9e3dcc46af4ad0d0d9097db3d43460d966d08bee4b777ead897d9517008cf SHA512 7f0fc7f5c80b09ef24399a6637fd6d10243fd12ce45266f49e5150e4abee07330e1394537f61c9fe202d54afc92d73741172f5b53945453d0f17177b35209172
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-void-return.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-void-return.patch
new file mode 100644
index 000000000000..f092363f01cd
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-void-return.patch
@@ -0,0 +1,13 @@
+As the code below the altered block shows, this was redundant to begin with.
+
+--- a/tdfsb.c
++++ b/tdfsb.c
+@@ -2794,8 +2794,6 @@
+                             else
+                             {
+                                 strcpy(TDFSB_CURRENTPATH,temp_trunc);        
+-                                TDFSB_FUNC_IDLE=nullDisplay; TDFSB_FUNC_DISP=noDisplay; 
+-                                return;
+                             }
+ 			    TDFSB_FUNC_IDLE=nullDisplay;
+                             TDFSB_FUNC_DISP=noDisplay;
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild
new file mode 100644
index 000000000000..cae3e543ef20
--- /dev/null
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="SDL based graphical file browser"
+HOMEPAGE="https://www.determinate.net/webdata/seg/tdfsb.html"
+SRC_URI="https://www.determinate.net/webdata/data/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-libs/freeglut
+	media-libs/sdl-image
+	media-libs/smpeg
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-debugging.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-void-return.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s|-O2|${CFLAGS} ${LDFLAGS}|" \
+		-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
+}
+
+src_compile() {
+	./compile.sh || die "compile failed"
+}
+
+src_install() {
+	dobin tdfsb
+	dodoc ChangeLog README
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index a11b53dea8e1..e92b98a5dedc 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -4,6 +4,6 @@ DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e9
 DIST tracker-2.3.6.tar.xz 1606716 BLAKE2B ea39df4438e4502bc0229a5cc3b42a2fe6e13a643ac8e4034004b1291da49ff3ad1a177227035a4a02fd8f3723a735d37371c898bb03a6fc10573606a1c29d70 SHA512 1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e
 DIST tracker-3.1.2.tar.xz 1429356 BLAKE2B 2401ee4d73aef29a40ff9c9f917fdf4709884bc26b7e8c5ae52b0e009bfd1934a122a78adea2fe6950480f4ccacb89d11388b4553bd4c0c68f5738118d34d3a1 SHA512 3c5feb658d7d3e35bcc61ef216e59b069df661d6f13de6f26e71da35bd0ca78878099d1ae507da82860d955954f971ab68d5a3b86a3132781c3f03a12dec1f0c
 EBUILD tracker-2.3.5-r1.ebuild 2593 BLAKE2B 35207de87a09ba270540c770dd492f6abe3684dfd3fe25e8e525006d370775b667047b92d60cd68542483f6bcee4684b478e91ba4d30738c58e31bd8dc911c25 SHA512 53a43d859aee9e278d9df6000c62a469a8fc038f02a55b3d28fb76c7ac4cb4d25f00366104acc89ee5566d20c046d784f7e62db3a0431c12bc60b56b76e112a3
-EBUILD tracker-2.3.6-r1.ebuild 2687 BLAKE2B 5283eaf1de9ae6f4f38f72a16482b13bbfb60a9a9806edcc136989e2216de4229642349a1d44496c438c974eb11695bb9d31e46ad83af510df54866c94e52fd3 SHA512 31a84813f657022f917139c1c3f9a0c660df829e61b7dd820ccac4e3418bceae56760014940d641132636a876e8ae339b0c2afcea74ffb44e4661662c7dd22d0
+EBUILD tracker-2.3.6-r1.ebuild 2694 BLAKE2B 7ed178e71d1eca8bea4acee5c5f73c047793592a3b1696b95c858aa1f459aa3ac21a546c42fd97f30fc40727512f053c76a960e00712e68e54a3d8facf1baaf3 SHA512 2a190bcb1104afc7ad5809c19aa882b4ecad92ffc9a9e01a80d5ffc159a90ca8c665bd81cea5d59109581690b37c710d432fc001735d68f1bc28d5373ab93880
 EBUILD tracker-3.1.2-r1.ebuild 2522 BLAKE2B e8acf928bc4d54c696258e59e5f14a176c39bfc56f813f0e6109775c89ebd52e6b83459149997de91e47bb40d1f963a7d88fb6ecbc181e8a94b445c858f978f6 SHA512 62ba4fcfed9205e2581032c2cad4df3c52c6d3fa801e129da634ad6093b589289b4c76869cc3a714fe4290342ca380852c14325a4ac805cf30512989cd138245
 MISC metadata.xml 498 BLAKE2B 53cd3148f5755776613afbd38fa6b0eac4d10bb60765e7af7922ff70c5875f78ba25a78ef81af69f7767bc9da9fc854d9c833f4aa8bf18e52811fc4292dc47f7 SHA512 b81b2eb4705e5280286c6b6d9cc37945c671cd9ab635d31d7cef7d7ed2a3cf7a2ba5107e37363a78d8c707a2095a3d002e4ca6c233555a075ae21a9f8885d6db
diff --git a/app-misc/tracker/tracker-2.3.6-r1.ebuild b/app-misc/tracker/tracker-2.3.6-r1.ebuild
index 259f0fc72451..cfaa81da0bab 100644
--- a/app-misc/tracker/tracker-2.3.6-r1.ebuild
+++ b/app-misc/tracker/tracker-2.3.6-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 #RESTRICT="!test? ( test )"
 
 PV_SERIES=$(ver_cut 1-2)
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 18bad19bfb03..a9c100a8b5c4 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -2,6 +2,8 @@ AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b74
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
 DIST uptimed-0.4.4.tar.gz 55491 BLAKE2B 8c4d19733e1b8f8ae682ac3238677e6ab24f9a5e8f948a130a2f6e345afe4cbb70e19ea789772fa9ec9c7f89fe1ea72e6a3c549dbb6e95e66c83a0a4a6966db0 SHA512 a39a3fe54dbd9373f1bf081584b16686f3a4ce742e282f8dfde7460ac156c2e189f48976fe32723468316c231ca6a3ea404ce42465460b2b52e96b7dbb92fe48
 DIST uptimed-0.4.5.tar.gz 55727 BLAKE2B 4d1f29eea3d0a4237bd7c81f60fcc115cd6762dc90cdcecfcad852b672f98e70e4cdb1988c10a00a76ba0a55f6bd921c8d294d38e3e50e5a317717b62807dd61 SHA512 11e99677eca5e0cbb81a72077bae9c8fe2c70054e9fa05d1656cb64837e1aa63984ef6b87f563dda09ea0ae3d452d6be7ccf3d21c04f5f6ba67d618d72923514
+DIST uptimed-0.4.6.tar.gz 56796 BLAKE2B 9ea2e5f9e045f11f29232e51746bd4984fb93a8b9c36b652c4b247ab0923c1b162067aa20cb5bf0d8d2dee8e927aecea33b7be488b51f573ba525b6234b78e86 SHA512 035caba32182a807312b587b3cb3b6322027b7c8f3e69a3f0b52ea4f44ecfc40505fe58b6a1b56a87a967f1f8b1fbc075414a04b60717577e32972feadb9bc2d
 EBUILD uptimed-0.4.4.ebuild 1404 BLAKE2B 2837246830414ba708fafe75111bd37cc0cf9bfbe6d3a25c0dec462d087bacb2f5496f32256855fb327100edd5bf4eb4491bc9b6ea334e6464feca2ca69f10e2 SHA512 b93c15b25611077e73dff9d2f0bce24f8c55b58a92d9b99baa5ab659be47a5abfd87864717426648686c83dbf091a0196dd5a66f88c1462a144c7609d15e06d4
 EBUILD uptimed-0.4.5.ebuild 1410 BLAKE2B 7015e898cd82e64d546133bd62a2cc28fa4c6d8640230301fc60b090948417d48e009654506cb1a271fb68e3a196c42c17201a154029e39e98a506fcc1fc03f2 SHA512 077996018d3a1b48faddb019ef32a0cfced5c00364be3d556ac0a259e8bb009806027f8020be09dec223a6e7e8626d08fcfa4143a40efa84fa5972e5ab301eef
+EBUILD uptimed-0.4.6.ebuild 1410 BLAKE2B 7015e898cd82e64d546133bd62a2cc28fa4c6d8640230301fc60b090948417d48e009654506cb1a271fb68e3a196c42c17201a154029e39e98a506fcc1fc03f2 SHA512 077996018d3a1b48faddb019ef32a0cfced5c00364be3d556ac0a259e8bb009806027f8020be09dec223a6e7e8626d08fcfa4143a40efa84fa5972e5ab301eef
 MISC metadata.xml 344 BLAKE2B 634b39532568022b95f0022976cb87f043e3f76dc287badbecaf7dc5d9cd4953aa11e9c35a95b8cd6aa2f47c8a2ecb6df680aabc66e3d90def348d87b8f3c70d SHA512 6d561adcf5995e8844cee3f83cf2a1f80cb69e111e185d5f5ca9c9837ae997f71262a7ea907e3755d9f76ab948e7a59c807687122d35c7523ae5449dd9190051
diff --git a/app-misc/uptimed/uptimed-0.4.6.ebuild b/app-misc/uptimed/uptimed-0.4.6.ebuild
new file mode 100644
index 000000000000..5d9a04fa9963
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.4.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	acct-group/uptimed
+	acct-user/uptimed
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	local spooldir="/var/spool/${PN}"
+	if [[ -d "${spooldir}" ]] ; then
+		einfo "Fixing permissions in ${spooldir}"
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs --no-run-if-empty chown uptimed:uptimed || die
+	fi
+	echo
+	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
+	elog "or systemctl start uptimed (for systemd)"
+	elog "To view your uptime records, use the command 'uprecords'."
+	echo
+}
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 3bac775301ca..93563a1265e0 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,8 +1,11 @@
 AUX yq-2.11.1-tests.patch 577 BLAKE2B e6a6f3fc58b9e260e095d1512cb807946c13f57b7a69f9dc8227287dad5965c94b1ace3f01383f12679455f4603c9b431a326e79e6dc7fb453d686c818bb1584 SHA512 4bb5887b1d5f826a205cfece0eaaddf50c8846cbc108dbaefc465c830d87d9ec3f313d4deeb60ee64fc7a09c1bb295747bb76d6a11c1e6bde3692ef580bbf323
+AUX yq-2.13.0-tests.patch 746 BLAKE2B 0d769a32a3e80cdc8a49e0f3575ab9da880bb0a916a564261874e6a8775b35c5570e99fad5a902bdf9bbdf5a6bb080a7bf57324aad461fb1ca7d9de4da787808 SHA512 e6bd60877d628e2fac51d5395b03f96a0cf7a5033c72a676dee8fe353425f6cc7ee585404567778d7765459ded0f7f71b6563e2343de9d520b8cde493012af01
 DIST yq-2.11.1.tar.gz 20660 BLAKE2B 4b51652958121c16462304d21ebe545cca835b6c189a6d7550c7ea0ffc8b7088a02eb61ee412295d85d502a339ec3ccbc67b8dc12cd45a07246cbafa7d7feaf7 SHA512 a59a0b12ac70724bb1b857618a66b8fa38ecd35f37adce0495e74ef194f4547be8adce345f29644d43c3b32c0e680512bfcb527310e17746965f9c1db2b612c1
 DIST yq-2.12.0.tar.gz 20796 BLAKE2B a314b54628e1865df68dadcbec8e59e16c1e57205e2b9f2b364bb6bee91563dc3da30c1e3a7ac9e2656899ee8ad004600291a845f59fbe13356f0cfb69de3e79 SHA512 3d6e26b674e5496e3a60678fb5b0389a6d83f4fdb519b40f5e6092f1df0023bbfb0e3b5e95dfac9b44e6001b8b35d7104aeeea6c347862313e57cc579110178d
+DIST yq-2.13.0.tar.gz 21695 BLAKE2B e6d75cde2c298c19616647aeb14f1e34b1a68bb4db1b7e6f4e2619166ef10142ebd405d3c21492e4f5880c46a8d42222ce22b08afec492e97102923e6b838e2d SHA512 fd2722450606175b7d6674407c992f1f542b8b2309fcb33d4eb7d6e3dbc6dbc9e04b3dae7c4c649d814fdffaa18cbd50472672f1d1357fc58c5306de082b353a
 DIST yq-2.9.2.tar.gz 19177 BLAKE2B 038d813679d3583eb863577f317d834f78f614d6be595c96601a06b40c3af5d9b04234381529012328a45984b183376e0647a6b09b8a87642f8e688e39ec7a7f SHA512 a526407f4f34e9c2a0acccaf38207bbe328468419450efaf30171493123b7715c2e6dd6799679220b07bfa7bc9081ac5f758f833ddf05dfb5e1fe14286baf45c
 EBUILD yq-2.11.1.ebuild 1160 BLAKE2B 30d84041cc2929fabb76b6b7839c158d3cf97b498bf52b41b2cfe0a316fe8d3e12c0750631872c9f0d5a197caebbbdb2ba2f82878c320c2dc9f2b68e5911cde3 SHA512 00c0e8f5287b367945b0e1933892e7ba149cf4fe5b1426c4516589ee2145b54cb791065e5d692fcf87780cc5a6c010a85b0320373af820263e5d32a86b38ec7c
 EBUILD yq-2.12.0.ebuild 1159 BLAKE2B 62ffa38711ce983dc1fcf3781bc818421eadccf1092027bd4a751f487afc3a283daa9910cd89b8752699b6e06a95d413394b6332b3e3d023de7919886c24c872 SHA512 ebba91ba965089a9d4ca7bae013ae2ab3e225d5c507e57c650e722c3c80fe1768fcf65772eb1edc158d749a13a8d437e3312d7577dea220792ade89aab90af96
+EBUILD yq-2.13.0.ebuild 1130 BLAKE2B 0fb7c0e006fce21126bb1316691dd56b5421cdd43f0224ce6f1372d4e1b23b541b6a6d9efee718bb63ce5fd48dbf9a089a68320316b05ed8cf1136cde409e57f SHA512 a46165b9afb3934b7039fe60dcf2d0fbd1120c3874213c01fc0ad9cf79c0814bd64b22e8efd4ae654e9ad1e6ed623c0ba69084276c9c740bceb8318faa3ddcd0
 EBUILD yq-2.9.2-r1.ebuild 1093 BLAKE2B 02dbdece9adbbd784011f5cfde704ea8d1f290d9218c99991a84bc50e6b45aedab7c6044a0bd5dc6859f3da3a3e809c7d60955b81437ba81bec6ba67719b61d0 SHA512 ed79ecbdbbda5e575d855a7ba21dac4696e539e99415a2621da290be65f11f58be4a4c839ca692847917319ddf4965c3a8c9756244239948d3fc9304d723e15c
 MISC metadata.xml 444 BLAKE2B 43250e8368905e7c7613ef6d9555abe4ee58c5d88f1d94dc2fc6d26c99cc71e0253ed830e82356a7cae131c0d8d70397da5e5c6fac41a11a4ed5f18879a4aaba SHA512 f14ad6182b3a82311473ff28308f9f435c2a9ecbf2f1fae996f82366d7547421923c2cebfe255574c3bc57b3d3774ed19bd896b6dda5be1d919d372e1428a143
diff --git a/app-misc/yq/files/yq-2.13.0-tests.patch b/app-misc/yq/files/yq-2.13.0-tests.patch
new file mode 100644
index 000000000000..83e77ed97f8e
--- /dev/null
+++ b/app-misc/yq/files/yq-2.13.0-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/test/test.py b/test/test.py
+index 6ec5e78..558187b 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -121,7 +121,7 @@ class TestYq(unittest.TestCase):
+         self.assertEqual(self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]),
+                          "a:\n- a\n- b\n")
+         self.assertEqual(self.run_yq("{}", ["-y", ".a=$ARGS.positional", "--args", "a", "b"]), "a:\n  - a\n  - b\n")
+-        self.assertEqual(self.run_yq("{}", [".", "--jsonargs", "a", "b"]), "")
++        #self.assertEqual(self.run_yq("{}", [".", "--jsonargs", "a", "b"]), "")
+ 
+     def test_short_option_separation(self):
+         # self.assertEqual(self.run_yq('{"a": 1}', ["-yCcC", "."]), "a: 1\n") - Fails on 2.7 and 3.8
diff --git a/app-misc/yq/yq-2.13.0.ebuild b/app-misc/yq/yq-2.13.0.ebuild
new file mode 100644
index 000000000000..43c89f52a700
--- /dev/null
+++ b/app-misc/yq/yq-2.13.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/jq
+	dev-python/argcomplete[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/yq-2.13.0-tests.patch"
+)
+
+python_prepare_all() {
+	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+		-i test/test.py || die
+
+	sed -r -i 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" test/test.py </dev/null || die "tests failed under ${EPYTHON}"
+}
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index 560bd50b6881..f48e812bdda8 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,6 +1,8 @@
 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
+DIST ytree-2.04.tar.gz 123324 BLAKE2B ec91bedb072c00000be590872c4af71c2f7b2d9b93c4fadc79f22f788975b864e99917a28c19fc7deff1f615e09f7b501c54e7942b0ccca4b38f4cffbecfd275 SHA512 9528f67cb4de6305b46e5ca4d79affab0433c357e58ed936fcf01ee16663924312e9ccb3d1bdd9009430a5a253e35ec04b7d52acaff74ff46c6a59904b90413b
 EBUILD ytree-2.02.ebuild 640 BLAKE2B e2820373acc5ac102d42ca42d43b8d781b4b7abfd0d3486776140b08ac32217875f1187e8690c55f36eee53ee243f8717c66ee5ab051728b0c8cc087b96d22af SHA512 0cb439cf671a123c3ae7dc7bf9dbfc646aa66d346ea1e4438ef25d1ebd881dab315882a8c6707d8b5111546d15b7a17a73a45ebbdf01a6502f9184dc10f715ca
 EBUILD ytree-2.03.ebuild 591 BLAKE2B b2bedeeb7551480734547adbd8be55ef7274e62c125b9917234ecefd03f0ca4ea7f2c7c0cf37c8d2ad2ff76d5988a8c5656c37323c85ab2bd58bd9b7990588ce SHA512 701d747b39162bcf6844edffb9026329c74092b741c85e6ccb466a50277434648efdfdeca67b39603506cf89a8571d0e872d4c9bd9753b78e845189c3f1bdba8
+EBUILD ytree-2.04.ebuild 591 BLAKE2B 30e5cce2728e9c6bfb9b41780d5e94287c70c1c959fa50f1707a462f8233c237de799bb83d66252d34cc8e67e6c5fae4c5db78040b366e89b78b3058de83e6ea SHA512 3839d502a724f87cc3fa27d43b0dc7d976c924c98716c7fa2efb4d110511de8b79031385367f02ed7f97d5586f3bd72a63f15023a0d380609f310289101946e9
 MISC metadata.xml 222 BLAKE2B b5daf033ea46a708411a54d1b465effb557d4f48cef8f0f4b6872917da7e8efbc9b69db6e04f6331c7a27b473d1ea83e2bdf54247e7c6b427c94c492e62ef21d SHA512 52f592a4e8342cae9f7a982302b75c68af50523b23b4d8a13b5434b150d3c0e812ba66a13b8d5d093e59b64ccbb550640064aabd9748a200e63d170d0b6f327d
diff --git a/app-misc/ytree/ytree-2.04.ebuild b/app-misc/ytree/ytree-2.04.ebuild
new file mode 100644
index 000000000000..2375c16b90ee
--- /dev/null
+++ b/app-misc/ytree/ytree-2.04.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based file manager"
+HOMEPAGE="https://www.han.de/~werner/ytree.html"
+SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES README THANKS ytree.conf )
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	default
+}
+
+src_install() {
+	einstalldocs
+	dobin ${PN}
+	doman ${PN}.1
+}