gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /app-misc
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
68 files changed, 813 insertions, 675 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7a459d587735..39ca4d5e5c62 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 7f5bfd93a942..27d469a179ed 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,3 +1,3 @@
 DIST asciinema-2.0.2.tar.gz 50058 BLAKE2B db04e21f41b76a7b2be1ca119b2c0a2ff29c9e525c35180d2506722b12c7d139087d0a102bd984cecd7d69e2da0ce8ac0f4bc83c631bc1373fecc8de2d29f107 SHA512 27ae831494c2532270940c3e0fedc87ebbdc1e9d8d24c37d1b63d3f74d9722d38e867fa1b46656249e5b0a84ed7ed32bb21da65f06e9c6a8b787aebdce2068f3
-EBUILD asciinema-2.0.2.ebuild 730 BLAKE2B 898b8a08c8ed1e2b390427ecdcc732e087ca3ee715137d7b1218aaf86c0ea6686f07ad30cc8766855f8c7204c4ba389ac096d009620c99df15b9fa8353b67eb1 SHA512 f738003157210b8497b1941eaa4eef35b7241fbf7580803a565624d89b00e81e7356b03c707435febb0d0dfbbb1227b96985ea909158d93ab92157e33292cbfc
+EBUILD asciinema-2.0.2-r1.ebuild 732 BLAKE2B 0dedb0252028b762e95d81678c8b5df0e16f5994675ae4dffc18c707bc086c7a215aa40752bc4352dd3149208390e3ca4d633e735942fbb7f775085c442e6c49 SHA512 ad99e2a494f5b81640cfa734ae9782a73402fa704d1a1ac777182b4e2f3346e54f00c76aff98e69413fe1c73d89c76487d8ba6d0fd378ca2ff8a7ef5c5836dad
 MISC metadata.xml 352 BLAKE2B a3fc1910fe080d3617e64abfa1d758ac162556451fbdf1500b5b7b5ae0ecc703004483f2e0a322bccabe2857319faf3ad011f75ddf676c950b5fe59a5feeda1e SHA512 382168389e0950d78c6df79b6ad6dcf8bdf54fc9f877b23dd1e69c3983e931590c82a26694279b83834121af33a4aa8915a9c1907da2bd617b895a2cb4c31d74
diff --git a/app-misc/asciinema/asciinema-2.0.2.ebuild b/app-misc/asciinema/asciinema-2.0.2-r1.ebuild
index 69f56e93857e..7d2ce682dbad 100644
--- a/app-misc/asciinema/asciinema-2.0.2.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 inherit distutils-r1
 
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 06907f1d466e..93dd16030405 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,5 +1,5 @@
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
-EBUILD binwalk-2.2.0.ebuild 1092 BLAKE2B db452b4618caf31f0e300050a17acdd8aaab0d32cf29afd2d5e52f7111fea43646883f2f20cd7a1620aeb4e71e81cec8b9d939322cb4a1b4b18e88074a28a6d9 SHA512 4cc01682cf28ed289e82f18d3d0d75fef421cb2c9b1f7c02bab834c0d247ba963c1a8c43c430452134da8a3d9a993e91ffc298eb9c7d0f8817108e4c9349f4be
+EBUILD binwalk-2.2.0.ebuild 1097 BLAKE2B c182a38834540bb955ce3ab23a818f95827abffdc74396819c37a469c30cc7b8f0096b55463c0e132882ca9e106762eb6677e87797130617a2ee442a89eda333 SHA512 51583644e30c492d7c7b1e48a6c0c7668a83a977110bf24ba88913fbe1c086dfb7e4bc1df0aaf2f36c02f8c8654c1481f3bfe4b48a11cc96228a57acd06a817d
 EBUILD binwalk-9999.ebuild 1089 BLAKE2B 9749014009bb0d2089dedb95f67fa594c299db27a79f917c8c974842f2a3d7dc7137aaaba48493423d250a5ddc75277836436f64d980e933283c51ab25cf0cb8 SHA512 25017f7e1bb1c6f0609312fa06953e16ab9b936b0a5cebb4029f57b1a884faf502a5e985384e7d71742fc2df60c37a4c270bb63bf8ced47bdebd1125bab6d34a
 MISC metadata.xml 910 BLAKE2B 2be4408e8546fec32d55527a3cda95fe5d2dba9a08db3700155b317a6a3c634d20ab9862e0459efc0a0bc4563a026b600d50d6a058bbb404c8edee83b73e3e84 SHA512 b080a492253731e1048dc6e263b257b601a6e20851e1399ae6e95b8794433ae7b8fd304f00d276582b2b1fd6ff605b45d3c370130293bc3488d57d557f2aad9a
diff --git a/app-misc/binwalk/binwalk-2.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
index 5bafa3ef8610..b396cddd2323 100644
--- a/app-misc/binwalk/binwalk-2.2.0.ebuild
+++ b/app-misc/binwalk/binwalk-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64 x86 ~x64-macos"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 9eaf75310db5..30d576ceaa2d 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,11 +1,12 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
 DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
+DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 593352912d2b490e3f46ea032ac1ddf1c87a7ac93859d475461cbba490918cdec853b0bb30bb253a634d8d597ca6f0304bc81122b4b31b5b31fd6a80e1faaf33 SHA512 a824209fa0ff0865872a07d8e6b901d8407f599243810fd5c820e1f69226e05b0b4f1e25e5ff3d8d398ff952529084442f026e32220961f359f6323f6bf03373
 DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
-DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
 DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
+DIST nss-3.62.tar.gz 82159506 BLAKE2B 9abd7504766fb57214a16608a7299f8cf6d25c9a4e285665eabd812bce536ba244b698de31fd53796148f3856e4bee6c8a03ce5b6c5234a9337d7af8f300f007 SHA512 7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
 DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20200601.3.53.ebuild 5591 BLAKE2B caeca6b6ef04f9cffcd09f71a71e60f5a0bb83e2a17d250b7c70509d7b7c5a0157ca73551b3195f8e896967ca7693c286d654924a7e928a32588b4548169f0b5 SHA512 50173d5d27dea6a7425d59f05f7d6739a0c247ec171e641af26197746f28257fbdbe1e84ed2596a44bbf5ff2417e9e8526271cc6f552ba960ce95b30b6406f94
-EBUILD ca-certificates-20200601.3.59.ebuild 5600 BLAKE2B 9745244af02f8be68ba8f055d4f5c4bb5c1bcdd071daef8beee5c56ba00b10f6b57ea25a016d76cbba4fb7ab496727011fdb9b27b3fa120711bcf731e05e23cb SHA512 b72089184394cb71bc2de8cfe9b12944989b0fd0f1c50c7955f823c7d13d0fd1cc430d2d8f502f0fe338ebd002eeccc9f11d96e6d9e5f8dc7242b96d7bcc1233
 EBUILD ca-certificates-20200601.3.60.ebuild 5736 BLAKE2B 676fdc86a69b8154d0cfe00d003d9ccc69092d62c2434ea641a10a2783562ece7662c9bf59789127acf6cca6870eb3f6388eeaeb3fc06d8978e091aac8ca92bb SHA512 f9ee82f49030ebdf44d4e399bdc8988e2bf4ebbe80a9dde88c192bd986ffd6305008d360f9a8ebe0795bf34af57e49ef451666f14cfd890f299e1d1ca867dad4
+EBUILD ca-certificates-20210119.3.62.ebuild 5736 BLAKE2B 676fdc86a69b8154d0cfe00d003d9ccc69092d62c2434ea641a10a2783562ece7662c9bf59789127acf6cca6870eb3f6388eeaeb3fc06d8978e091aac8ca92bb SHA512 f9ee82f49030ebdf44d4e399bdc8988e2bf4ebbe80a9dde88c192bd986ffd6305008d360f9a8ebe0795bf34af57e49ef451666f14cfd890f299e1d1ca867dad4
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
index 65559a6386b6..2f777c592fc7 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
@@ -16,16 +16,15 @@
 # When triaging user reports, refer to our wiki for tips:
 # https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit eutils python-any-r1
+inherit python-any-r1
 
 if [[ ${PV} == *.* ]] ; then
 	# Compile from source ourselves.
 	PRECOMPILED=false
-	inherit eapi7-ver
 
 	DEB_VER=$(ver_cut 1)
 	NSS_VER=$(ver_cut 2-)
@@ -45,7 +44,7 @@ else
 	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
 		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
 		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch
 		)"
 fi
 
@@ -55,20 +54,24 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
 # c_rehash: we run `c_rehash`
 # debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
+CDEPEND="app-misc/c_rehash
 	sys-apps/debianutils"
 
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
+BDEPEND="${CDEPEND}"
+if ! ${PRECOMPILED} ; then
+	BDEPEND+=" ${PYTHON_DEPS}"
 fi
 
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+
+RDEPEND="${CDEPEND}
+	${DEPEND}"
+
 S=${WORKDIR}
 
 pkg_setup() {
@@ -79,12 +82,12 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if ! ${PRECOMPILED}; then
+	if ! ${PRECOMPILED} ; then
 		default
 		# Initial 20200601 deb release had bad naming inside the debian source tarball.
 		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
 		DEB_BAD_S="${WORKDIR}/work"
-		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]]; then
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
 			mv "${DEB_BAD_S}" "${DEB_S}"
 		fi
 	fi
@@ -106,7 +109,7 @@ src_prepare() {
 
 		if use cacert ; then
 			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+			eapply "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
 			popd >/dev/null || die
 		fi
 	fi
@@ -137,8 +140,10 @@ src_compile() {
 			|| die
 		if use cacert ; then
 			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CAcert_Inc..crt \
-				"${c}"/cacert.org/cacert.org_root.crt || die
+			mv "${d}"/CA_Cert_Signing_Authority.crt \
+				"${c}"/cacert.org/cacert.org_class1.crt || die
+			mv "${d}"/CAcert_Class_3_Root.crt \
+				"${c}"/cacert.org/cacert.org_class3.crt || die
 		fi
 		mv "${d}"/*.crt "${c}"/mozilla/ || die
 	else
@@ -169,16 +174,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
+	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
 		# if the user has local certs, we need to rebuild again
 		# to include their stuff in the db.
 		# However it's too overzealous when the user has custom certs in place.
 		# --fresh is to clean up dangling symlinks
-		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
 	fi
 
-	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
+	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
 		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
 	fi
 }
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 7aae2ee350cc..672c49e4c9ba 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,7 +1,4 @@
-AUX ckb-0.4.2-gcc10.patch 868 BLAKE2B 67c3682f6aca611fd0955ab157e7e5b9a7ffd94a9acf45c12f2c8c0fda64de71e80939eb1a500331c8df4efa136bf031199fe4b5698aaf337b154837b44b135e SHA512 b0ae75c0be22576773adea5c0ecae8bae2b957de569a8863d31dcff2f29444941d50ca17e09d87e13d31c064191e0bff630b5f90cc606c0e24d6beb4d7b58cd7
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
-DIST ckb-0.4.2.tar.gz 883681 BLAKE2B b3d921010b1caa8cb870770c6cf3ff0e9f6c65ea742325995e26351331e3063a16e8a391f593bfc8b16663cef0580e087d776796ea69776465122b08e00e9382 SHA512 4c80101e935a4d5137b0fd6aaf7d97889913af0bbb8e3097e035e2420043d6525094c1e3f7b5676e8c50328454251ff3260f6aa9b81ec583a2e8136333ee6af8
 DIST ckb-0.4.3.tar.gz 1588845 BLAKE2B bdf11580c8224dfe0a7d01f99e3bea1d36fa3d7c1de84ec991ee4454c838db614bd74757ec3b952d28ab672244bb4c28888f6b80366255cfb57ec37ff8742c1d SHA512 6772812fb9608251f3a14efeb16960966be446462ab3f5b1bec896761aeae9e5f5cf9c07b21e509dbef057825c3017323f82f066519cb512ebe2fc6eea6ec217
-EBUILD ckb-0.4.2-r2.ebuild 796 BLAKE2B 9bc343aa665e14200c2700e23517e735546e0ebf723c60d222297243af360c2a608ef1284a9df50692758f5274870c73af3154f6cf2a0a13b6cdb6fbcbb6452b SHA512 7a46d2b0deda858e4f3e4b64433e5d64497114c8cbe3ebaa8ea3046dc6e7e25104f906fe1c1456f1ef1fb3d06d8a0a582c14084bf1ad37c2c344d3807fed282b
-EBUILD ckb-0.4.3-r1.ebuild 1148 BLAKE2B ce766e2161c63520acb6dc9c62d71d847cc76b4bedb3fd7b8dae73bad21a4569fa6de344114e954e5b1228a719948ac5a05623909a590a4156b92080ce5b1a49 SHA512 94191e1fec557ab2046ff224e2809c61c25a93eb08dcbba24e1acc50b73670c200bb8a6c37d2ed1b918acd44fef3ace47831649138f3827741114806dd634e90
+EBUILD ckb-0.4.3-r2.ebuild 1151 BLAKE2B 26119621c4d58064209a92df8816fa3649fe6d09bb355a8faf2c3a31bc1b9247a747106d26d4c916e7641ee261531c609e5e73abd50ad45a871370c9082df253 SHA512 5a473d8136bfafac3cf82848a696108ca518d2873b8174d4ecf1b18d68e6a0b64713920e48bf7094634675a727f19fac8d22fb69c080408d349ccb24248484a2
 MISC metadata.xml 319 BLAKE2B 413fd0ee948a3bf39044251e819bbf2e10c2896b857b8079a23fe46d8639ddcc7c1c7289c8d3a6f8b9a82cb05e65b38298fabe4359c27497a7aced8fa97d276f SHA512 a878c93cd07a39758b418d7884df552a6741805d148959487d0b0114fb6e5476a718b637b02526310b810e153b0e027abafef14d4e3fd981e1ba1ba88bb1fda2
diff --git a/app-misc/ckb/ckb-0.4.2-r2.ebuild b/app-misc/ckb/ckb-0.4.2-r2.ebuild
deleted file mode 100644
index 6cf15eba6ad5..000000000000
--- a/app-misc/ckb/ckb-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ckb-next/ckb-next"
-SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-libs/quazip-0.7.2:0[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	virtual/libudev:=
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc10.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_UPDATER=yes
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc CHANGELOG.md
-
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-}
diff --git a/app-misc/ckb/ckb-0.4.3-r1.ebuild b/app-misc/ckb/ckb-0.4.3-r2.ebuild
index 8d8485e09da7..296ba6dabec8 100644
--- a/app-misc/ckb/ckb-0.4.3-r1.ebuild
+++ b/app-misc/ckb/ckb-0.4.3-r2.ebuild
@@ -13,8 +13,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-libs/libdbusmenu-qt
-	dev-libs/quazip:0
+RDEPEND="
+	dev-libs/libdbusmenu-qt
+	dev-libs/quazip:0=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -26,8 +27,8 @@ RDEPEND="dev-libs/libdbusmenu-qt
 	x11-libs/libX11
 	x11-libs/libxcb:=
 	x11-libs/xcb-util-wm"
-BDEPEND="dev-qt/linguist-tools:5"
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 S="${WORKDIR}/${PN}-next-${PV}"
 
diff --git a/app-misc/ckb/files/ckb-0.4.2-gcc10.patch b/app-misc/ckb/files/ckb-0.4.2-gcc10.patch
deleted file mode 100644
index e070471cdc02..000000000000
--- a/app-misc/ckb/files/ckb-0.4.2-gcc10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a9f41cd8b8f5b04c0c66c6d94f96a9725943831e Mon Sep 17 00:00:00 2001
-From: Erik Zeek <zeekec@gmail.com>
-Date: Tue, 12 May 2020 09:56:49 -0600
-Subject: [PATCH] Fix gcc-10/-fno-common error
-
-gcc-10 now defaults to -fno-common and does not automatically add extern
-to variables declared in headers.
-
-https://gcc.gnu.org/gcc-10/porting_to.html
-
-Signed-off-by: Erik Zeek <zeekec@gmail.com>
----
- src/daemon/devnode.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/devnode.h b/src/daemon/devnode.h
-index a0b3a931..349e778d 100644
---- a/src/daemon/devnode.h
-+++ b/src/daemon/devnode.h
-@@ -5,7 +5,7 @@
- #include "usb.h"
- 
- /// Device path base ("/dev/input/ckb" or "/var/run/ckb")
--const char *const devpath;
-+extern const char *const devpath;
- 
- /// Group ID for the control nodes. -1 to give read/write access to everybody
- extern long gid;
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index d13e19be61db..acccc6bf6d07 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -2,6 +2,6 @@ AUX dateutils-0.4.6-unportable-sys-sysctl_h.patch 230 BLAKE2B 66d3e0f227e06eef65
 DIST dateutils-0.4.6.tar.xz 640552 BLAKE2B 7f1b5bef1465063f46a7bc4b64ed1d645b3bf827aa17b7c962bf3e2731a031f8cf074970aad618157283f0303222413c7be80a72bdcc65bd0918120216542295 SHA512 014e8411774250d2862943bbbdd69cc7ec2ca934349272ae7c44b136a57ef30c23f841018cc38f86d49e2348b2199848076db224e3653d6d7337a3f17709c8cb
 DIST dateutils-0.4.7.tar.xz 649932 BLAKE2B 710c22d63fe3c8f77c69c97c405d3d4aa5c51de3d5768076ca24f8b2be0d6033ae652825e528d99c36f382e25c4e0a60eaa7cb9eec58f6b814d60d513b37ce7e SHA512 480943c32585efd8f42958d6e7d3304a37568f2134c9561d6e0b38f4719fd149ec7e55c559a5e73e97e1c9d217f3d53fe76a7e6a9d3114c040915ebf48db4666
 EBUILD dateutils-0.4.6.ebuild 798 BLAKE2B 656721cb90bd9e00e46a590312c5600acacbaf4d7333273e86f55ed7b70a54e7e81ea47a6e63a4ba9290f4b4588a267376f9dd1d7a1b84ae6fc57ce4e5f1048b SHA512 fe670bd080919f910e96d570ef25d122fc243d2ae63782698085151f2900f41e5331a430ee9db1764c5d40e0fead91c5a4cdfd33e5c8f3fdab836a2de4d79fae
-EBUILD dateutils-0.4.7.ebuild 806 BLAKE2B 6c223263ec7856f78060555f67fbf4d285a4877a3c40cbf30963ab8c3a9a89a86894db2e8624892304edf16e3faa09d90bec06a43089978b89652749f446820a SHA512 642a07707ab0ff66a6d77a20321645930000fe338175639923e068887cb3f1bd40228bda64c00cbcf6397d921fa34deab771a2060816086481ee23bcb16f4ecc
+EBUILD dateutils-0.4.7.ebuild 804 BLAKE2B eba3a0dc5309e16cfc00e237b35cf8be8b93f5eca7e7c5afa24eb155e67ee6363455bf31b64062544e0a12f3838acee3231ad8fc73a76b87637b58b1ddf05053 SHA512 ede4962055b614988a868738028129c42ee78d3b6e2bd6a644e319af5f1da447f520663a34072ac143a46d2faa2ea9da62582004549aeb8c452fcafdc5f9ba89
 EBUILD dateutils-9999.ebuild 736 BLAKE2B 795e03b4a34d334b98ebf2fae42a4ac0ef4fcf3b3e477006fe6ca06ede93483882fff8ac337f51d71a2f1ce33fbb1d2b753e652cbabc7903f39fccc685c6403c SHA512 09cd4bd1a2d8d99de4cc2169d8af4136cdb8b1bc2593196d12b95bf6021e994f74ce9e9e8a2fc25fed7f1ca97b26496d7cd2a58e9d8321bc5f5c3eafd6243a8e
 MISC metadata.xml 851 BLAKE2B 91eacf1cd8fa8e0a8455fc5ee60ada4bbb360eb7dcc40b1b1e4339ad7c6e0a56a07ce0682e13903a68a642a2ceed812baf30b061614647a61c069a68bd462ff4 SHA512 4fb4cfaed3812b0d35c2a467a11240561b96edea8a86834996353ac35fc2a281d72f27cc7f32f29367ec68fba3fa2fc942e0256b9d968b91cf67a450aa40ac21
diff --git a/app-misc/dateutils/dateutils-0.4.7.ebuild b/app-misc/dateutils/dateutils-0.4.7.ebuild
index 88466aa59af9..8efc3c6c2dd7 100644
--- a/app-misc/dateutils/dateutils-0.4.7.ebuild
+++ b/app-misc/dateutils/dateutils-0.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ case "${PV}" in
 		;;
 	*)
 		SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
-		KEYWORDS="~amd64 ~x86"
+		KEYWORDS="amd64 x86"
 esac
 
 LICENSE="BSD"
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index 140513388397..568b3a602110 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -6,5 +6,5 @@ AUX detox-1.2.0-parallel.patch 1120 BLAKE2B bccae5f969e1127b8819a5542354ea2aaac7
 DIST detox-1.2.0.tar.bz2 86118 BLAKE2B 2dbde6ebd98b59c18c60f99006731484dcbc698ab77b56991f2af94f4ad45da141046975af47b66242ff42d4e3a8bb3b515d4b70ba30f12cb1b8ceea5832f52a SHA512 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a
 DIST detox-1.4.0.tar.gz 106361 BLAKE2B 5993ded30282a16a81481885cdee41fe0b1c2ac34e5f389b53981e098d13acdfe367c7de462436fe3a4ee8ff86220f4c69d54a47c1122a0f39bde12c4d6ec908 SHA512 9486056b3b58dbb5ae16bc461586a997f8990ddb6e0db5ba561df862c16dfe926911fd09f065ef2578d39c3e3f1a267be201f865cf3f6b576c01910bda39cecb
 EBUILD detox-1.2.0-r3.ebuild 993 BLAKE2B 0ecfb0ee6437c8d45be1eeffa7a35d63bd60a49fe54b1bf53ca29977f611e9cd094b79ab92e9135d319505e305b7a24804043841f02da5450b4124dc768b003e SHA512 8e631cf1e4918543ae6c92dd05aca05b268385dc95b465c3249a17f8e6b9a7091d6f5c08f617722cc2ee22e62074fffc0d5a801cfeb6c5e75bd903986468f5c8
-EBUILD detox-1.4.0.ebuild 754 BLAKE2B 9ffdaf8ed00ae146f2902897eda10849260ec7d839d740c54f7268fa823ee19c69c81731126bc8a27b3fe5a88df842fd2ff92e498c2de271f936579174010b6e SHA512 500bd7cb2603534f3b32f4dbb5b544ea11ee7f63d0c32a055dfae0fdfca74b065dfc2157b5eed4a19b49225a88ba2369a311fa92bb59119bba74b261ff9c36a7
+EBUILD detox-1.4.0.ebuild 761 BLAKE2B 7e57e85fcd74bb94348441557a3ee1afc3885855a675e588fcae59af1e9b10c0370ad7ef272fe2fadba13a381b49da3d9f6f0109ef5b3ba942f6f6ea0df305ea SHA512 8eb75960ac89da5831fd390d0c5008cf9c1184cdab3d1854dccb69daaf8a259eb72ba3c6ae96354a90c430a5ce9758f5fa17ab3a6e7362b4d74cea1107680566
 MISC metadata.xml 340 BLAKE2B 448af504cf3e5e2d644d5a7551d5a0e7775f95601c06704584df7be0fe68060deddd9ad41e04e6240c346bb37a7f6017f5ed54e999ecb36efda481463a10388e SHA512 22cb6a81a6b5001f6ebeae252400eb4a7568a6baf028413d1eeaccad3de9b7b2e5c4d5a3f9e0cd4c87567a2135e7a4e7d0796d2efc377f2f26ddf0b555713943
diff --git a/app-misc/detox/detox-1.4.0.ebuild b/app-misc/detox/detox-1.4.0.ebuild
index ab367fc95870..7a6a540e4cee 100644
--- a/app-misc/detox/detox-1.4.0.ebuild
+++ b/app-misc/detox/detox-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/${MY_P}
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index 87425b97c27f..063efa7c0605 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -1,12 +1,4 @@
-AUX fdupes-1.50_pre2-compare-file.patch 2002 BLAKE2B 235dea1ccd34b5c75bb289af920fbc51151703ff81ff9f7bc31f9f9fc1c243791fdb1e3c7c6439b8f5ec45a7985aea2fd87df92394346183ecdba4750bf4ee35 SHA512 53a61081cf4f0cde8ec98926edea6a6d46864b0b48f30c2112148f1aa92971b3127dd04a55689a9ba408d52a43ff0a6ebccbe5f1ff918e83943c942beca086a3
-AUX fdupes-1.50_pre2-typo.patch 675 BLAKE2B 790bc07cc4e83a3dfc8736417d8e5eb5c892ef6d4eb452ead369ef6e700f530e45e0410b2b03702592032a78207f700a812673abf75d1cfe6387e0952ce9885d SHA512 fdc313c2bfa44c17bc30f2f001f06b818eeea7fddc0b2c6a600b4694cbaeb53aa4fcfd93a7fe6eb0b6d48297b1a8654481f8efa57e2a78908e75b35df5959619
-AUX fdupes-1.51-fix-stdin-lvalue.patch 585 BLAKE2B 15bff93ab94497d4cafa27baa27fd8a214a16efb7a90d5d42926141b4a02e5fc36d0b353eab93ffe8ef512f6039deb81e1448e28a259f87d78459db50d1ecdb1 SHA512 87ddc27a1125a5500be9120781d7b7b695f638af6219498e200d375bca5b98f009d25905ca7d72dde7ebea2bd58a4e23db48843eef5dabeff6cb95194e9bc7c1
-AUX fdupes-1.51-makefile.patch 779 BLAKE2B de015e63777f64b2f798eb61314f71e3b66a91f2c8360a63ca7a0078df21d9fb9b01a9adc8e670f70545946ba7dd594287e701ca31caa1f34b57d4c8ee2d99db SHA512 965b8eda17f52b822657373f3aa6d624900477c43d50fd507f853ffe10764184dac6c0f46cf40cbe371eec69f12434a63b49759c94512896640c9001641d0a8d
-DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e9445fba6c46bccbeaa471ebc776b9deb18b323c6eebea4f231bdf1503af9010cbe83b6aae2a3efe479c3a49c SHA512 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
-DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
 DIST fdupes-2.1.2.tar.gz 142266 BLAKE2B caf949b87baf0fecc87fef58f512d0a99e1219b57bc167992b0e40841ce67e5ddcf5307de7fc9c70f173e75aab4a12eb86abef0084084b5119f95326509ea665 SHA512 9c3761e7ce34f2d9d1b5ee49ebc3bf665e3d45e4146231bc77d7416801fbfa70415e80c81c64962897766ee068d1a103609895d783f20a765c351d4cd433323d
-EBUILD fdupes-1.5.1.ebuild 967 BLAKE2B 4194d5858cc9f677391c7129a14cf654dbe8b85feb59a0b52d8247b09692433aa5be075dd2f5a1523c4b9e9eaa9d45900d9db3742a779ba5b7a3b17c44e45f3b SHA512 8138668d8cc7c9748075f13f6c384597accfe73ef1ca33d5ca547c67e19c4bafde2590515695a9d224ce95001ec7f11ff3d80eaaa4cb9d650d343e3091fbd41d
-EBUILD fdupes-1.6.1-r1.ebuild 781 BLAKE2B 5a06c5e3e377a4ff287b037b909badb8c796b0b903b88312202a1f153c35b185fd3fda4833f7e2b7807b424442fa4185a512c9a3c226abda55424b0bb1a9ea88 SHA512 94926bdd838eb754e4f59ab049f45e377ef9485c17970a67d8e52cc3ce9713e64a97261a0f93ddaa7e09b4a507b380c8af4566ed1c26bae0b99ef09c2f5895ab
-EBUILD fdupes-2.1.2.ebuild 774 BLAKE2B aa48150134e666136d41b5a29db3afd8ef08d9315b8ef65409762e2e2481d1cf8d3df80407d385f1d5e14151617b55de444b636050bd3c7c5421e04fa766741e SHA512 c2e383f68cfaa5d5dda001b844c0fb08862721da228451c57fe4d50d9bb485181efef4fdfb922d038b725c910815bc46505dfe8e08ccd6389334db446cecc991
+EBUILD fdupes-2.1.2.ebuild 767 BLAKE2B d8d5d28325ac80d0462e6af09d84dd8f97dcf8f47e000211d94bb4337c5f87efd7957b1e76d3e2631b0e5887d6363f106eaad1d4c1e0899ec88698016f3a1d98 SHA512 424aaff6d4b6093ff47c55aa7037c9b2c6fe6f46f4c006a49208aa9192f06003b26f24c9a62e1edd92303744350f762213418f1b50a006994f0b5c218db387ee
 EBUILD fdupes-9999.ebuild 973 BLAKE2B 59e4bab5eff1a0d8bc82d6235c282272110e35056092e6a3ed35e5d88a2a87eab5edb4757d256a03fb464c55db2b089d5aa7933f6fca1846d381e6cf79709a70 SHA512 d7004dd32acd802cc3bccad9b7d229bc669fab5c3075f51d0f99ce9200ed5ba8e624244bf92770a7ceac559eb8d06b9c630350614bda345c885c455753590d77
 MISC metadata.xml 353 BLAKE2B 39808fa78e13623faaeb1acf023d3bba06fb38635f315144fe9f0713b209e5c31ba36073f03102bf55fbc216c00347cef077f4ddd9e5fe585104bbeac954ac46 SHA512 a918f701cfd176d6281ce0703be9ced24bba96090d0c6ed0647e20909cc420336506c943cd5e82050ebba4618dba28b8543afc9baa394c35e5bcdd3d7ffebb8c
diff --git a/app-misc/fdupes/fdupes-1.5.1.ebuild b/app-misc/fdupes/fdupes-1.5.1.ebuild
deleted file mode 100644
index 8202ea8e4789..000000000000
--- a/app-misc/fdupes/fdupes-1.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P="${PN}-${PV/_pre/-PR}"
-MY_P="${MY_P/5\.1/51}"
-
-DESCRIPTION="Identify/delete duplicate files residing within specified directories"
-HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
-SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/${P/5\.1/51}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.51-makefile.patch \
-		"${FILESDIR}"/${PN}-1.50_pre2-compare-file.patch \
-		"${FILESDIR}"/${PN}-1.50_pre2-typo.patch \
-		"${FILESDIR}"/${PN}-1.51-fix-stdin-lvalue.patch
-
-	append-lfs-flags
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dobin fdupes
-	doman fdupes.1
-	dodoc CHANGES CONTRIBUTORS README TODO
-}
diff --git a/app-misc/fdupes/fdupes-1.6.1-r1.ebuild b/app-misc/fdupes/fdupes-1.6.1-r1.ebuild
deleted file mode 100644
index a1e3cc6080c7..000000000000
--- a/app-misc/fdupes/fdupes-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Identify/delete duplicate files residing within specified directories"
-HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
-SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-src_prepare() {
-	default
-	append-lfs-flags
-	sed -e "s#^CFLAGS= \(.*\)#CFLAGS= \1 ${CFLAGS}#g;" \
-		-i "Makefile" || die "can't patch Makefile"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-misc/fdupes/fdupes-2.1.2.ebuild b/app-misc/fdupes/fdupes-2.1.2.ebuild
index 78acd8f3a926..8f97be90f133 100644
--- a/app-misc/fdupes/fdupes-2.1.2.ebuild
+++ b/app-misc/fdupes/fdupes-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+ncurses"
 
 RDEPEND="
diff --git a/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch b/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch
deleted file mode 100644
index fa9e2a34a893..000000000000
--- a/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -urNp fdupes-1.50-PR2.orig/fdupes.c fdupes-1.50-PR2/fdupes.c
---- fdupes-1.50-PR2.orig/fdupes.c	2009-01-31 20:11:49.577968848 +0530
-+++ fdupes-1.50-PR2/fdupes.c	2009-01-31 22:01:11.872219443 +0530
-@@ -492,7 +492,10 @@ file_t **checkmatch(filetree_t **root, f
-   else {
-     if (checktree->file->crcpartial == NULL) {
-       crcsignature = getcrcpartialsignature(checktree->file->d_name);
--      if (crcsignature == NULL) return NULL;
-+      if (crcsignature == NULL) {
-+        errormsg ("cannot read file %s\n", checktree->file->d_name);
-+        return NULL;
-+      }
- 
-       checktree->file->crcpartial = (char*) malloc(strlen(crcsignature)+1);
-       if (checktree->file->crcpartial == NULL) {
-@@ -504,7 +507,10 @@ file_t **checkmatch(filetree_t **root, f
- 
-     if (file->crcpartial == NULL) {
-       crcsignature = getcrcpartialsignature(file->d_name);
--      if (crcsignature == NULL) return NULL;
-+      if (crcsignature == NULL) {
-+        errormsg ("cannot read file %s\n", file->d_name);
-+        return NULL;
-+      }
- 
-       file->crcpartial = (char*) malloc(strlen(crcsignature)+1);
-       if (file->crcpartial == NULL) {
-@@ -577,8 +583,8 @@ file_t **checkmatch(filetree_t **root, f
- 
- int confirmmatch(FILE *file1, FILE *file2)
- {
--  unsigned char c1 = 0;
--  unsigned char c2 = 0;
-+  unsigned char c1[CHUNK_SIZE];
-+  unsigned char c2[CHUNK_SIZE];
-   size_t r1;
-   size_t r2;
-   
-@@ -586,14 +592,13 @@ int confirmmatch(FILE *file1, FILE *file
-   fseek(file2, 0, SEEK_SET);
- 
-   do {
--    r1 = fread(&c1, sizeof(c1), 1, file1);
--    r2 = fread(&c2, sizeof(c2), 1, file2);
-+    r1 = fread(c1, 1, sizeof(c1), file1);
-+    r2 = fread(c2, 1, sizeof(c2), file2);
- 
--    if (c1 != c2) return 0; /* file contents are different */
--  } while (r1 && r2);
-+    if (r1 != r2) return 0; /* file lengths are different */
-+    if (memcmp (c1, c2, r1)) return 0; /* file contents are different */
-+  } while (r2);
-   
--  if (r1 != r2) return 0; /* file lengths are different */
--
-   return 1;
- }
- 
diff --git a/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch b/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch
deleted file mode 100644
index 1615a15f49b1..000000000000
--- a/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp fdupes-1.50-PR2.orig/fdupes.1 fdupes-1.50-PR2/fdupes.1
---- fdupes-1.50-PR2.orig/fdupes.1	2009-01-31 20:11:49.581967819 +0530
-+++ fdupes-1.50-PR2/fdupes.1	2009-01-31 20:32:46.383969471 +0530
-@@ -84,7 +84,7 @@ If fdupes returns with an error message 
- .B fdupes: error invoking md5sum
- it means the program has been compiled to use an external
- program to calculate MD5 signatures (otherwise, fdupes uses
--interal routines for this purpose), and an error has occurred
-+internal routines for this purpose), and an error has occurred
- while attempting to execute it. If this is the case, the 
- specified program should be properly installed prior 
- to running fdupes.
diff --git a/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch b/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch
deleted file mode 100644
index 65c06e3f1ddf..000000000000
--- a/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This is a combination of upstream's fe2d8334 and 03abad.  See
-https://bugs.gentoo.org/show_bug.cgi?id=574610.
-
-diff -Naur fdupes-1.51.orig/fdupes.c fdupes-1.51/fdupes.c
---- fdupes-1.51.orig/fdupes.c	2013-04-20 14:02:18.000000000 -0400
-+++ fdupes-1.51/fdupes.c	2016-02-29 02:45:36.360804360 -0500
-@@ -1164,7 +1164,12 @@
-     }
-     else
-     {
--      stdin = freopen("/dev/tty", "r", stdin);
-+      if (freopen("/dev/tty", "r", stdin) == 0)
-+      {
-+        errormsg("could not open terminal for input\n");
-+        exit(1);
-+      }
-+
-       deletefiles(files, 1, stdin);
-     }
-   }
diff --git a/app-misc/fdupes/files/fdupes-1.51-makefile.patch b/app-misc/fdupes/files/fdupes-1.51-makefile.patch
deleted file mode 100644
index 138914239a90..000000000000
--- a/app-misc/fdupes/files/fdupes-1.51-makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- fdupes-1.50-PR2/Makefile.orig	2010-11-19 19:05:18.152330536 -0800
-+++ fdupes-1.50-PR2/Makefile	2010-11-19 19:06:00.998659992 -0800
-@@ -72,9 +72,9 @@
- # Make Configuration
- #
- CC = gcc
--COMPILER_OPTIONS = -Wall -O -g
-+COMPILER_OPTIONS = -Wall
- 
--CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
-+CFLAGS += $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
- 
- INSTALL_PROGRAM = $(INSTALL) -c -m 0755
- INSTALL_DATA    = $(INSTALL) -c -m 0644
-@@ -94,7 +94,7 @@
- all: fdupes
- 
- fdupes: $(OBJECT_FILES)
--	$(CC) $(CFLAGS) -o fdupes $(OBJECT_FILES)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o fdupes $(OBJECT_FILES)
- 
- installdirs:
- 	test -d $(BIN_DIR) || $(MKDIR) $(BIN_DIR)
diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest
index 610cc7af4aac..fdd444d7e379 100644
--- a/app-misc/gcalcli/Manifest
+++ b/app-misc/gcalcli/Manifest
@@ -1,3 +1,3 @@
 DIST gcalcli-4.2.0.tar.gz 1701050 BLAKE2B a0e310097cdb740ac873049d19d21dc8698afe61c919fd082258864e7170f5ca42a55b4eb211cfa9ecd9b2bef63f3e107839a4e3cad9ec2c278a8529f58ac33c SHA512 2dd39a62e3fd81753f30b77be196476ef366cb6914e62c5de82ab946b7159751a5cbf246aa54eaed1fb6adfef7dbba785d10e29571a454b627b7ff45b52375d6
-EBUILD gcalcli-4.2.0.ebuild 886 BLAKE2B ce527aee99a7c8773d67a7aab8bbeb3a7b348dc7333918a08b8a01cbf957c27ba6b3935c8848f013d50ad67fe123ce54ab201541899ce9cee66f421fe3f732fe SHA512 b0e45f01d9696674af4b97344f5853cab45989e4f79e3fcb3033dc13ee44b7cd715e5b61b7aa35201619c4ebed09c16985883ad8f1f5c9340abc0741918db686
-MISC metadata.xml 340 BLAKE2B 206e5c230d6379249a0cd6e99bc41cd3246cd37dd3766be939b5fea135664b63e9cf1aa92e24f035be65f0553f7f7cfbc8a460391f52119aa1f052399c05ea33 SHA512 4d2abd6d07db32d501923eef6b9aa7752b844745a0511a36801480833dd205adef443bea80efa86d270cdd6d0edda16a9989d678221d0b480366a47a7c76de02
+EBUILD gcalcli-4.2.0-r1.ebuild 879 BLAKE2B a1f169b53c53932c41192ceb704f2a302b5d6d43438f1b9eaa45fbc9df76f5b2bccd2ab752a010a1db78a01af4325b241cb832a0d6adee67c320ad7703b67fad SHA512 fea85cbddbea037c393bd7451199688aefc581db0103d0d7eda8fdb13d88b65401ba922c1e07ca2bb3f5f3124ba58c50555a82a1748f71e2856b590c720803bb
+MISC metadata.xml 412 BLAKE2B e99254f8c98a2e7f658ca5885220cbd6278428bbde1331d8256c6413a1e9ede19b08f8dbc0421ab8bde14464bd1c6f0a2877d2452d713f956fc2ac51d7c82431 SHA512 55d54591ee23936291ef63fec5a7f10b7e11b006bd071c77433570d41b81c5b9639a33b7775a0eff5b54f98b5e10d2c4af411b56b20d44b662194f13bfd9e0fc
diff --git a/app-misc/gcalcli/gcalcli-4.2.0.ebuild b/app-misc/gcalcli/gcalcli-4.2.0-r1.ebuild
index 4d9494ca6015..559222c1bbbc 100644
--- a/app-misc/gcalcli/gcalcli-4.2.0.ebuild
+++ b/app-misc/gcalcli/gcalcli-4.2.0-r1.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-# parsedatetime doesn't support pypy
-PYTHON_COMPAT=( python3_7 )
 
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 MY_PV="4.2.0"
-
 DESCRIPTION="Google Calendar Command Line Interface"
 HOMEPAGE="https://github.com/insanum/gcalcli"
 SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/gcalcli-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
 	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
+	dev-python/oauth2client[${PYTHON_USEDEP}]
 	dev-python/parsedatetime[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/python-gflags[${PYTHON_USEDEP}]
 	dev-python/vobject[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/gcalcli-${MY_PV}"
+distutils_enable_tests pytest
 
 src_install() {
 	dodoc -r ChangeLog README.md docs
diff --git a/app-misc/gcalcli/metadata.xml b/app-misc/gcalcli/metadata.xml
index abed7bc8eb66..3a9f4364293c 100644
--- a/app-misc/gcalcli/metadata.xml
+++ b/app-misc/gcalcli/metadata.xml
@@ -5,7 +5,9 @@
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">insanum/gcalcli</remote-id>
+    <remote-id type="pypi">gcalcli</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
index 137da72e8d11..4cde5fd65037 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -1,3 +1,5 @@
 DIST goobook-3.4.tar.gz 35100 BLAKE2B 8419f79313a68b108f08a0f7a0b6809d01979a01044d011f53acdf554e87f20f3ac41819a4823abd74e1c8ce0350956e91f17ae9a9342551a263af72b7b6c98a SHA512 e58cdee28ee4464548b04800740d0ffd40ce972efd52af9509f3de603eed9e50fad03cc9116f1d0dc42f77621bbab58d73bff98cf35a3cb55b24a0f04b26cd4d
+DIST goobook-3.5.1.tar.gz 38176 BLAKE2B 99a068256ca83e800a2d2e82c88adba85797107dc72edde9fbb3c9790ef38fff627b4db64c21baff14aa8a4c69788c29aeb01dae60533c7f389352aee9401e9c SHA512 58d056d7d76843bc874e55424912bb00068541e674b780511b7753da31f2df9514baa188017dd0a7479b5527cd50c47e35f37afc493bdc973e0eb1624998a611
 EBUILD goobook-3.4-r1.ebuild 1179 BLAKE2B 36a578f5d47e8e327d660c8a09634a3937e4f1e8282123ed07a74ed394aa98b21a36304d1991bbd43b327cda20669f82b0a78269d84af1951787d926d510c39e SHA512 2eb41761a72a33a0a6422ba8066714fdf907df7daf9da51728f3a594724cef204f9ad6edaa9cbb586aa9014cbfdfa3d081579c663a53b7beb2a2397cb5ed25ab
-MISC metadata.xml 453 BLAKE2B 000e304e5d8f67c8f2b272b75a3f501e5b73366e8ac75f9a1a8f5f7b4c67ef75e8a8f540f3f30b73ea85d9bf290f0676697094ecf55dc11180d84200194614af SHA512 910714efd3b83f29a6b95b5ac13a7c832ae336a6c5bc7505d6ed44a8342ad31b5b2545c63ec25be525a0cf54efb62283d576cfb11947018f75490453a0823045
+EBUILD goobook-3.5.1-r1.ebuild 1173 BLAKE2B cc3747e45d19ea46e390031c0566c415b0f571134c420755bfe3576d0cb25615e83ac1ff02c65348c658ed395ed892d34b64d3de9d6d2b0b01984d8388b8dae0 SHA512 1a588455d84feb5184631a44d700ef2c40f1b12b787a25c3b62e09f4ddfd8461ba738a7c6756717e600a647ff1ba641572f77e5af06b26ce448b8eb1786c3b5f
+MISC metadata.xml 478 BLAKE2B e898a1ca96096dd7ae1bc246db1a5fc938a2319fac72e7fcfa41a42da5f65bcc7628c87f6a59aff69cc802ce39c7ea7172b5af9ad2cb2c1c5c9d8063696efd86 SHA512 013fbe5c11b4a6eabe8313c049f5f82486b6db64f93636ceaf95d1369f56f8cec7f35077415c373bab81adca364afe8f284a945fbe6a95dd55d8c1d4994060dc
diff --git a/app-misc/goobook/goobook-3.5.1-r1.ebuild b/app-misc/goobook/goobook-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..6ea38b8a97ef
--- /dev/null
+++ b/app-misc/goobook/goobook-3.5.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Access your Google contacts from the command line"
+HOMEPAGE="https://gitlab.com/goobook/goobook"
+SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/google-api-python-client-1.7.12[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-5[${PYTHON_USEDEP}]
+	dev-python/xdg[${PYTHON_USEDEP}]"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+To setup initial authentication, execute:
+
+~ $ goobook authenticate
+
+If you want to use goobook from mutt, add this in your .muttrc file:
+	set query_command=\"goobook query '%s'\"
+to query address book.
+
+You may find more information and advanced configuration tips at
+https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section"
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml
index 7502096e1290..da36391e86c0 100644
--- a/app-misc/goobook/metadata.xml
+++ b/app-misc/goobook/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">goobook</remote-id>
   </upstream>
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 48c4f71390fe..4d50e28fbb67 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,7 +1,3 @@
-DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0
-DIST pdfpc-4.4.0.tar.gz 7733136 BLAKE2B e0bae93803561e8d7a96621baef4e8e2d038324dd28c31ce9cc05a8e42dafda101eb7eb2cea258bd66a41dff904c6a95e8c9cb50b236780564b9501edf3aeef8 SHA512 4f5d013ae513ba5f106638401cccd280e1a77535747663963a566c8b9ddc7b87c0ae1859220586ed66d294902674d54cea4256c72320ad3005e3e47cc8ea57a3
 DIST pdfpc-4.4.1.tar.gz 7733986 BLAKE2B 4232dedbda6423e95259169348a36196a539ed966e50a230390a6f99dbff6c9710d0c41be11436005454858a213ff5f07d1b1f26fd67973f20812111eea81d79 SHA512 61db48eae75f0e55f7d7b728bc107827b9f141826c3c55be4fb90faf95eaac2dbef1858eb1b7a3e5980130ee09c4096812a3403451f2a52052c29e4fb7be458f
-EBUILD pdfpc-4.3.0.ebuild 1014 BLAKE2B 5865c6ddb7f777d0e6f0882dd9198030b101c934c6bb2bda06e7b6766225a43e717ec8462db1e1018292862fe5ba05380c7f6223fd83486a1c6189b8eb1824d7 SHA512 34473475f604b45312884eaed52ecafe727499d2bb81f6c857dd4b3ee380dcc06e5130fbbb3cdd329395652008902a4cd07fa3882474103fa1e60a0a0f4119ed
-EBUILD pdfpc-4.4.0.ebuild 1018 BLAKE2B ad2e1b87467798caf25736123a267f6e6b38779ac734a36ebb93f6fc65aab2fd7277a38dbe48282da212a4d6d63de7bdedf882a8dcb9de06b3502427d03ab79d SHA512 8a92dbeeb501dfd8dc1d8fb824b605ab4e6cbab54761bac596ef4acaad9e042e5a5fc4132e007337133e8e2aba2d4339d3ab65e5ec2f1fd5728505e28afe2af4
-EBUILD pdfpc-4.4.1.ebuild 1244 BLAKE2B c8ee12af08a4a0e7830e62bc6b079ba68870c44e58058f6235507484ff6da1f159e6b515239d2c5b7a82b88eaee284f7813ea17ec1d739b6b038256ae0e9958b SHA512 eadfa044d9532a66ac600b5f4886f125550495e496955faf3e08022908f2d56c14c896fa617f14c92940c3f5eeac18a477b1c0a6370d7ba16ab299ecd3a797d0
+EBUILD pdfpc-4.4.1.ebuild 1242 BLAKE2B 0f4c09533bd338ba82265d800dba50f15e6c575991d9a99700567367b0265bf4090b6ad09a9aa3c6324a80fb77b0105620cd024439c01ebc747c22ba29b8cefd SHA512 a94bd059f53ea505c484e660fa894a6e9e0d2186642ce26e064db220e6c60b9a9978278639f080150fe9bcec441681d2d1f9cb7bd70f12e2fe8ab530286004f0
 MISC metadata.xml 442 BLAKE2B 2c0c51b3e75d8e7012fa16b4d289c16c929c15c9967d648dd7d4dd474c930deccd53f39cc6324bca81a697acd700e04eacca5d34f6e66fb320c2b01d602f9b0b SHA512 63c75c7e256649f353b2e0015d9952a7a51c6f49c09c37acc45a1aae6560ee5df0f7969d2bf9c9161a059238b5ba21858e94fc5a3736345d5bf75482e4278fa3
diff --git a/app-misc/pdfpc/pdfpc-4.3.0.ebuild b/app-misc/pdfpc/pdfpc-4.3.0.ebuild
deleted file mode 100644
index 1d5e52835d67..000000000000
--- a/app-misc/pdfpc/pdfpc-4.3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION="0.32"
-VALA_MAX_API_VERSION="0.36" # fix sed line if you increase this
-
-inherit vala cmake-utils
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="https://pdfpc.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gstreamer"
-
-RDEPEND="app-text/poppler[cairo]
-	dev-libs/glib:2
-	dev-libs/libgee:0.8
-	gnome-base/librsvg
-	gstreamer? ( media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0 )
-	sys-apps/dbus
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e "s/valac/valac valac-0.36 valac-0.34 valac-0.32/" cmake/vala/FindVala.cmake || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		-DMOVIES=$(usex gstreamer on off)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-misc/pdfpc/pdfpc-4.4.0.ebuild b/app-misc/pdfpc/pdfpc-4.4.0.ebuild
deleted file mode 100644
index 1aff12796f0b..000000000000
--- a/app-misc/pdfpc/pdfpc-4.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.48" # append versions in sed line if increased
-
-inherit cmake vala
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="https://pdfpc.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gstreamer"
-
-RDEPEND="
-	app-text/poppler:=[cairo]
-	dev-libs/glib:2
-	dev-libs/libgee:0.8=
-	gnome-base/librsvg
-	sys-apps/dbus
-	x11-libs/gtk+:3
-	gstreamer? (
-		media-libs/gstreamer:1.0=
-		media-libs/gst-plugins-base:1.0=
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(vala_depend)"
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s/valac/valac valac-0.48 valac-0.46 valac-0.44 valac-0.40 valac-0.36/" cmake/vala/FindVala.cmake || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOVIES=$(usex gstreamer on off)
-	)
-	cmake_src_configure
-}
diff --git a/app-misc/pdfpc/pdfpc-4.4.1.ebuild b/app-misc/pdfpc/pdfpc-4.4.1.ebuild
index c767bbae520c..6776b1461374 100644
--- a/app-misc/pdfpc/pdfpc-4.4.1.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 #       https://github.com/pdfpc/pdfpc/commit/2a2c9b71467db801a3a0c6e5aabc8794004216bb
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gstreamer"
 
 RDEPEND="
diff --git a/app-misc/radeontop/Manifest b/app-misc/radeontop/Manifest
index 85ebae83f9c0..21f5cc0b5250 100644
--- a/app-misc/radeontop/Manifest
+++ b/app-misc/radeontop/Manifest
@@ -1,4 +1,4 @@
 DIST radeontop-1.3.tar.gz 38138 BLAKE2B 41bc36c571a99a136f2d1c1d5ff1a06b1e99bccb6e01f7432b9867e2700afa9d2b5cab7f743d3560b2120642c98253313e0356af977805ada173cd3c2168acbc SHA512 cc54e0726b2a934d14ad591c7a199474b49885e6122399b282e9289610d26f3c55b3d68a7d655d88a0ff8de1a0ac0994e868fa06ae1198416aaf857a099181f1
-EBUILD radeontop-1.3-r1.ebuild 1098 BLAKE2B 370556635c629c800ed4a55d67c4b99ceecf68712314d11b242a7a02828a85a31dbd4f4deea320dbc8a8f65cd024350b8125457b27164edcb58bc0bdd9f51d53 SHA512 2642b7caa517865d572555b7fa685dab4c82e6aefe15db8cda86d808c8067044e68c4b09540b4ecd8f2ae49499f2ec3246244dfc6626c82716ba87b79f17fd16
-EBUILD radeontop-9999.ebuild 887 BLAKE2B fd1813e82d96b817e2a1bd05ad83df5f4837d4b192c5e726c2e25add63a764b0f05f32fc018145348e0f2b7c30b273bba08929edb78ae7f91cf320fc30aeeef5 SHA512 1aaff2ae8f67872b4a751da8737b9dd704a017a523253bd239f328a5ad5ad711a931831af6509ad7bf208d365beda7d0c756fb45747c702bf54b3505e90b99fc
+EBUILD radeontop-1.3-r2.ebuild 1127 BLAKE2B f2c3a449282e84b39caabecf9c133dd983f78766b0f48d85b4690f11c1128e774cb4dc092082dfcb7703d1597a868781479ea891c57eea5e009a58109bef36f4 SHA512 ee89705660af341058cd9ef25f3f99e78243dd1d835089a0c4359b68092543bf6c43bef0b3c41caa97df92970be6a62974a42cb579f7ebdb0f9ba00f5cd22c81
+EBUILD radeontop-9999.ebuild 916 BLAKE2B 39e2d0f6389253aa19a82cf13c1e84e67d7ea3f0f7b39960ee40544169239baad2091b6b842d77aed6a57d180a59c6ffa273e9e016a85b6b03875d3b1d24997d SHA512 8f7c892e6a4b1af1bbea595e34f55c403e411af2dc4097ce683b3c05a831b86681aca75afc92249ad22061efd95af34247771d14a22e3f3ab11d01cc2914f25d
 MISC metadata.xml 451 BLAKE2B c4ca2856ca2629b92995ade4871f9e8108b33908d6a9909b770dabe48f92cfdaa1a3f3dda03a78dda9ceee1db2c69355390cb737c60b5134ebb38f92608c153e SHA512 20fc03e321f528b1728b3ea4ec408101eac67931240ba5ef88235569b2a80b88856dc974d75264a3f67c720da2963ea77913c6bd88ad06f668aee35fa40e98bd
diff --git a/app-misc/radeontop/radeontop-1.3-r1.ebuild b/app-misc/radeontop/radeontop-1.3-r2.ebuild
index c82aa5733c6a..504d9fd32d8c 100644
--- a/app-misc/radeontop/radeontop-1.3-r1.ebuild
+++ b/app-misc/radeontop/radeontop-1.3-r2.ebuild
@@ -50,7 +50,7 @@ src_configure() {
 	tc-export CC
 	export LIBDIR=$(get_libdir)
 	export nls=$(usex nls 1 0)
-	export amdgpu=1
+	export amdgpu=$(usex video_cards_amdgpu 1 0)
 	export xcb=1
 	# Do not add -g or -s to CFLAGS
 	export plain=1
diff --git a/app-misc/radeontop/radeontop-9999.ebuild b/app-misc/radeontop/radeontop-9999.ebuild
index f8399ddb7e69..8185bf5f830e 100644
--- a/app-misc/radeontop/radeontop-9999.ebuild
+++ b/app-misc/radeontop/radeontop-9999.ebuild
@@ -35,7 +35,7 @@ src_configure() {
 	tc-export CC
 	export LIBDIR=$(get_libdir)
 	export nls=$(usex nls 1 0)
-	export amdgpu=1
+	export amdgpu=$(usex video_cards_amdgpu 1 0)
 	export xcb=1
 	# Do not add -g or -s to CFLAGS
 	export plain=1
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 02f9f1ba1639..f483c10d2354 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1,5 +1,6 @@
 AUX 0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch 765 BLAKE2B f71598d503d5c9981b2955aa1eadf374d7bf00cc1af7b6733aee8009ff7bb20455a6539a7614ec742b4067e6a9337f1dfe713bfc19fb8344af6a43422867a148 SHA512 e9661c5365d2c71fe9f016d936b3d4c844c91cbc9649f877eee385ad894ff03bd3a8e90ecc504aaf1f21c7d339348f22b59a45859fe9b1527113ad7eb39dfd9e
-AUX rbutil-1.4.1-quazip.patch 1829 BLAKE2B 616af9d3d90384c70f717c363dfea2f4a7a3b9ad75438612a92e12997d2239d10860acc17fb8f2885ef6863764257c2756e03d9d2650e1af90e8f097607a3906 SHA512 6e30cfccb30d9f0dd677abd55fd2d53dc2cf8c06aadd8f278d119d1fca5c5a78e2adb84bf32feac37f6d82ba00e090b3693ef4d28c0f3234b8445368f4bd0cb0
+AUX rbutil-1.4.1-fix-versionstring.patch 402 BLAKE2B afe3c79869c926ff04d7630104c0b177974beb9103d729e5deb2e91f183e7ec859811beaf1141084ed9371f9541ec6b3a6e59fbad4dfab5069ab3ab19bc39d87 SHA512 9a627aa68fdd639a33dfcbbe81f86e1a757fc040cef223eb3c0ea1feed2574140cb6c6645c9fe200adc9c8dcf4026e32d792572d3011ad8c1bbf37b9c445033d
+AUX rbutil-1.4.1-quazip1.patch 2376 BLAKE2B 5bf56d8ca9d91e321f3a61b80e64b80a3e227e7cfc46c96d1a6b5b2dbf94f63a3c545f1394df76dcf2562cfdb45d4e19dfdf17896553146c214fbb80a2eb4c0d SHA512 b2b58a21e13af102bddf1be14e506310f9c1f8e03cbf8793440492080ee7868b8e9d664177c6309dd3dd99da1c3898f4edad8fadb484d69590cc6d0bb689742a
 DIST RockboxUtility-v1.4.1-src.tar.bz2 1427019 BLAKE2B b4d5e7e74c46c32138c564ebe5b81233ac47ddabe51241e7c6cfef9d5ca25f85b53166a840e5aadec0e021ad206e5d987c71d617c56aee425ece0321aea5edb2 SHA512 24e4ac7b99618d40044bd8248e6755b40e77e333902ddd898e57b33c50705e97fdc5a751be49f8e5ded445b4f712bdd5310b266ff82680ea76488d8bfc8e17c2
-EBUILD rbutil-1.4.1-r1.ebuild 1475 BLAKE2B aeb6e184759a04c0dea644e140589686125341320d9cb1af0ea539e2d8a8ff3341929e8f83a7c18a3ba6c42426430a3edc343e52cb785559580daca830ddf31a SHA512 cce769fa3152092f1daf2aa260eb609db663275e042b71b96192505b7cce67282efb8ea8f1b67aa3f890e24533921c0fb7840046f28c3789d317a753cc30bc78
+EBUILD rbutil-1.4.1-r2.ebuild 1676 BLAKE2B b7c7a662ce282f9cc8f96a93f3a86e318f035889eb6e15c7c33533a8a0b3b084b2becaaa08ed4353392d653a4296aab1428102e3d6c4f455ebd3e844b716f462 SHA512 071dd21234e5880be514247aea42a35d20d7533cf4ccf379ed0f327c775583b8704734db25f5bacf493b205fcd5b6ea5df92f446ca31648779a2ba1d6004d567
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/app-misc/rbutil/files/rbutil-1.4.1-fix-versionstring.patch b/app-misc/rbutil/files/rbutil-1.4.1-fix-versionstring.patch
new file mode 100644
index 000000000000..f8a1fade7f0e
--- /dev/null
+++ b/app-misc/rbutil/files/rbutil-1.4.1-fix-versionstring.patch
@@ -0,0 +1,11 @@
+diff --git a/rbutil/rbutilqt/version.h b/rbutil/rbutilqt/version.h
+index f0877ba..044c7c7 100644
+--- a/rbutil/rbutilqt/version.h
++++ b/rbutil/rbutilqt/version.h
+@@ -40,5 +40,5 @@
+ // PUREVERSION should identify the build uniquely. Use version string for now.
+ #define PUREVERSION "v1.4.1"
+ 
+-#define FULLVERSION VERSION " (" PUREVERSION "), built " __DATE__ " " __TIME__
++#define FULLVERSION VERSION
+ 
diff --git a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
deleted file mode 100644
index 2feabb771367..000000000000
--- a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-This patch is a simplified version of a patch I have sent upstream.
-http://gerrit.rockbox.org/1825
-
--- Chewi
-
-diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
---- a/rbutil/rbutilqt/base/ziputil.cpp	2019-11-10 06:45:49.000000000 +0000
-+++ b/rbutil/rbutilqt/base/ziputil.cpp	2019-12-04 22:38:34.443112450 +0000
-@@ -22,9 +22,9 @@
- #include "progressloggerinterface.h"
- #include "Logger.h"
- 
--#include "quazip/quazip.h"
--#include "quazip/quazipfile.h"
--#include "quazip/quazipfileinfo.h"
-+#include <quazip5/quazip.h>
-+#include <quazip5/quazipfile.h>
-+#include <quazip5/quazipfileinfo.h>
- 
- 
- ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent)
-diff -Naur a/base/ziputil.h b/base/ziputil.h
---- a/rbutil/rbutilqt/base/ziputil.h	2019-11-10 06:45:49.000000000 +0000
-+++ b/rbutil/rbutilqt/base/ziputil.h	2019-12-04 22:38:34.443112450 +0000
-@@ -21,9 +21,9 @@
- 
- #include <QtCore>
- #include "archiveutil.h"
--#include "quazip/quazip.h"
--#include "quazip/quazipfile.h"
--#include "quazip/quazipfileinfo.h"
-+#include <quazip5/quazip.h>
-+#include <quazip5/quazipfile.h>
-+#include <quazip5/quazipfileinfo.h>
- 
- class ZipUtil : public ArchiveUtil
- {
-diff -Naur a/rbutilqt.pro b/rbutilqt.pro
---- a/rbutil/rbutilqt/rbutilqt.pro	2019-11-10 06:45:50.000000000 +0000
-+++ b/rbutil/rbutilqt/rbutilqt.pro	2019-12-04 22:43:30.144259710 +0000
-@@ -131,7 +131,7 @@
- 
- DEPENDPATH = $$INCLUDEPATH
- 
--LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR
-+LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR -lquazip5
- # append all RBLIBS to LIBS
- for(rblib, RBLIBS) {
-     LIBS += -l$$rblib
-@@ -142,7 +142,6 @@
- 
- # on win32 libz is linked implicitly.
- !win32 {
--    LIBS += -lz
- }
- 
- # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
-@@ -271,5 +270,4 @@
- 
- # source files are separate.
- include(rbutilqt.pri)
--include(quazip/quazip.pri)
- include(logger/logger.pri)
diff --git a/app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch
new file mode 100644
index 000000000000..aa28cc9ea271
--- /dev/null
+++ b/app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch
@@ -0,0 +1,84 @@
+From f9e3ba5d8be99dc78eeb7b21d16afe2955e0a9f8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 20 Feb 2021 18:11:09 +0100
+Subject: [PATCH] Use upstream quazip1-qt5 pkgconfig
+
+Based on patch by James Le Cuirot <chewi@gentoo.org>
+http://gerrit.rockbox.org/1825
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ rbutil/rbutilqt/base/ziputil.cpp | 6 +++---
+ rbutil/rbutilqt/base/ziputil.h   | 6 +++---
+ rbutil/rbutilqt/rbutilqt.pro     | 9 +++------
+ 3 files changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/rbutil/rbutilqt/base/ziputil.cpp b/rbutil/rbutilqt/base/ziputil.cpp
+index b6cfddd..9fa6632 100644
+--- a/rbutil/rbutilqt/base/ziputil.cpp
++++ b/rbutil/rbutilqt/base/ziputil.cpp
+@@ -22,9 +22,9 @@
+ #include "progressloggerinterface.h"
+ #include "Logger.h"
+ 
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
+-#include "quazip/quazipfileinfo.h"
++#include "quazip.h"
++#include "quazipfile.h"
++#include "quazipfileinfo.h"
+ 
+ 
+ ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent)
+diff --git a/rbutil/rbutilqt/base/ziputil.h b/rbutil/rbutilqt/base/ziputil.h
+index 25c3dce..7a6e08a 100644
+--- a/rbutil/rbutilqt/base/ziputil.h
++++ b/rbutil/rbutilqt/base/ziputil.h
+@@ -21,9 +21,9 @@
+ 
+ #include <QtCore>
+ #include "archiveutil.h"
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
+-#include "quazip/quazipfileinfo.h"
++#include "quazip.h"
++#include "quazipfile.h"
++#include "quazipfileinfo.h"
+ 
+ class ZipUtil : public ArchiveUtil
+ {
+diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
+index d5caa77..40a62ff 100644
+--- a/rbutil/rbutilqt/rbutilqt.pro
++++ b/rbutil/rbutilqt/rbutilqt.pro
+@@ -140,11 +140,6 @@ for(rblib, RBLIBS) {
+ # We need libcrypto++
+ LIBS += -lcryptopp
+ 
+-# on win32 libz is linked implicitly.
+-!win32 {
+-    LIBS += -lz
+-}
+-
+ # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
+ !static:!isEmpty(LIBSPEEX) {
+     LIBS += $$LIBSPEEX
+@@ -205,6 +200,9 @@ unix:!static:libusb0:!macx {
+     LIBS += -lusb
+ }
+ 
++CONFIG += link_pkgconfig
++PKGCONFIG += quazip1-qt5
++
+ unix:!macx:static {
+     # force statically linking of libusb. Libraries that are appended
+     # later will get linked dynamically again.
+@@ -271,5 +269,4 @@ unix {
+ 
+ # source files are separate.
+ include(rbutilqt.pri)
+-include(quazip/quazip.pri)
+ include(logger/logger.pri)
+-- 
+2.30.1
+
diff --git a/app-misc/rbutil/rbutil-1.4.1-r1.ebuild b/app-misc/rbutil/rbutil-1.4.1-r2.ebuild
index fbb297fc7fb5..ebfb53deeda9 100644
--- a/app-misc/rbutil/rbutil-1.4.1-r1.ebuild
+++ b/app-misc/rbutil/rbutil-1.4.1-r2.ebuild
@@ -8,6 +8,7 @@ inherit desktop qmake-utils xdg
 DESCRIPTION="Rockbox open source firmware manager for music players"
 HOMEPAGE="https://www.rockbox.org/wiki/RockboxUtility"
 SRC_URI="https://download.rockbox.org/${PN}/source/RockboxUtility-v${PV}-src.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -15,7 +16,7 @@ IUSE="debug"
 
 RDEPEND="
 	dev-libs/crypto++:=
-	dev-libs/quazip:0
+	dev-libs/quazip:0=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@@ -24,20 +25,28 @@ RDEPEND="
 	media-libs/speexdsp
 	virtual/libusb:1
 "
-
 DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/RockboxUtility-v${PV}"
 QTDIR="${PN}/${PN}qt"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.1-quazip.patch
+	"${FILESDIR}"/${P}-quazip1.patch
 	"${FILESDIR}"/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
+	"${FILESDIR}"/${P}-fix-versionstring.patch # bug 734178
 )
 
 src_prepare() {
 	xdg_src_prepare
+
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/^PKGCONFIG/s/quazip1-qt5/quazip/" -i ${QTDIR}/${PN}qt.pro || die
+	fi
+
 	rm -rv "${QTDIR}"/{quazip,zlib}/ || die
 }
 
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 86ee4a4e46a8..64abb7f53fcb 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -2,128 +2,121 @@ DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3
 DIST alga-0.9.3.crate 37838 BLAKE2B cd5e31d9445c5a1e4b4f86f333843bccb5600416b43f5ff5e90540e0ddbe72fde1aadb0a7da81aaaaaa1537a2ca865e262ee828386192c20f66ec28e3e04c6f7 SHA512 dbfbdd98b4fc382e98efd0a63b28fa8591c6c882ad238ea376640ac3362003de0c6fa7997e4001f248710426b330fca735515c3827e7eeb064bdf470aef9086c
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST approx-0.3.2.crate 14288 BLAKE2B 601eb7b83c6f0e41a4d64db5669b7058b4038319414bde74761f0b1584baf8426f9735cd0076d1dde829a056a07e8f820d85737e5b1bf371d9510551c367025c SHA512 3853684c3b1c5c63204304f2e4f1c673b92311125c1df0fc16e96bd6f765e8266079e8d4ec3c85fad933361638c7515d5be18a2fc551353c4097051d0bd96ae3
+DIST approx-0.4.0.crate 14280 BLAKE2B 8508006fd4b31290b4a3e0b26f521af94d5014774b7295705ac5d03099de1d9e22a26c4a1ad3fc0e70d1c6642c30034a7971ed4d57e0de766129213e2d025ac9 SHA512 eb63504a72065362067cd213543f74206fd6ee93d94d12ed5da9d430341b20cb51c860890465a4118ea0ea30baf84013ab81468b73677742af8a6dbb16121568
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
-DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST assert_cmd-1.0.2.crate 25037 BLAKE2B b7fe731a66ce7270b165e30da774420ff17f29a881e738b8b8a9ed37170edc6d0c27f1b052553c408c93b832f879742123b1585abccfde9c7e4b5830d0f327a6 SHA512 1d17d4ac5748a3a44ed25c8788f17bb5edcc15ce0e3f2232dfcb0c88cf735406e1048752473ae76fb033aad6d544c142c699c49e0398d2625e59b36526417f7a
+DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
-DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
 DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83 SHA512 de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
-DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
+DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
 DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
-DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
-DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713
 DIST csv-1.1.5.crate 886773 BLAKE2B c5da00c6d81b3cc1336edbe462cbca59121c3438d41c55148de21a538c5a3a9d81d10da44177c51898dd6b9d027f794fa15779cf0c01861183efed54fd6b95a3 SHA512 d878a953fd1079b1aef7f23108c1bc5db3cadc2e1a1dc1ceb4e26508e4249db01f957f6626eef721153d3b0cc47f5f3b25380e4c943adbdf28647b9bb7cd8f05
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
 DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
 DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
+DIST downcast-0.10.0.crate 4923 BLAKE2B 3e69a1dcd0f2ad487273775b304ea6fa26f225eaab012219072cb5ef3ff60931ff3ffd616e09f3708895b2d01538c8e46e3e91aa1f4a288bdf910bdc7043acba SHA512 f618ec81bcdf74e8851703c6dfe92b36c9a035214635fdae598af20258549ef31a1c23a4d220c67505aa403fcc8a0b99a990fda01305a71b801acd5044f91c12
 DIST dtoa-0.4.7.crate 15910 BLAKE2B e6b4ad0c4a81d73557f93675671735eca3c5c31426319e746c73b65a34847085ee82f50a4f561036dae31a4fedf24a307e6edcd756cc1e6d46f2f20fc29bf456 SHA512 df090a5ea273265ae2f05aac2ae364cd0b606872a392411359548b9e780b2bc8dcb999254186ccc2da0a7353a4e0f1b0f513b2cd83d7e4f1290dcb1f466847f7
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
+DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
+DIST fragile-1.0.0.crate 10315 BLAKE2B 5f81d144012372be3504f151e9740d422edb9e29224ce2be4105d7aebc8bfc0b882e1a3a8a0eb6ff1f314264e3c70a6054196703cb69cf43560dc9711340fc69 SHA512 bbdd87f97c494495f4db10c68121f4b6f76e3752b9e4b363c0dde24a96a1344868faceeaf7e6df1edfee6ec107f10b69fd26bf271519675463c0235ecec3780b
 DIST generic-array-0.13.2.crate 26715 BLAKE2B c0ec536cd455b82fedcbc201820090db78c798ab69b3bf4e185a5b4860dfa560e0b9d6d87d991cf99ec406867b98e3cf0cb48761b0a91bc25833e12cd59fbe2e SHA512 7039c1d0e4f8f9b0518ddd807adb7e0e86ebee056bc8562eaaa3f7360b6a953b8be4d5c2660ad62a68e42eb242111ee98fa961c0e8a74bde532970bcef3dbe4a
-DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.1.crate 25459 BLAKE2B 2b3eb82c444d15a770691e1c312e4e694292de6b8a0eb8f6b3e19e0ceadc2d44a6cabb93f2a309e7ee388bc0d9a4b323800d863db7b7e7460e98e4ef6156eb6d SHA512 3cd15d52c5821972d1777cf2249a5f55ca0705ac2ff688ec45c21b70e3e956b538133a529e229d778cc0d0b48f293466d1bbccd0e18d43b9b6646daec4b08480
-DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
-DIST hermit-abi-0.1.15.crate 9597 BLAKE2B 012fdcd6ed09e4bfc9256d524648b0e7f65e9bc8dc6351d04249c492a0b5e836c529791f79fd144b9f09ae55462c034b9a3fbcff5b2abb40a7c78f7f8d78f64a SHA512 f81f6a87e0a182b5e49a2edf60f47243b7cbb116df5aa6a3354f1e230d4030bb5697ad4eb9abb6203ff66c1cfac1fc35b7d7e76dedc276767124ea4f41f97535
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
-DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.73.crate 502354 BLAKE2B 72120cb5f110870b571724710a082222025f40df6c2ab770cb9011ce75ecc259d22c7f296e2aea8ee967af476d70b5e848fb7d4b3656d694e7a22435b723a0b3 SHA512 e24581325c43c7aeb6c9b4d48dbe7ab103f2defbbea9a3c6358e7a71ef357c0ca5dd71afe3cfaa2b699dca4d5cdd2ceb41964e007d715fba6c326d3262d51343
 DIST libc-0.2.82.crate 515967 BLAKE2B 60c1ebdf659f1eb37f47a068e778567412bb133526df28fee1d20b3fd58dbe7fee1abbdd21c5445bc1022f2cdc39847244dcb7412114037a0be64f5a2a383978 SHA512 25eaf390acb409d329b9e32008078824eed4ca3a10af851f5097b653793db316419a395910c23dff293dfe2bac051a51871281a6bf2487937121b403286630c1
+DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
-DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
-DIST matrixmultiply-0.2.3.crate 32224 BLAKE2B 32da2713c816364c35ed60dadcece4999c9d90401da8d09c4b6a2be0ab55ce8d3537fbc62568bb6b169081a12bb58306c343d98fe5af382ac8e8654918bb96b9 SHA512 97eee72dd78a13693bec24a38815d9c18a531d9f85c14180e291ce6ef325b3060213fa865a2002a2388f99bc30524c9517f7a58ee5f8aa150c0b5a51da737337
 DIST matrixmultiply-0.2.4.crate 32929 BLAKE2B bd3c6b2d11202ea9390760ca59b7452beb4094b4a95314c1a1c596ff623eb985ae5cf2b3821d365dd2e2912c1bd25713188de07b4555a996a667cb4d6b0cfb11 SHA512 3ec6846e1342d6dddb81f5bd4495e940f011a3e048c712262cc413318c087aaa137550cff6d969873ac96bb628f6a460e92536674c0d503d5c609d9be5d9d184
-DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST mockall-0.9.1.crate 44172 BLAKE2B 7f6acce0914d526ffc88f9965142cd5785ccea0633ae163cfaa9266a24f1ff144fc17899e6ffc28585d1c55200deb7278269ed7c475601c4d5030526c0961605 SHA512 351c81daaaf411c4e7bca2a9c74b7eabf4a3a45772b5dd1b15d04994cfa759ad6094230b7410e9ce12db2dc99d8450f949276583ce210d200f12fa95b98ce6de
+DIST mockall_derive-0.9.1.crate 41256 BLAKE2B d6c162162e5a83773401de5582955592c7592490d31d793b5c02aab049f3cde63a40e31df72750d5da74f998a2343ec935844fd2e78c1d2806d6b60ac42e4911 SHA512 dc01d735ca2b05a903f169b9deb2f9dac70e89d2ccd469c988ac93d86d9c2dd101d17fc4bd0ac6d184b0de86f13bfb0c7cc869d884a48509791903b32785735e
 DIST nalgebra-0.19.0.crate 253667 BLAKE2B e8959c237f4fff99e0deb8726e63a0536459b9bb9a2b8a2b2561fccd34d54bca57e3af9a86ef4543dd3bded627367900a5a03b38e9fb3581377b6dedf01c8669 SHA512 d9dc64a9e27af77f77eccd59f2dd672e087153dabc35058f6c7dd0c29bb9c388179606cdb20402f13a325a235e27dda65232194f572b701a3a3ccf38862106f8
+DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
-DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-rational-0.2.4.crate 21694 BLAKE2B 6e8dbb873b1c62046c3fc45eeea0533a8375224fee6537e369a6042a42f98865c010635f3723c8116c32b365f8dd553831efeac4a1fb2bd0cbb169c90d7035cd SHA512 06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93
-DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
-DIST ppv-lite86-0.2.8.crate 20848 BLAKE2B ca85104fc1d6b300aab69c7b9367ba04f77ccde38bb7aad80cf1f615490696b27d61dcf242574abebe54b288414fdec2b63c756e47f188386a0f5523482ad9f5 SHA512 224db067f771eb48e4b0ddc2b7a1baf7389a47675ba93da50e3e4d6c88cef09e0f4529f399350b1b3feac7a88469406aa9b967377177a8c89605c49e1179771b
 DIST predicates-1.0.6.crate 26093 BLAKE2B 20eec0af0b3464931f486938fd7a058d4ccd15fc12d7842387906f142897b929ec79068ef410853b6008b71945424930064bafd84ead7afcdca29f35b9624926 SHA512 0e971a05e1ada5ffe61054d551330a6bcb1c9a5df541d19b442d7a06842ccfec9db981d347e3357f83b1cad750e8af1f90cc9130df94f417267063e7954c529e
+DIST predicates-1.0.7.crate 274733 BLAKE2B 5275012b3759356882fc1256119b52526eb8a39f3670d8e38d10ea96918bdc3bd13fbdfc841c6784aa3dbe8147777048f751886427c1ee8c4380b5084c5a70c5 SHA512 6d72f940714d698f5ff92f16a35e26675d995ea94c82de9bddbd386e7783ce0ed726b21c85bac3dd21e8f8a92cd2d4ee37dafe1cbc42e8e6b30ba13f06858b40
 DIST predicates-core-1.0.1.crate 8186 BLAKE2B cef5cbdc252e3f953fb9417bd5a439f226f627b2ca6a9c537834ee8ee59cf3a252ad92ef5ee40f4e544e388757e5dba6b07b6807e95dd89eb35bf45f612d09b8 SHA512 3addfc4f6e3f549125eddc9f1aa11072e17f48909f53ce8e476ce783cc690c0b52a1fe6416d87816d8b558350fb8b4666adc6b79cff880956bf258f646459da0
+DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-tree-1.0.1.crate 6355 BLAKE2B b79f756d9f1822a037c05a65f90cf01592ec6ba83bde2c44aa6fc8a3d476f9e4e3d0ac13afdcd3936b0d43244e8e7ab1eeaf0223cecc3f7941af96e44c45366f SHA512 f97f6e05b3edc1faf82931ab47541b3e459066e0f5181f77a4ab885e10bdce43f71021bf2c848993125a4feef13c3290a312a74ad1d2b4a2cb55fe7d24492a19
+DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
-DIST proc-macro-error-1.0.3.crate 23736 BLAKE2B 194430b63d71644f8bfe2b919a915f2f828827d5235199cc5f62a6914794a4098b2653d291ace74e597ffb0076cebaa318d6f1fab611d6d887d1e5679c0233b2 SHA512 a689eef04fb86c87172ca718049e34d7a1b20ecc95ab981b94348161f1461a31df6b89d96177e8d9912908e40dc297aefc673aa3938dfaa65ae7155b89678769
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
-DIST proc-macro-error-attr-1.0.3.crate 6963 BLAKE2B e07befceb22c21ae34d6f8cb0961565a091f62ea9a17d7717d95a4f1e9f96574b1cc77ad841e7683aa5779ee7197bc677304545078b3592c46e6ea60141fd7f6 SHA512 0e52a14814c4723646e17be9097faab2da74f8bd41a085dd57d6aa1dd1c978ed8b4fb98b85f39d4e313cec996af6f3d2ca6216ace03585ad8cd8678c05c025c8
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.19.crate 36390 BLAKE2B d21272e6bbe7bc5953ca388181a3875e6a3426e48ba3eb8808ec51fd2139093b60260998509b81ab1d67dceb4f9a0a255c234912d41739a7420537615ad3a4f0 SHA512 046f65ee0eefc1bfa39a405f46a7aa5ba83a11af057f150700412bc79a7a76d713f020377f38171086da58ee15e3db784c3e198cd18cc852add405e5e27eaeea
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.2.crate 84288 BLAKE2B 406820e506cb3dfd2529703ff4ac42dc1a693fc4c12023ab46fd69c5517b3136f02b580d850730855493a69ce31f8825bd9fb1905717178b1221f6c6c9aa3788 SHA512 573090e4a3501df912b04e5cecc40b1c61a46602f790a8f6068a06fc28acb40ff760882cb1c65eda073d33b4ab74691ca84456e5f1744bd0fc2bc9990ba894f3
+DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_core-0.6.1.crate 21634 BLAKE2B f059ef57238977208711b2b25f96682f58a5e935406b24a91cbbfca2cea918e764c512efa8ed8d77ee8df1fa3aae1d887148c5dd54cc0bd82ff14ee2dfade0f9 SHA512 546c1cc6064f22fa2b0cda1e42329aa7da1ea3be9b6aa277ef97de13067f28c473fe7f5bae4cf4151693aff31df3e57d6e99c6ff10d8fc79f94154dc26d19bf3
+DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
 DIST rand_distr-0.2.2.crate 40805 BLAKE2B 9c4ff7770da3e04798c5de17a43e7943cffbc3adce334e7bd8ed3720787ad029c5127523bc3128b54736e4071d2ccf7b699bbf00d9ff9c1d39d47a988e5b22b4 SHA512 15c710f3ec4e06fb4c356ef1016431c8b7e6fd6d7f03f2fe56b7ffd34cfffd728d3b3a9c92ddca36fb4920154f92589dc9c91b1735bb32d5b61eaedb24d702cc
 DIST rand_distr-0.4.0.crate 51930 BLAKE2B 67731792f82d012cdde89b8d67b444ba06727675b384e52ba7ede682ec247c8c2e6f956e00bb923f37cfce4c2d584ba8aa3af1d72de5b84ed4ed0cee5e1c5656 SHA512 e4670482a411be4257a7b3ebe4fa13a1f63acafd3a4bcc95a54c2e84183491b2539b02952b7ba654ed30e0c4e589ec452accf4c331af118285e26ac535278190
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
-DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
 DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_syscall-0.2.4.crate 23234 BLAKE2B 2190c072fcc0d5be9823353427e5ebb3277a9452dd9c2320f7b46168a3d764f8a2e9215f333a72e272b6d021de7141c76d25e65210e70a6b0da6a7cc987a281c SHA512 622f38ed962f7647299bcd4a742dd137c63450d5eb85d74adfa4b72951144b9920eb04d4af87e9c679c4bd47a985c528a8e56bdc31b15f4c8cd85e6b1bbddfe3
-DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
+DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
+DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rpick-0.7.0.crate 32472 BLAKE2B 498fa1b0ff3451510e2f2a1bc6813205c0329ee7a941789fec3ead64d1133a26b82dd7f8d7a946b7e385b31be538e5c7a4e9fa28dabd94b5de6176ad50f299ec SHA512 d4e51f9cc5c211d0877da4c237aaa38d6930076ee6517cfdf9b0d52360ba48e51a312123971d1a6bdaf3eff92c8fdea97112a1850e3c9a176a4c7b9c05aaea63
 DIST rpick-0.7.2.crate 37916 BLAKE2B b13612c1cf46b4a96efff68df59fedf2ef83d9582ecaade75b107d28e5aaf13fbf60921627a476c4c8a4858e32cea5f72605017f7e8af360abac4d5655835d2d SHA512 8b5072effd68d10a556607900c546deb652d9a7a7420842578c1f97e6a913ecb5d3a71811e94d4324ae472b97ab09bd1b709830396d933e402e167dce047ca89
-DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
+DIST rpick-0.8.1.crate 40723 BLAKE2B 6fc98b965f392c1db82056096265528500eb84f16d480db476f412ae4a38d23be19b9d991fa71b038d1f3540272238b89b961895a94cf4e8a835995b688656f8 SHA512 e713b1b322f8ea552320f1d4f004a0950ccd09d23605cb95569fb85522b4a5e4383ff30894d2b898c6a47bd8419a2e305123a276518c6bf02bf7c506941d5c8d
 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.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
 DIST serde-1.0.119.crate 74321 BLAKE2B 334922cb9b3115a929c7b32ee7ca3356de1f7cadbda224bffb7044db9ec0a6d949c415e10ffc7cdae356da749e779185072e965162ac036987ab997b40cf761f SHA512 7bce4d7c836c3d65f8d63e1200ea28e11f7b43c4c72e3d9576e2493699b2cc1dc88908a1086310a46961f6cf2e1191724f0a6f1fb137030659280dad434a451b
-DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
+DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823
 DIST serde_derive-1.0.119.crate 50617 BLAKE2B 71520b2b83e55129b901876fcaebb4e7a1717f89d573b9b7780a9a27e3f50915eafa9a0fbd803af31f17ba2de7e7708b8357cc915827217ebb0f227f2632f087 SHA512 6fb88db514c30f4706a1f535fb0997a753601e2f6a4d0c7546b50b9d5febde4b982bab172101973232784cb8a8ba54ecf8584ac0f980f339b6578bfab41001b5
-DIST serde_yaml-0.8.13.crate 37683 BLAKE2B a6739f29e638fa77516ae106314a332a6cc86022db4a029eb7615e5deca712b67669330f02ba0d04cc53b9e3f661a5e970f7ebe723be18cd44c309218123a74a SHA512 12621a641ccc68f90a962e9a6d84ab922d9b30e58be88c26e8fa0cf921981f573bb929113108cfd08f47988902997d4b685db2cd361cbf83119612e95ff6e686
+DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
 DIST serde_yaml-0.8.15.crate 37877 BLAKE2B 31cf453a3b04332f9ef3ecc7366c1a6e4017029767ff2484846955d8dca8ba1100d8cd5eac6c2367bdab8efebde987345ab0b7802629b8bf96effa3933646052 SHA512 8697f445ff13a93aa584afe1b91829c6dde86239751ab71f6b3b088b0506249268eda3e1cf507095a4ffda5ad78d589f92ab908117050a0bd70311867e0d031b
+DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
 DIST statrs-0.13.0.crate 123300 BLAKE2B 2c4c0f608c261ff6feea282fa28aa4d7bdf6b8dfbc5c8b927c0253bd1ea49e7038513c2f3cd15237ac11a01978c2d5794dc4e104ac6d50b882fb5cda6cf9f485 SHA512 3ce6f35dba25e27535dcff6985ebd2b24093b9b9b1911e151be740da3c1ad0722a3c35fba1fc6ef105e9d1aec122c56e0d3a9f223c3327cf970e3c720d16a996
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.15.crate 49378 BLAKE2B 5474b71fefea749d2bba1be76f4aeef52564b686ca6315e56192de2fa01377df82ce1331ee35c6c5c8ab25fcc936e909f2d85448d8464722bab11cccb1d7b361 SHA512 92f577714dae111b6a3c0a4b2f2e30be60f9387427c4458b1641e2589e17c6c1055c9860f3370a89bb6e1fd48333d0a88c7af007c6310ec881436a7aec444e99
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
-DIST structopt-derive-0.4.8.crate 19647 BLAKE2B a260833142085899cabe918c748ba661dd14d3adcca2d4e35698a4df404a81230ea4bfca8a34dcabf411efe229c9adeb7ea51b514899ca40690d18c8d477ca17 SHA512 b8819fb5958d889f7d871fd952084e7695ab061458e8c97b5be8a7171bea6dff92407fc87d816bef62e322d2aee0ed1375029aaebbc4fee17cd909a7f5a01848
-DIST syn-1.0.35.crate 204757 BLAKE2B 9c4321b64390b640f34d198d81eefd048b1745446c7548ab2ded72297544d8b9d590011e87b7c3e0ad8ff117af1fde22a8e588e37af02df7b98f8ef63feb6dfd SHA512 14098301949727ffd95b419a7578e849736fc918a9065688f645ffa20334cb2ec07ad9ff7bfd60aed64dd93369f3b8a04be98d3ee919868b4bb19702be6d47dc
 DIST syn-1.0.58.crate 229250 BLAKE2B 28df7854962f46339d1f993d2e1dae4c142731c3d7f08d03015ffcbf7eb307c1da9d35eb603d6efe653ff80bb0108bd5faabe1d7c68cec9476eaa0b710a27586 SHA512 b6bd101a455b77c2836384d7346f79b651f41c7685667b64032905cdd4026ee673c24de16a2acb2b8005af743a6d1b40628b30cd09c8454a39cc7d131ce71487
-DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
+DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.23.crate 16423 BLAKE2B fd257d34da829c8d0fd2cdce9910e0b5e797ec233af3a6b3be6b47a4fa3f39bc0170edd08cde3fb546d8f3c7be63049ddd94400b602dc73262fba2c323229650 SHA512 e6b6ab7a4a23f3c50e765a16071b65007441ad3f1eb5566e91bc19755cd019fb8efb358cea5663bf7c83cb3be63fae9ee0d019cffb3fddae58233c84b93aea9c
+DIST thiserror-impl-1.0.23.crate 13269 BLAKE2B 7b570c1a0d122a11fcbb7784e6c0620bee0e4644e6e8e988de6936ba23901ef6549585d1e14afa8240b199e3c92a6471af3e4b63fac902292f46ab7ff0a7a6f5 SHA512 72098ef63a73986c8d6a0f3fff6d5b23e29da0dc8eb4eddb410b7bdfcedb303e73418b2a3518d9315772b0c2c1b9c3d86d6a67bc7cdebd45f4488c13a5b62162
 DIST thread_local-1.1.0.crate 12222 BLAKE2B 4d19e85f5e342cdad8bcb33ab4c54d19563a831128c0d98dd79906f1096d3665a2bd0bdc114f11f51bf517dd5f401b2788a16482e38895610b080d1e2eba6dc7 SHA512 4681b69e471f2b90091f51422358cd86d1e851cb7118613d7e791b18d7464cd71e9d21d50223ccaa9dcca1c54b220474d3d6739634f57666938baf4dc174e621
+DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
-DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
@@ -131,12 +124,12 @@ DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST wasi-0.10.1+wasi-snapshot-preview1.crate 26898 BLAKE2B 658d12823fdff936f3205917a2370a6d2dd87288f4b9b93956298a58ac6ced8da1081d6f024505b5532655329dd437557b3e56319d742d791bf4108173c7a6a3 SHA512 7e40e580df3707681e3d31c7058234549f036628a6bbfae301bdffabf5c36133ba2f20a6c0f5ddb4c7129500b3bce57fdc9049f0bc227df8fab4d8ff398fb9a9
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD rpick-0.7.0.ebuild 2136 BLAKE2B 82a1258d073f881c0cb4c68594e18dc757191989d198a1daf2dc20b8a6853fa35907f1fdda5bc88660d723111e4e1ea2254138c200ab50b99be57620acda99df SHA512 12aa34b78b10fff3a965b7e3ace3256554112c4fcecb450f19a01ccf0cd75c5182006214b7fd9842763020ca4dd797f333234e666b91e6d1b853d38f554eab7b
-EBUILD rpick-0.7.2.ebuild 2479 BLAKE2B 22dcf3ab8e286b731859ae0fb1985e8094cd674c0667ab0677cec85b837ccc7824d3e1df7aefd3af28576cbf0403f9bfac891a5cdb8fca32731aaf9ccf69346f SHA512 799e41a57db2a88857a17ffa0600e69f90b5b0070d4efcafe82a319d293f547c4d48170fe48e0851552a06438ea377c3f5b98f324f68d71cd6bc1c6b48a03994
+EBUILD rpick-0.7.2.ebuild 2476 BLAKE2B 29fefdc7f27dbcd9ddd05e48011a5efb6d59b47eab35f27d5e8816127c3bfbc340adad377cdfb769f514456d6a54ce400aa139a16fd411e00247fae57cb4e08e SHA512 a0d08a5566ef9af7d7e1a921c463a85771b59533bb2609010bea5b1fc3ffdd2f97f62e806b47df7f81b3aca490d22e5f1b98c580b13cee534debd93079de5768
+EBUILD rpick-0.8.1.ebuild 2685 BLAKE2B 5608cdaec2a48b9f9fef324d49bf2d199c56904ae5f088bf196d8101fe8816a5e1f378699abfe02e7cd061fa170419f1bab416d33507918997e26195975d4626 SHA512 e178e5906a8cdf27d0cafbccf118f045119f9c52fad17221ef842dee8e1c6ea23f4a6c3bbb6195efa2dff18d75f299ce1fb5dec2b437c2e8938600b9f8ac7f8d
 MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
diff --git a/app-misc/rpick/rpick-0.7.0.ebuild b/app-misc/rpick/rpick-0.7.0.ebuild
deleted file mode 100644
index fbbb7e691692..000000000000
--- a/app-misc/rpick/rpick-0.7.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.3.0
-
-EAPI=7
-
-CRATES="
-alga-0.9.3
-ansi_term-0.11.0
-approx-0.3.2
-arrayref-0.3.6
-arrayvec-0.5.1
-atty-0.2.14
-autocfg-1.0.0
-base64-0.11.0
-bitflags-1.2.1
-blake2b_simd-0.5.10
-bstr-0.2.13
-byteorder-1.3.4
-cfg-if-0.1.10
-clap-2.33.1
-constant_time_eq-0.1.5
-crossbeam-utils-0.7.2
-csv-1.1.3
-csv-core-0.1.10
-dirs-1.0.5
-dirs-3.0.1
-dirs-sys-0.3.5
-dtoa-0.4.6
-encode_unicode-0.3.6
-generic-array-0.13.2
-getrandom-0.1.14
-heck-0.3.1
-hermit-abi-0.1.15
-itoa-0.4.6
-lazy_static-1.4.0
-libc-0.2.73
-libm-0.2.1
-linked-hash-map-0.5.3
-matrixmultiply-0.2.3
-memchr-2.3.3
-nalgebra-0.19.0
-num-complex-0.2.4
-num-integer-0.1.43
-num-rational-0.2.4
-num-traits-0.2.12
-ppv-lite86-0.2.8
-prettytable-rs-0.8.0
-proc-macro-error-1.0.3
-proc-macro-error-attr-1.0.3
-proc-macro2-1.0.19
-quote-1.0.7
-rand-0.7.3
-rand_chacha-0.2.2
-rand_core-0.5.1
-rand_distr-0.2.2
-rand_hc-0.2.0
-rand_pcg-0.2.1
-rawpointer-0.2.1
-redox_syscall-0.1.57
-redox_users-0.3.4
-regex-automata-0.1.9
-rpick-0.7.0
-rust-argon2-0.7.0
-ryu-1.0.5
-serde-1.0.114
-serde_derive-1.0.114
-serde_yaml-0.8.13
-statrs-0.13.0
-strsim-0.8.0
-structopt-0.3.15
-structopt-derive-0.4.8
-syn-1.0.35
-syn-mid-0.5.0
-term-0.5.2
-textwrap-0.11.0
-typenum-1.12.0
-unicode-segmentation-1.6.0
-unicode-width-0.1.8
-unicode-xid-0.2.1
-vec_map-0.8.2
-version_check-0.9.2
-wasi-0.9.0+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.4
-"
-
-inherit cargo
-
-DESCRIPTION="Helps you pick items from a list by various algorithms"
-HOMEPAGE="https://gitlab.com/bowlofeggs/rpick"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-# License set may be more restrictive as OR is not respected
-# use cargo-license for a more accurate license picture
-LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DOCS=( CHANGELOG.md README.md )
-
-# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
-QA_FLAGS_IGNORED="usr/bin/rpick"
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-}
diff --git a/app-misc/rpick/rpick-0.7.2.ebuild b/app-misc/rpick/rpick-0.7.2.ebuild
index 3f204077f002..3f192883a59e 100644
--- a/app-misc/rpick/rpick-0.7.2.ebuild
+++ b/app-misc/rpick/rpick-0.7.2.ebuild
@@ -118,7 +118,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
 QA_FLAGS_IGNORED="usr/bin/rpick"
diff --git a/app-misc/rpick/rpick-0.8.1.ebuild b/app-misc/rpick/rpick-0.8.1.ebuild
new file mode 100644
index 000000000000..44535b416930
--- /dev/null
+++ b/app-misc/rpick/rpick-0.8.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.15
+alga-0.9.3
+ansi_term-0.11.0
+approx-0.3.2
+approx-0.4.0
+arrayref-0.3.6
+arrayvec-0.5.2
+assert_cmd-1.0.3
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bitflags-1.2.1
+blake2b_simd-0.5.11
+bstr-0.2.15
+byteorder-1.4.2
+cfg-if-1.0.0
+clap-2.33.3
+constant_time_eq-0.1.5
+crossbeam-utils-0.8.1
+csv-1.1.5
+csv-core-0.1.10
+difference-2.0.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.7
+encode_unicode-0.3.6
+float-cmp-0.8.0
+fragile-1.0.0
+generic-array-0.13.2
+getrandom-0.1.16
+getrandom-0.2.2
+heck-0.3.2
+hermit-abi-0.1.18
+itoa-0.4.7
+lazy_static-1.4.0
+libc-0.2.86
+libm-0.2.1
+linked-hash-map-0.5.4
+matrixmultiply-0.2.4
+memchr-2.3.4
+mockall-0.9.1
+mockall_derive-0.9.1
+nalgebra-0.19.0
+normalize-line-endings-0.3.0
+num-complex-0.2.4
+num-integer-0.1.44
+num-rational-0.2.4
+num-traits-0.2.14
+once_cell-1.5.2
+ppv-lite86-0.2.10
+predicates-1.0.7
+predicates-core-1.0.2
+predicates-tree-1.0.2
+prettytable-rs-0.8.0
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.24
+quote-1.0.9
+rand-0.7.3
+rand-0.8.3
+rand_chacha-0.2.2
+rand_chacha-0.3.0
+rand_core-0.5.1
+rand_core-0.6.2
+rand_distr-0.2.2
+rand_distr-0.4.0
+rand_hc-0.2.0
+rand_hc-0.3.0
+rawpointer-0.2.1
+redox_syscall-0.1.57
+redox_syscall-0.2.5
+redox_users-0.3.5
+redox_users-0.4.0
+regex-1.4.3
+regex-automata-0.1.9
+regex-syntax-0.6.22
+remove_dir_all-0.5.3
+rpick-0.8.1
+rust-argon2-0.8.3
+ryu-1.0.5
+serde-1.0.123
+serde_derive-1.0.123
+serde_yaml-0.8.17
+statrs-0.13.0
+strsim-0.8.0
+structopt-0.3.21
+structopt-derive-0.4.14
+syn-1.0.60
+tempfile-3.2.0
+term-0.5.2
+textwrap-0.11.0
+thiserror-1.0.23
+thiserror-impl-1.0.23
+thread_local-1.1.3
+treeline-0.1.0
+typenum-1.12.0
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.1
+vec_map-0.8.2
+version_check-0.9.2
+wait-timeout-0.2.0
+wasi-0.10.2+wasi-snapshot-preview1
+wasi-0.9.0+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 ${CRATES})"
+
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
+QA_FLAGS_IGNORED="usr/bin/rpick"
+
+src_install() {
+	cargo_src_install
+
+	einstalldocs
+}
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index fa2c11a2f58a..3310a337ccc2 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,7 +1,9 @@
 AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
 AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
+AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f3cd639dd274971393420ccf45e8273539ae020f8a1a6e4063e741e75dcbf8cecd4e35b26c6d04ffca108ddea7bd32 SHA512 419f4d10b23369fccdadfb024b6ce268794e7f76188b25dd9051ff8cd6080dc0c70f66b9c2480095d655bb63f20ba1fdfa1ce0c681c9b8aff4d4918764018516
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
 EBUILD screen-4.8.0-r1.ebuild 4115 BLAKE2B 5d9bff693395a3a104253585b30561dda21444540420a68d74ca7d9ca753d79fbb26f82164bf222a659545dc570189db0641f1437f329edc3066630fb0c69f95 SHA512 60d6fdf67117a025cedd504bc109cb519f96defeb7cdded86b5a473641d89969cbdcd939c51849249dd43e1e24ce07ecefdabf9f74f469bf1458d54defa6317f
+EBUILD screen-4.8.0-r2.ebuild 4166 BLAKE2B 9dd7621f5f1d3e2431053a694eb7ddfd4a0cf6218e627d8f41d39a93cae8c4201aea726eaea189d0f997a084a00b3f6a462328f13f57be3a85e3b8a111b5835d SHA512 68eef9c4e34fb49de5f5654c4a067e7fb3be3244424773fc83d259d38114db5d83875b61c6b8a355a47c291128a5a5b27be693453a14467b74dd2aac63646f00
 EBUILD screen-9999.ebuild 4221 BLAKE2B b3156a67b9708e22c231e902ee005bf034c118cf610f5461b6408d17694601bb00e4b3aaccc670247aae6b762241e6375324db184cd1410fc3baca8a5bf22e13 SHA512 a8b839ebdbc262851c3725c7099bc85b444b8b00ed40badba7c240a5810eeb22aa0714971b2f116e1860de2c1204b403ffe3bda1200e86ecad2dd5c667a98ba3
 MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/files/screen-CVE-2021-26937.patch b/app-misc/screen/files/screen-CVE-2021-26937.patch
new file mode 100644
index 000000000000..9556278274e8
--- /dev/null
+++ b/app-misc/screen/files/screen-CVE-2021-26937.patch
@@ -0,0 +1,61 @@
+ encoding.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git i/encoding.c w/encoding.c
+index e5db3e7..79f5d14 100644
+--- i/encoding.c
++++ w/encoding.c
+@@ -43,7 +43,7 @@ static int  encmatch __P((char *, char *));
+ # ifdef UTF8
+ static int   recode_char __P((int, int, int));
+ static int   recode_char_to_encoding __P((int, int));
+-static void  comb_tofront __P((int, int));
++static void  comb_tofront __P((int));
+ #  ifdef DW_CHARS
+ static int   recode_char_dw __P((int, int *, int, int));
+ static int   recode_char_dw_to_encoding __P((int, int *, int));
+@@ -1263,6 +1263,8 @@ int c;
+     {0x30000, 0x3FFFD},
+   };
+ 
++  if (c >= 0xdf00 && c <= 0xdfff)
++    return 1;          /* dw combining sequence */
+   return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
+           (cjkwidth &&
+            bisearch(c, ambiguous,
+@@ -1330,11 +1332,12 @@ int c;
+ }
+ 
+ static void
+-comb_tofront(root, i)
+-int root, i;
++comb_tofront(i)
++int i;
+ {
+   for (;;)
+     {
++      int root = i >= 0x700 ? 0x801 : 0x800;
+       debug1("bring to front: %x\n", i);
+       combchars[combchars[i]->prev]->next = combchars[i]->next;
+       combchars[combchars[i]->next]->prev = combchars[i]->prev;
+@@ -1396,9 +1399,9 @@ struct mchar *mc;
+     {
+       /* full, recycle old entry */
+       if (c1 >= 0xd800 && c1 < 0xe000)
+-        comb_tofront(root, c1 - 0xd800);
++        comb_tofront(c1 - 0xd800);
+       i = combchars[root]->prev;
+-      if (c1 == i + 0xd800)
++      if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
+ 	{
+ 	  /* completely full, can't recycle */
+ 	  debug("utf8_handle_comp: completely full!\n");
+@@ -1422,7 +1425,7 @@ struct mchar *mc;
+   mc->font  = (i >> 8) + 0xd8;
+   mc->fontx = 0;
+   debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
+-  comb_tofront(root, i);
++  comb_tofront(i);
+ }
+ 
+ #else /* !UTF8 */
diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild
new file mode 100644
index 000000000000..e5fef8fffeab
--- /dev/null
+++ b/app-misc/screen/screen-4.8.0-r2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+	S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+	>=sys-libs/ncurses-5.2:0=
+	pam? ( sys-libs/pam )"
+RDEPEND="${CDEPEND}
+	acct-group/utmp
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+	sys-apps/texinfo"
+
+PATCHES=(
+	# Don't use utempter even if it is found on the system.
+	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
+	"${FILESDIR}"/${PN}-CVE-2021-26937.patch
+)
+
+src_prepare() {
+	default
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+		doc/screen.1 || die
+
+	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
+		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+	fi
+
+	# disable musl dummy headers for utmp[x]
+	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
+	# reconfigure
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# enable msg_header by upping the feature standard compatible
+		# with c99 mode
+		append-cppflags -D_XOPEN_SOURCE=600
+	fi
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	local myeconfargs=(
+		--with-socket-dir="${EPREFIX}/tmp/${PN}"
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc"
+		--with-pty-mode=0620
+		--with-pty-group=5
+		--enable-rxvt_osc
+		--enable-telnet
+		--enable-colors256
+		$(use_enable pam)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	LC_ALL=POSIX emake comm.h term.h
+	emake osdef.h
+
+	emake -C doc screen.info
+	default
+}
+
+src_install() {
+	local DOCS=(
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	)
+
+	emake DESTDIR="${D}" SCREEN="${P}" install
+
+	local tmpfiles_perms tmpfiles_group
+
+	if use multiuser || use prefix ; then
+		fperms 4755 /usr/bin/${P}
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/${P}
+		fperms 2755 /usr/bin/${P}
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
+
+	insinto /usr/share/${PN}
+	doins terminfo/{screencap,screeninfo.src}
+
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	if use pam; then
+		pamd_mimic_system screen auth
+	fi
+
+	dodoc "${DOCS[@]}"
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]
+	then
+		elog "Some dangerous key bindings have been removed or changed to more safe values."
+		elog "We enable some xterm hacks in our default screenrc, which might break some"
+		elog "applications. Please check /etc/screenrc for information on these changes."
+	fi
+
+	# Add /tmp/screen in case it doesn't exist yet. This should solve
+	# problems like bug #508634 where tmpfiles.d isn't in effect.
+	local rundir="${EROOT}/tmp/${PN}"
+	if [[ ! -d ${rundir} ]] ; then
+		if use multiuser || use prefix ; then
+			tmpfiles_group="root"
+		else
+			tmpfiles_group="utmp"
+		fi
+		mkdir -m 0775 "${rundir}"
+		chgrp ${tmpfiles_group} "${rundir}"
+	fi
+
+	ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index a69cde9cb899..f662a20cf931 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1,5 +1,5 @@
 DIST scrub-2.5.2.tar.gz 192060 BLAKE2B 4709bf04e2aa8ef01b835c8fd30c31f2990f902fc2704454bd2b8871518a3d525d9101abd9f2ebb11171cb57937b598125b599371908c3b32800dfbd7aeda0fb SHA512 1ae96c6f59d9039720642acc320a7e4498116594a3058ace86ea6346c58131283063c4337a8d6960a0fab5d4d592e471cb0652d7886def850d97a71e8dbce201
 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640
 EBUILD scrub-2.5.2.ebuild 361 BLAKE2B 12c02e0203f651d963a8e03820e0c32124870f4501ffb0236652941a7a455342165107e852a84f2435e8a4732c57567ba840414292d385c8492398ff2bf08dcb SHA512 f03300f1f891d99128652209b056a90af2c5ca70dc693afd75c3846dccd476f5f129ce2ba92596f60ff6f2400182edbac31299a5109bd178c56ac748c22d4360
-EBUILD scrub-2.6.1.ebuild 387 BLAKE2B 69e776ece679d3d53d64d605f01ee31e5b12ee626df3a4832c49f3f17affa01a135daccab3a5906c3b2c687bb40aaf4414216f1959156cb725f4f2fcb23c2bb0 SHA512 f7561ff780daaf7e99f0500052944176a415082defe759f6ba105de1fb48cd77ac0795994292c70df035a4dd48a7575c20c91b2d731c2743a7050bcdf3b4cb3d
+EBUILD scrub-2.6.1.ebuild 386 BLAKE2B 838abb88e8f819a332ef9af4405ac8ede63e066b18ea1c5755e9f4275f780e3f719da70063cd88d92878759e27d796fc7b5e1045f0ecc33e5700e22e557d7776 SHA512 838861353bb6ed7f2163b3bdd19cdba6c115f002d0138f7ce828c7bc5f7ad33835c9b01ad8c59c21995adfc745db545da16a100229d5c791b23c53fc9baad180
 MISC metadata.xml 427 BLAKE2B cabf19dba485a1ab72e0500c58039417e3d43a16221200a291fa24ccf071592bd6fc4360dcacf03f56242a3a218a4783e4f716253056384dec0da2dd60831b6d SHA512 6df40e1c7f4e9a5dff97a24cac6e0ec70ef4932846de7499be62bcd9bad40c5e23cfe23aac3672f1c9de4aadd36b6abcf96945cd8bd6c58a87ee91f793e0a627
diff --git a/app-misc/scrub/scrub-2.6.1.ebuild b/app-misc/scrub/scrub-2.6.1.ebuild
index 635cd71d32b7..71111d91acc5 100644
--- a/app-misc/scrub/scrub-2.6.1.ebuild
+++ b/app-misc/scrub/scrub-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 9422a4085e24..4446b218a21d 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,8 +1,10 @@
 DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
 DIST solaar-1.0.2.tar.gz 1540722 BLAKE2B 66c6f7c347f5eba538d3d48ff1c1137c1c71bf84dfb1a306a94e3cb24810378864066644a82d27eaaee2d80d30bcd30bb71ebe80fdb12363e9b194df9054946d SHA512 5f97b51e7853386311c5b9ff968a72529d55837f7262786e86085e130d219ac22095c20c984e340f619a15b8242f90e66a6c678c5e0c507c261d0430b74eacd6
 DIST solaar-1.0.3rc1.tar.gz 782803 BLAKE2B a4dde7238f2616d98cafafa775050fd0c3a3aaf8a11b0eab333993a9246c321c45ebe4d30adddf82d826e1909a8e90cb0914472ab40f9ed5560d380931aea591 SHA512 845c55865ef93c163bae80dfe6e8e3013363cff1be03b167dcd4f30c541ae16e1828ed6e51c8c77aa8b067e3a75cd8e1980fb8847b308d067a816598f83c8d83
+DIST solaar-1.0.5.tar.gz 920452 BLAKE2B 44aa0f9abd63629a5a4e737c14e468922c4aa501341717d595f045c5f40369ade6ff296120931557f1e8f04b99aa4f690454aa8f6bceaa526f370f93b312f6d6 SHA512 28603c30f0e9f2f0fe2549722062548031c69a0d9c98f732fdd8fbb51ed1d55ef033262113b2f88044a68f8b26c8c51fb0b45d4f4689fb3619e143d159618c47
 EBUILD solaar-1.0.1-r1.ebuild 1116 BLAKE2B 86891cf9c89c9bb87eb511387ffdb0c3ec92f02d9e3e18fc6b973ef2ec2746873293c964e8f579d7dde2bec679dfc4e15820d44acd3b67799f4ddf37ce12ef88 SHA512 dfb02b757c7815c0dc6abe7d9e268dca1b5777c9994766b49c02de43a0d16129076cab85afa3e9c8a4aaa01b92dd00fb87306cd1162e669f77833e01caafb885
 EBUILD solaar-1.0.2.ebuild 1423 BLAKE2B e669a6042537d9eace4d98fe2f87df9d7d9e3e4749ee2e4688d787aafbdb9308cf9612613e5ee06be9d6eeb58aacd504e3211e519f55ebc15e68f2f39801a2ad SHA512 04bfcbe65ab40091d0d0ff1ad786084ab24b1b674727156bf8bd35489f7208a5ac09807c5e671b0adbd97718f69353dd86648c3c657c0548f0fbcfdd87a30e4c
 EBUILD solaar-1.0.3_rc1.ebuild 1495 BLAKE2B 188e5ff05ff51cca97c2b16feb0b089d0e75e934e7f985d74070376bde7013281e81ead81e8fc14900b992ed75f0a0be86c192ca190148c67164949ea5fb90b4 SHA512 368a0fa8448e39eb4ea2620562945e40723c6ddb46fad17a2db3cfccf8bebd76259fb5abe80dd8b8a24a396f0c1717e4dada033c9c5ced9fa008f7c6b16ba1a5
-EBUILD solaar-9999.ebuild 1284 BLAKE2B acbe3311bc6fafad5d22cdcda798f0791e7876214e8d6ea5f7d08111f14219d21fe8174567ff4592f76b52a24ca141cfccc183e44e168d08585dd57f5b11807b SHA512 dde3f9bfa00bea24b301f9cd3cbfeb4284359d2ff4ec02e90d22b94e47cf01be69594c37a5c9d44a94da4a250e4f2b9f4627ef504fad04dfe5fa965d0c1ede74
+EBUILD solaar-1.0.5-r2.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
+EBUILD solaar-9999.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 MISC metadata.xml 301 BLAKE2B e1a95f23856b0daa09eba917e05537d4e423ca5d36ef0af029c240cff5186125868c54bf70981005b9b26bc57d5d6118972836ef4ecc1dc73131b46da9106724 SHA512 8af96a19368452eb3396e6d33ed62f4702d82d99995cf09cd55da5d55154e43422f3da527ca2101ee352392af2be5e5a521d254b99682184d68ade9da1196acb
diff --git a/app-misc/solaar/solaar-1.0.5-r2.ebuild b/app-misc/solaar/solaar-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..cad0500253bc
--- /dev/null
+++ b/app-misc/solaar/solaar-1.0.5-r2.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/solaar/solaar-9999.ebuild b/app-misc/solaar/solaar-9999.ebuild
index 8b13996f6d32..cad0500253bc 100644
--- a/app-misc/solaar/solaar-9999.ebuild
+++ b/app-misc/solaar/solaar-9999.ebuild
@@ -1,39 +1,54 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit linux-info udev xdg distutils-r1
 
-DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
+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}.tar.gz -> ${P}.tar.gz"
+	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} # hopefully upstream fixes this in future packaging
+	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc"
+IUSE="doc appindicator libnotify"
 
 RDEPEND="
 	acct-group/plugdev
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
+	$(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 '/yield autostart_path/d' setup.py || die
+	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
@@ -44,10 +59,11 @@ python_prepare_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	udev_dorules rules.d/*.rules
-
 	dodoc docs/devices.md
 	if use doc; then
 		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
 	fi
+	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
 }
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index b6962e5f795c..aa890c293e3f 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -6,5 +6,5 @@ AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f
 DIST spacenavd-0.7.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
 DIST spacenavd-0.8.tar.gz 47515 BLAKE2B 5ab3432220ae44222b72b3fe18df096322031e0e2643798f494a87287e89607370cd15da919eececc714aacee1b75708a365feac5a182c901d63bdf4fa9f52c1 SHA512 8bb0dd2a95c602d23c84750e55ee649e7999bce43607cd09559f36a782780ceb15769bc0ed8e35b56f7c4b0724574830c2c06d4d8853b6f997ed8bba04441a05
 EBUILD spacenavd-0.7.1.ebuild 2344 BLAKE2B c8875709154e76954b675f808f58f59f2c9c8faea230fc236f9d648011d712363abe96516c74c54996d215129e790416de639efdc192920778cf8d9a55994035 SHA512 1e37501840845ca62be2413148dd1dea0c891a66814cdb0a87524747cc546ff2393312a10851bdc4574f45ce256d913148783e30caf1729a1bb752acf29ef1ab
-EBUILD spacenavd-0.8.ebuild 2389 BLAKE2B e509313c88c6d044eef44900df95a367e0f5186ae747e5e637acd22866675efbcb93ee4bfb2d23320bc2bde3d8bf8d871148178a875dde80b5520a76f797c9f8 SHA512 372a90114f1bb0c3b9ba0cd89be1b0ed0fb848dba95c023ac62e1ed7d1762b1aa921c2f5d55fe2507fbab6a76c7f6a922b9762f00be218db0bc88e375b5192f6
+EBUILD spacenavd-0.8.ebuild 2394 BLAKE2B e0de97a84d5d71f18543a4eed853cc8264b3aa97bafa4265cbb963610d03c9ffdcd9a578a447c8bc333cd3caba1f76a599182553b142c7f61726853cfbec581c SHA512 1995b4284750078245cda683a61744cfc68b6bd524819df2459d3884576fef7f283647f69c3845147e68da6d93d13ea2ec9c6f1ae28baa2359bf985cab37fd56
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/spacenavd-0.8.ebuild b/app-misc/spacenavd/spacenavd-0.8.ebuild
index 242921ea9c4b..3e2772c32f2f 100644
--- a/app-misc/spacenavd/spacenavd-0.8.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 RDEPEND="X? (
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 2fd4aef6eef2..b823d7546576 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,5 +1,8 @@
 AUX 0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch 660 BLAKE2B 56250a860b836d64b190049912123ebc5a06202ad25a6aa974a420b856f472d7aa5364cee96539c204e2c09c88a9f6e59cc5606aacf5b8c29655310340233a49 SHA512 6af9226a73280ca1c5f3f95d11b9c8f10ad4d847df9401643a8294645031cd3141916e4b00a188e25795f4a51f9f55e4caf2ba3280d5c9bd89f44a89411389a5
 AUX task-2.5.1-clang-build-system.patch 720 BLAKE2B 346ed760dfdc0e7dfb90de4ed91f49fbe91e48e28c624177898ec317fef9f0c43854e18527c57b21ba84320dc87adde3837f5cce69e1ffeb548cc1cbc0ab51a5 SHA512 afeb97da39429fa7402d1f856923d168bd07ae05492099c3132ebf04e459707208ccd0c1a7927c554c7573ae4c296e224e49e12a72e499543057fe7a7b25d8e1
 DIST task-2.5.1.tar.gz 903428 BLAKE2B afa17364984237ea589921afb4379297b128ea1bb6b0834f875b1b02b38dbfde5e961122fdde00dc5ff29b56226a5ce0f805bd1be8a8194c9e185ab80ad6d6c2 SHA512 ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10
+DIST task-2.5.3.tar.gz 788760 BLAKE2B 3e8a4f2ebf6c39d3d51dc9b044cf1c8fbce23ab8178b6645405f26522bbb6f29e9f78247fe52601f6c8f87f966a3b7aad130417d0f416b9d969e9e396c10eafc SHA512 e906c8f42ad4b9a7e20a82defe31b89194d72957f18dd5129ecc41a2a60a9d8b0d01abb9b44ecce79b65cd9064af4a4a4c9dd695f98152e77908f130dc3f9677
+DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
 EBUILD task-2.5.1-r2.ebuild 1166 BLAKE2B 726572a3998040ea2b48f50aeabcfce2c7ce4538c99c9b1fe4d960fb1f0d76e6804a8625a618d54c9c1df643fcc878d56563202524cdda4c70c2de32c37a2840 SHA512 a7785cb3b81097e69ac3fafbd7586069f35c305b6ae6e29ac75b57d9e896d66e6c7099948df7985560bd0f509425351f6240862716f54413b4846057bc703015
+EBUILD task-2.5.3.ebuild 1372 BLAKE2B 732b1e4334475946e54f18e798d2671e9df7ea3f2225dff6c0cbd44ead6b7b212fa26ee76a2e29c7e84fa3f8e0dedb50d3c9127ac72291e76c7aecb7d1700368 SHA512 dc94c3845672c981536013b521904354ee64928b87bc37fc20060681744f34df5adde9b5bfcb1427303ab45b3f049cc139b8524cccdab71f9cbd4820736da968
 MISC metadata.xml 435 BLAKE2B bc50b21afa9614b81ef07ba84c6261fa5978fc8e050a7b2436e83eb2030a86404c89c37a2acc6164d53d0aa265921fea209eb0e3e10d67b3dc028a41f4a2885a SHA512 2b2ea567948e32f5cab9fbebb7e5b96add831e4992eab88bcc304c26eb2bf533fade36048dbdbf36202c174a63cd8587b33f2a7ba86d0fd8bf009a860c9a7593
diff --git a/app-misc/task/task-2.5.3.ebuild b/app-misc/task/task-2.5.3.ebuild
new file mode 100644
index 000000000000..3b3b987763ac
--- /dev/null
+++ b/app-misc/task/task-2.5.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+		-DBUILD_SHARED_LIBS=off  # bug 764224
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${WORKDIR}"/"${P}"_build || die
+
+	eninja 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/*
+
+	exeinto "/usr/share/${PN}/scripts"
+	doexe scripts/add-ons/*
+}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 7983a4c4b301..e38dd9576e00 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -4,5 +4,5 @@ DIST tracker-miners-2.3.4.tar.xz 3128484 BLAKE2B f52c46123c95252f8f16df824ff7498
 DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
 EBUILD tracker-miners-2.3.3.ebuild 4635 BLAKE2B 11c4b5662fae132610db03cb86c9ca78e9630a5fab1ab6d1a2fde5ec3193afb5937416ec20ac2f95a13be25ff821ab67fce0667fa9ee97cd422e82eb44bbcf0a SHA512 9d8cb95df031b25f3e0eef61c6d40f68e8fa872c52235057ce834cf563a9a3fc35370fd4272a5775bf4cc65d4e22e61d9c7ebc2e66502f210589034b82639596
 EBUILD tracker-miners-2.3.4.ebuild 4638 BLAKE2B c017180ddc7aa6131d802f2acd8f38fe92d375d1c4dd1607808194fbf998626a96bd8ac18ce493d75765d32fbaf0944d9a6355a3b8c7ef574361eb5c05e91639 SHA512 7fb21ad11dae03de02fbc9770c98c809da9f98161ea9c437f22dacfef33958ae797495a4ca53be9885f7afc528be3a6c4d2b677b46e7d22654e88e4ab748ac92
-EBUILD tracker-miners-2.3.5.ebuild 5004 BLAKE2B 6da7bae9afc7a97b74b9f9b72b8bcb1c1e79b5313f853a87e174234e1533d711f0112688436a38f6d66c716e7d39b651e750b76167ef6c431f2fb10677abd234 SHA512 2d0fbf47b4a9cdb917eafc89df811b1e2b0ae679b86f2348801983164d019bfbb2831d4d19f3e8e3ea31a4894977c18bd7c83c30ef95f3b4f34e4dea8f627260
+EBUILD tracker-miners-2.3.5.ebuild 5001 BLAKE2B b683e12c111b42c22a1703d14490809af17d54e1bc2943c2f208706eee6b715261a2e39a923d4d622a224f402c32bbae41e0eff45065dcd63848358976c1694d SHA512 ab5f4f7bcb7577ee88d96c19ebace33c85e4b71b54bcaf903a54e837d99e59575ae0c426bf61f9e93e2a85053c4e9609d80d514d2ce85ca1e343bf2ced27f8f5
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild
index 2acee245aefc..2572bcfe9e5c 100644
--- a/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 24b54c6df71d..816ec310ea08 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,5 @@
 DIST tracker-2.3.4.tar.xz 1607928 BLAKE2B f0285480091fdac3aab1d258496643b7644f2d58383eb0d7cdd10f273a79e75a36507285db4737bb270dda8cb195482d6f8e2770b24fce13c72dd32325c3976e SHA512 8b8ffc33962a5dffbae83dfb8ea73b0d2ff6ee002fbd9e4b574ef5f8e562338e359caab290ab804f2801a14e04d2c76eb0a52cf06be4d236ea043de4fc39dadf
 DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
 EBUILD tracker-2.3.4.ebuild 2618 BLAKE2B 4bb5b38390812608d2f1331db79cdecc273e632986aadb29ee009ae90104eca8aa3a10c242c779eea8a9d69d69a10e5450664d8823cf8b4bfca4feeff59f6c0b SHA512 3eb5fca780e09629d86c8c0ac00040ec3d50cf37d35839be5cdfd654c01bcbdc72dc0f76633c45fa20f38389141bcf86e4f9514a9186a95b7222e93e21db8ce4
-EBUILD tracker-2.3.5.ebuild 2593 BLAKE2B d049e1bc711631f19357c90fb4afc86998295b714374b8186a02f46e3a671e12bb77a085027b51b4423852baa9018a7ab50878fb8df704323bcb75368bbafc75 SHA512 e44145b438062bac714fed94964ad733f4f59b33881f619ee7f11555077c0a3411734eba484064312d881b6bd40bc2bb9428fd32521081289b8473d3d7bd1c46
+EBUILD tracker-2.3.5.ebuild 2590 BLAKE2B f5fe092b79880b45882747be8225efbbb7dbf7e12c7c3889277c1985997a4c3616c1fe311b21109ee3ec614d92f814b7e4f44b256cef1d3d6ef8bea5511b243e SHA512 b98e80469d53a0b984a587a7097a588391d02265342eb8577bec6312fb1e895c6de3b36c2075399f87e79c1c1a31ed6fedb31fd6b0317c2a7d0dffc47cc0d477
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.3.5.ebuild b/app-misc/tracker/tracker-2.3.5.ebuild
index 30c14973ed63..4a430b59490c 100644
--- a/app-misc/tracker/tracker-2.3.5.ebuild
+++ b/app-misc/tracker/tracker-2.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc x86"
 #RESTRICT="!test? ( test )"
 
 PV_SERIES=$(ver_cut 1-2)
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index ab808f6ac544..da62df3b40be 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,5 +1,5 @@
 DIST trash-cli-0.17.1.14_p20170816.tar.gz 69713 BLAKE2B f995c22ba0704eba96abac2c130f9118cc98ad5c5f21903601ea60ee1f52c594b7f8b16ebcaabb4b34086f5f9f66ad02cd628c379ed5139bcb1f691016b435ab SHA512 9d35620b55c63b53b7255179a6304f4d7190c2a90f68c102f64b9616ee897460939633e9c77826968a1682fc5fa090b0f3ea1daad82a44cc96704dc54da45dcd
 DIST trash-cli-0.20.11.23.tar.gz 69229 BLAKE2B f3650a037f00e6ce8cd7bd1ff5f3e11c794ceb09563193e2930eb9b81cd40120dd48f117e8c96d900a8221db9a68360ff633e591367bd544ad07045b1a505304 SHA512 d370687da706677de61c0d234d4cb4db4ff4d9da8cde60c361d11eaccf319e2e418969a7d49ec6edd456524b1275b63d1fcd49bc9a9012afabda1c7a8ad7de78
 EBUILD trash-cli-0.17.1.14_p20170816-r1.ebuild 672 BLAKE2B b2a32366ec8a30804d17cb8d2ae0584aea22ef9d25eb899fadb287c6c58ea9c8c9a9dfa044ca4efbb6f5d14a6e2d6668b4f3b48b2bb727d9b97ab51cc3d20705 SHA512 c61d68b82936308431b6b7fdae2c80ccfc9aefa88bb8f508b65374a928ffefd881e3b422e9e197d7e0c7c8a384f2ece47b89e9d52006a5de13a1f0f018352f8e
-EBUILD trash-cli-0.20.11.23.ebuild 588 BLAKE2B 04ce1588f5601ef11edc8447788f55b04e8bcb6698e853a092265b57a8b546cb588b1e4ed15c4d32a0597a14c55f92de0af12d82fa7c6ef50e7b53792962ff16 SHA512 b2b3a74726903b6c495ef1142f4eb61c034e65b38d474b256b40d32808c481a78902cabade1cb4d6e24a773cfadf1d0cb4c6f769a30ca642052335a9120290ff
+EBUILD trash-cli-0.20.11.23.ebuild 586 BLAKE2B ee96ab281f9d8c27d5dd22e67552de0084f32a1fa26c3385465b3cf8f8ea95fe381179fbbaf7589f4d2de9370b6242df8e6e702531f8624d18149366dd0462ea SHA512 207d7a1cf4215dfc2e53b673cdbb74d74ae1703a083075a0af31ad4d7f0e6314ae6206bdf03ebee5a7287393aee2ab5338a940bf2fc983f19f83a465b552c384
 MISC metadata.xml 1064 BLAKE2B ce5e59cc568a0542a0f94bccc46521901384ca856adaf922db9a62a4d45b86e9d179e12cff203fa8a2813131882116310122265805d54d1303b33e82680404c3 SHA512 8f74a9665e4d72c4f7dde8104189ab55d0a64c1e79abdf41920ff1ca425735cb76ce0e5fba044aae2608151086c8b0ad8a552dc15b7780c6086b8ca36d856068
diff --git a/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild b/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
index a6a571417364..fac401424dc2 100644
--- a/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index ef88ff798b0a..ff581a3d2108 100644
--- a/app-misc/vcontrold/Manifest
+++ b/app-misc/vcontrold/Manifest
@@ -1,4 +1,4 @@
 AUX vcontrold 157 BLAKE2B c8d08ae44343850d95e9b99626690a2f79403bb9bafef9ea6125376623c617c4fc1523beb4be4d3cfa50d67c3a7ef84e4b3042afcaf8211ea0276d4e519cd713 SHA512 10583cff05a3099d06ec13cd35711c93dece72de1ba05a2026d85b31cb6279136cbbffa00bcc162cba841232d2f8fe2babda463bdadb6b4f3e1f39ce95562401
 DIST vcontrold-0.98.10.tar.gz 87721 BLAKE2B 06111f534d137d08f0a66b00f1238dd04856c3a7dbe630baeed89667de2840cfa6d9227a899b3ce4819accccd8d2228ef7e31e9562e1bb21027a3ddd2fe2b148 SHA512 4e65c23edd2542323a2815154544c2a4376c35a49a52168d6a3a08dba68f462dbd9c0c43020f86a4cb6c4eb7736b5d9460c2e4e2a67c015e2e51841338547c55
 EBUILD vcontrold-0.98.10.ebuild 882 BLAKE2B febf481c4f796ed0058fd4cee3f938d2633f5ae86dc47b1fc2dd603c40d13fde1107abd0cff0e865b5702a01a2df2b1f1f5435c2242bd9cb8ad3219d5f32cf68 SHA512 b958adf4ca63c46fa77fd1dbf700a25b569bb3eb9b90b888780af43adf4382b959deecdb3ab8f08b0a8d3831ab139ca63d6c43080942e3e821806fba4f80a4a5
-MISC metadata.xml 910 BLAKE2B eb06d0c4ca09ba13dc5ec335afc9da950429c650c05289608c90f91e0b7d550f97f6833752a8e71101fad25d2600dd24c522f9747ddad20c958b31c790769d36 SHA512 9eeeb42e54cff821d986407940d3a8e434ba3126708eef45f3234bbd8519dc7fd564f5bd6767d249370a796e7ed13d934b52b309305b4bcc03401c63a68a3d64
+MISC metadata.xml 866 BLAKE2B f39b62acb12f76e47aa345545eae5801bda3fcf0a6bf2231ccccf053aa7f3718b2c2f3c7bce2a29072ec4728f4632b05c406f14248dd50dbfa4ad86ca1b973dc SHA512 e6b65ade9861e2c8d9f7968d09d5a3faae227f6887e5647d6b8efbc8768b67345c96c813738f841eff00946264c7f9b56b2fef665cf087fec44886e8b2ac8f4f
diff --git a/app-misc/vcontrold/metadata.xml b/app-misc/vcontrold/metadata.xml
index b718f1673eb4..3883fcf236b3 100644
--- a/app-misc/vcontrold/metadata.xml
+++ b/app-misc/vcontrold/metadata.xml
@@ -16,7 +16,6 @@
 	"OpenV" project).
 </longdescription>
 <use>
-	<flag name="man">Build the manpages</flag>
 	<flag name="vclient">
 		Build the vclient helper program to talk to vcontrold
 	</flag>
diff --git a/app-misc/when/Manifest b/app-misc/when/Manifest
index 83023f670c1a..81acde86a6a7 100644
--- a/app-misc/when/Manifest
+++ b/app-misc/when/Manifest
@@ -1,5 +1,5 @@
 DIST when-1.1.37.tar.gz 51020 BLAKE2B 242d7833c91279bc7a73effc108a0f7d5edad9838006d8ff632c46215b7cd2a2187660075e2525a352a458a494abc648a9518945cdf18e2e7d58261e428efd8f SHA512 b1f0cb9cb797a5a32263ef2851498dfbf6a769d3e708b79ca1c5b37c7c877124194dd9b5ae78bfafebc0e73e82f306b3ae734a5ef7140fe3bf0e6b2cfcc4bb18
 DIST when-1.1.40.tar.gz 55306 BLAKE2B 3d4bdc962ccff64b09f5dda7a2c7be1daa0fd5fed2039f784ea6279e9aac495823159098f6a05c281de40d7964cc244a76c6b3bda1c4227748c04c98effac54d SHA512 0d70f2c9c4d44bbd922dc0d6b1a4e1eb90561a81add3ad4f1e1fc467a6331ca856d66725361d4e5ea3f1ce9ea1ed59d91ad18178e022b029c04c0c15747ecbcd
 EBUILD when-1.1.37.ebuild 883 BLAKE2B 6c9dfcb07bbb0952a21d2394af310032d98069cbfcce5467ea85c80b76114673d49b2aab91b399e029151ed22676bbcc8ab980cd8030ebef7ce117f0305b26dc SHA512 904b9f973b8db0fbd57f09e9a1620e8b0056ddb2e2be5674ef8d8045c8470b30290d2858bce9e44c15fe194f0767ffe0ec5b75e73bbb1f0ee42d2b0231751bcb
-EBUILD when-1.1.40.ebuild 903 BLAKE2B fc278605b1145752195ef116b5ff9a14fda50ea188227c05d3f1457680456ac422f204943342cb4d85e7f5b4370a5a6cde4450a05a0cfe96f4e9d09bc1417d7e SHA512 8f9077616f7ad5cd31a10d6333e61a8dbd427dfd1fde0990fd62cf0f84edabf14852470758f5dd5c7204d62850868639a8aaa54ea61de7c60784c9d80c98a47d
-MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
+EBUILD when-1.1.40.ebuild 900 BLAKE2B ec3e9967163ac70897ae0b8a96dda7f379ee694cdc400caa70b3fa31fadc1ddf3adf9466df9834a1fcf1d0e1199a9bb25cbfe18759f0f89ff14c8b68c73445e2 SHA512 5d799b94f8751c4030caf276386f856325d04ea9e15c688a756fa3a72f9a320c1d6975700bd7081621ea67bbbcb151ff60ea9d779295757ced70da0069e4ea76
+MISC metadata.xml 296 BLAKE2B a32736982613d5d7d4c99169fc5bc6af3607a89fef7351aee4230615611df20107c0ab865192d7c5bdc7ad84e41887a4ce34c8eb9c3a4228568fdfa8d4f92050 SHA512 8a2af01ba19649adce33f89067295923c603df7c8a14eb1563e4024ab0a41d55a885d95c020d263d6a8ad5e9e59d9c00ab79a809f79fc9f6d6724f1671807783
diff --git a/app-misc/when/metadata.xml b/app-misc/when/metadata.xml
index 3e927f8d7480..cac49a73ac40 100644
--- a/app-misc/when/metadata.xml
+++ b/app-misc/when/metadata.xml
@@ -5,4 +5,5 @@
     <email>shell-tools@gentoo.org</email>
     <name>Gentoo Shell Tools Project</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-misc/when/when-1.1.40.ebuild b/app-misc/when/when-1.1.40.ebuild
index 495eda01aa68..51356f2b9c61 100644
--- a/app-misc/when/when-1.1.40.ebuild
+++ b/app-misc/when/when-1.1.40.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /app-misc
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)