Updating liguros repo21.1.2

author: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-17 23:35:33 +0000
committer: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-17 23:35:33 +0000
commit: 8e8120eabdd28020aa69c7a60505cce2edd20adc (patch)
tree: 061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /app-misc
parent: c16790af2c9b4cbc38e565d4311252193ff85484 (diff)
download: baldeagleos-repo-21.1.2.tar.gz
baldeagleos-repo-21.1.2.tar.xz
baldeagleos-repo-21.1.2.zip
175 files changed, 2529 insertions, 1808 deletions
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index d013dc23f146..fcec57bd07d4 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,3 +1 @@
-DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
-DIST anki-2.1.13.tgz 4248906 BLAKE2B 82a2a9a556cbf3596af22a73a2865815561cdd408b249443fc7e144734fdc2b62317120db71475afd7b0d4027f19e53c47437132028ef78b158ec3624f54a33f SHA512 921ef48b16c0c8c83b85523aa0a5b828210b210cd51fa471f57e9aa6777a1aced30c7e24084ef0c2f14c9d846a19091923d13faaff7ed9075860fc23f8ba1cd3
 DIST anki-2.1.15.tgz 4269571 BLAKE2B 00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e SHA512 f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild
deleted file mode 100644
index 223433d68ad8..000000000000
--- a/app-misc/anki/anki-2.1.0_beta27.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 xdg
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net"
-
-MY_P="${P/_/}"
-SRC_URI="https://apps.ankiweb.net/downloads/beta/${MY_P}-source.tgz -> ${P}.tgz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		|| (
-			(
-				>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-				dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
-			)
-			<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-		recording? (
-			media-sound/lame
-			>=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	sound? ( media-video/mplayer )
-	latex? (
-		app-text/texlive
-		app-text/dvipng
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-src_compile() {
-	:;
-}
-
-src_test() {
-	sed -e "s:nosetests:${EPYTHON} ${EROOT}usr/bin/nosetests:" \
-		-i tools/tests.sh || die
-	./tools/tests.sh || die
-}
-
-src_install() {
-	cp tools/runanki.system tools/anki
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README.md README.development
-	python_domodule aqt anki
-	python_doscript tools/anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-
-	# not sure if this is correct, but
-	# site-packages/aqt/mediasrv.py wants the directory
-	insinto /usr/share/anki
-	doins -r web
-}
diff --git a/app-misc/anki/anki-2.1.13-r1.ebuild b/app-misc/anki/anki-2.1.13-r1.ebuild
deleted file mode 100644
index 484cda3846bb..000000000000
--- a/app-misc/anki/anki-2.1.13-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 xdg
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net"
-SRC_URI="https://apps.ankiweb.net/downloads/current/${P}-source.tgz -> ${P}.tgz"
-
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		|| (
-			(
-				>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-				dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
-			)
-			<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-	')
-	recording? ( media-sound/lame )
-	sound? ( media-video/mpv )
-	latex? (
-		app-text/texlive
-		app-text/dvipng
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-src_compile() {
-	:;
-}
-
-src_test() {
-	sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests\":" \
-		-i tools/tests.sh || die
-	sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests3\":" \
-		-i tools/tests.sh || die
-	sed -e "s:which nosetests3:which ${EROOT}usr/bin/nosetests3:" \
-		-i tools/tests.sh || die
-	./tools/tests.sh || die
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README.md README.development
-	python_domodule aqt anki
-	python_newscript runanki anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-
-	# not sure if this is correct, but
-	# site-packages/aqt/mediasrv.py wants the directory
-	insinto /usr/share/anki
-	doins -r web
-}
diff --git a/app-misc/anki/metadata.xml b/app-misc/anki/metadata.xml
index ce291ec35f67..5c89744fca28 100644
--- a/app-misc/anki/metadata.xml
+++ b/app-misc/anki/metadata.xml
@@ -10,13 +10,5 @@
 		(such as words and phrases in a foreign language) as
 		quickly, easily and efficiently as possible.
 	</longdescription>
-	<use>
-		<flag name="recording">
-			Enable support for audio recording
-		</flag>
-		<flag name="sound">
-			Enable support for adding sound to cards
-		</flag>
-	</use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/app-misc/beanstalkd/beanstalkd-1.10.ebuild b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
index 055c00ea7114..2c2ca1bfbcb0 100644
--- a/app-misc/beanstalkd/beanstalkd-1.10.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
 
 RDEPEND=""
 DEPEND=""
diff --git a/app-misc/beanstalkd/beanstalkd-1.11.ebuild b/app-misc/beanstalkd/beanstalkd-1.11.ebuild
index b73a46fa6fbc..e9af71b56460 100644
--- a/app-misc/beanstalkd/beanstalkd-1.11.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.11.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
 
 RDEPEND=""
 DEPEND=""
diff --git a/app-misc/bfr/bfr-1.6-r3.ebuild b/app-misc/bfr/bfr-1.6-r3.ebuild
index 36da22707188..b9381a4178cb 100644
--- a/app-misc/bfr/bfr-1.6-r3.ebuild
+++ b/app-misc/bfr/bfr-1.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 19a51267e2ae..a944587036d0 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1 +1,2 @@
 DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
+DIST byobu_5.133.orig.tar.gz 761655 BLAKE2B 796cfe22ba60a8cfe41ca6570e4c7f265dd249e7767086341903da7862037f39b1f49434b6dae36d12d82df1ee34306b815ff3f8e703eeedab79cf02e8d86a7d SHA512 4c0ef7a3b483e48c57f3e97dae1c7c77084797016efb677b201f2b56c6b9f4b771739d9a6d9a4fb612203a22e9fa460db80fde30c837b102ad830b1b2919db6c
diff --git a/app-misc/byobu/byobu-5.133.ebuild b/app-misc/byobu/byobu-5.133.ebuild
new file mode 100644
index 000000000000..3f75ff34ae6b
--- /dev/null
+++ b/app-misc/byobu/byobu-5.133.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="https://byobu.org"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/newt[${PYTHON_MULTI_USEDEP}]')
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# It's easier than forcing autoconf
+	mv "${ED}/usr/share/doc/${PN}/"* "${ED}/usr/share/doc/${PF}/" || die
+	rmdir "${ED}/usr/share/doc/${PN}" || die
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 04e92b9aa0e8..4f631bdca8e1 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
index e000dc1f7a2b..301f0fda6591 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.53.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
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
index db15fba794b6..a9eece971c11 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.59.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
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
index 0d45aa119424..41f1c533f16d 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.60.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
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -58,7 +58,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index 4ea5c0164140..242d866bed66 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild
index 4c796fdadaa2..39b2136d9ab9 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
 
 # ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild
index 731e22fc2b79..56e47ddbd5b4 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
 
 # ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild
index c5e804d282eb..4ff80bd27a2b 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
 
 # ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
diff --git a/app-misc/cdcat/cdcat-0.3-r1.ebuild b/app-misc/cdcat/cdcat-0.3-r1.ebuild
index af26f8e2a26f..2082c8c5492c 100644
--- a/app-misc/cdcat/cdcat-0.3-r1.ebuild
+++ b/app-misc/cdcat/cdcat-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="virtual/cdrtools
+RDEPEND="app-cdr/cdrtools
 	!app-backup/cdbkup"
 
 src_prepare() {
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
index 1599b0e536af..c684a70c88ba 100644
--- a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="X"
 
 DEPEND="
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
index f13c4ed13d70..3d121d23e23e 100644
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/colordiff/colordiff-1.0.18.ebuild b/app-misc/colordiff/colordiff-1.0.18.ebuild
index 47466f9aec97..cbf68c547973 100644
--- a/app-misc/colordiff/colordiff-1.0.18.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/colordiff/colordiff-1.0.19.ebuild b/app-misc/colordiff/colordiff-1.0.19.ebuild
index d60e7888d2a7..416441e3d6dd 100644
--- a/app-misc/colordiff/colordiff-1.0.19.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
index 326ae6f60c97..f0df9cfaaeab 100644
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ b/app-misc/datefudge/datefudge-1.22.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=()
diff --git a/app-misc/datefudge/datefudge-1.24.ebuild b/app-misc/datefudge/datefudge-1.24.ebuild
index ae3251a7d789..3f5a06b1b0ee 100644
--- a/app-misc/datefudge/datefudge-1.24.ebuild
+++ b/app-misc/datefudge/datefudge-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index c63f3d1cf672..f625e5a75484 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,2 +1 @@
-DIST datovka-4.15.0.tar.xz 2816380 BLAKE2B 4e7d74bfc95286f9b6af3e84cd1439ca22b9aa83735cdde76827d49957bc210105ef82d6c1cb2c6ab861cd38ef852d043bf1fc30c22264aedb22f598c6c78ab0 SHA512 c379c61e091b92db0a061bff943f0f95e8627b2806641e001de090fafe8407b9a1167697b0b009217c0999c4ec2f61cb2bf3d3a8f5b234ed823ec6b88b6232fb
-DIST datovka-4.15.1.tar.xz 2821764 BLAKE2B ebc0eb75b239579224f77f1894d05fb617dc1556033ee1e82a27fb13b71284dcbe3b4dfff1711084869f7cc82837487f3676d9c3d681e91b0232cee0c77b7da0 SHA512 7f2286f6af5350be668a83098d65f49ead31473b0d2f3d4d336089bdd73cf6a6cec007112c0e10f08ecbb90e1a29c2ee12cd4773f41c677ebe1127366d06ca20
+DIST datovka-4.15.3.tar.xz 2827960 BLAKE2B 765b48f0608f3cbd947e5191778a0ae88e1fcb6679bc252160c8f5ed2b186f672fcfe2b55db67182d9a07676ebab01a272b70fced151e7f8ae027a632c6d9879 SHA512 e3791dae451ce7b42bd50cfdf0191430e3d1b5d8101a70e5c1466296b03d94e798dc080b663ff98bdf9dd80138f5d067ae5d493aeaf89285d66095b24ce15f1a
diff --git a/app-misc/datovka/datovka-4.15.0.ebuild b/app-misc/datovka/datovka-4.15.0.ebuild
deleted file mode 100644
index c1b58089938d..000000000000
--- a/app-misc/datovka/datovka-4.15.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="GUI to access the Czech data box e-government system"
-HOMEPAGE="https://www.datovka.cz/"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# minimum Qt version required
-QT_PV="5.14.0:5"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=net-libs/libisds-0.11
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-"
-PATCHES=( "${FILESDIR}/${P}-appdata-to-metainfo.patch"
-	  "${FILESDIR}/${P}-include-QPainterPath.patch" )
-DOCS=( ChangeLog README )
-
-src_configure() {
-	lrelease datovka.pro || die
-	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/datovka/datovka-4.15.1.ebuild b/app-misc/datovka/datovka-4.15.3.ebuild
index 89144ad68b57..89144ad68b57 100644
--- a/app-misc/datovka/datovka-4.15.1.ebuild
+++ b/app-misc/datovka/datovka-4.15.3.ebuild
diff --git a/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch b/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch
deleted file mode 100644
index c824777436e7..000000000000
--- a/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/datovka.pro	2020-04-01 09:22:29.110403965 +0200
-+++ b/datovka.pro	2020-04-01 09:24:11.984441796 +0200
-@@ -72,7 +72,7 @@
- 	desktop.path = "$${DATADIR}/applications"
- 	desktop.files += deployment/datovka.desktop
- 
--	appdata.path = "$${DATADIR}/appdata"
-+	appdata.path = "$${DATADIR}/metainfo"
- 	appdata.files += deployment/datovka.appdata.xml
- 
- 	icon16.path = "$${DATADIR}/icons/hicolor/16x16/apps"
diff --git a/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch b/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch
deleted file mode 100644
index e381c40b5925..000000000000
--- a/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/delegates/tag_item.cpp	2020-03-04 11:05:08.000000000 +0100
-+++ b/src/delegates/tag_item.cpp	2020-06-08 14:52:06.000000000 +0200
-@@ -23,6 +23,7 @@
- 
- #include <algorithm> /* std::sort */
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include "src/datovka_shared/localisation/localisation.h"
- #include "src/datovka_shared/log/log.h"
diff --git a/app-misc/dfshow/dfshow-0.8.2_beta.ebuild b/app-misc/dfshow/dfshow-0.8.2_beta-r1.ebuild
index 2b75216f7b96..5733b6700512 100644
--- a/app-misc/dfshow/dfshow-0.8.2_beta.ebuild
+++ b/app-misc/dfshow/dfshow-0.8.2_beta-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-libs/libconfig
+DEPEND="dev-libs/libconfig:=
 	sys-libs/ncurses:0=
 "
 RDEPEND="${DEPEND}"
diff --git a/app-misc/dfshow/dfshow-0.9.1_beta.ebuild b/app-misc/dfshow/dfshow-0.9.1_beta-r1.ebuild
index 29830de4a64a..883ebd7c7fee 100644
--- a/app-misc/dfshow/dfshow-0.9.1_beta.ebuild
+++ b/app-misc/dfshow/dfshow-0.9.1_beta-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-libs/libconfig
+DEPEND="dev-libs/libconfig:=
 	sys-libs/ncurses:0=
 "
 RDEPEND="${DEPEND}"
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index 4370535e247c..28db668bb039 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/empty/Manifest b/app-misc/empty/Manifest
index 42fdd9d1fa18..b916d68dfed2 100644
--- a/app-misc/empty/Manifest
+++ b/app-misc/empty/Manifest
@@ -1 +1,2 @@
 DIST empty-0.6.20b.tgz 16269 BLAKE2B 15a50b2484278cb03b7d91cd5b6a14b9898a3ead3bf2017cc86d9dc8e3a3ec5650b20f57fec6ccdccf780c008841d41205098ea423731c593c1744ca55e5a934 SHA512 bdeda29ecde0bc7ee0432656f0497154e04dbad26aba62a0fe76ded394ddeefe2bfd921594a2dae44459b62ab4767d3b12a7a86216dfda56b6d77035a8b05c3d
+DIST empty-0.6.21b.tgz 26793 BLAKE2B d7266c03ef1580bf9871c294e54e292ba264ef6b72c4be1db8e408696bc8327891cb7827de68e429b0496165bc7e105c697c76f29267b3f10030bc6b183a4910 SHA512 4aef74a61161e8d6b6b5159adfa5b7f2779798fddfdbc070b15ca3f747081eb2f7984b58b0a0cef4452892712d274580cf33c64ffddaee3f70ac9bacfc2f7e09
diff --git a/app-misc/empty/empty-0.6.21b.ebuild b/app-misc/empty/empty-0.6.21b.ebuild
new file mode 100644
index 000000000000..8f1e8687f455
--- /dev/null
+++ b/app-misc/empty/empty-0.6.21b.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Small shell utility, similar to expect(1)"
+HOMEPAGE="https://sourceforge.net/projects/empty/"
+SRC_URI="https://download.sourceforge.net/empty/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/logger"
+
+PATCHES=( "${FILESDIR}/${PN}-respect-LDFLAGS.patch" )
+
+S="${WORKDIR}"
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin empty
+	doman empty.1
+	dodoc README
+	dodoc -r examples
+}
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index 83286cc270b7..ad561a85095b 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/app-misc/fdupes/fdupes-1.5.1.ebuild b/app-misc/fdupes/fdupes-1.5.1.ebuild
index 47746954021f..8202ea8e4789 100644
--- a/app-misc/fdupes/fdupes-1.5.1.ebuild
+++ b/app-misc/fdupes/fdupes-1.5.1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-misc/fdupes/fdupes-2.1.2.ebuild b/app-misc/fdupes/fdupes-2.1.2.ebuild
new file mode 100644
index 000000000000..78acd8f3a926
--- /dev/null
+++ b/app-misc/fdupes/fdupes-2.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
+SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${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"
+IUSE="+ncurses"
+
+RDEPEND="
+	dev-libs/libpcre2[pcre32]
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README )
+
+src_configure() {
+	econf $(use_with ncurses)
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
diff --git a/app-misc/fdupes/fdupes-9999.ebuild b/app-misc/fdupes/fdupes-9999.ebuild
index f27d34c2d82a..9fc8d0597860 100644
--- a/app-misc/fdupes/fdupes-9999.ebuild
+++ b/app-misc/fdupes/fdupes-9999.ebuild
@@ -1,34 +1,41 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic git-r3 toolchain-funcs
-
-MY_P="${PN}-${PV/_pre/-PR}"
+inherit toolchain-funcs
 
 DESCRIPTION="Identify/delete duplicate files residing within specified directories"
 HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
-EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
-
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
+else
+	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
 LICENSE="MIT"
 SLOT="0"
+IUSE="+ncurses"
 
-KEYWORDS=""
-SRC_URI=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+RDEPEND="
+	dev-libs/libpcre2[pcre32]
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( CHANGES CONTRIBUTORS README )
 
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
 src_configure() {
-	append-lfs-flags
-	tc-export CC
+	econf $(use_with ncurses)
 }
 
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-	einstalldocs
+src_compile() {
+	emake CC=$(tc-getCC)
 }
diff --git a/app-misc/fdupes/files/fdupes-9999-gentoo.patch b/app-misc/fdupes/files/fdupes-9999-gentoo.patch
deleted file mode 100644
index 4c6edda50e04..000000000000
--- a/app-misc/fdupes/files/fdupes-9999-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -71,9 +71,9 @@
- # Make Configuration
- #
- CC ?= gcc
--COMPILER_OPTIONS = -Wall -O -g
-+COMPILER_OPTIONS = -Wall
- 
--CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
-+CFLAGS += $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
- 
- INSTALL_PROGRAM = $(INSTALL) -c -m 0755
- INSTALL_DATA    = $(INSTALL) -c -m 0644
diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
index d234389a9e19..b0196c0d391c 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-5.5-20060227
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc10.patch"
+
 	local d="${WORKDIR}"/debian/patches
 	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
 	sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
index 1116db851a7f..632a26a8982b 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-5.5-20060227
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc10.patch"
+
 	local d="${WORKDIR}"/debian/patches
 	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
 	sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
diff --git a/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
new file mode 100644
index 000000000000..2bda41e11255
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
@@ -0,0 +1,20 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Bug-Debian: https://bugs.debian.org/957200
+Forwarded: no
+
+---
+
+--- fdutils-5.5-20060227.orig/src/superformat.h
++++ fdutils-5.5-20060227/src/superformat.h
+@@ -97,7 +97,7 @@ int compute_all_sequences(struct params
+ void compute_track0_sequence(struct params *fd);
+ int calc_skews(struct params *fd0, struct params *fd, int n);
+ extern int verbosity;
+-int header_size;
+-int index_size;
++extern int header_size;
++extern int index_size;
+ 
+ #endif
diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 935a9eaf4905..8bf940a21ca2 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 src_compile() {
 	emake clean
diff --git a/app-misc/figlet/figlet-2.2.5.ebuild b/app-misc/figlet/figlet-2.2.5.ebuild
deleted file mode 100644
index f3f2af022bc5..000000000000
--- a/app-misc/figlet/figlet-2.2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="program for making large letters out of ordinary text"
-HOMEPAGE="https://www.figlet.org/"
-SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-src_compile() {
-	emake clean
-	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-	    LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		all
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}/usr/bin" \
-		MANDIR="${EPREFIX}/usr/share/man" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	doman chkfont.6 figlet.6 figlist.6 showfigfonts.6
-	dodoc README figfont.txt
-
-	dobashcomp "${FILESDIR}"/figlet.bashcomp
-}
diff --git a/app-misc/gcal/gcal-3.6.3.ebuild b/app-misc/gcal/gcal-3.6.3.ebuild
index ef7714001f50..b84cc575396a 100644
--- a/app-misc/gcal/gcal-3.6.3.ebuild
+++ b/app-misc/gcal/gcal-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses nls unicode"
 
 DEPEND="
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1.ebuild
index cd7e657da4f9..56c197b65ff0 100644
--- a/app-misc/gcal/gcal-4.1.ebuild
+++ b/app-misc/gcal/gcal-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses nls unicode"
 
 DEPEND="
diff --git a/app-misc/geekcode/files/geekcode-1.7.3-exit.patch b/app-misc/geekcode/files/geekcode-1.7.3-exit.patch
index 23eba06a52eb..08fe92601942 100644
--- a/app-misc/geekcode/files/geekcode-1.7.3-exit.patch
+++ b/app-misc/geekcode/files/geekcode-1.7.3-exit.patch
@@ -1,5 +1,5 @@
---- geekcode.h.orig	2003-06-30 16:47:40.000000000 +0200
-+++ geekcode.h	2010-12-30 19:14:51.000000000 +0100
+--- a/geekcode.h
++++ b/geekcode.h
 @@ -22,6 +22,7 @@
  #ifndef __INCLUDED_GEEKCODE_H__
  #define __INCLUDED_GEEKCODE_H__
diff --git a/app-misc/geekcode/files/geekcode-1.7.3-fno-common.patch b/app-misc/geekcode/files/geekcode-1.7.3-fno-common.patch
new file mode 100644
index 000000000000..c5725d19c2b2
--- /dev/null
+++ b/app-misc/geekcode/files/geekcode-1.7.3-fno-common.patch
@@ -0,0 +1,151 @@
+--- a/geekcode.c
++++ b/geekcode.c
+@@ -24,6 +24,55 @@
+ #include <sys/stat.h>
+ #include "geekcode.h"
+ 
++/* Geek type - gc_type.c */
++int get_type(void),          gc_type;
++
++/* Appearance section - gc_appearance.c */
++int get_dress(void),         gc_dress;
++int get_height(void),        gc_height;
++int get_weight(void),        gc_weight;
++int get_age(void),           gc_age;
++
++/* Computers section - gc_computers.c */
++int get_computers(void),     gc_computers;
++int get_unix_type(void),     gc_unix_type; /* Added in v1.1 */
++int get_unix(int x),         gc_unix;
++int get_perl(void),          gc_perl;
++int get_linux(void),         gc_linux;
++int get_emacs(void),         gc_emacs;
++int get_www(void),           gc_www;
++int get_usenet(void),        gc_usenet;
++int get_oracle(void),        gc_oracle;
++int get_kibo(void),          gc_kibo;
++int get_windows(void),       gc_windows;
++int get_os2(void),           gc_os2;
++int get_mac(void),           gc_mac;
++int get_vms(void),           gc_vms;
++
++/* Politics section - gc_politics.c */
++int get_social(void),        gc_social;
++int get_economic(void),      gc_economic;
++int get_cypher(void),        gc_cypher;
++int get_pgp(void),           gc_pgp;
++
++/* Entertainment section - gc_entertainment.c */
++int get_startrek(void),      gc_startrek;
++int get_babylon5(void),      gc_babylon5;
++int get_xfiles(void),        gc_xfiles;
++int get_rp(void),            gc_rp;
++int get_television(void),    gc_television;
++int get_books(void),         gc_books;
++int get_dilbert(void),       gc_dilbert;
++int get_doom(void),          gc_doom;
++int get_geekcode(void),      gc_geekcode;
++
++/* Lifestyle section - gc_lifestyle.c */
++int get_education(void),     gc_education;
++int get_housing(void),       gc_housing;
++int get_relationships(void), gc_relationships;
++int get_sex_type(void),      gc_sex_type; /* Added in v1.2 */
++int get_sex(int x),          gc_sex;      /* Modified in v1.2 */
++
+ int readgeek(char geekcode[64][16],char *data,int *j,int *k){
+   int i;
+ 
+--- a/geekcode.h
++++ b/geekcode.h
+@@ -34,53 +34,53 @@
+                  */
+ 
+ /* Geek type - gc_type.c */
+-int get_type(void),          gc_type;
++extern int get_type(void),          gc_type;
+ 
+ /* Appearance section - gc_appearance.c */
+-int get_dress(void),         gc_dress;
+-int get_height(void),        gc_height;
+-int get_weight(void),        gc_weight;
+-int get_age(void),           gc_age;
++extern int get_dress(void),         gc_dress;
++extern int get_height(void),        gc_height;
++extern int get_weight(void),        gc_weight;
++extern int get_age(void),           gc_age;
+ 
+ /* Computers section - gc_computers.c */
+-int get_computers(void),     gc_computers;
+-int get_unix_type(void),     gc_unix_type; /* Added in v1.1 */
+-int get_unix(int x),         gc_unix;
+-int get_perl(void),          gc_perl;
+-int get_linux(void),         gc_linux;
+-int get_emacs(void),         gc_emacs;
+-int get_www(void),           gc_www;
+-int get_usenet(void),        gc_usenet;
+-int get_oracle(void),        gc_oracle;
+-int get_kibo(void),          gc_kibo;
+-int get_windows(void),       gc_windows;
+-int get_os2(void),           gc_os2;
+-int get_mac(void),           gc_mac;
+-int get_vms(void),           gc_vms;
++extern int get_computers(void),     gc_computers;
++extern int get_unix_type(void),     gc_unix_type; /* Added in v1.1 */
++extern int get_unix(int x),         gc_unix;
++extern int get_perl(void),          gc_perl;
++extern int get_linux(void),         gc_linux;
++extern int get_emacs(void),         gc_emacs;
++extern int get_www(void),           gc_www;
++extern int get_usenet(void),        gc_usenet;
++extern int get_oracle(void),        gc_oracle;
++extern int get_kibo(void),          gc_kibo;
++extern int get_windows(void),       gc_windows;
++extern int get_os2(void),           gc_os2;
++extern int get_mac(void),           gc_mac;
++extern int get_vms(void),           gc_vms;
+ 
+ /* Politics section - gc_politics.c */
+-int get_social(void),        gc_social;
+-int get_economic(void),      gc_economic;
+-int get_cypher(void),        gc_cypher;
+-int get_pgp(void),           gc_pgp;
++extern int get_social(void),        gc_social;
++extern int get_economic(void),      gc_economic;
++extern int get_cypher(void),        gc_cypher;
++extern int get_pgp(void),           gc_pgp;
+ 
+ /* Entertainment section - gc_entertainment.c */
+-int get_startrek(void),      gc_startrek;
+-int get_babylon5(void),      gc_babylon5;
+-int get_xfiles(void),        gc_xfiles;
+-int get_rp(void),            gc_rp;
+-int get_television(void),    gc_television;
+-int get_books(void),         gc_books;
+-int get_dilbert(void),       gc_dilbert;
+-int get_doom(void),          gc_doom;
+-int get_geekcode(void),      gc_geekcode;
++extern int get_startrek(void),      gc_startrek;
++extern int get_babylon5(void),      gc_babylon5;
++extern int get_xfiles(void),        gc_xfiles;
++extern int get_rp(void),            gc_rp;
++extern int get_television(void),    gc_television;
++extern int get_books(void),         gc_books;
++extern int get_dilbert(void),       gc_dilbert;
++extern int get_doom(void),          gc_doom;
++extern int get_geekcode(void),      gc_geekcode;
+ 
+ /* Lifestyle section - gc_lifestyle.c */
+-int get_education(void),     gc_education;
+-int get_housing(void),       gc_housing;
+-int get_relationships(void), gc_relationships;
+-int get_sex_type(void),      gc_sex_type; /* Added in v1.2 */
+-int get_sex(int x),          gc_sex;      /* Modified in v1.2 */
++extern int get_education(void),     gc_education;
++extern int get_housing(void),       gc_housing;
++extern int get_relationships(void), gc_relationships;
++extern int get_sex_type(void),      gc_sex_type; /* Added in v1.2 */
++extern int get_sex(int x),          gc_sex;      /* Modified in v1.2 */
+ char show_sex_type(int x);                /* Added in v1.2 */
+ 
+ void show_geekcode(int x);                /* Modified in v1.2 */
diff --git a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
index c7ee00d9be1e..443adb611452 100644
--- a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.3-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=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Geek code generator"
 HOMEPAGE="https://sourceforge.net/projects/geekcode"
@@ -11,13 +11,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-exit.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
-	eapply -p0 "${FILESDIR}/${P}-exit.patch"
+	default
 	sed -i Makefile -e 's| -o | ${LDFLAGS}&|g' || die "sed Makefile"
-
-	eapply_user
 }
 
 src_compile() {
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 57f17eca5ea1..83f801df4557 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1 +1,2 @@
 DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
+DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
diff --git a/app-misc/geneweb/geneweb-7.0.0-r1.ebuild b/app-misc/geneweb/geneweb-7.0.0-r1.ebuild
new file mode 100644
index 000000000000..b7c12813fba3
--- /dev/null
+++ b/app-misc/geneweb/geneweb-7.0.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils
+
+DESCRIPTION="Genealogy software program with a Web interface"
+HOMEPAGE="https://github.com/geneweb/geneweb"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="strip"
+
+RDEPEND="dev-lang/ocaml[ocamlopt?]
+	dev-ml/camlp5[ocamlopt?]
+	acct-user/geneweb
+	acct-group/geneweb
+	dev-ml/jingoo
+	dev-ml/uunf
+	>=dev-ml/markup-1.0.0
+	dev-ml/unidecode
+	dev-ml/calendars"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+
+QA_FLAGS_IGNORED=(
+	/usr/bin/gwb2ged
+	/usr/bin/update_nldb
+	/usr/bin/consang
+	/usr/bin/gwd
+	/usr/bin/gwsetup
+	/usr/bin/gwc
+	/usr/bin/ged2gwb
+	/usr/bin/gwu
+	/usr/bin/connex
+	/usr/bin/gwdiff
+	/usr/bin/gwgc
+)
+
+src_configure() {
+	ocaml ./configure.ml
+}
+
+src_compile() {
+	if use ocamlopt; then
+		emake
+	else
+		emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
+		# If using bytecode we dont want to strip the binary as it would remove
+		# the bytecode and only leave ocamlrun...
+	fi
+}
+
+src_install() {
+	default
+	mv "${D}"/usr/bin/{,gw}setup || die
+	rm -r "${D}"/usr/doc || die
+	dodoc ICHANGES etc/README.txt etc/a.gwf
+
+	# Install manpages
+	doman man/*
+
+	emake distrib
+	cd distribution/gw
+	insinto /usr/share/${PN}
+	doins -r etc images lang setup gwd.arg only.txt
+
+	newinitd "${FILESDIR}/geneweb.initd" geneweb
+	newconfd "${FILESDIR}/geneweb.confd" geneweb
+}
+
+pkg_postinst() {
+	einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
+	einfo "instructions on the README in that directory to use it"
+	einfo "If you come from an old version you need to rebuild the database"
+	einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
+	einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
+	einfo "(using the current package)"
+}
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index a488e78f4aa3..fe2eb782424d 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,2 +1,3 @@
 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
 DIST geoclue-2.5.3.tar.bz2 85084 BLAKE2B 3f61c16dcb4d0de95499865d83df4bd9b393d9d2f204b70029fb753666caab0e74468ae14f37ed78475d623caae9553e0e69b62765afebc6730212428d377aff SHA512 b4188f1b055f84ce0c58e497896a328d09838073b867598a0ca026c741e4464ae7ee54e53e9f02addd818152dce4a21eb5f83a3245e7ce1a93eec5671d0a9ee9
+DIST geoclue-2.5.7.tar.bz2 85764 BLAKE2B bf0a6e312b7a303ed2cfc33f02cfad0e68e44f60899a327c9eba12f4967d2a3a5922a475f8fefb6f47da328c92dc75706504b41bc2dcd21db3fc5da7c2a50180 SHA512 16ec15afa41910b7d993a9918dd3c068dea3f6c5be922b7ac772493cd6aabb0cad3fe2206b82c1a008781c3f1ddd8f4afd8f70b5d497920bea8ed5e473f0fd1f
diff --git a/app-misc/geoclue/geoclue-2.5.7.ebuild b/app-misc/geoclue/geoclue-2.5.7.ebuild
new file mode 100644
index 000000000000..aa3184b5e50d
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.5.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson systemd vala xdg
+
+DESCRIPTION="A location information D-Bus service"
+HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
+SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection gtk-doc modemmanager vala zeroconf"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-0.14.0
+	>=net-libs/libsoup-2.42.0:2.4
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	modemmanager? ( >=net-misc/modemmanager-1.6 )
+	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}
+	acct-user/geoclue
+	sys-apps/dbus
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/2.5.3-optional-vapi.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlibgeoclue=true
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc)
+		$(meson_use modemmanager 3g-source)
+		$(meson_use modemmanager cdma-source)
+		$(meson_use modemmanager modem-gps-source)
+		$(meson_use zeroconf nmea-source)
+		-Denable-backend=true
+		-Ddemo-agent=true
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Ddbus-srv-user=geoclue
+	)
+	meson_src_configure
+}
diff --git a/app-misc/getopt/getopt-1.1.6-r1.ebuild b/app-misc/getopt/getopt-1.1.6-r1.ebuild
index c850aac36d57..5a27d8784e54 100644
--- a/app-misc/getopt/getopt-1.1.6-r1.ebuild
+++ b/app-misc/getopt/getopt-1.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://frodo.looijaard.name/system/files/software/getopt/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/glimpse/glimpse-4.18.6-r1.ebuild b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
index 919525fbca4a..e0e449c5a40c 100644
--- a/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
+++ b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 RDEPEND="!dev-libs/tre
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 41f9152dcb62..18e55e3d1acc 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1 @@
-DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
 DIST golly-4.0-src.tar.gz 5579026 BLAKE2B fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32 SHA512 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
diff --git a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
deleted file mode 100644
index e46b608ed6c5..000000000000
--- a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-'execfile' is python-2-only. 'exec/open' works for both python2 and python3.
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -3356,7 +3388,7 @@ void RunPythonScript(const wxString& filepath)
-     // for the global namespace so that this script cannot change the
-     // globals of a caller script (which is possible now that RunScript
-     // is re-entrant)
--    wxString command = wxT("execfile('") + fpath + wxT("',{})");
-+    wxString command = wxT("exec(open('") + fpath + wxT("').read(),{})");
-     PyRun_SimpleString(command.mb_str(wxConvLocal));
-     // don't use wxConvUTF8 in above line because caller has already converted
-     // filepath to decomposed UTF8 if on a Mac
diff --git a/app-misc/golly/files/golly-3.3-allow-py3.patch b/app-misc/golly/files/golly-3.3-allow-py3.patch
deleted file mode 100644
index 54a047830818..000000000000
--- a/app-misc/golly/files/golly-3.3-allow-py3.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-The patch allows python3 as a python implementation.
-Ports module loading to conditional python3 support.
---- a/gui-wx/configure/configure.ac
-+++ b/gui-wx/configure/configure.ac
-@@ -19,7 +19,7 @@ AC_ARG_WITH([python-shlib], [AS_HELP_STRING([--with-python-shlib=ARG],
- 	, [with_python_shlib=check])
- AC_ARG_VAR([GOLLYDIR], [golly data directory [default=DATADIR/golly]])
- AC_ARG_VAR([PERL], [Perl 5 interpreter])
--AC_ARG_VAR([PYTHON], [Python 2 interpreter])
-+AC_ARG_VAR([PYTHON], [Python interpreter])
- 
- # Check for build tools:
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-@@ -76,7 +76,7 @@ AS_IF([test "x$enable_perl" = xyes], [
- ])
- 
- # Find Python
--AC_PATH_PROGS(PYTHON, [python2 python])
-+AC_CHECK_PROGS(PYTHON, [python python3 python2])
- AS_IF([test "x$PYTHON" = x], [AC_MSG_ERROR([missing Python])])
- AC_SUBST([PYTHON_INCLUDE], [-I"'`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())"`'"])
- AS_IF([test "x$with_python_shlib" = xcheck],
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -90,6 +90,12 @@
-     #include <Python.h>
- #endif
- 
-+#if PY_MAJOR_VERSION >= 3
-+    // python-3 got rid of int/log distinction
-+    #define PyInt_AsLong PyLong_AsLong
-+    #define PyInt_FromLong PyLong_FromLong
-+#endif
-+
- #ifdef USE_PYTHON_DYNAMIC
- 
- #ifndef __WXMAC__
-@@ -3268,6 +3274,22 @@ static PyMethodDef py_methods[] = {
-     { NULL, NULL, 0, NULL }
- };
- 
-+#if PY_MAJOR_VERSION >= 3
-+static PyModuleDef golly_module = {
-+    PyModuleDef_HEAD_INIT,
-+    "golly", /* name */
-+    NULL,    /* doc */
-+    -1,      /* size */
-+    py_methods, /* methoods */
-+};
-+
-+PyMODINIT_FUNC
-+PyInit_golly(void)
-+{
-+    return PyModule_Create(&golly_module);
-+}
-+#endif
-+
- // =============================================================================
- 
- bool pyinited = false;     // InitPython has been successfully called?
-@@ -3280,6 +3302,13 @@ bool InitPython()
-             if (!LoadPythonLib()) return false;
-         #endif
-         
-+        #if PY_MAJOR_VERSION >= 3
-+            // Autoload 'golly' builtin module at interpreter start.
-+            if (PyImport_AppendInittab("golly", PyInit_golly) == -1) {
-+                Warning(_("Error: could not extend in-built modules table\n"));
-+            }
-+        #endif
-+
-         // only initialize the Python interpreter once, mainly because multiple
-         // Py_Initialize/Py_Finalize calls cause leaks of about 12K each time!
-         Py_Initialize();
-@@ -3287,9 +3316,12 @@ bool InitPython()
-         #ifdef USE_PYTHON_DYNAMIC
-             GetPythonExceptions();
-         #endif
--        
--        // allow Python to call the above py_* routines
--        Py_InitModule((char*)"golly", py_methods);
-+
-+        // Python-3 uses module constructor
-+        #if PY_MAJOR_VERSION < 3
-+            // allow Python to call the above py_* routines
-+            Py_InitModule((char*)"golly", py_methods);
-+        #endif
-         
-         // catch Python messages sent to stderr and pass them to py_stderr
-         if (PyRun_SimpleString(
diff --git a/app-misc/golly/files/golly-3.3-glife-py23.patch b/app-misc/golly/files/golly-3.3-glife-py23.patch
deleted file mode 100644
index 8b1599712508..000000000000
--- a/app-misc/golly/files/golly-3.3-glife-py23.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Use python-3 compatible syntax.
---- a/Scripts/Python/glife/__init__.py
-+++ b/Scripts/Python/glife/__init__.py
-@@ -90,7 +90,7 @@ def rule(s = "B3/S23"):
- def description(s):
-     """Supply a textual description to the whole pattern."""
-     for line in s.split("\n"):
--        print "#D", line
-+        print("#D", line)
- 
- # --------------------------------------------------------------------
- 
-@@ -161,7 +161,7 @@ class pattern(list):
-   It is also the base for computing generations subsequent to N-th."""
-         if N < 0:
-             raise ValueError("backward evolving requested")
--        if self.__phases.has_key(N):
-+        if N in self.__phases:
-             return self.__phases[N]
-         M = 0
-         for k in self.__phases.keys():
---- a/Scripts/Python/glife/text.py
-+++ b/Scripts/Python/glife/text.py
-@@ -173,7 +173,7 @@ def make_text (string, font='Snakial'):
-         unknown = '-'
- 
-     for c in string:
--        if not f.has_key (c): c = unknown
-+        if not (c in f): c = unknown
-         symbol = f[c]
-         p += symbol (x, 0)
-         x += symbol.width
diff --git a/app-misc/golly/files/golly-3.3-nondynamic-python.patch b/app-misc/golly/files/golly-3.3-nondynamic-python.patch
deleted file mode 100644
index bc1c81a61917..000000000000
--- a/app-misc/golly/files/golly-3.3-nondynamic-python.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Don't use runtime python loading via dlopen().
-
-Just link to libpython directly. That makes python dependency
-more explicit and allows catching more compile-time bugs.
---- a/gui-wx/configure/Makefile.am
-+++ b/gui-wx/configure/Makefile.am
-@@ -22,7 +22,7 @@ golly_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(PYTHON_INCLUDE) \
- 	$(PERL_CPPFLAGS) $(PERL_INCLUDE) \
- 	$(liblua_a_CPPFLAGS) -I$(top_srcdir)/../../lua
- golly_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS_ONLY)
--golly_LDADD = $(WX_LIBS) libgolly.a liblua.a
-+golly_LDADD = $(WX_LIBS) $(PYTHON_LIBS) libgolly.a liblua.a
- 
- if WINDOWS
- golly_LDADD += gollyres.o
---- a/gui-wx/configure/configure.ac
-+++ b/gui-wx/configure/configure.ac
-@@ -86,6 +86,16 @@ AS_IF([test "x$with_python_shlib" = xcheck],
- AS_IF([test "x$shlib" = x], AC_MSG_ERROR([could not determine Python shared library name]))
- AC_DEFINE_UNQUOTED([PYTHON_SHLIB], [$shlib])
- 
-+# Find python interpreter
-+# 1. --embed is needed for python>=3.8
-+# 2. statuc check is needed because python-3.7-config outputs error to stdout, not stderr
-+if ${PYTHON}-config --libs --embed; then
-+    PYTHON_LIBS=`${PYTHON}-config --libs --embed`
-+elif ${PYTHON}-config --libs; then
-+    PYTHON_LIBS=`${PYTHON}-config --libs`
-+fi
-+AC_SUBST(PYTHON_LIBS)
-+
- # Find zlib (unless explicitly disabled)
- AS_IF([test "x$with_zlib" != xno],
- 	[	AC_CHECK_HEADER([zlib.h], , [AC_MSG_ERROR([missing zlib])])
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -59,8 +59,12 @@
-     #undef SIZEOF_SIZE_T
-     #undef SIZEOF_VOID_P
- #else
--    // load Python lib at runtime
--    #define USE_PYTHON_DYNAMIC
-+    // On gentoo just link against python to make
-+    // python dependency more explicit.
-+    # if 0
-+      // load Python lib at runtime
-+      #define USE_PYTHON_DYNAMIC
-+    #endif
- 
-     #ifdef __UNIX__
-         // avoid warning on Linux
diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
deleted file mode 100644
index 911e4e7df5a3..000000000000
--- a/app-misc/golly/golly-3.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit autotools desktop python-single-r1 wxwidgets xdg-utils
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="https://sourceforge.net/projects/golly/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="virtual/opengl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff]
-	${PYTHON_DEPS}
-"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-nondynamic-python.patch
-	"${FILESDIR}"/${PN}-3.3-allow-py23-exec.patch
-	"${FILESDIR}"/${PN}-3.3-glife-py23.patch
-	"${FILESDIR}"/${PN}-3.3-allow-py3.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_prepare() {
-	default
-
-	# patches change configure.ac and Makefile.am
-	pushd gui-wx/configure
-		eautoreconf
-	popd
-}
-
-src_configure() {
-	ECONF_SOURCE=gui-wx/configure econf \
-		--with-wxshared
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
index 3e2ba99280ea..04e9d7a6f85d 100644
--- a/app-misc/golly/golly-4.0.ebuild
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index f0e5c739940c..a9bfd045f096 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1 +1 @@
-DIST graphlcd-base-2.0.0.tar.bz2 522921 BLAKE2B 34223a84b11fef03d6dbd3f9d5f17362206823a5df0828b7494e88809f313ccd82ccc3ef62df129e6ccd6912a4152829a49c56024976aaf58fbf127d98b0903c SHA512 7fd0d558df16b845b4cd788f597552be85563b00d26d37181b3e0cc7cdc1a9eb00f2437b1c0dc6e9bb7851c6c9168dcc2d952898c1a371aeb8684b6c6aa8d995
+DIST graphlcd-base-2.0.2.tar.bz2 522939 BLAKE2B aa4cb227872602f408bda5c80e0269945ddd985e93d5964da8cc67466edbc4bb14fc9813b7e95715b049c1b51dfe692bb2426a032df55a60d869a41d9869302b SHA512 218d914f0286b5025dc9a8a0c738bc01f5f0218a5d56fb0a3b7cdd4acdd8dfaa7465e6d6e5606f38efc0bcc80c7d1b755b139372288c1910e27c5113aea15359
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch b/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch
deleted file mode 100644
index 388d2f93f8f8..000000000000
--- a/app-misc/graphlcd-base/files/graphlcd-base-2.0.0-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/glcdgraphics/font.c
-+++ b/glcdgraphics/font.c
-@@ -176,7 +176,7 @@
-  
-         int y; int loop; 
-         int num = 0;
--        uint dot; uint b;
-+        unsigned int dot; unsigned int b;
-         cBitmap * charBitmap = new cBitmap(charWidth, fontHeight);
-         charBitmap->SetMonochrome(true);
-         charBitmap->Clear();
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.2.ebuild
index ccc4b2335727..b633c5ca0c02 100644
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.2.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
@@ -32,8 +32,6 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "HISTORY" "README" "TODO" "docs/." )
 
-PATCHES=( "${FILESDIR}/${P}-musl.patch" )
-
 src_prepare() {
 	default
 
@@ -55,7 +53,7 @@ src_configure() {
 	if use lcd_devices_picolcd_256x64; then
 		sed -e "81s:#::" -i Make.config || die
 	fi
-	if use lcd_devices_vnc; then
+	if ! use lcd_devices_vnc; then
 		sed -e "72s:1:0:" -i Make.config || die
 	fi
 
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index 9dc3f54dfb2b..bb840e7488af 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1,2 +1 @@
 DIST grc-1.11.3.tar.gz 45205 BLAKE2B 852f58145fe11ceab3e6222b61c18cdb18a09f0666f28df4b8b8a8bc42a22dd01ae7e2bcf6232a6aa0d1f42ac233148f694a0eafbd995fbd5d147e06480f7abf SHA512 abc756a21e039c136bbf9be1ef7c1890aa2415ac21e87fb7377c90ced1def2dcaf9ce5cce22edeac68db20f6d6ccea31a2ec57044a37ba200ff79273bf11d8cf
-DIST grc-1.11.tar.gz 43224 BLAKE2B 40fe050f1198dadd039ad91fedf279ad5e913e803a669335ee21158f7f9702f3fd65ee5876595b9a4ce46da2f7f3c2cc589bf7ea3e10d84c37b5f20677ed626b SHA512 abaa18aeebf9858369b639975ae6c9a33f3111beb783b4e86463ace70de1d660efc6c17b05020862c3b2f467310f0974443f96d4f91cd322a90731c4be49206c
diff --git a/app-misc/grc/grc-1.11-r1.ebuild b/app-misc/grc/grc-1.11-r1.ebuild
deleted file mode 100644
index e07bf395d75e..000000000000
--- a/app-misc/grc/grc-1.11-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit eutils python-r1
-
-DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
-HOMEPAGE="https://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
-SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed \
-		-e 's:#! :#!:g' \
-		-e 's:3$::g' \
-		-i grc grcat || die
-	default
-}
-
-src_install() {
-	python_foreach_impl python_doscript grc grcat
-
-	insinto /usr/share/grc
-	doins \
-		contrib/mrsmith/conf.* \
-		colourfiles/conf.* \
-		grc.bashrc \
-		grc.fish \
-		grc.zsh
-
-	insinto /etc
-	doins grc.conf
-
-	dodoc README.markdown INSTALL TODO debian/changelog CREDITS Regexp.txt
-	doman *.1
-}
-
-pkg_postinst() {
-	elog
-	elog "Shell specific configurations can be found in ${ROOT}usr/share/grc"
-	elog "Be sure to symlink one to use grc globally:"
-	elog
-	elog "    ln -s ${ROOT}usr/share/grc.SHELL ${ROOT}etc/profile.d/grc.sh"
-	elog
-	elog "Replace 'SHELL' in the above command with one of: bashrc, fish, zsh."
-	elog "Afterwards, use '. ${ROOT}etc/profile' to activate grc in existing"
-	elog "shell sessions."
-	elog
-}
diff --git a/app-misc/hilite/hilite-1.5-r1.ebuild b/app-misc/hilite/hilite-1.5-r1.ebuild
index b8ee20d4bf43..59ee22306d2e 100644
--- a/app-misc/hilite/hilite-1.5-r1.ebuild
+++ b/app-misc/hilite/hilite-1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.c"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 933c62f73e32..7af733a86f68 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,2 +1 @@
-DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
 DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild
deleted file mode 100644
index 50421024eac4..000000000000
--- a/app-misc/hivex/hivex-1.3.14.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-RUBY_OPTIONAL=yes
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit eutils perl-module ruby-ng python-single-r1
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="https://libguestfs.org"
-SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ocaml readline +perl python test ruby"
-
-RDEPEND="
-	virtual/libiconv
-	virtual/libintl
-	dev-libs/libxml2:2
-	ocaml? ( dev-lang/ocaml[ocamlopt]
-			 dev-ml/findlib[ocamlopt]
-			 )
-	readline? ( sys-libs/readline:0 )
-	perl? (
-		dev-lang/perl:=
-		dev-perl/IO-stringy
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	python? ( ${PYTHON_DEPS} )
-	"
-
-DEPEND="${RDEPEND}
-	perl? (
-		test? ( dev-perl/Pod-Coverage
-			dev-perl/Test-Pod-Coverage )
-		  )
-	"
-
-ruby_add_bdepend "ruby? ( dev-ruby/rake
-			virtual/rubygems
-			dev-ruby/rdoc )"
-ruby_add_rdepend "ruby? ( virtual/rubygems )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-			ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-DOCS=( README )
-
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	if use perl; then
-		pushd perl
-		perl-module_src_configure
-		popd
-	fi
-
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		--disable-ruby
-		$(use_enable python)
-		--disable-rpath
-		--disable-static
-		)
-
-	econf ${myeconfargs[@]}
-}
-
-src_compile() {
-	default
-	ruby-ng_src_compile
-}
-
-src_install() {
-	strip-linguas -i po
-
-	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
-
-	ruby-ng_src_install
-
-	if use perl; then
-		perl_delete_localpod
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-misc/hivex/metadata.xml b/app-misc/hivex/metadata.xml
index 35527d1ae4b0..d85b4252fc33 100644
--- a/app-misc/hivex/metadata.xml
+++ b/app-misc/hivex/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
+<!-- maintainer-needed -->
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index bbdd5ae7dfaa..ed442368fcd6 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,2 +1 @@
-DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
 DIST icdiff-1.9.5.tar.gz 31914 BLAKE2B 8d9b9b5104c3075addae2954b41c27ccebe3b4723b0e71ef88a214d7fa0ff7d8cb9ac52cada8ddec929d308a356daf37ef4463a52667f7e229a4a33d1d993e86 SHA512 f4c50da1e73a1af2fd63feabfd180125637a856a8757356eb3b48bbc21871f36a2c876acd2e2ba9d354c8f6e658f6e262fbbfd65fa4078d0adebc1353d87e40a
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
deleted file mode 100644
index e7da0a4567cf..000000000000
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colourized diff that supports side-by-side diffing"
-HOMEPAGE="https://www.jefftk.com/icdiff"
-SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=(README.md ChangeLog)
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-python_test() {
-	./test.sh "${EPYTHON%.*}" || die "Tests failed"
-}
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 6c5897b1b924..d201adab37f0 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1 +1,2 @@
 DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
+DIST khal-0.10.2.tar.gz 182534 BLAKE2B 0c7c4ab1234ebe90ef9ad8291f2a0087a3f6a60d25f5426445eedadb25f236b3598dacc051e959a108ad472efc56628bf7ba11ed714c885d956f1a8f905029ca SHA512 e15449b73175190f02b6fe5774a8feef8a5390966da3836624c94a044d146cc6e8a73985d991042fbb617f736c6759ded387a65292529e71f5b2f34bc80a686e
diff --git a/app-misc/khal/khal-0.10.2.ebuild b/app-misc/khal/khal-0.10.2.ebuild
new file mode 100644
index 000000000000..45dae3cddb66
--- /dev/null
+++ b/app-misc/khal/khal-0.10.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="https://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}]
+	>=dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	zsh-completion? ( app-shells/zsh )"
+DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+	dev-python/vdirsyncer[${PYTHON_USEDEP}]
+	dev-python/freezegun[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+	distutils-r1_src_install
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/__khal
+	fi
+}
diff --git a/app-misc/klavaro/klavaro-3.0.1.ebuild b/app-misc/klavaro/klavaro-3.0.1.ebuild
index 983b17c371ed..3df645f763e1 100644
--- a/app-misc/klavaro/klavaro-3.0.1.ebuild
+++ b/app-misc/klavaro/klavaro-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+static-libs"
+IUSE=""
 
 RDEPEND="
 	net-misc/curl
diff --git a/app-misc/ledit/Manifest b/app-misc/ledit/Manifest
index f20d2f02f044..8a708e3eb874 100644
--- a/app-misc/ledit/Manifest
+++ b/app-misc/ledit/Manifest
@@ -1,2 +1 @@
-DIST ledit-2.03.tgz 24319 BLAKE2B d0a9dfbcb21b54075b61db34035291eaf3df4a337ea9fcf24b8b163d8a45c00b667dd311f39765dc904cbae1ec34e8773dea4c7ec6753796e768a8ee4cbbb927 SHA512 94281ea31d02c046db73bed42a1835826f063ff5d1ff4c374356e37fdf6b1a018f95a6372ece0eec53193aaf2e95c234c509ac178541bfe48dbc6f223f34f661
 DIST ledit-2.04.tgz 24430 BLAKE2B 782f39606e6151307c30a665cfb6e641647fe861718ae304171db07ac82c27ee5ca9503229a27857723de98c15ac350f60be8df2e4b4fe7dc475ef2271dcf591 SHA512 56fed04fa6306b5550dc6ab4f000553d5b01eddbdeccaafad51160ba9e2c12de5faab08cb8463cad2952501c73dff0e2e214f52a30a74da20f18af153206b807
diff --git a/app-misc/ledit/ledit-2.03.ebuild b/app-misc/ledit/ledit-2.03.ebuild
deleted file mode 100644
index e047e3fc5005..000000000000
--- a/app-misc/ledit/ledit-2.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A line editor to be used with interactive commands"
-SRC_URI="http://pauillac.inria.fr/~ddr/ledit/distrib/src/${P}.tgz"
-HOMEPAGE="https://pauillac.inria.fr/~ddr/ledit/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ocamlopt"
-RESTRICT="installsources !ocamlopt? ( strip )"
-
-DEPEND=">=dev-lang/ocaml-3.09:=[ocamlopt?]
-	dev-ml/camlp5:="
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 ledit.opt
-	fi
-}
-
-src_install() {
-	if use ocamlopt; then
-		newbin ledit.opt ledit
-	else
-		newbin ledit.out ledit
-	fi
-	doman ledit.1
-	dodoc CHANGES README
-}
diff --git a/app-misc/ledit/ledit-2.04.ebuild b/app-misc/ledit/ledit-2.04.ebuild
index d327061389f6..381a74426c60 100644
--- a/app-misc/ledit/ledit-2.04.ebuild
+++ b/app-misc/ledit/ledit-2.04.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
@@ -9,7 +9,7 @@ SRC_URI="http://pauillac.inria.fr/~ddr/ledit/distrib/src/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+ocamlopt"
 
 RESTRICT="installsources !ocamlopt? ( strip )"
diff --git a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
index ed8315491cc6..cec3f78e558d 100644
--- a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/livecd-tools/livecd-tools-2.8.ebuild b/app-misc/livecd-tools/livecd-tools-2.8.ebuild
index 1a1442ff5e58..2105bbd658b3 100644
--- a/app-misc/livecd-tools/livecd-tools-2.8.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b5f95b458333..f94aa2c85e28 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,2 +1 @@
-DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
 DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e
diff --git a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
deleted file mode 100644
index 8db6fdfb2ea3..000000000000
--- a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://midnight-commander.org/ticket/4070
-
-From 30fd157a73f148dbc150c18b206b85e1a4a93e9c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 3 Mar 2020 09:26:12 +0000
-Subject: [PATCH] misc/Makefile.am: install 'mc.lib' only once (#4070)
-
-Before the change `mc.lib` was installed twice due to being
-in two `_DATA` variables:
-
-```
-dist_pkgdata_DATA = \
-        mc.lib
-
-pkgdata_DATA = \
-        $(dist_pkgdata_DATA) \
-        $(PKGDATA_OUT)
-```
-
-This causes occasional install failures when two parallel
-`/usr/bin/install` calls race in installing the file:
-
-```
-$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install
-...
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
-    -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
-    -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
-...
- /usr/bin/install: cannot create regular file
-   '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists
-```
-
-After the change `mc.lib` is present only in `dist_pkgdata_DATA`.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- misc/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/misc/Makefile.am
-+++ b/misc/Makefile.am
-@@ -17,7 +17,7 @@ dist_pkgdata_DATA = \
- 	mc.lib
- 
- pkgdata_DATA = \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_OUT)
- 
- SCRIPTS_IN = \
-@@ -54,7 +53,7 @@ EXTRA_DIST = \
- 	$(LIBFILES_SCRIPT) \
- 	$(SCRIPTS_IN) \
- 	$(noinst_DATA) \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_IN)
- 
- install-data-hook:
---- a/misc/Makefile.in
-+++ b/misc/Makefile.in
-@@ -472,7 +473,7 @@ dist_pkgdata_DATA = \
- 	mc.lib
- 
- pkgdata_DATA = \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_OUT)
- 
- SCRIPTS_IN = \
-@@ -508,7 +509,7 @@ EXTRA_DIST = \
- 	$(LIBFILES_SCRIPT) \
- 	$(SCRIPTS_IN) \
- 	$(noinst_DATA) \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_IN)
- 
- all: all-recursive
--- 
-2.25.1
-
diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
deleted file mode 100644
index 8d15c3c2bcc3..000000000000
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp slang spell test +unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}"/${P}-mc-lib-twice-4070.patch)
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.25-r1.ebuild b/app-misc/mc/mc-4.8.25-r1.ebuild
index a879470398e3..22047b53509d 100644
--- a/app-misc/mc/mc-4.8.25-r1.ebuild
+++ b/app-misc/mc/mc-4.8.25-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp slang spell test +unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-4.8.25.ebuild b/app-misc/mc/mc-4.8.25.ebuild
deleted file mode 100644
index 477d5d835256..000000000000
--- a/app-misc/mc/mc-4.8.25.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp slang spell test +unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index ba86b922307d..48e68f527bff 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.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 @@ inherit flag-o-matic ${LIVE_ECLASSES}
 
 if [[ -z ${LIVE_EBUILD} ]]; then
 	SRC_URI="http://ftp.midnight-commander.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
diff --git a/app-misc/mediacrush-cli/metadata.xml b/app-misc/mediacrush-cli/metadata.xml
index 7f668fb2a129..e42e1e8012f8 100644
--- a/app-misc/mediacrush-cli/metadata.xml
+++ b/app-misc/mediacrush-cli/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>maksbotan@gentoo.org</email>
-    <name>Maxim Koltsov</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">MediaCrush/MediaCrush-cli</remote-id>
   </upstream>
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index fd5c643f1077..7c5cc6c1f08e 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/mmv/mmv-1.01b_p18-r1.ebuild b/app-misc/mmv/mmv-1.01b_p18-r1.ebuild
index 8000ceab4eac..d9873bba502f 100644
--- a/app-misc/mmv/mmv-1.01b_p18-r1.ebuild
+++ b/app-misc/mmv/mmv-1.01b_p18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}/${PN}-${MY_VER}.orig"
 
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 9143d81562bb..6c9a8feed279 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,4 +1 @@
-DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
-DIST neofetch-6.1.0.tar.gz 118346 BLAKE2B d9a08cf0b3f9164e8e42e25434d3e23e3c0ebac5e3fe3e770d7a2bde67b127078977fdb44fcc5e11703cafbe0f68332d6d7a4df8ced235d4dbd4a525afc171b1 SHA512 a68b5021d02d217ae5bc67f3d542afe4aebf1cc891f083e276b58847b1dff4419e036dbd7694b7c49c19c615b13eb54c22db3e69e6143c3f10f3fc1966a22a2e
-DIST neofetch-7.0.0.tar.gz 90892 BLAKE2B 7cee56b0b3dd49cfaddec99cd10594c5792a24dac54bae99af2bd5f13ac1a1f152fee917175a6ce911fc9b6eecb0e92cec287448f78ec714634c9fbff07a2e50 SHA512 84dde5b34b0defc24ac472efd4354483e0438c5bbed25f1f39cec53eeeee0a7d8f10dcace736b720f0e1dfbe55342ef3f5e866501bc62aee40a09bef90bf13b5
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
diff --git a/app-misc/neofetch/metadata.xml b/app-misc/neofetch/metadata.xml
index 41b383f5c4ff..c914a91137ac 100644
--- a/app-misc/neofetch/metadata.xml
+++ b/app-misc/neofetch/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		neofetch is a script that gathers information about your system and
 		prints it to the terminal next to an image, a distro's logo or any
diff --git a/app-misc/neofetch/neofetch-6.0.0.ebuild b/app-misc/neofetch/neofetch-6.0.0.ebuild
deleted file mode 100644
index 102c239995d1..000000000000
--- a/app-misc/neofetch/neofetch-6.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~mips x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-6.1.0.ebuild b/app-misc/neofetch/neofetch-6.1.0.ebuild
deleted file mode 100644
index f3ecd1b3aa6d..000000000000
--- a/app-misc/neofetch/neofetch-6.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-7.0.0.ebuild b/app-misc/neofetch/neofetch-7.0.0.ebuild
deleted file mode 100644
index 2b82020241d3..000000000000
--- a/app-misc/neofetch/neofetch-7.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-7.1.0.ebuild b/app-misc/neofetch/neofetch-7.1.0.ebuild
index 2b82020241d3..1b5936a85115 100644
--- a/app-misc/neofetch/neofetch-7.1.0.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips ~ppc64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/note/Manifest b/app-misc/note/Manifest
index 1c24a54984f2..39f5fafcdbe2 100644
--- a/app-misc/note/Manifest
+++ b/app-misc/note/Manifest
@@ -1 +1,2 @@
+DIST note-1.3.26.tar.gz 53485 BLAKE2B b88fe67b708d85a60ea705caa99506a5ef59c442ed233b349cb07bf1cbc80514e8324b63f6e7a1ea6727e9742b11ecf4c460ecda818fc03de4532a132e3aa608 SHA512 4de22da10aef93e694cd1facb356666241435d2a468c25d43f42453c708d9a75b451820a01d952e587cca34b310a64c6e0069cdbe264376eb0cf50e3f852a252
 DIST note-1.3.3.tar.gz 42691 BLAKE2B f4dc9b5c006925c04706260ed0d11f1c5bfb0923786284401c1f824936a32b61a60e516b35070cb4dcd8302caec820aad37e02c31c5fd50a8931d4cba54ef5ad SHA512 99744394084eec3bf84ecef10b2bc294375f18f6ce41614316c4f4bc02a73297f4b3a956f48fb424bb0b0f100ea23debea49c1029887ca52043dd733de0fcfad
diff --git a/app-misc/note/metadata.xml b/app-misc/note/metadata.xml
index dc849573ea47..d8134cf80c8f 100644
--- a/app-misc/note/metadata.xml
+++ b/app-misc/note/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="general">Add support for ascii flatfile backend</flag>
-  <flag name="text">Add support for text backend</flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="general">Add support for ascii flatfile backend</flag>
+		<flag name="text">Add support for text backend</flag>
+	</use>
+	<upstream>
+		<changelog>https://www.daemon.de/idisk/txt/note.Changelog</changelog>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/app-misc/note/note-1.3.26.ebuild b/app-misc/note/note-1.3.26.ebuild
new file mode 100644
index 000000000000..94a63b164318
--- /dev/null
+++ b/app-misc/note/note-1.3.26.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+DESCRIPTION="A note taking perl program"
+HOMEPAGE="https://www.daemon.de/NOTE"
+SRC_URI="https://www.daemon.de/idisk/Apps/note/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="crypt dbm general mysql text"
+
+DEPEND="
+	dev-perl/Config-General
+	dev-perl/TermReadKey
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/YAML
+	virtual/perl-Storable
+	crypt? (
+		dev-perl/Crypt-CBC
+		dev-perl/Crypt-Blowfish
+		dev-perl/Crypt-DES
+	)
+	mysql? ( dev-perl/DBD-mysql )
+"
+RDEPEND="${DEPEND}"
+
+# extraneous README that gets installed into the perl module
+PERL_RM_FILES=( NOTEDB/README )
+
+src_prepare() {
+	# Supressing file not needed
+	local v
+	for v in mysql text dbm general; do
+		if ! use ${v}; then
+			PERL_RM_FILES+=( NOTEDB/${v}.pm )
+		fi
+	done
+	perl-module_src_prepare
+}
+
+src_install() {
+	perl-module_src_install
+
+	# Adding some basic utitily for testing note
+	exeinto /usr/share/${PN}
+	doexe bin/stresstest.sh
+
+	# Adding some help for mysql backend driver
+	if use mysql; then
+		insinto /usr/share/${PN}/mysql
+		exeinto /usr/share/${PN}/mysql
+		doins mysql/{README,sql,permissions}
+		doexe mysql/install.sh
+	fi
+
+	# Adding a sample configuration file
+	insinto /etc
+	doins config/noterc
+
+	dodoc UPGRADE VERSION
+}
diff --git a/app-misc/note/note-1.3.3-r1.ebuild b/app-misc/note/note-1.3.3-r1.ebuild
deleted file mode 100644
index 64815300f8b1..000000000000
--- a/app-misc/note/note-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="A note taking perl program"
-HOMEPAGE="https://www.daemon.de/NOTE"
-SRC_URI="http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/note/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="crypt dbm general mysql text"
-
-DEPEND="dev-perl/TermReadKey
-	dev-perl/Term-ReadLine-Perl
-	virtual/perl-Storable
-	dev-perl/Config-General
-	crypt? ( dev-perl/Crypt-CBC
-		dev-perl/Crypt-Blowfish
-		dev-perl/Crypt-DES )
-	mysql? ( virtual/mysql
-		dev-perl/DBD-mysql )"
-RDEPEND=""
-
-src_install() {
-	perl-module_src_install
-
-	# Adding some basic utitily for testing note
-	dodir /usr/share/${PN}
-	cp "${S}/bin/stresstest.sh" "${D}/usr/share/${PN}"
-
-	# Adding some help for mysql backend driver
-	if use mysql; then
-		dodir /usr/share/${PN}/mysql
-		cp -r "${S}/mysql" "${D}/usr/share/${PN}"
-	fi
-
-	# Adding a sample configuration file
-	dodir /etc
-	cp "${S}/config/noterc" "${D}/etc"
-
-	# Supressing file not needed
-	for v in mysql text dbm general; do
-		if ! use ${v}; then
-			for u in `find "${D}" -type f -name *${v}.*pm`; do
-				rm "${u}"
-			done
-		fi
-	done
-
-	dodoc UPGRADE VERSION
-}
diff --git a/app-misc/note/note-1.3.3-r2.ebuild b/app-misc/note/note-1.3.3-r2.ebuild
index fc0e6b7a020b..59c93175ac43 100644
--- a/app-misc/note/note-1.3.3-r2.ebuild
+++ b/app-misc/note/note-1.3.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.daemon.de/idisk/Apps/note/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="crypt dbm general mysql text"
 
 DEPEND="dev-perl/TermReadKey
diff --git a/app-misc/ondir/ondir-0.2.4.ebuild b/app-misc/ondir/ondir-0.2.4.ebuild
index 8015b0dd6ae9..ea58404f5526 100644
--- a/app-misc/ondir/ondir-0.2.4.ebuild
+++ b/app-misc/ondir/ondir-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="sys-apps/sed"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/pal/pal-0.4.3-r2.ebuild b/app-misc/pal/pal-0.4.3-r2.ebuild
index 867f6a597628..09f976084a2a 100644
--- a/app-misc/pal/pal-0.4.3-r2.ebuild
+++ b/app-misc/pal/pal-0.4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 66599d029bcd..28a9b53391f4 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1 +1,2 @@
 DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
+DIST pax-utils-1.2.8.tar.xz 704804 BLAKE2B b64b50f985320618e10528aaddbeee9a2c86b05724d8564342fc78fd8bd31a84f3cfe5e6051b3b8a1a882bb0b3da586ca351b6fdda0fd6168930e8e4a44806cb SHA512 c211defb72921a6dfa950173bef7ef6bc5ac059dbb394a82d2b2455d082843fc7722a6819f37aa39033bd37a5a77880f193f8be550020320e87ce5becfa6e5bf
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
index 3482d46f4fd2..7b7dcda47b8b 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.6.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="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pax-utils/pax-utils-1.2.8.ebuild b/app-misc/pax-utils/pax-utils-1.2.8.ebuild
new file mode 100644
index 000000000000..2b0a0f2aff7f
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit eutils python-single-r1 toolchain-funcs
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug kernel_linux python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	seccomp? ( sys-libs/libseccomp )
+"
+# >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+DEPEND="
+	${RDEPEND}
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+"
+BDEPEND="
+	caps? ( virtual/pkgconfig )
+	seccomp? ( virtual/pkgconfig )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux ||
+		has_version '<sys-libs/glibc-2.10'
+	then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
index 039b36098f28..a61135212585 100644
--- a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
+++ b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pipeworks/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild b/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild
deleted file mode 100644
index 8da771824875..000000000000
--- a/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A Password Safe compatible command-line password manager"
-HOMEPAGE="https://nsd.dyndns.org/pwsafe/"
-SRC_URI="http://nsd.dyndns.org/pwsafe/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="X libressl readline"
-
-DEPEND="sys-libs/ncurses:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	readline? ( sys-libs/readline:0= )
-	X? ( x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXmu
-		x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${P}-cvs-1.57.patch"
-	eapply -p0 "${FILESDIR}/${P}-printf.patch"
-	eapply -p0 "${FILESDIR}/${P}-fake-readline.patch"
-	eapply -p0 "${FILESDIR}/${P}-man-page-option-syntax.patch"
-	eapply -p0 "${FILESDIR}/${P}-XChangeProperty.patch"
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_with X x) $(use_with readline)
-}
-
-src_install() {
-	doman pwsafe.1
-	dobin pwsafe
-	dodoc README NEWS
-}
diff --git a/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch b/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
new file mode 100644
index 000000000000..3ff18f2afcf1
--- /dev/null
+++ b/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
@@ -0,0 +1,27 @@
+From 141c9c218c31dfd6f4f9e47f25cc2764d2bb4b63 Mon Sep 17 00:00:00 2001
+From: Martin Hauke <mardnh@gmx.de>
+Date: Sat, 13 Jun 2020 19:11:15 +0200
+Subject: [PATCH] imxtools/sbtools: fix compilation with gcc 10
+
+---
+ utils/imxtools/sbtools/misc.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/utils/imxtools/sbtools/misc.h b/utils/imxtools/sbtools/misc.h
+index f803fbb..5c6b2fc 100644
+--- a/utils/imxtools/sbtools/misc.h
++++ b/utils/imxtools/sbtools/misc.h
+@@ -40,8 +40,8 @@ extern bool g_debug;
+ extern bool g_force;
+ 
+ typedef struct crypto_key_t *key_array_t;
+-int g_nr_keys;
+-key_array_t g_key_array;
++extern int g_nr_keys;
++extern key_array_t g_key_array;
+ 
+ typedef void (*misc_printf_t)(void *user, const char *fmt, ...);
+ 
+-- 
+2.26.2
+
diff --git a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
index 596127c34060..2feabb771367 100644
--- a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
+++ b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
@@ -4,8 +4,8 @@ http://gerrit.rockbox.org/1825
 -- Chewi
 
 diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
---- a/base/ziputil.cpp	2019-11-10 06:45:49.000000000 +0000
-+++ b/base/ziputil.cpp	2019-12-04 22:38:34.443112450 +0000
+--- 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"
@@ -20,8 +20,8 @@ diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
  
  ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent)
 diff -Naur a/base/ziputil.h b/base/ziputil.h
---- a/base/ziputil.h	2019-11-10 06:45:49.000000000 +0000
-+++ b/base/ziputil.h	2019-12-04 22:38:34.443112450 +0000
+--- 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>
@@ -36,8 +36,8 @@ diff -Naur a/base/ziputil.h b/base/ziputil.h
  class ZipUtil : public ArchiveUtil
  {
 diff -Naur a/rbutilqt.pro b/rbutilqt.pro
---- a/rbutilqt.pro	2019-11-10 06:45:50.000000000 +0000
-+++ b/rbutilqt.pro	2019-12-04 22:43:30.144259710 +0000
+--- 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
diff --git a/app-misc/rbutil/rbutil-1.4.1.ebuild b/app-misc/rbutil/rbutil-1.4.1.ebuild
index 2478bc80799a..f558a5e9dd92 100644
--- a/app-misc/rbutil/rbutil-1.4.1.ebuild
+++ b/app-misc/rbutil/rbutil-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,26 +28,36 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
+S="${WORKDIR}/RockboxUtility-v${PV}"
+QTDIR="${PN}/${PN}qt"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.1-quazip.patch
+	"${FILESDIR}"/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
 )
 
 src_prepare() {
 	xdg_src_prepare
-	rm -rv quazip/ zlib/ || die
+	rm -rv "${QTDIR}"/{quazip,zlib}/ || die
 }
 
 src_configure() {
+	cd "${QTDIR}" || die
+
 	# Generate binary translations.
-	lrelease ${PN}qt.pro || die
+	"$(qt5_get_bindir)"/lrelease ${PN}qt.pro || die
 
 	# noccache is required to call the correct compiler.
 	eqmake5 CONFIG+="noccache $(use debug && echo dbg)"
 }
 
+src_compile() {
+	emake -C "${QTDIR}"
+}
+
 src_install() {
+	cd "${QTDIR}" || die
+
 	local icon size
 	for icon in icons/rockbox-*.png; do
 		size=${icon##*-}
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index 1a33ec767ebb..003512f3ec68 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.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=5
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/recoll/recoll-1.27.12.ebuild b/app-misc/recoll/recoll-1.27.12.ebuild
index d64f11a7df78..a2690de2e400 100644
--- a/app-misc/recoll/recoll-1.27.12.ebuild
+++ b/app-misc/recoll/recoll-1.27.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="camelcase chm doc +inotify qt5 session +spell webengine"
 REQUIRED_USE="
diff --git a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
index 2c38397dbbfe..61dc8b3e4150 100644
--- a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/app-misc/rlwrap/rlwrap-0.42.ebuild b/app-misc/rlwrap/rlwrap-0.42.ebuild
index 3e1de3deca34..9d5c9a976ab7 100644
--- a/app-misc/rlwrap/rlwrap-0.42.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~mips ppc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/app-misc/rlwrap/rlwrap-0.43.ebuild b/app-misc/rlwrap/rlwrap-0.43.ebuild
index 7ab6f6005d75..bfb57b61c24b 100644
--- a/app-misc/rlwrap/rlwrap-0.43.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/hanslub42/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 772929d16f70..c8a1cec91e56 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -1,104 +1,139 @@
+DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 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 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 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 byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+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-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
-DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
-DIST dtoa-0.4.5.crate 14840 BLAKE2B d6e46d8d53baf565931d0796cdebd030a0f6fae8c6b88f738b7dd00db35bdb130a2b3778192e90fcf06183e706db7c30cc3e2b05909dabc04472e3f6ca9fca7a SHA512 7f9cd7d2e8f143c81896f8a242b09de3384d9dd6c375659a48b4e4f0506b2eb642c8aba6d500a989668760458861f2249bd82f5f3d6fa22d0ffb68e508d059c0
+DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
+DIST dtoa-0.4.7.crate 15910 BLAKE2B e6b4ad0c4a81d73557f93675671735eca3c5c31426319e746c73b65a34847085ee82f50a4f561036dae31a4fedf24a307e6edcd756cc1e6d46f2f20fc29bf456 SHA512 df090a5ea273265ae2f05aac2ae364cd0b606872a392411359548b9e780b2bc8dcb999254186ccc2da0a7353a4e0f1b0f513b2cd83d7e4f1290dcb1f466847f7
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 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 hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
+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 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.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
 DIST libc-0.2.73.crate 502354 BLAKE2B 72120cb5f110870b571724710a082222025f40df6c2ab770cb9011ce75ecc259d22c7f296e2aea8ee967af476d70b5e848fb7d4b3656d694e7a22435b723a0b3 SHA512 e24581325c43c7aeb6c9b4d48dbe7ab103f2defbbea9a3c6358e7a71ef357c0ca5dd71afe3cfaa2b699dca4d5cdd2ceb41964e007d715fba6c326d3262d51343
+DIST libc-0.2.82.crate 515967 BLAKE2B 60c1ebdf659f1eb37f47a068e778567412bb133526df28fee1d20b3fd58dbe7fee1abbdd21c5445bc1022f2cdc39847244dcb7412114037a0be64f5a2a383978 SHA512 25eaf390acb409d329b9e32008078824eed4ca3a10af851f5097b653793db316419a395910c23dff293dfe2bac051a51871281a6bf2487937121b403286630c1
 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 nalgebra-0.19.0.crate 253667 BLAKE2B e8959c237f4fff99e0deb8726e63a0536459b9bb9a2b8a2b2561fccd34d54bca57e3af9a86ef4543dd3bded627367900a5a03b38e9fb3581377b6dedf01c8669 SHA512 d9dc64a9e27af77f77eccd59f2dd672e087153dabc35058f6c7dd0c29bb9c388179606cdb20402f13a325a235e27dda65232194f572b701a3a3ccf38862106f8
 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 ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+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-core-1.0.1.crate 8186 BLAKE2B cef5cbdc252e3f953fb9417bd5a439f226f627b2ca6a9c537834ee8ee59cf3a252ad92ef5ee40f4e544e388757e5dba6b07b6807e95dd89eb35bf45f612d09b8 SHA512 3addfc4f6e3f549125eddc9f1aa11072e17f48909f53ce8e476ce783cc690c0b52a1fe6416d87816d8b558350fb8b4666adc6b79cff880956bf258f646459da0
+DIST predicates-tree-1.0.1.crate 6355 BLAKE2B b79f756d9f1822a037c05a65f90cf01592ec6ba83bde2c44aa6fc8a3d476f9e4e3d0ac13afdcd3936b0d43244e8e7ab1eeaf0223cecc3f7941af96e44c45366f SHA512 f97f6e05b3edc1faf82931ab47541b3e459066e0f5181f77a4ab885e10bdce43f71021bf2c848993125a4feef13c3290a312a74ad1d2b4a2cb55fe7d24492a19
 DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
-DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
 DIST proc-macro-error-1.0.3.crate 23736 BLAKE2B 194430b63d71644f8bfe2b919a915f2f828827d5235199cc5f62a6914794a4098b2653d291ace74e597ffb0076cebaa318d6f1fab611d6d887d1e5679c0233b2 SHA512 a689eef04fb86c87172ca718049e34d7a1b20ecc95ab981b94348161f1461a31df6b89d96177e8d9912908e40dc297aefc673aa3938dfaa65ae7155b89678769
-DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
+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-macro2-1.0.12.crate 35819 BLAKE2B b4207a6e1baa1a5bccbe61e898eb97f7ff874fa4db13cd4657def82d6120f65c151ffc4accc7036204dd32bbf4d065ebfc8b37675d99647b7b6782612656338d SHA512 4918cf60005aa322ad7afcdf2f6352f95414f5652a85742334bfd8f246a9f5438b5e4a1ae8d7f04fd07d2a1ac3eb18e118fc49367a91183778c74814704d5715
+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 quote-1.0.4.crate 22965 BLAKE2B 6cb3471e1024134e70044195f1c776be1835e0a5bb17a8428d5c4aab41013ee173fb8f4b3ad22de020a30e61185e966116079b9f14db177281b0515299a09c08 SHA512 cf729bdf4eabc81d92529394c6bb9e7a3d05a449d3a306c1e536e0ec9bee789d0bf0c0d3158c58b7a995a7f3c1044cd746bac84efc087cf8fd740a98a25a97be
+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 rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.2.crate 84288 BLAKE2B 406820e506cb3dfd2529703ff4ac42dc1a693fc4c12023ab46fd69c5517b3136f02b580d850730855493a69ce31f8825bd9fb1905717178b1221f6c6c9aa3788 SHA512 573090e4a3501df912b04e5cecc40b1c61a46602f790a8f6068a06fc28acb40ff760882cb1c65eda073d33b4ab74691ca84456e5f1744bd0fc2bc9990ba894f3
 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_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.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 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_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
+DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-DIST rpick-0.6.1.crate 28517 BLAKE2B b5c052c10087f343b734cbd29b015e669b418debafb9563053daab2abd276adbd02ba3d60827298504888daa6e7e1df85f1a21290a6ac0a0d772a30516f3728f SHA512 2e720e15dd0a73d043ea40c1b47f121f801169f7bb4136639a6b42d82ea49dc7c2f3981c47259f1c2ac38879952852e0b30c5b0c3681477d5804c4cbc90de7cc
+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 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.106.crate 73343 BLAKE2B f2d8478f457e4416971bb0daa405a3b9c9d3176c314d512ff810f61b3baf80fd0966ea14194dd093ab9bf61d1d2cc860bb8fed753e1532ca74d028734f27705f SHA512 4d60918d9ed0d4d4706b0d0a9257583aa8f150b846b0603ebfa5bf70e02b728dbe1a1ebb08220a6996f764f6461f8cbdd85f74633f2223fbcc0722f0c3175313
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
-DIST serde_derive-1.0.106.crate 49719 BLAKE2B ae97ada2d0f6f101fb6b901af36763fee1877a53023a21ef4d7f8deeb25d7cfdda33deca34c12735fc109640fe1ed0efba56b007b98e6b9d2c5b291af0d85e3f SHA512 7ac2a3336f1d1d3c37a345cafc66995926edbb3532784589a54b755b601b8948ffea22bf9d860a97e5c2c7a1fd6700995ccfb0ff348bdfff4e80a13daa79e03e
+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_yaml-0.8.11.crate 35772 BLAKE2B 5b88c2df37c8e5f06847db307debc2e6800a25aebd8435c066c79f2a10b38a4b8f33499561511b6f70257aeb2f272a2c99294da1d1fbc77eb85d4b077a8ea027 SHA512 8baea9692990370e92415aadfb410c17e99f4d5b4bc09bdae13ffe438ba2be536152a68dd183e5c6a00e04a386472a7e081beb5fad6ba5231c39da794be2efa2
+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_yaml-0.8.15.crate 37877 BLAKE2B 31cf453a3b04332f9ef3ecc7366c1a6e4017029767ff2484846955d8dca8ba1100d8cd5eac6c2367bdab8efebde987345ab0b7802629b8bf96effa3933646052 SHA512 8697f445ff13a93aa584afe1b91829c6dde86239751ab71f6b3b088b0506249268eda3e1cf507095a4ffda5ad78d589f92ab908117050a0bd70311867e0d031b
 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.14.crate 50408 BLAKE2B ec0e00f6ba689773450c653e94866807a098eddb2e2f7245bbcb14afa075fcbb23c4f831d1f558333d03bc5255d1344a06f1c698a0efe3888f3fb9532bc125ff SHA512 f05d7edf430626c9281e97782bfe1d42aeebe0eb4d4689e0251906dcc67f039fa1a24e1059db88e3f4aded2a094cd1dbe68551a64116fe0b92e460080c4b116b
 DIST structopt-0.3.15.crate 49378 BLAKE2B 5474b71fefea749d2bba1be76f4aeef52564b686ca6315e56192de2fa01377df82ce1331ee35c6c5c8ab25fcc936e909f2d85448d8464722bab11cccb1d7b361 SHA512 92f577714dae111b6a3c0a4b2f2e30be60f9387427c4458b1641e2589e17c6c1055c9860f3370a89bb6e1fd48333d0a88c7af007c6310ec881436a7aec444e99
-DIST structopt-derive-0.4.7.crate 19395 BLAKE2B 47d504003f99fca23ab9eb6e76ca6fc60a5509adadf6419dc15c82b00ec00ea826636e290628a6e94cd7e4745b2aefe2856035743cafa97ddca24351ca9353ba SHA512 db052fa7932d0050e93db82cad44283e04883436a2af5f63833330013985e9ac3d661bada194429aeb606781d2517383b7f5bd876125a4e02142dd6ccc6fb750
+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.19.crate 198451 BLAKE2B 7b039572b2ea68c7b05fa531b618c53cec2b568b158091e7249aa4fc3438895b514568a299386c516287096ca2f8a69c4a81159bc4e1ac51e72cca9289662687 SHA512 aaf23dc81c9f2a6270abb704d51cd6f78b014917a81d716244ebb37101470465611986137e57bbbff2e16a30b85b50b75753663a28b11a93e262f7e0b36bd8ab
 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 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 thread_local-1.1.0.crate 12222 BLAKE2B 4d19e85f5e342cdad8bcb33ab4c54d19563a831128c0d98dd79906f1096d3665a2bd0bdc114f11f51bf517dd5f401b2788a16482e38895610b080d1e2eba6dc7 SHA512 4681b69e471f2b90091f51422358cd86d1e851cb7118613d7e791b18d7464cd71e9d21d50223ccaa9dcca1c54b220474d3d6739634f57666938baf4dc174e621
+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-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+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.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 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.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 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.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
+DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
diff --git a/app-misc/rpick/rpick-0.6.1.ebuild b/app-misc/rpick/rpick-0.6.1.ebuild
deleted file mode 100644
index ed79d3064a24..000000000000
--- a/app-misc/rpick/rpick-0.6.1.ebuild
+++ /dev/null
@@ -1,87 +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="
-ansi_term-0.11.0
-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
-cfg-if-0.1.10
-clap-2.33.0
-constant_time_eq-0.1.5
-crossbeam-utils-0.7.2
-dirs-2.0.2
-dirs-sys-0.3.4
-dtoa-0.4.5
-getrandom-0.1.14
-heck-0.3.1
-hermit-abi-0.1.12
-lazy_static-1.4.0
-libc-0.2.69
-linked-hash-map-0.5.3
-ppv-lite86-0.2.6
-proc-macro-error-1.0.2
-proc-macro-error-attr-1.0.2
-proc-macro2-1.0.12
-quote-1.0.4
-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
-redox_syscall-0.1.56
-redox_users-0.3.4
-rpick-0.6.1
-rust-argon2-0.7.0
-serde-1.0.106
-serde_derive-1.0.106
-serde_yaml-0.8.11
-strsim-0.8.0
-structopt-0.3.14
-structopt-derive-0.4.7
-syn-1.0.19
-syn-mid-0.5.0
-textwrap-0.11.0
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-vec_map-0.8.2
-version_check-0.9.1
-wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-yaml-rust-0.4.3
-"
-
-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-2 CC0-1.0 MIT"
-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
new file mode 100644
index 000000000000..3f204077f002
--- /dev/null
+++ b/app-misc/rpick/rpick-0.7.2.ebuild
@@ -0,0 +1,130 @@
+# 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
+arrayref-0.3.6
+arrayvec-0.5.2
+assert_cmd-1.0.2
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bitflags-1.2.1
+blake2b_simd-0.5.11
+bstr-0.2.14
+byteorder-1.4.2
+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-3.0.1
+dirs-sys-0.3.5
+doc-comment-0.3.3
+dtoa-0.4.7
+encode_unicode-0.3.6
+generic-array-0.13.2
+getrandom-0.1.16
+getrandom-0.2.1
+heck-0.3.2
+hermit-abi-0.1.17
+itoa-0.4.7
+lazy_static-1.4.0
+libc-0.2.82
+libm-0.2.1
+linked-hash-map-0.5.4
+matrixmultiply-0.2.4
+memchr-2.3.4
+nalgebra-0.19.0
+num-complex-0.2.4
+num-integer-0.1.44
+num-rational-0.2.4
+num-traits-0.2.14
+ppv-lite86-0.2.10
+predicates-1.0.6
+predicates-core-1.0.1
+predicates-tree-1.0.1
+prettytable-rs-0.8.0
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.24
+quote-1.0.8
+rand-0.7.3
+rand-0.8.2
+rand_chacha-0.2.2
+rand_chacha-0.3.0
+rand_core-0.5.1
+rand_core-0.6.1
+rand_distr-0.2.2
+rand_distr-0.4.0
+rand_hc-0.2.0
+rand_hc-0.3.0
+rawpointer-0.2.1
+redox_syscall-0.1.57
+redox_syscall-0.2.4
+redox_users-0.3.5
+regex-1.4.3
+regex-automata-0.1.9
+regex-syntax-0.6.22
+remove_dir_all-0.5.3
+rpick-0.7.2
+rust-argon2-0.8.3
+ryu-1.0.5
+serde-1.0.119
+serde_derive-1.0.119
+serde_yaml-0.8.15
+statrs-0.13.0
+strsim-0.8.0
+structopt-0.3.21
+structopt-derive-0.4.14
+syn-1.0.58
+tempfile-3.2.0
+term-0.5.2
+textwrap-0.11.0
+thread_local-1.1.0
+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.1+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/rq/Manifest b/app-misc/rq/Manifest
new file mode 100644
index 000000000000..81f5923962a8
--- /dev/null
+++ b/app-misc/rq/Manifest
@@ -0,0 +1,134 @@
+DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
+DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
+DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
+DIST avro-rs-0.6.5.crate 63693 BLAKE2B 2f44b09ae86dc56448e3badcaeff80c4236915cbd783345f0bb607a0daf2ac79aa03558c1b82c32ed55689ceb9525850e80af2ca52083c71bfc03dc6fe7dd24a SHA512 bc9e573cf59fc1fb375478fc53ea98d16cc1ced735f0a3edb1ae89d2c5a1982ec33e43e5132c92f85b5582abe056a8e3a863a467e3a08957179ca424787f289f
+DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
+DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
+DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
+DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
+DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
+DIST built-0.3.2.crate 13879 BLAKE2B 832d882a57cf933c4b397229125ca707c2c34fc860b1056653f9bf873b279a529fb77938b48202f1d20ca5439bf0e9db5d74af4d8343bbb6f942a7821fb7edbc SHA512 eb7c8548e13d521254e121083f72a96d34a6d659fbd08b40293ffba4cc9b504c62085055ad407dfc9eb38bab3fc8e59c62b2cea83e275d88a3c6e5406608f268
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST cc-1.0.47.crate 49645 BLAKE2B 39771b601b37a9695a6d49e6d7bba2fa97ff5c1fab11a1a94115d5427a3bfb57cb1501e6b29fe64aa331942a99a9ded88fc8fe21693be697fc7200d919a4e448 SHA512 92bfe74600a43c9d59581641fe0d2aabecb6060b3cbcaac8c8e0fb4f0a21f1099d2887c7b00f205e6c5e972b7aba50e68c360dbcc1090aba942a30199e3cd86c
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST chrono-0.4.9.crate 133671 BLAKE2B b11f0b9d5ea182974ad1a8f176d0fd100479bdcc0e99b32da055393c0ce617a2d006545b0acb145a9cbf838d06bebe9650ab21c50246caeac9cf93fdcdcc0cd8 SHA512 d68fdcc255a2b967ea3e18d30dba7bba76929fcfa216c2081426b4fd3846bed660bcec8f92eeccb3de88f6e08aae9ade1c5e5d14f36d0853fe9a4499bcd5a57f
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
+DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
+DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
+DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
+DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
+DIST directories-2.0.2.crate 15214 BLAKE2B 80ea5cf3f3d7b539318ad053651d7432af26dd3050d6d24803744d733a937b7502332c7f1756cf8e113ca9b763cda09802c31094e686135644e6cacb55dd9f06 SHA512 d42ec9308b131c33fc779684ce067faae03135ad45064ed653dc1ee68a7f0ffc739ef82c0b54b869a3951d4d58210208975d5e564b7dad8f0570e7ad0cf1cce2
+DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
+DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
+DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
+DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
+DIST git2-0.10.1.crate 157914 BLAKE2B 5b774d5e4ce859c4b5bbc0f456610dfc9b090efe5102e15120e85b4708d1428a124e93b5f07116451e40ff6da02d5ae9b40740a5d07925837848bc57daa70959 SHA512 4860fe56038038322c4775fd15c1d5db5c44e9740c93b4437a4185035081c3d3521b1ec327b2774b7b852027d6ee2a8f81b2c1807a9ffe04423db08dd37f4b3d
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST half-1.4.0.crate 35130 BLAKE2B 53248311181e4061ebce108d7a933c8ad29a72fa97cfde6369a424fbc40684f4fb6a152655d9dac1c1b022b07fc13eedd66d0e5213dc0b3cf5fe6a01059b49f7 SHA512 3ef3fa7889971edf62fb9dece068142a1ce4d5d9971ef78299a3de6e2948e2d7a2fbd52cce107e5b4b3e8f734a9ac58ce40d3302244769277551d104a1293726
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.3.crate 6741 BLAKE2B 0a7edada6e7c834fdd20b804237d29558b9b413ab99b538de5647e485d36864749fba6b8f46b4a6de4c620cdaa2d711bcc6759b53f8d57438ec5c9b78da71ea8 SHA512 ca85d69192ddd2c1cf0f12d6abc7eaa70a71956df5b55aaf1d3780c6e40207c33bb188a92a5f4769478c4ce13bd93cfd6b4134a21e245781b4ab4e3cb3eabe87
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST jobserver-0.1.17.crate 19563 BLAKE2B 369af1c6ea420f3be059e7dec5e59d3634dbe0c7bd30e2067bad0ab7702b1643841943f72d8d8624d9b9b208f7e7c1480d2d2dadbadbe52855a6c08316ee1298 SHA512 14578203a000efe2cd88e9de96af216b5aec50f02aa2f33a884119d2edbad02626c05eae6f203ef92032f7d6f9ca58f427a368f843bd379e9e35b585d04fa161
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
+DIST libflate-0.1.27.crate 37829 BLAKE2B a33189433c395b0e4f61a0c700f6179d209ed5a5fcfe2bc5d3c49d16b0f3bfb9e5ea791b08604e536a04bbc1f8770e82b044996940d7bf41ff2a746e2250645f SHA512 056ecd475079ebf366209a04d8204b0c175365ab865607e5b6364a9177c8ffe7d56550d0af8b9269ba12996ff60b3258a0470116158fac6ac3eb0e786eb87050
+DIST libgit2-sys-0.9.1.crate 1521733 BLAKE2B 1887c8df211cb825f1cc4634471d848f54eea56f95b1d9058c6122ab4975c5bf398d64a4f202b9b4e9fc0d4e7040a4cbb26ab680f714172095c89324d161bcfa SHA512 8ebd011639c329e691d964c30d6f9e77661b831865f75147432efb3943e2c4075bea5ef75b0c9edb5f923404498a9ee154427f0e25dd633e7bca54ad1c8bdb25
+DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
+DIST linked-hash-map-0.3.0.crate 13693 BLAKE2B 1d533fbe24475d831d22b64896a8e2ff7dc370c797c1fa7ff2fa6cacd43a87d08e68283436347458c4f047c938a5e45048b5f5801204f7411fd775e5ac7cf1dd SHA512 4e93c0ac9fc64beeb3b800ca09d4c701f7fd35a866c174588a9d174604d5b820f43c21d48b4e00143770efb1046a053a28004258754930f2c4ed76b2ff8ed8c2
+DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST nix-0.15.0.crate 188640 BLAKE2B e217fc7329cbf49e53f1770da4e4eb15fa84718c265e323cd43b5744aaec2686d3ab93fc8cd52a585341588ee1c76f3d3bf7e25b0a8cb0e876111d12fee3a3c8 SHA512 1b65fcf1701939b85a95dec1483c3ee3e86bcd3ee65b175cd9ba0fc951220594ed9368dca082ef0da566463143d7234a275c15d6b66a724beab128b287c26b3b
+DIST num-integer-0.1.41.crate 19399 BLAKE2B 44b96c8f1295f0d3021303d7e3b49474b86fa7287a1f284867e18883617d642fbbb8725ddae0fd68b1ec70276977b87f4d040bc457e037562f4de374d042f178 SHA512 f979ace06e3c109e9b5217a85341117ad12bb6e8da1b7ad799d91a967e3da1eb785fb114294f049ed8a2022cd5269c1ff771bc319af3da0899df97a1e412297f
+DIST num-traits-0.1.43.crate 7659 BLAKE2B 313221a4364b18eb29e2d4c480209766c56b1ca2587a0ab8f668c71cfdefcd733d64be1430bea1846a77f075a26137fbe71f2f4d9be79688374cdbe9e0274ba4 SHA512 35ee0a41f8ae33b1e6656935585f540956a8155045992e7b488b9fdbcf0eb9c9adc90ed8128d45f248b9ac583114cf518c4c7de719b8c6627b29f2fbbac91f17
+DIST num-traits-0.2.9.crate 41469 BLAKE2B 294146b639902678577b6d55c5eae0ed4bac6a3130193e90e724a5c830b2ae3c18fab1bb50055e4f79d61ad73b33393857fc7f9a62e27687eafc067c331e88a4 SHA512 97cffcb1ec02284132ec99a7c45d5478504bfaa7c57691cd4003c50efc451267d6ac3395bc446cd19fd62de7322240bd06318faa71876a668a8afd91ec853bc0
+DIST num_cpus-1.11.1.crate 11798 BLAKE2B e395b63d0c7050e06d4e70dd9581c0c005a673a1534b49fd4a257c3a210d3f48a32fb467aa4f05c69e1324ba0c1e117f3d0802df2cb54080d27ebf9d31d2117f SHA512 c3a943f5ff82eccee6f2e8af73e12fc83a82590030381cfdfa52c79b2f53012012b246fe8fa682606b7ddc011892d72d5579bc17ed072498170b51060c7e7f5b
+DIST ordered-float-1.0.2.crate 9458 BLAKE2B 6a2611ecf0ed5c1a999b3b192edaba940caf8b07a432b4f3e27003d246f9b1eae346747da60019a9a60a92ccb867fd2451ad3f4e6acddb9c08ba817912806115 SHA512 aec5c5e00fc17e47687d69fdc6cc3d4cae337b2af6f28cc869ba5e98aa64c81493c8f822e6b68f6cc109b99a7b19363211b28cd3cd9263cd61f2ccad3d3f7399
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pest-2.1.2.crate 77321 BLAKE2B 9b586271aa8e6a84a21f4bd01986f12996656a310a0fc0fa4ef7309d0478e01bf4db9c3d9c258f80a2559fd5f65ce26dee48ff43cd126697ebba167f841f7e4d SHA512 c23624c33c986823d22b685e7297afb506254e2fc1b05e5a87e9b7f8c3e9c898312116fbc93517be5994eb1e3b9bbb20a479f8c72010873b790ea6cce2129a87
+DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
+DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
+DIST protobuf-2.8.1.crate 143489 BLAKE2B 81a6ef464805f4a39346a32fd9f582e9bf3091beb009311a99f34fdc64fa26c46f0fa1a66506fa8a07dcb2aa765fefff5388e096b3a2637d675cd0277f7484e4 SHA512 ae72844258c4937c326694e907e7dd681f4c72f78db938a42d292da3642707d0fc62f1e2d98f1b5d8fdbe0be0db3123a247420352aa85d022dbaedf4bba92945
+DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
+DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST rle-decode-fast-1.0.1.crate 62490 BLAKE2B 34370186c8875c91b8d353b372518bc039c58061e0e0377c7596a9e100b047550e800c431f2b4a59556fc266eefcbc7846b53d5a4e10360fcbe435acf63249b2 SHA512 38b3565279b134dcb3bcba001b081ada73f36e4107bdee935036631b740b6e1d1f767e3965ad414e38c8606abc1733f898062bce01b8c19234f204adcbe05a4a
+DIST rmp-0.8.8.crate 23462 BLAKE2B c6a5fb9a2540099ba6eb7dc5086fc82b62fa29720492fe00e439f0a19fd7cfb37c828f3fec84f2a2d27b41a91a4f24fea3c18e2cac78db8399d763c20c10be91 SHA512 743f285a754ae5ec1e4a2d8f9c5d745576fe318bf091ed8966803163615eaf00a8c4f19ce36a8ab726bd6c691baecf082f4c6365b3679d1a04d2194874bd994e
+DIST rmpv-0.4.2.crate 25561 BLAKE2B 6d269ff5ccbe8b7a3e3c48e79d58d91461a674d498543f86ff194e9438c70885093e1fc287a161a9407eaace395d313da7939829e54023fd919af983fef352b3 SHA512 e45aa3a0d0d47038674a5397d6a78db61d6b2e0d821827cd6210ec630bdedfe9fcb083b9908adfbdee5377c7d8cacbefb0b65fda5b3724b61be4ba3e935385c4
+DIST rq-1.0.2.tar.gz 59413 BLAKE2B 2f0adf5d84e8ef29a164e05adc66698aceb3dc02a02ae1265810243ea80ec77f17d59fe77831f106c54a97961adda68819daad553a3f57f2754314d761e58528 SHA512 87acf0c88e5a16c5e39792e411f58faa8b2afaa89d2bedb568ee7df8a84e2feb63106f3f90eb7250b75afdea133cb39b25385f8958aa18b34db53d35320c80bc
+DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
+DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
+DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-0.8.23.crate 25824 BLAKE2B 96bc2e07504202ad51dc20cd972e7a3047c26f2dc892d6892466e92c8e9a58a65664d9a5f6f2d38ad2c9e0bfcffc0096b913b6c5ef1d3736d53114c13f00663a SHA512 537761d0fad243799c63b742b9ac020195ad5575e346080c2cf19b1792d2026bdab6f61550679b8883f7af5e16e98289aa749f0646a6d4b0cb24eec0f7d92edc
+DIST serde-1.0.102.crate 73356 BLAKE2B 1ac078a443f6afc7bfb31f485f1dfab71e61a8978981a88184b79a87b1b238afd1317dd1825f27fa59c762b98d68322ad9d9ea17629f639ed3c088b556ab180e SHA512 76ba1647a896aa907448e496392359c5de727be14b85352d84e6271ca51da77cbcfc99ff77656eb5897e1a99b1e17aee0cbc35ab4b13201a14b8b2a38ce6b6e8
+DIST serde-hjson-0.9.1.crate 22811 BLAKE2B a9721b2d2406ff8f15fff7cf0d8e43a9057613639b7bd947b45c3cbb643905fd24c42570846ce1f88df079b0f9746cb51d9a6f9ff928b503a723b50240b9995f SHA512 edc6aabfcee87df4a82792eb00f86d41b1b15294300b4f245d69235984c25309e4cde4f480d78a67acae85ad50420b05bc2ba760c8d9708bbcfff962c79fad1e
+DIST serde-protobuf-0.8.1.crate 114812 BLAKE2B d75ab508eeb5a2b4cbb948050ac327c39738e0855682b4bbadbd1950caf70a1e2b6d0e061f7ea39c66c5fecca0b91b9570febe5b0828c247bcb4994af298b89f SHA512 fbe4957fb8cd072665671ae46cf675453b60f55f4f320a1f8be5e351797ff9c13a4b29884ba517b8ee81899b950a483e1869946be2858c14f1981386013f03c3
+DIST serde_cbor-0.10.2.crate 40204 BLAKE2B 36fc90f1c6a7e140c76e2a469d714197fa3af3f3c085bd3ebc2ad301c4275dad56a3953e4270291dd0a9a5a396fb793741b13b41b16619e678a2b0bd8de800e1 SHA512 91a4b180291abdd0feb223ac515bb7cfa4d4b5d40a456b03f74d532a136f00bc56f031222c8dc732ddd4040920aa3c28df489188f2c755ca27bad42747529e3c
+DIST serde_derive-1.0.102.crate 49693 BLAKE2B 814ca6dc47ddaad2276a0c2ec8f3be9be4001c57294c350f54c86774df7fe6d92404fd4bc5efd87bee2e15745b2b0760481a81125df2e2a01eac5b958599d5d7 SHA512 159cf3b0c9c38fb82ffdf923e9d80abe58eb155da182aa63d7cf94a66507cb533071cb87f89d027c556a08d7560ca5e91e20267341ba0721aefa88b307fe9182
+DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
+DIST serde_test-0.8.23.crate 5068 BLAKE2B c6f4fb735796e3c9832f9b257aec426547a37a8a410a422a2e35b95928c66a923f92e221981342fe3516ecdc9d67729fc35fb3810a727cde61abee3a0a69215e SHA512 bde1913e885d47eb1f96b352baa3f6d4f0771fb9cd35e3d0e6a43a1dfc9abb6e58a2191947d8e3c75ab6023e7ae17c6ffa5ac89c1484099ea30dc248e59c59dd
+DIST serde_yaml-0.8.11.crate 35772 BLAKE2B 5b88c2df37c8e5f06847db307debc2e6800a25aebd8435c066c79f2a10b38a4b8f33499561511b6f70257aeb2f272a2c99294da1d1fbc77eb85d4b077a8ea027 SHA512 8baea9692990370e92415aadfb410c17e99f4d5b4bc09bdae13ffe438ba2be536152a68dd183e5c6a00e04a386472a7e081beb5fad6ba5231c39da794be2efa2
+DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33
+DIST snap-0.2.5.crate 1074199 BLAKE2B bfc0440ab2a1e501252ecfbed96d8d373c0fe8c595f59a24b85db61d9bbefa5d099fffa886b815d90d343674f326cd138eb222d40ce400af43e23e254960a8cb SHA512 ef3d5e9618ae564f026bfe283bd9ac972a3537f65be4380cd8422463cbe3bfe3607258355de25a32ac940840d71bcfee8b60337c634719f89f0d00475c273e69
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.4.crate 41301 BLAKE2B 9a7883faff72d748dccaaa888d37b6e2a9b1a9b1fd7aacc9958f9a96dc8df54cdbd722af57117f3b58680e41d9d812ed4513dcd01c5894912823ac1e10e62476 SHA512 90ccf78031f0c6d1071e1e2925e4b0444760ccb45b611190fe22a653943d4337da88a6403b18a869c97cf956744d220427a01996321a62918a1fa66fbe64cc64
+DIST structopt-derive-0.3.4.crate 16500 BLAKE2B b5c30c0f99c368063ad31fb30f80e87a14ef5699e365d6721b7bae80059a89ed78f9f149c4e694b0b61ddfd2681bfba997d5b94f6739de4afd6fbc5a42c0e3ec SHA512 8cb0a6e0173bb94747a9c7176134ded12feeded597bb8e027ce08e8d5b3200db3cbfc68137c96ba691037195bc634417ce83fdcf30f68dc43b8fd93e2ee974bb
+DIST syn-1.0.8.crate 191978 BLAKE2B 9c4f925cf437c8baec1d0bc347454096124e996f1c26ef27fbb0ccbef087ba7a5eb780f4e1f87037568e93c7b7fea2963e2782621c0ab04e5c33ef98349e97fc SHA512 314229610133a1c1db1d60b549846e7b9f9c50ac345ca59d6fbfb263b828653be7fac0f56fd88312162138d85b915dc994ea651c1f9ac591c9c56c53a1738093
+DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
+DIST take_mut-0.2.2.crate 4263 BLAKE2B 3660c519b5ce8a39ab4f06dd61ac062f645de321f36913e948e8f10ead18866e2aae2609eb1f7f5faa7cc2500083743fcad816578defaddede456c6c05b3244e SHA512 f75a5ce723e710809130878b0ff5df368f5929201e557661dd0154f3b31ea58d7d30d84672ca5a684fbfcae5f82ab2c21b1b5d9edc4c67d08c221228bd9de814
+DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST toml-0.5.5.crate 54805 BLAKE2B 2b319f37165164793866bc4a470ed99447fdccb59242c94e5311906dc764f54131f2bc14921caab56bf84706d12800fb26a58210e3e58728f4076edc9a66e771 SHA512 8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33
+DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
+DIST ucd-trie-0.1.2.crate 44984 BLAKE2B 088ffe354217338966b8c6983152cc52f477973d2cee5dd4110b25eeeb252de8b5ef291cd2c8bdf08caf0d0c627ae0a4e80f32f62abd8d03a97a4e9341c100d7 SHA512 788d01f6b42bda3e18d18b5be53fcb3ca50c9c5f816b19d0fb37147f7dcdd08f5d535ef950c17ae92eca1b86ae6c3ae899a33d1bb767068dcef3820ef2c14607
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.9.crate 89492 BLAKE2B 75fc4a6ba6ae3d9e72380eafd50a727ec049f986a58dedd4854a086af844966701463ef8940fa477685096ed2961e2f044d6a308fc3bccc3046bc92554b7a94f SHA512 f1a96c0687d6394fed55e400183bc37a8f0ab4dc2568eb114f86dda3f504fd9768bf58e1ac87f2ff732dc58041de2f2cb8d9b65faf767243830ddd159ae36d81
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST url-2.1.0.crate 64776 BLAKE2B aefc8cd2be90818c757312c354a0bd39ae08a52fb7d5a2a4552ffac3488a4bbc60c3f502ea5cd861aefbab02b0748e4bf35c49592b8fba4377cc17207c666d0c SHA512 1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3
+DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST vergen-3.0.4.crate 15089 BLAKE2B ab4ac03c3dde426e79cee3bc8d57c0a0608eb70cedfabc88fad8db8378ae6b49291a6141277ed4960cd8bdfeadcf9c8773f09977f97d6ecc1e54e1b7920289a9 SHA512 85ece8fe633069f486676daffdc5402d90d4073e2ea1b114ff7cb68f26e36ef39537b1c97ad8c25ebd8da13dbb4ff6afbb71187b75547f96ebb047f3df6ab265
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
+DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
diff --git a/app-misc/rq/metadata.xml b/app-misc/rq/metadata.xml
new file mode 100644
index 000000000000..20988e2a35f4
--- /dev/null
+++ b/app-misc/rq/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/dflemstr/rq/issues</bugs-to>
+		<changelog>https://github.com/dflemstr/rq/commits/master</changelog>
+		<remote-id type="github">dflemstr/rq</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/app-misc/rq/rq-1.0.2.ebuild b/app-misc/rq/rq-1.0.2.ebuild
new file mode 100644
index 000000000000..0ec67b42f05a
--- /dev/null
+++ b/app-misc/rq/rq-1.0.2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.6
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayref-0.3.5
+arrayvec-0.5.1
+atty-0.2.13
+autocfg-0.1.7
+avro-rs-0.6.5
+backtrace-0.3.40
+backtrace-sys-0.1.32
+base64-0.10.1
+bitflags-1.2.1
+blake2b_simd-0.5.9
+bstr-0.2.8
+build_const-0.2.1
+built-0.3.2
+byteorder-1.3.2
+cc-1.0.47
+cfg-if-0.1.10
+chrono-0.4.9
+clap-2.33.0
+cloudabi-0.0.3
+constant_time_eq-0.1.4
+crc-1.8.1
+crc32fast-1.2.0
+crossbeam-utils-0.6.6
+csv-1.1.1
+csv-core-0.1.6
+digest-0.8.1
+directories-2.0.2
+dirs-sys-0.3.4
+dtoa-0.4.4
+env_logger-0.7.1
+failure-0.1.6
+failure_derive-0.1.6
+fuchsia-cprng-0.1.1
+generic-array-0.12.3
+getrandom-0.1.13
+git2-0.10.1
+glob-0.3.0
+half-1.4.0
+heck-0.3.1
+hermit-abi-0.1.3
+humantime-1.3.0
+idna-0.2.0
+itoa-0.4.4
+jobserver-0.1.17
+lazy_static-1.4.0
+libc-0.2.65
+libflate-0.1.27
+libgit2-sys-0.9.1
+libz-sys-1.0.25
+linked-hash-map-0.3.0
+linked-hash-map-0.5.2
+log-0.4.8
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.2.1
+nix-0.15.0
+num-integer-0.1.41
+num-traits-0.1.43
+num-traits-0.2.9
+num_cpus-1.11.1
+ordered-float-1.0.2
+percent-encoding-2.1.0
+pest-2.1.2
+pkg-config-0.3.17
+proc-macro-error-0.2.6
+proc-macro2-1.0.6
+protobuf-2.8.1
+quick-error-1.2.2
+quote-1.0.2
+rand-0.3.23
+rand-0.4.6
+rand_core-0.3.1
+rand_core-0.4.2
+rand_os-0.1.3
+rdrand-0.4.0
+redox_syscall-0.1.56
+redox_users-0.3.1
+regex-1.3.1
+regex-automata-0.1.8
+regex-syntax-0.6.12
+rle-decode-fast-1.0.1
+rmp-0.8.8
+rmpv-0.4.2
+rust-argon2-0.5.1
+rustc-demangle-0.1.16
+ryu-1.0.2
+semver-0.9.0
+semver-parser-0.7.0
+serde-0.8.23
+serde-1.0.102
+serde-hjson-0.9.1
+serde-protobuf-0.8.1
+serde_cbor-0.10.2
+serde_derive-1.0.102
+serde_json-1.0.41
+serde_test-0.8.23
+serde_yaml-0.8.11
+smallvec-0.6.13
+snap-0.2.5
+strsim-0.8.0
+structopt-0.3.4
+structopt-derive-0.3.4
+syn-1.0.8
+synstructure-0.12.3
+take_mut-0.2.2
+termcolor-1.0.5
+textwrap-0.11.0
+thread_local-0.3.6
+time-0.1.42
+toml-0.5.5
+typenum-1.11.2
+ucd-trie-0.1.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.9
+unicode-segmentation-1.6.0
+unicode-width-0.1.6
+unicode-xid-0.2.0
+url-2.1.0
+vcpkg-0.2.7
+vec_map-0.8.1
+vergen-3.0.4
+void-1.0.2
+wasi-0.7.0
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.2
+yaml-rust-0.4.3
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for doing record analysis and transformation"
+HOMEPAGE="https://github.com/dflemstr/rq"
+SRC_URI="$(cargo_crate_uris ${CRATES})
+	https://github.com/dflemstr/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 GPL-2-with-linking-exception ISC LGPL-2+ MIT PCRE unicode Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="${RUST_DEPEND}"
+RDEPEND="!dev-python/rq"
+
+src_install() {
+	cargo_src_install
+	dodoc -r {doc,{README,CONTRIBUTING}.md}
+}
diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild
index 00c07832352d..22ea9a336fbc 100644
--- a/app-misc/screen/screen-4.8.0.ebuild
+++ b/app-misc/screen/screen-4.8.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index f1d31c30f53b..52f096401272 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screenie/screenie-20120406.ebuild b/app-misc/screenie/screenie-20120406.ebuild
index ad452493da10..98f7088a8bfa 100644
--- a/app-misc/screenie/screenie-20120406.ebuild
+++ b/app-misc/screenie/screenie-20120406.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 sparc x86"
 
 RDEPEND="app-misc/screen"
 
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index adcc8237c133..82ee3a9243b6 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -1,109 +1,159 @@
+DIST aho-corasick-0.7.14.crate 113042 BLAKE2B 6ba517169dd0bfafe7dd7755e2f664d831a17c6a367f29cb54d22b8b61eb04c75b67dead9a7855bdeaa1afd8aa5049b7580617bebf0cdac61c0712eb3525db4e SHA512 0a11e7bd2d3b6868fb6f64b61f3feead4ea57ab3c5d75c6586b68765425219e631bf875e43f73e79888e71079b3d7e10af36af6f96b72515105df79f5922f296
 DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.4.10.crate 26133 BLAKE2B 43772765a9be4e3e6dd5b2ee8864f7894aab3128123a673fd0ddf18dafb69d7ed94709dad6de26e222f080b1de83d31aacbb3419b1d926ec4005de64e4db8b30 SHA512 8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
+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.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
+DIST beef-0.4.4.crate 14801 BLAKE2B 8b6e7cec0503d0fa05becf60a9d9a9073f6eb81f61f36b04f7f7ec4db99029a3e4ef148734be07b25d96ca4061819bd1caa69475080853340e70287a282f2346 SHA512 8c0e04e749860bd42b8fd9a73a981ce948ac2d0000e09710304b4a909b587347c2fa141f53d0c84abd8ff8a62c8d0242baf5f7a57416d3da3f7814f18ed29324
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
 DIST cc-1.0.31.crate 42956 BLAKE2B 87e79061397a0e12ad4f3a32ab0b4bba764260c7de11eea055163538c749e8da32b95ad5efcb69ab72d210e0e7aed68c79f9ece33352b4cdacc5c1ec6d11f3cb SHA512 d6efba4c53fc8f11fdd685efb2759dbbbe53e65ae7878a61805b110c5a6028debb89a3e6d740bf7fd71055613de4fe92daaa98f34f86473c5a410ce3f17052df
+DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+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-0.7.3.crate 9906 BLAKE2B fcdfb2fc07670cc90e1a60f58b798ecf913cc27153123c430e6920cdbce8459837d8a2ac7436f1fa37389b3912fb3166917af812fee474b73923c8af316a5b84 SHA512 9b06c2379364827df715a1cf6a842d6d793f53082e21eb6daeea0ac03dbc2e6a7902d0cbd39dc8d81d82b02641925f4a70b443d65a413f8e497eb3a9be55a8d0
 DIST crossbeam-channel-0.4.0.crate 86869 BLAKE2B b0f75c33a1527bbcccaa1babffb08582368e33ad66c7838d5500ab9ed6875d603b901fb304920e1f8ea892171259cb762f9db361c84d4bb5d52114c3345686b2 SHA512 169808414541d16a9d2677edd6b4ee339a72e1c72ba43deb85e0c67a6d4980f7d21dac4fa10b612944c56abc0631e490a77dd29051c35a1adb2ed20f5ccb47aa
+DIST crossbeam-channel-0.4.4.crate 86868 BLAKE2B 88629c72c0be41bb3a0d7dc92f6908d46cb397223449da5b2c990b7660e09dfd3e3f3fb708d13586f5dbf199d62f781f1f7e0b73d279de0ef810f7bcf25b3f27 SHA512 2933721d6af3126f492f112f3d662fc40fb49139a84c72d33b6c2b0aa94fe964acb302fe726e999be4292a1410d3ee896169a0434dccfbf44d166008719846d3
 DIST crossbeam-deque-0.2.0.crate 12638 BLAKE2B cbf76e49fee9e1274e295f0958458a6f8f6f0bc449a83011da3dfc64607a649ff6a72102b9ff7784e0ce2b33bb317e4a927eebb749bb9cf31a7ce89e5aca8f7e SHA512 22a1b839ecd4359e3c961e5ff0a044f6f2bc14b5ceec4637c57bb5d26ad04840b0dc0a07f06b494f4b7e224f2a51e3e9a79bf7f895a73179a10705481b33d8a4
 DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
+DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
 DIST crossbeam-epoch-0.3.1.crate 33093 BLAKE2B 915d28d3040232768a60956eaa3d574206ae7664a53af3a993acaa9fac0cca50af321923c3be71d2d1799b7a0d4eb617ddace861644a3c8b067ca360aacab34f SHA512 8fc0641701fdb1d22fa60a5408aff96bbc296b975e6f9644859295abe6ee4729d86ada81969a51a09a7a8518f287ba41fdb258dd0143ce8d7db5abff604b955b
 DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
+DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4
 DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e9788fa546ac75ef449b298ff55cb20871cc00ff075814ee3c20924ce890fdf455c607313b9fd07252b576777bfc1713 SHA512 9a6cf2cda3a76f3efe30290413bf3cd539406039d29f42e06326822fcd32aed3dbdfcfddccdc5871b824951653836a8943e0d771c261fcf7878a8526927b5ca7
+DIST crossbeam-queue-0.2.3.crate 14753 BLAKE2B 1dc60d5a48672f26f0c3afd0b14efc943fe9aea8fc9b10dc1e551a489a178899f1a82c0bc8bebf8511e112711ebb26170d1f76f9caaf06556bbe8b74242e97b6 SHA512 f53385dea0a2b0830372ee11b9d393022f501a79631a15696d641a812939faad62b61112f9da9dda381fe69ecc3c91462fad95f329eddb002aa941110297cd85
 DIST crossbeam-utils-0.2.2.crate 11901 BLAKE2B d089d4d810d3c29163a9c3007c5c3a2479901c111905182df0c24b293853e37107693ee0fb50f0984bb7dae76908a66f1be402222667fe1eec31319e5c6e9979 SHA512 fc49d36efcb3a53125c1173415e27de43970c1d2f32547687e02c99001c98cb200047bd2b0072e47466515df5de9ee2104d1b83e7b4ccf03f0e3580a1d416f32
 DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
-DIST darling-0.8.6.crate 16146 BLAKE2B 4c7d19ecdc6fb1e19aaf48b0237fb16c06a6eb7458fcfc52d03457ca673b9b382b10fcc348da14418b4105b5498ca5bcfee4307b9d75f0a1ce70705887b5196a SHA512 c1b28f6c32e2e2bc7dc0710c0ec6f400a3065573fa9a248e069f17c4315d2594906aad9486abda32508acc9f3ae2b4014eb5119352fe37b92e2b344549e122a6
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
-DIST darling_core-0.8.6.crate 44024 BLAKE2B 6f623cee39ccf274eadf5a0909afb7a65d94e556d9cbe6fa5e213adf73f97ae732ee0f64244ab6fd6e0c9bf8d06077c1496f184cea8e5288d1b8db620c92ff98 SHA512 d0d5983ff11d47b469d64b2ee6ed3e0c493e5a847ddaa97244b8eea9ba00692980ca4fffb91029dd079db7c7a31790d8904e06855205edc4539eb2fdfddb6666
 DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
-DIST darling_macro-0.8.6.crate 1924 BLAKE2B 73350f7ef0ef8e28706ceef8d50e593ef982a7762e1a3a0312e0280182f777ac0292a571f07cc2d468fbb6b4339b7cb0d73658ff09c7bf796928071e0c87f602 SHA512 94900319d079500fc9cfdbf5fbcb53c15d825cbc8cb7a50519cc8e8584871d2a9cd340277b60d85bd261c2bf2628fe5e3ff0d2f74b0b36a9e0bf404fee8c6e33
-DIST derive_builder-0.7.1.crate 30908 BLAKE2B 5bb18cfe4af9ae479f0ce0c23e23fb4e93fe639dbddf6da0860ff2f7f4951d4d976288726d9f7ad863d7c58c2bc44cfdca7b876eef89c7290d9b6df4c43bc179 SHA512 367b7f66c593bfac2b2271e2d55dfb1418d485dd590ee0631cf1297e6d37b66bc6269d7b8c859b24f8e70c76b37e8cd047d463eee18f8013b1aed5b454fe63bc
+DIST defer-drop-1.0.1.crate 9062 BLAKE2B 6b2e1d29d4e7141e70af1c11669e42c7b66dcbc999fd1e0c4de5786b307c773cc2581d8858ce3a405009285d70223d2e69404ac6cd583533a161fec03169f87a SHA512 317f6bbf340d6ff60c624d45b829563ea36d85b1de82cf3543227b11b0c95c1c23e44d02be7315f0c99db0af932d71aaec2f41c066b3abf28ebe3b86bbe95e01
 DIST derive_builder-0.9.0.crate 38161 BLAKE2B 08bcbf8851ba813627a56e3f93a95f08a938e0cdd4f2a7971961eb5ecbdd3c96f6143214b49d8ae6cf6be166a934208ff7d0f768a3408868cab093872860e7dc SHA512 e56a01ed13420ac024be394883e5cf148f83ea74d2488931216d84cd2e8f00953e2d61f9b81d34f18be40bda055c02614baeaa89d5fbb9d3defe9ed314f2ef95
-DIST derive_builder_core-0.4.1.crate 17157 BLAKE2B 56a1ff198fb5fefa1186fa829eb79ddbbaf4efef191cc56ed41950a8e32a27bf980994a41ebedb84fa6432d10d8ed83022a95a858daa8047fa5570aad66f798a SHA512 abb287b29f4c47741c7f8cccc7d96d23312f2880011a428613562de387326c76b15aef7e9449de3fa5c8f471330fe42639b9f06f7b9ceb16256fd97df764db80
 DIST derive_builder_core-0.9.0.crate 18328 BLAKE2B b7a70372bf9300a2957927dc6bf45d64ff923552d2aff463e9811cf295d8bf300f8e3a03c73d08e1f727e91bb0eca2d34e332bd65a1b43506b9d486e559c879a SHA512 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf
 DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
+DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 DIST either-1.5.1.crate 11532 BLAKE2B 3cb46de61309efeedb614c20a83bdcf2c4de024fa1ca4e6e1cec6384445596cfbf2c9d7a9712faf554a373eaa462835b455d7b2a908a99e99ae1c738680778a8 SHA512 268d218b10ed7cabbf1a116afa22ebe47791303aa012a61676d04376961156983374490d3d939e5d68b2ccf3a9c56f41eb9c9651cf81ea1294ef275dc898733e
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
+DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
-DIST fuzzy-matcher-0.2.1.crate 8135 BLAKE2B 9fa6417a90190905b0c563d2f629a77f4a711c4c87eb2600b2411c00f11b125b2fad346be02ef30fbf21c0e6d0ae068f89baf5b300ba61bf705c4a4256909687 SHA512 c177eacbbfb45bcf6f607e0d421da18eaf4c25738a26fd553574901be2e9f5b9fd877f4886b0f6d68050dbd7a04d37f73420648fa3e122f2a18e26794865b63d
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fuzzy-matcher-0.3.1.crate 15837 BLAKE2B 33ce848aa3853df14c695139870046c63dae72479b2279b383bdda79428ccf961943b12ed2c76716f1fe1767b14ac35f9252afd5cfa9a41e977783f752bd1f5c SHA512 f3c29df8f0d70bdcfd8188d190f13aa72ef46ed607bd77abb6a237b40a771c256b35df6d78f1c6942c159132f9849d0fe3b8d106aa097eedab70ec2e7c2cc52e
 DIST fuzzy-matcher-0.3.4.crate 16249 BLAKE2B 2d3b059805d70eeee43d5d00031ac45e712703ee95386fc0ea34498d1d352cd4858985f80c8d6e2886e93659c338e06eacd83b0a219e8fd3d5e29bcd0a063364 SHA512 06e6b5ae153959d3bcbe3fa1211aaa7ee354bd156fa1ff257ec5b0dc6b41c67d682dc063f541655dd1dfd33f2743eedc54cf860628d7be302d1b53c2fd50c3d5
+DIST fuzzy-matcher-0.3.7.crate 18047 BLAKE2B 934b90a74826393ceccc3e433df7cbc056a10744077e7a2178df9d9edc9db5d4cbc86d006c0ef1f7d82f4fb8ea0d52df71be1c7cc9ee39b433207d7f2126404e SHA512 ebcb6de06dd66da952183c75e4a44988bc60df17f035fe541c134f1c4e3c33d18a7385a9867fc23a99c07cef2b2737edd6128dea6546e243985da2f3a55dd8e3
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
 DIST getrandom-0.1.6.crate 18529 BLAKE2B 11b9f6475686f59ac710705c2ffb3de3e248cc38c4da8c0d00e7ec938adcc4ffdb120a472d5a9416a9093f62c77a1565ef42a9614d7bfbe5a48aa460a16e4ebd SHA512 e4426a90e1a942344568c087b27a7e7f483e715947ddf25b5a2671b7844b646d09033994a810c9bc96c905d75bf0552e217cf93526a6294a73cb3ddc02540801
+DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.58.crate 409031 BLAKE2B 81353f2e0962bdc3bca806a195c80b84f9c63c0a7184aad966f33ea073982045577eebb468bf379a7e342bac722b9df7052d25becd9f25c99923bc309ae75211 SHA512 9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491
+DIST libc-0.2.79.crate 511752 BLAKE2B e5da81cbbf3bd400fc301096750cc94683f13000b3f20461d2bad942c3999122fb944655871039e3bc32b9dc5037de4e82800db16899dce4685d80a569e21512 SHA512 943e097b3a4fd33b547812dadad15da33c98b1d78fd86579f63a78030a5fadd431d5d1fc969e67e1bc301d33dc550c0398ccadae26aa990d05ee474a5f76c634
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
 DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
+DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6681787c6969360c8db54912ae511580d8c899a3b9cb7f2fba98099c8df4c17534b97e4f4b1902d9251296527 SHA512 6df8952d41f60fa0993fbc85d112a15c1f6ecfef66da29ebdab71f40cd8ee8722400693b6ea023344f1b5dc351cbe828f465a8cabd150377a62948cedeb5db6b
 DIST nix-0.14.0.crate 184529 BLAKE2B 106c90d03a9359608d99f8356239623a8b983dbabf92d170c19ca05b3eb035bf10749a9bc45e43d014b946c857eff5435aa1a02ae23e3f01a2baf7fab8bc22ba SHA512 34e900f3119d62ac00fd2d8ef001bfd7474bafd8415ba9986562a943eac292f2c9a679dc27e9b09d26d04c1e020bd88ec87689793f78b7b5c45ba21d29510207
+DIST nix-0.14.1.crate 185227 BLAKE2B ecd12ae7580879c960cd828a22109e5a7f209a24c4208bc04d4392f36726886b66b147dbd3a1f3705edd35e53187553c125dfd47589a326c032aab0a3d3c9ba2 SHA512 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
+DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
+DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
 DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
-DIST proc-macro2-0.4.27.crate 34098 BLAKE2B ecec94ab4c79dbdfc77731054e3c370c2ae330baa3502efba34d2f900ba9ddcc5d89373adb06a465fa10c9bda061f7b3040c5f20fcf1b1accaba177632b6edb2 SHA512 b1ec1f59355c122022ac93f7ac03ddcc092b8712321f4ad74bf346a0dbea06c31cc695b1edfb735010620ab5eac5c62d3bde423c8458691edd0336127462359c
+DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
-DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
+DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rayon-1.0.3.crate 134391 BLAKE2B b0f938ad39bf8772374d312893097bb91ee3886e79f6c3050658b0797fad55f309d03d99c3f300837e86aa28f4b5041d9cf7dc455cb418fb4d38b678e8063a10 SHA512 bd23dbcd8b17061e0623df01af141d0e51532b46ef360ddbd392f4992d6b62fda26255cd9908f853a5a4c3cf111f6c9224a97abb0a3f9754aa0ed79ac58392f7
+DIST rayon-1.4.1.crate 158219 BLAKE2B 67a921c77170092911b5acef76ad550a52906737115b422062bef8f70a8dd3d092ffb0faabbc4247d9d40770bc9a353c9d7f12bc92d1971bab8ba053d9ea5993 SHA512 646727428091def322ef395e032de810d228813f6ea2cfb7ccfc7dcb1a6e09112f469b5fb7cd9a05fba13cecce1ed6a46a53f03b50f691a9b50da2c507fd59de
 DIST rayon-core-1.4.1.crate 53760 BLAKE2B 0c8c9b83e3459f85fbd168b70ca8a4f34378a2e902b5cdf88730dd57e84248c8474c5cfc5dedbc66322b996733bf404226c0d2694fd7139ae9706a822f567d3c SHA512 4d12b8097356d0a9eac8b3ca64085de8d19360dae81b3ccb199275c3487f705e2aded498e819958bb81d4de56c05d4d29c21c07da02236ba6fa0b2888ecfbea8
+DIST rayon-core-1.8.1.crate 63681 BLAKE2B fbb6aa174b141e515a0733cf8c1308ab37ef70f9e0ba5355382e590180ec0151e270a73410802cfafce1d76e60afbfa41406e4231eff517161caf633f5f42489 SHA512 bd5c4a1cf9534229adaf7db52bbe5bc9409758e47cdd783fa0bd50e82beb7ebe1c531bd0a63a92a86afe3c9b14142e94cd7716d7296c9968f245186a228ddd30
 DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
+DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
 DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
+DIST regex-1.4.1.crate 236871 BLAKE2B 1a232e6a83e02b4fd2189142eb2e20d3f06d8d484f9012661aea99c23bfc8d56a04b993cab6a3fe85d29aca38a1b3ad5a8ea6cd5bcf3439d5d173923af9d9d1f SHA512 eb8869031ac156f10e8d031c8f5e5fab66575663b7daf4a0e86523fb3dea43e11c7bffe802d5fb7896e017e61afa856783c0541a1d414d91f322b2fbfaf8e249
+DIST regex-syntax-0.6.20.crate 293727 BLAKE2B ea19fdee49290481d20230e58da22d32e0cb715a93a67f98687b6fa8bfca5fea77d82399485a6be15b2a24d21fa4635c60cfe05b7132128e36a770fe86bf3c8f SHA512 65cfd5c493a066801a290d3663d5ceec738558ac7f3af9f3c3773065d9b6b02df006bedc556ee0dc377c032cf934426dea817d06f9639b837d7864f966ec94d8
 DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
 DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
+DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
-DIST skim-0.6.9.crate 85410 BLAKE2B 6b06657896f6959c4ea0882e99c4ecf29b485fdddbcc9b7313753e5557e42ccd786e107327aeed5485785cab001d0586059017492f1d3d7e4eeba443817c7312 SHA512 28619820fa564906a8b13d587a484055dc540befd509668e05d181888412c66530039c4cc2e5d9ad872b15b757e1f836d0503559b91eb77b1a9caed435b17d80
 DIST skim-0.7.0.crate 91967 BLAKE2B ea50dda7ba272d5c64a9bd9cf35903df87e25010ea25f1931da0aa0987b5bd1264a49c38078971686c4fbe9b09ef86905540736a6904b620a44ab425d3efddee SHA512 8e43dc786fc301dbec56234c65690461926c899a7b5aad3187f0a588f73b4470bc47fdd12f31e67c59d153cadc7a6b3408a1a23b4ccb220e069dfa6eddf38551
 DIST skim-0.8.1.crate 104044 BLAKE2B 0b375e667aec1998219f4dacbe2599440852e37bf321bdabdf8d6cc82ef81989cb88a9f9b3efc98c14845b945e93d08292d482212b881c181e1a9c25499c4cb0 SHA512 d07acb458b38f62e10a3379da0e79a3ae988700ed34105b3b4194918587514f375adf82b6ce0e86b0fb6dc259b33e63f40821a9dd912eede228f2bfeb0e59083
+DIST skim-0.9.3.tar.gz 120208 BLAKE2B a58d4b5b9f73895504806f3cbc123a4ae4b081b71faa9a3434271c7e7eefdf3345294c6025f4d13a4a5ecc9b5e083804c1c521febce2e550da69a43411875e77 SHA512 00b7ccaf458c0742b8d8fda5bae018ca0de569d36c932fb38d45d4c81d86b476c5f7e6e89c144b050a85932b8d57af5046fbbfa09288a38047b04a3b41ad594e
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
-DIST syn-0.15.29.crate 146203 BLAKE2B b9280bda7735dfc08f80816e5db9c22e27596e5bfcbc54accd37a9bc4899c2caf1bcef03155c653441365ed9fc8cad910fa47c58ba7a386b3fc9f40b4be59a27 SHA512 1a5f365a8239758c9a2e2cfac3bac1bc94995ea48eb087cc8a2dc62a33a2f22b2bbe2985e344fdd758021ab66e55ff17e76c0234e9ae342499d1ae1fc3294767
 DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
+DIST syn-1.0.44.crate 225524 BLAKE2B 1e96512143ae8fc2e0c904ec5dd3ef21aeb21a4c16e895c22b46f42a80dc7e56d494b8b225c874b9bdc4895ffbeaf23ee4b7986715c38c987c16a1acac72d90a SHA512 b4215f7fa6373c4c283b872d9464dce40254e7236912d868007e0c9d6c868098dbb50ad218d512d5d1d2f13670dc0562b2f8f1cc758868bbe548bbad888fa774
 DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
 DIST term-0.6.1.crate 37578 BLAKE2B 6ff130b12efadff7ece7858935f3fc9481da87ce0954c49cdcf7f4210a572274048292372aee7ef58efe6c00fa38242c2abd29bbd4563d00a55fb9337e038ed3 SHA512 5e684eedfe522da12914d579fddf1b04720086325ab18498e56b0cc709b0c8a022f887731a2bba9d0ddf200c756d12948835bccdff5bfb2b19af7d071051eacd
 DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
+DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST thread_local-1.0.0.crate 12629 BLAKE2B 3ec8ed420965ccd2fe6f8b1322d83f339795bb7121637daf6ee6079dd1bb023d4f723ae53ced5406beffee809752c30dc8be04c09704a6c692a1b3ab4dbc56eb SHA512 70d87a71909c405112257c7e4588d6432844fd9c0ae135149f1378a3b26b6619c0269a059ce02cfabe2e5041770824314ba031a04be1a0cef91b13f9894b6369
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST timer-0.2.0.crate 12190 BLAKE2B 51a84f110fa814a9d844bbc7b81cb68f931e85a1a73f437874b0915458b539b27e90fc6872594f882d2f3d88117f605982c21129dfd2ada105ce207504758b8f SHA512 631997776e6b3d7e7abb4d42b7a4cbb12c3ac4337a11ed2cd83d783ee732b56ef27fc0bdf4156dca331494029b8c207d3c8df6936278b6eacd23348c44a4d757
 DIST tuikit-0.2.9.crate 35141 BLAKE2B 0ade82741a12b9fb094d3c56cd2d5efae093663fb6f52156f18e5777ee556e7521cf98849dc03b88e46d0ceb3cc253afe218708346914960a1a9a371dfe15bec SHA512 33568432d0c38f77b6102c27a5fe2a654c6772afaa442b021e4d29c181573e4d22b323fba642f6e916eba5968733eb422ec1dd24bf3748dbc4158a53a1bc5f86
 DIST tuikit-0.3.2.crate 41529 BLAKE2B 214275063544462a41a9934c7ec8eeb28714b50a42d7ae0c4029fd9215e10b0dc32ce7fad81e2ffd39c02db2d5b7ed60c82d5862d515478369db480721df2dca SHA512 f5cf5918480430e380165fc2e656b98499e237113e65a1e523f4a69721afcfb4d6e64331963d3938e2883588a41459e23a6df4c5048d0c3ad5a5b561b400420e
+DIST tuikit-0.4.2.crate 44394 BLAKE2B ac057f3b5db767be126224385c098f841e829fa6ae956768732465a20eec4df0fae0859648b97d12d8a19112bc33e7ee3d6a3f4bbb54d9b367c96cae9a72d43d SHA512 06a0126d5745fc2653a575d810bf859156f8474dd301263edb680e780c534c12ade029e848efd693c300069ef3918c7b95d1e2761a017ec93d25af6ada42f666
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+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-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
diff --git a/app-misc/skim/metadata.xml b/app-misc/skim/metadata.xml
index ccd1a67a8c21..e1e7f0921f1f 100644
--- a/app-misc/skim/metadata.xml
+++ b/app-misc/skim/metadata.xml
@@ -8,6 +8,7 @@
 	</use>
 	<upstream>
 		<remote-id type="github">lotabout/skim</remote-id>
+		<changelog>https://github.com/lotabout/skim/blob/master/CHANGELOG.md</changelog>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/app-misc/skim/skim-0.6.9.ebuild b/app-misc/skim/skim-0.6.9.ebuild
deleted file mode 100644
index 6d4ce1d790d2..000000000000
--- a/app-misc/skim/skim-0.6.9.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.3
-ansi_term-0.11.0
-arrayvec-0.4.10
-atty-0.2.11
-bitflags-1.0.4
-byteorder-1.3.1
-cc-1.0.31
-cfg-if-0.1.7
-chrono-0.4.6
-clap-2.32.0
-crossbeam-deque-0.2.0
-crossbeam-epoch-0.3.1
-crossbeam-utils-0.2.2
-darling-0.8.6
-darling_core-0.8.6
-darling_macro-0.8.6
-derive_builder-0.7.1
-derive_builder_core-0.4.1
-either-1.5.1
-env_logger-0.6.1
-fnv-1.0.6
-fuzzy-matcher-0.2.1
-humantime-1.2.0
-ident_case-1.0.1
-lazy_static-1.3.0
-libc-0.2.58
-log-0.4.6
-memchr-2.2.0
-memoffset-0.2.1
-nix-0.14.0
-nodrop-0.1.13
-num-integer-0.1.39
-num-traits-0.2.6
-num_cpus-1.10.0
-proc-macro2-0.4.27
-quick-error-1.2.2
-quote-0.6.11
-rayon-1.0.3
-rayon-core-1.4.1
-redox_syscall-0.1.51
-redox_termios-0.1.1
-regex-1.1.6
-regex-syntax-0.6.6
-scopeguard-0.3.3
-shlex-0.1.1
-skim-0.6.9
-strsim-0.7.0
-syn-0.15.29
-term-0.5.1
-termcolor-1.0.4
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-time-0.1.42
-timer-0.2.0
-tuikit-0.2.9
-ucd-util-0.1.3
-unicode-width-0.1.5
-unicode-xid-0.1.0
-utf8-ranges-1.0.2
-utf8parse-0.1.1
-vec_map-0.8.1
-void-1.0.2
-vte-0.3.3
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
-"
-
-inherit cargo
-
-DESCRIPTION="Command-line fuzzy finder"
-HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-IUSE="tmux vim"
-
-RDEPEND="
-	tmux? ( app-misc/tmux )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sk"
-
-src_install() {
-	# prevent cargo_src_install() blowing up on man installation
-	mv man manpages || die
-
-	cargo_src_install
-	dodoc CHANGELOG.md README.md
-	doman manpages/man1/*
-
-	use tmux && dobin bin/sk-tmux
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins plugin/skim.vim
-	fi
-
-	# install bash/zsh completion and keybindings
-	# since provided completions override a lot of commands, install to /usr/share
-	insinto /usr/share/${PN}
-	doins shell/{*.bash,*.zsh}
-}
diff --git a/app-misc/skim/skim-0.8.1.ebuild b/app-misc/skim/skim-0.8.1.ebuild
index 92f49bfe4fbe..3e51408f8bbf 100644
--- a/app-misc/skim/skim-0.8.1.ebuild
+++ b/app-misc/skim/skim-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -107,7 +107,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="tmux vim"
 
 RDEPEND="
diff --git a/app-misc/skim/skim-0.9.3.ebuild b/app-misc/skim/skim-0.9.3.ebuild
new file mode 100644
index 000000000000..08d5bf0fe518
--- /dev/null
+++ b/app-misc/skim/skim-0.9.3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.14
+ansi_term-0.11.0
+arrayref-0.3.6
+arrayvec-0.5.1
+atty-0.2.14
+autocfg-1.0.1
+base64-0.12.3
+beef-0.4.4
+bitflags-1.2.1
+blake2b_simd-0.5.10
+cc-1.0.61
+cfg-if-0.1.10
+chrono-0.4.19
+clap-2.33.3
+constant_time_eq-0.1.5
+crossbeam-0.7.3
+crossbeam-channel-0.4.4
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.3
+crossbeam-utils-0.7.2
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+defer-drop-1.0.1
+derive_builder-0.9.0
+derive_builder_core-0.9.0
+dirs-2.0.2
+dirs-sys-0.3.5
+either-1.6.1
+env_logger-0.6.2
+fnv-1.0.7
+fuzzy-matcher-0.3.7
+getrandom-0.1.15
+hermit-abi-0.1.17
+humantime-1.3.0
+ident_case-1.0.1
+lazy_static-1.4.0
+libc-0.2.79
+log-0.4.11
+maybe-uninit-2.0.0
+memchr-2.3.3
+memoffset-0.5.6
+nix-0.14.1
+num_cpus-1.13.0
+num-integer-0.1.43
+num-traits-0.2.12
+once_cell-1.4.1
+proc-macro2-1.0.24
+quick-error-1.2.3
+quote-1.0.7
+rayon-1.4.1
+rayon-core-1.8.1
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.4.1
+regex-syntax-0.6.20
+rust-argon2-0.8.2
+scopeguard-1.1.0
+shlex-0.1.1
+strsim-0.8.0
+strsim-0.9.3
+syn-1.0.44
+term-0.6.1
+termcolor-1.1.0
+textwrap-0.11.0
+thread_local-1.0.1
+time-0.1.44
+timer-0.2.0
+tuikit-0.4.2
+unicode-width-0.1.8
+unicode-xid-0.2.1
+utf8parse-0.1.1
+vec_map-0.8.2
+void-1.0.2
+vte-0.3.3
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Command-line fuzzy finder"
+HOMEPAGE="https://github.com/lotabout/skim"
+SRC_URI="https://github.com/lotabout/skim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="tmux vim"
+
+RDEPEND="
+	tmux? ( app-misc/tmux )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+QA_FLAGS_IGNORED="usr/bin/sk"
+
+src_install() {
+	# prevent cargo_src_install() blowing up on man installation
+	mv man manpages || die
+
+	cargo_src_install
+	dodoc CHANGELOG.md README.md
+	doman manpages/man1/*
+
+	use tmux && dobin bin/sk-tmux
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins plugin/skim.vim
+	fi
+
+	# install bash/zsh completion and keybindings
+	# since provided completions override a lot of commands, install to /usr/share
+	insinto /usr/share/${PN}
+	doins shell/{*.bash,*.zsh}
+}
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 5643b8f3e100..bddeee2947c9 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Toyoda"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="l10n_ja"
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index b13d1338d9d8..364a389caa40 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
 
 REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
index 91bd955c6da5..890e70a9e11b 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
 
 REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild
index c95a6ad36c9b..3cf544e110b2 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
 
 RDEPEND="mysql? ( virtual/mysql )
diff --git a/app-misc/supercat/supercat-0.5.5-r2.ebuild b/app-misc/supercat/supercat-0.5.5-r2.ebuild
index 477241c20c0c..fc0d5e22b20c 100644
--- a/app-misc/supercat/supercat-0.5.5-r2.ebuild
+++ b/app-misc/supercat/supercat-0.5.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --with-system-directory="${EPREFIX}/etc/supercat"
diff --git a/app-misc/supercat/supercat-0.5.6.ebuild b/app-misc/supercat/supercat-0.5.6.ebuild
index 2b23723db957..762e54276cf8 100644
--- a/app-misc/supercat/supercat-0.5.6.ebuild
+++ b/app-misc/supercat/supercat-0.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --with-system-directory="${EPREFIX}/etc/supercat"
diff --git a/app-misc/symlinks/symlinks-1.4-r3.ebuild b/app-misc/symlinks/symlinks-1.4-r3.ebuild
index aa0b9092dbe6..b4c316a04006 100644
--- a/app-misc/symlinks/symlinks-1.4-r3.ebuild
+++ b/app-misc/symlinks/symlinks-1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
 
 LICENSE="symlinks"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static"
 
 DOCS=( symlinks.lsm )
diff --git a/app-misc/tmux/tmux-3.1c.ebuild b/app-misc/tmux/tmux-3.1c.ebuild
index 45cd420cb8c4..398b9ae47ef7 100644
--- a/app-misc/tmux/tmux-3.1c.ebuild
+++ b/app-misc/tmux/tmux-3.1c.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 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 5a80c44dea65..04927c56269f 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.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 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 1e0abca880de..db5be3913be3 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -2,3 +2,5 @@ DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c70
 DIST tmuxp-1.5.5.tar.gz 856665 BLAKE2B fa18222840b9c221de48a78291243776a66a7aec3221f23be3218f81eae0d15ce5a4568f7eff679c01793d4ac4d441f6714c37d9ac3c9f705af49214f5dc2570 SHA512 61c14197af7742b48dab95443bb818ede20d26aa46ab2e89b883a34e2bcec910d8210fc1358fc88f96ccc637c47d6432082cd58995b80a43234cebba95240ebc
 DIST tmuxp-1.5.6.tar.gz 883700 BLAKE2B c8ad08c709aa1763cc046a05c6241983d2cdd33ca530ce0510ae7bb68ce3e340d40c6ec23c9544ef8b0d8da38aad74305e13d7b6348b0f46da929e94b3e862ff SHA512 1db74aa9ee6274aacec127aff210e8ed64176142991a9691c31c59ef0370503dddeb35b69c0a8229204968308c68788d408d6a5e0bc2ad1fb3320727ea4994f9
 DIST tmuxp-1.6.2.tar.gz 1014758 BLAKE2B c6c60978938892311151cfff35bdc74e2daa9a615b2952a14c4a0020e434af7c28d36466a5ae82db683c6bda9a95f12f7e032d04eb58c5b164aeb05b144b2005 SHA512 a38c3f46a726df0cd885113d82ed5a186d68f6d643a7bde6d169908373e6881fac14c8c46c00ede727e47e4e1af5f9d3cd79cb0057457478ace1ec0ba0632cfb
+DIST tmuxp-1.6.4.tar.gz 1015684 BLAKE2B 4f8d34ab1e1bd8e46e89e49ac92ce0a05b614bd7b43ce910120f12a46fb3ab143330975352cf2275999146ba005646c7c5aa07b7cc616ae80265edb4e173cf34 SHA512 482ba47652090a13d7866695b2639ab580c0cca5f6935f58e0be6867efde298c6f3350f65c231dec59a3f2dc1e0f795b02df1ad24d5ace6e7ee6aecdd60a9611
+DIST tmuxp-1.7.0.tar.gz 1027071 BLAKE2B d1806794e11e651e7ba826d7b28a9b0f467272d2972b06be4036919a08a5ad36140aa09f975da41a2a4bd8a71b25f38c8d08d8dd37cf2b371441a3557880146a SHA512 0cfba5375f35957e3db15c61876b4a142d4a13411e67dd7ba9c643e1bfe754e71d02773e10336f83613b90e6211d8bb9b1132fae4e890c8467b638e605dc2108
diff --git a/app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch b/app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch
new file mode 100644
index 000000000000..4bdfe015474a
--- /dev/null
+++ b/app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 1e14e51..6945c2b 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -486,7 +486,7 @@ session_name: hello
+                 '{SESSION_NAME}',
+                 '{WINDOW_NAME}',
+                 '-c',
+-                'print(pane.id)',
++                'print(getattr(pane, "id", "{PANE_ID}"))',
+             ],
+             [],
+             {},
+@@ -496,7 +496,7 @@ session_name: hello
+             [
+                 '-L{SOCKET_NAME}',
+                 '-c',
+-                'print(pane.id)',
++                'print(getattr(pane, "id", "{PANE_ID}"))',
+             ],
+             [],
+             {'TMUX_PANE': '{PANE_ID}'},
diff --git a/app-misc/tmuxp/files/tmuxp-1.7.0-tests.patch b/app-misc/tmuxp/files/tmuxp-1.7.0-tests.patch
new file mode 100644
index 000000000000..9be2392557b1
--- /dev/null
+++ b/app-misc/tmuxp/files/tmuxp-1.7.0-tests.patch
@@ -0,0 +1,15 @@
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index e5a7f93..de132db 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -15,6 +15,10 @@ import pytest
+ import click
+ import kaptan
+ from click.testing import CliRunner
++
++import sys
++import pathlib
++sys.path.extend([str(p) for p in pathlib.Path(__file__, '..', 'fixtures/pluginsystem/plugins').resolve().iterdir() if p.is_dir()])
+ from tmuxp_test_plugin_bwb.plugin import PluginBeforeWorkspaceBuilder
+ 
+ import libtmux
diff --git a/app-misc/tmuxp/tmuxp-1.6.4.ebuild b/app-misc/tmuxp/tmuxp-1.6.4.ebuild
new file mode 100644
index 000000000000..0775af231cfe
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.6.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
+	>=dev-python/libtmux-0.8.5[${PYTHON_USEDEP}]
+	<dev-python/libtmux-0.9[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	<dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+		!dev-python/flaky
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/tmuxp-1.6.4-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	SHELL="/bin/bash" pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/app-misc/tmuxp/tmuxp-1.7.0.ebuild b/app-misc/tmuxp/tmuxp-1.7.0.ebuild
new file mode 100644
index 000000000000..8c06d823833a
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
+	>=dev-python/libtmux-0.8.5[${PYTHON_USEDEP}]
+	<dev-python/libtmux-0.9[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	<dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+		!dev-python/flaky
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/tmuxp-1.6.4-tests.patch"
+	"${FILESDIR}/tmuxp-1.7.0-tests.patch"
+)
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	SHELL="/bin/bash" pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 2d0ebd468d76..cb04f7150941 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1 +1,3 @@
 DIST tracker-miners-2.3.3.tar.xz 3144712 BLAKE2B a5789cce89dedd7cf35548b730acc80eb9b8bcbc8338c4ee55b07c97af4b9fbadc46bf0fdc552a3384e995d71aca0defe2d57dc21d99f775dee6f33f69e0aa9b SHA512 1e845aaa5412125df84298a05f29888b3872c0f4d9251f026dd51846831fcd4aa0c6965c85752d7b6ed6548268d21f0fd2a8427c922a5dc0afcd294286c607e2
+DIST tracker-miners-2.3.4.tar.xz 3128484 BLAKE2B f52c46123c95252f8f16df824ff7498a8f44698cea13fa78653d7733590bef0a502139fea686b4fd9012f7569a6f946e1dbf8e053a16c474230c733d37103a3f SHA512 ceddddfa6c3151b5caeb197a4ae4dbe24fa2674e807bf66a9cc72227b60ee295171b52c2edb35236a3fbf9d8803678f55f8b990864a7a3a32bf362b0739d03ba
+DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
diff --git a/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch b/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
new file mode 100644
index 000000000000..85f201bcf051
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
@@ -0,0 +1,80 @@
+From e7b6d5f8b7541a4693c61be5d210fad85a5c9d06 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Sat, 12 Sep 2020 13:37:11 +0200
+Subject: [PATCH] build: Fix -Dautostart=true
+
+Meson doesn't seem to like that we use install_data() with custom target
+results. Make this option toggle the "install" keyword argument in the
+custom target itself.
+---
+ src/miners/fs/meson.build       | 10 +++-------
+ src/miners/rss/meson.build      | 10 +++-------
+ src/tracker-extract/meson.build | 10 +++-------
+ 3 files changed, 9 insertions(+), 21 deletions(-)
+
+diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
+index a770516c9..5a23bd06c 100644
+--- a/src/miners/fs/meson.build
++++ b/src/miners/fs/meson.build
+@@ -54,13 +54,9 @@ desktop_file_untranslated = configure_file(
+ desktop_file = custom_target('tracker-miner-fs-desktop-file',
+     input: desktop_file_untranslated,
+     output: 'tracker-miner-fs.desktop',
+-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
+-
+-if get_option('autostart')
+-  install_data(desktop_file,
+-      install: true,
+-      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+-endif
++    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
++    install: get_option('autostart'),
++    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+ 
+ if install_systemd_user_services
+   configure_file(
+diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
+index f540befe2..0bf0bb765 100644
+--- a/src/miners/rss/meson.build
++++ b/src/miners/rss/meson.build
+@@ -31,13 +31,9 @@ desktop_file_untranslated = configure_file(
+ desktop_file = custom_target('tracker-miner-rss-desktop-file',
+     input: desktop_file_untranslated,
+     output: 'tracker-miner-rss.desktop',
+-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
+-
+-if get_option('autostart')
+-  install_data(desktop_file,
+-      install: true,
+-      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+-endif
++    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
++    install: get_option('autostart'),
++    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+ 
+ if install_systemd_user_services
+   configure_file(
+diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
+index 239907179..aec37bfcc 100644
+--- a/src/tracker-extract/meson.build
++++ b/src/tracker-extract/meson.build
+@@ -189,13 +189,9 @@ desktop_file_untranslated = configure_file(
+ desktop_file = custom_target('tracker-extract-desktop-file',
+   input: desktop_file_untranslated,
+   output: 'tracker-extract.desktop',
+-  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
+-
+-if get_option('autostart')
+-  install_data(desktop_file,
+-      install: true,
+-      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+-endif
++  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
++  install: get_option('autostart'),
++  install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+ 
+ if install_systemd_user_services
+   configure_file(
+-- 
+2.27.0
+
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild
new file mode 100644
index 000000000000..45c0a5b0b215
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+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"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=app-misc/tracker-2.2.0:=
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-meta:1.0 )
+	!gstreamer? (
+		ffmpeg? ( media-video/ffmpeg:0= ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	iso? ( >=sys-libs/libosinfo-0.2.10 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0[cairo] )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	upower? ( >=sys-power/upower-0.9.0 )
+	sys-libs/zlib:0
+	gif? ( media-libs/giflib:= )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS}
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| ( media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0 )
+	) )
+"
+# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	xdg_src_prepare
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Ddocs=true
+		-Dextract=true
+		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
+		#$(meson_use test functional_tests)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Ddvi=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature cue)
+		$(meson_feature exif)
+		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature tiff)
+		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild
new file mode 100644
index 000000000000..3209404f14ac
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+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"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=app-misc/tracker-2.2.0:0=
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-meta:1.0 )
+	!gstreamer? (
+		ffmpeg? ( media-video/ffmpeg:0= ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	iso? ( >=sys-libs/libosinfo-0.2.10 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0[cairo] )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	upower? ( >=sys-power/upower-0.9.0 )
+	sys-libs/zlib:0
+	gif? ( media-libs/giflib:= )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS}
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| ( media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0 )
+	) )
+"
+# intltool-merge manually called in meson.build in 2.3.5; might be properly gone by 3.0
+RDEPEND="${RDEPEND}
+	!>=app-misc/tracker-miners-2.99
+" # Incompatible revision for (upcoming) parallel-installable tracker-miners-3 due to autostart; a revision that disables autostart and drops the blocker to be added together with v3
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-autostart-build.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	xdg_src_prepare
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Ddocs=true
+		-Dextract=true
+		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
+		#$(meson_use test functional_tests)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Ddvi=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature cue)
+		$(meson_feature exif)
+		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature tiff)
+		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dautostart=true # turn to false to co-exist with tracker-miners-3
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 104819fc25f8..c336bc3acd51 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1 +1,2 @@
 DIST tracker-2.3.4.tar.xz 1607928 BLAKE2B f0285480091fdac3aab1d258496643b7644f2d58383eb0d7cdd10f273a79e75a36507285db4737bb270dda8cb195482d6f8e2770b24fce13c72dd32325c3976e SHA512 8b8ffc33962a5dffbae83dfb8ea73b0d2ff6ee002fbd9e4b574ef5f8e562338e359caab290ab804f2801a14e04d2c76eb0a52cf06be4d236ea043de4fc39dadf
+DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
diff --git a/app-misc/tracker/tracker-2.3.4.ebuild b/app-misc/tracker/tracker-2.3.4.ebuild
index bb74dad255a3..086d7863d663 100644
--- a/app-misc/tracker/tracker-2.3.4.ebuild
+++ b/app-misc/tracker/tracker-2.3.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 VALA_MIN_API_VERSION="0.40"
+VALA_MAX_API_VERSION="0.48"
 
 inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
 
diff --git a/app-misc/tracker/tracker-2.3.5.ebuild b/app-misc/tracker/tracker-2.3.5.ebuild
new file mode 100644
index 000000000000..7897ddee866a
--- /dev/null
+++ b/app-misc/tracker/tracker-2.3.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/2.0"
+IUSE="gtk-doc +miners networkmanager stemmer"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+#RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
+# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-1.3.2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.0
+	>=net-libs/libsoup-2.40.1:2.4
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.20.0
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	$(vala_depend)
+	gtk-doc? ( >=dev-util/gtk-doc-1.8
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dfts=true
+		-Dfunctional_tests=false # many fail in 2.2; retry with 2.3
+		#$(meson_use test functional_tests)
+		-Dman=true
+		$(meson_feature networkmanager network_manager)
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion="$(get_bashcompdir)"
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
index 2eaf3adf54dd..3b9972d14bf2 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 PATCHES=(
 	"${FILESDIR}/${P}-flags.patch"
 	"${FILESDIR}/${P}-glibc-2.30.patch"
diff --git a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
index 4baa78134245..abc5e89c99e0 100644
--- a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 pkg_setup() {
diff --git a/app-misc/uptimed/uptimed-0.4.2.ebuild b/app-misc/uptimed/uptimed-0.4.2.ebuild
index b5ad54d55125..889f23dba921 100644
--- a/app-misc/uptimed/uptimed-0.4.2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-misc/utimer/files/utimer-0.4-fno-common.patch b/app-misc/utimer/files/utimer-0.4-fno-common.patch
new file mode 100644
index 000000000000..a8386fe8e215
--- /dev/null
+++ b/app-misc/utimer/files/utimer-0.4-fno-common.patch
@@ -0,0 +1,29 @@
+--- a/src/utimer.h
++++ b/src/utimer.h
+@@ -66,9 +66,9 @@
+ #define TIMER_PRINT_RATE_MSEC  79
+ #define TIMER_CHECK_RATE_MSEC  500
+ 
+-GMainLoop         *loop;
+-gboolean          paused;
+-struct termios    savedttystate;
+-Config            ut_config;
++extern GMainLoop         *loop;
++extern gboolean          paused;
++extern struct termios    savedttystate;
++extern Config            ut_config;
+ 
+ #endif /* UTIMER_H */
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -36,6 +36,10 @@
+ #include "utils.h"
+ #include "utimer.h"
+ 
++GMainLoop         *loop;
++gboolean          paused;
++struct termios    savedttystate;
++Config            ut_config;
+ 
+ gulong ul_add (gulong a, gulong b)
+ {
diff --git a/app-misc/utimer/files/utimer-0.4-locale.patch b/app-misc/utimer/files/utimer-0.4-locale.patch
new file mode 100644
index 000000000000..68acdd471a39
--- /dev/null
+++ b/app-misc/utimer/files/utimer-0.4-locale.patch
@@ -0,0 +1,10 @@
+--- a/src/utimer.h
++++ b/src/utimer.h
+@@ -35,6 +35,7 @@
+ #include <stdlib.h>
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
++#include <locale.h>
+ 
+ #include "utils.h"
+ #include "timer.h"
diff --git a/app-misc/utimer/utimer-0.4-r1.ebuild b/app-misc/utimer/utimer-0.4-r1.ebuild
index bcb4f3381a70..59e73edf27fe 100644
--- a/app-misc/utimer/utimer-0.4-r1.ebuild
+++ b/app-misc/utimer/utimer-0.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A command line timer and stopwatch"
 HOMEPAGE="https://utimer.codealpha.net/utimer"
@@ -12,21 +12,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug nls"
 
-DEPEND="
+RDEPEND="
 	dev-libs/glib:2
 	dev-util/intltool"
+DEPEND="${RDEPEND}"
 
-RDEPEND="${RDEPEND}"
-
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-locale.patch
+)
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_configure() {
-	local myconf=( --enable-debug=no )
-	use debug || myconf=( --enable-debug=yes )
-	econf "${myconf[@]}" $(use_enable nls)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	einstalldocs
+	econf \
+		$(use_enable debug) \
+		$(use_enable nls)
 }
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index c46edb4ac7bd..40e25b659b47 100644
--- a/app-misc/vcontrold/Manifest
+++ b/app-misc/vcontrold/Manifest
@@ -1,2 +1 @@
 DIST vcontrold-0.98.10.tar.gz 87721 BLAKE2B 06111f534d137d08f0a66b00f1238dd04856c3a7dbe630baeed89667de2840cfa6d9227a899b3ce4819accccd8d2228ef7e31e9562e1bb21027a3ddd2fe2b148 SHA512 4e65c23edd2542323a2815154544c2a4376c35a49a52168d6a3a08dba68f462dbd9c0c43020f86a4cb6c4eb7736b5d9460c2e4e2a67c015e2e51841338547c55
-DIST vcontrold-0.98.8.tar.gz 87831 BLAKE2B cb6ac6771e087e355f909c63be480caf974632a2fc6378f6c7c461d2cd5d6f12fc0fc762a925d05af4f0ccc9252320009c3f8eee33cc026b5621ec8bcb531b72 SHA512 a3452735bc78ba4add991c03c263c1e59ae6ebfc4eb41f27136bd76c01745990b956dea17b489c6d4f088ec0d69d6f6215f2377baf78ee485e0b31642d4ae468
diff --git a/app-misc/vcontrold/vcontrold-0.98.8.ebuild b/app-misc/vcontrold/vcontrold-0.98.8.ebuild
deleted file mode 100644
index 2e6f68c2c7ed..000000000000
--- a/app-misc/vcontrold/vcontrold-0.98.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
-HOMEPAGE="https://github.com/openv/vcontrold/"
-SRC_URI="https://github.com/openv/vcontrold/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+man +vclient vsim"
-
-RDEPEND="dev-libs/libxml2:2"
-DEPEND="${RDEPEND}
-	man? ( dev-python/docutils )"
-
-src_prepare() {
-	sed "s/@VERSION@/${PV}/" "src/version.h.in" \
-		> "src/version.h" || die "Setting version failed"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMANPAGES="$(usex man)"
-		-DVCLIENT="$(usex vclient)"
-		-DVSIM="$(usex vsim)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doinitd "${FILESDIR}/vcontrold"
-	insinto /etc/vcontrold/
-	doins -r xml
-}
diff --git a/app-misc/vcp/files/vcp-2.2-fno-common.patch b/app-misc/vcp/files/vcp-2.2-fno-common.patch
new file mode 100644
index 000000000000..394cbaede850
--- /dev/null
+++ b/app-misc/vcp/files/vcp-2.2-fno-common.patch
@@ -0,0 +1,47 @@
+--- a/common.h
++++ b/common.h
+@@ -23,8 +23,8 @@
+ #define T_DIR  1 /*      -> DIR              */
+ #define T_NED  2 /* DIR  -> NON-EXISTENT DIR */
+ 
+-WINDOW *mainw;
+-WINDOW *logw;
++extern WINDOW *mainw;
++extern WINDOW *logw;
+ 
+ struct dest_new {
+ 	char *opath;
+--- a/log.c
++++ b/log.c
+@@ -13,6 +13,8 @@
+ #include "screen.h"
+ #include "color.h"
+ 
++extern WINDOW *logw;
++
+ int logaddi(int code, char *base, int var, int var2) {
+ 	
+ 	if(code == LOG_VRB && !vflag)
+--- a/misc.c
++++ b/misc.c
+@@ -22,6 +22,8 @@
+ #include "color.h"
+ #include "screen.h"
+ 
++extern WINDOW *logw;
++
+ int statit(char *path,struct stat *st,int cmdline) {
+ 	if(Rflag) {
+ 		if(pflag || ((Hflag) && !cmdline))
+--- a/screen.c
++++ b/screen.c
+@@ -17,6 +17,9 @@
+ int winw,winh,mainww;
+ int mainwsbw; /* width of status bar */
+ 
++WINDOW *mainw;
++WINDOW *logw;
++
+ /* create windows, draw border and title */
+ void scrn_draw() {
+ 	int dev_null;
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index de130d5ed1d0..f778892bbc00 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -17,8 +17,10 @@ DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
 
 DOCS=( Changelog README INSTALL )
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-tinfo.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_compile() {
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index ff1f5a8facc2..d3f6ca28a838 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1 +1,2 @@
 DIST vifm-0.10.1.tar.bz2 1097998 BLAKE2B b9712d61a00761986aa54d9bc561a5125ae96f751e8ba2844adae91577ba093b1a4860071b57ab81dbed3eb52c2c91ce3316831fa44a06436ef5fa81d2739f3a SHA512 8116c4c31b01a9453684a90b26b87a33e5ec2cd2930162869507f673319d231f44e464d1056239f647531c3be5bc9bcf92045c79e5d545f9c75be11c7fe03ea2
+DIST vifm-0.11.tar.gz 1525791 BLAKE2B c2aa6d3ddd0304ce1e3a0d1c9ac3218a783bc6dd8eebf7b3346ca262811f63dac75597913ad4883c62680cb77036c2985ca4ce88989a0dd0212dce975d8ec8b8 SHA512 15ace460da6d5f9bb7a016d8bb3f3d9cba47a608da5a39defbf7d09ff9de64c90a63a44264d695fe005f2f6d27ecb07dcec8f4ed5aef15e9d8728b52f1168dbd
diff --git a/app-misc/vifm/vifm-0.11.ebuild b/app-misc/vifm/vifm-0.11.ebuild
new file mode 100644
index 000000000000..107adaeaf4ec
--- /dev/null
+++ b/app-misc/vifm/vifm-0.11.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools vim-doc xdg
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="https://vifm.info/"
+SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="developer +extended-keys gtk +magic +vim +vim-syntax X"
+
+DEPEND="
+	>=sys-libs/ncurses-5.9-r3:0
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable developer) \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_install() {
+	default
+
+	if use vim; then
+		local t
+		for t in app plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins -r data/vim/doc/${t}/${PN}*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins -r data/vim/${t}/${PN}*
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	use vim && update_vim_helptags
+}
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index 6bac4b08b79e..63003936c4cc 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/when/when-1.1.37.ebuild b/app-misc/when/when-1.1.37.ebuild
index 9469591ac764..462669f249b5 100644
--- a/app-misc/when/when-1.1.37.ebuild
+++ b/app-misc/when/when-1.1.37.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="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 ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/when/when-1.1.40.ebuild b/app-misc/when/when-1.1.40.ebuild
index fde3e88abe39..37916128786c 100644
--- a/app-misc/when/when-1.1.40.ebuild
+++ b/app-misc/when/when-1.1.40.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
@@ -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 ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/worker/Manifest b/app-misc/worker/Manifest
index aabc519b79f3..09eba53dc893 100644
--- a/app-misc/worker/Manifest
+++ b/app-misc/worker/Manifest
@@ -1 +1,2 @@
 DIST worker-3.8.3.tar.bz2 1519483 BLAKE2B 45573bed62256eda879a776f8a65af63a5c57f8c89784445faf264d2e09403faecdeb225d99ee50498df4c21a9cdf69a131c7d391a24eafe48c2319808b009dd SHA512 fa5d078233a91ec603cd87718542cdd5d99ef89c5d2e72c84fe40c08778c5e9dde8e99a23ccfee5ef61e63535c809a48ccf71fe9a256fd7afa05f848c5045738
+DIST worker-4.6.1.tar.bz2 1615384 BLAKE2B a0d665f82d585d4e8a7e515e44b23541da24f6712c86bff422d4612ea67292c31cd204367965f8dd0ed91e69fa11453f7fc5a0228b2508d8397bde39460ff6f1 SHA512 f5977bc2c84c1eebb0058d63c7d10a0b39fa3c3bace09b6adac82f6a17bd9df8b1e2ba8138d764899895b69493493245cb6f7aff15014471a109a023fe203e57
diff --git a/app-misc/worker/metadata.xml b/app-misc/worker/metadata.xml
index b0a7881b44f0..6a17e6b858e8 100644
--- a/app-misc/worker/metadata.xml
+++ b/app-misc/worker/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-  Worker is a filemanager for X-Window on UNIX.
-  It's a clone of the filemanager "Directory Opus 4", a very famous program
-  for Amiga-systems.  The dirs and files are shown in two independent panels
-  (similar to MidnightCommander).
-</longdescription>
-<use>
-  <flag name="avfs">Enable support for <pkg>sys-fs/avfs</pkg></flag>
-</use>
+	<!-- maintainer-needed -->
+	<longdescription>
+	Worker is a filemanager for X-Window on UNIX.
+	It's a clone of the filemanager "Directory Opus 4", a very famous program
+	for Amiga-systems.  The dirs and files are shown in two independent panels
+	(similar to MidnightCommander).
+	</longdescription>
+	<use>
+		<flag name="avfs">Enable support for <pkg>sys-fs/avfs</pkg></flag>
+	</use>
+	<upstream>
+		<changelog>http://www.boomerangsworld.de/cms/worker/changes.html</changelog>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/app-misc/worker/worker-3.8.3-r100.ebuild b/app-misc/worker/worker-3.8.3-r100.ebuild
index 06b9831b0d02..b16bd9ad472a 100644
--- a/app-misc/worker/worker-3.8.3-r100.ebuild
+++ b/app-misc/worker/worker-3.8.3-r100.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..2} )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua-single
 
diff --git a/app-misc/worker/worker-4.6.1-r100.ebuild b/app-misc/worker/worker-4.6.1-r100.ebuild
new file mode 100644
index 000000000000..d8f33abc29ea
--- /dev/null
+++ b/app-misc/worker/worker-4.6.1-r100.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools lua-single
+
+DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone"
+HOMEPAGE="https://www.boomerangsworld.de/cms/worker/"
+SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="x11-libs/libX11
+	avfs? ( >=sys-fs/avfs-0.9.5 )
+	dbus? (	sys-apps/dbus )
+	lua? ( ${LUA_DEPS} )
+	magic? ( sys-apps/file )
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS )
+
+src_prepare() {
+	default
+
+	# Don't use /usr/share/appdata
+	sed -i -e "s:/appdata:/metainfo:" contrib/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# there is no ./configure flag to disable libXinerama support
+	export ac_cv_lib_Xinerama_XineramaQueryScreens=$(usex xinerama)
+	econf \
+		--without-hal \
+		--enable-utf8 \
+		$(use_with avfs) \
+		$(use_with dbus) \
+		$(use_enable debug) \
+		$(use_enable libnotify inotify) \
+		$(use_enable lua) \
+		$(use_with magic libmagic) \
+		$(use_enable xft)
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc examples/config-*
+	fi
+}
diff --git a/app-misc/worker/worker-4.6.1.ebuild b/app-misc/worker/worker-4.6.1.ebuild
new file mode 100644
index 000000000000..6d85904ae666
--- /dev/null
+++ b/app-misc/worker/worker-4.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone"
+HOMEPAGE="https://www.boomerangsworld.de/cms/worker/"
+SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"
+
+RDEPEND="x11-libs/libX11
+	avfs? ( >=sys-fs/avfs-0.9.5 )
+	dbus? (	sys-apps/dbus )
+	lua? ( dev-lang/lua:0 )
+	magic? ( sys-apps/file )
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS )
+
+src_prepare() {
+	default
+
+	# Don't use /usr/share/appdata
+	sed -i -e "s:/appdata:/metainfo:" contrib/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# there is no ./configure flag to disable libXinerama support
+	export ac_cv_lib_Xinerama_XineramaQueryScreens=$(usex xinerama)
+	econf \
+		--without-hal \
+		--enable-utf8 \
+		$(use_with avfs) \
+		$(use_with dbus) \
+		$(use_enable debug) \
+		$(use_enable libnotify inotify) \
+		$(use_enable lua) \
+		$(use_with magic libmagic) \
+		$(use_enable xft)
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc examples/config-*
+	fi
+}
diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
index 67866d5575d9..869813d042d0 100644
--- a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.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
@@ -14,7 +14,7 @@ SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
 	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index eefa3471197c..0f810360a6c2 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1 +1,2 @@
 DIST ytree-2.02.tar.gz 124868 BLAKE2B e0b9b4251617df9d851752382e695657eb3bef5ce58deff00604ded14d6d29dad1c50b2d9f394defdabc3338bcdf491a9cec5821022e1171f2aa2b6887b274cb SHA512 31a425e9acd81921c111f1ef72f9e2d9342c04cdd9121d9cecd81893518b6f9579bfe22c3630d4d117783aed536cfafdf09866eb80bace3e5cbd59fd393e77a1
+DIST ytree-2.03.tar.gz 124768 BLAKE2B 51c0c00bd1223c8ca21289a00d1e06bd7934cf1b247baf8920d1de0c70778dfda9dddfea19dcb3e8fc601e6e50b0ac9c2aded385dd665bfa2aa9b36d30b53193 SHA512 39566827aac4c505b46deddce02fcc1fb4432442e327a40b1e3c18084db126264604adf0235970c3800a2b365a0a8b01d1f87ba6f045a2ab77f672026087a097
diff --git a/app-misc/ytree/ytree-2.03.ebuild b/app-misc/ytree/ytree-2.03.ebuild
new file mode 100644
index 000000000000..719e4443d480
--- /dev/null
+++ b/app-misc/ytree/ytree-2.03.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based file manager"
+HOMEPAGE="https://www.han.de/~werner/ytree.html"
+SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES README THANKS ytree.conf )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_install() {
+	einstalldocs
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
index 800d24e2f3a0..288ff1329e49 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 RDEPEND=">=sys-libs/zlib-1.1.4:0="
author	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-17 23:35:33 +0000
committer	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-17 23:35:33 +0000
commit	8e8120eabdd28020aa69c7a60505cce2edd20adc (patch)
tree	061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /app-misc
parent	c16790af2c9b4cbc38e565d4311252193ff85484 (diff)
download	baldeagleos-repo-21.1.2.tar.gz baldeagleos-repo-21.1.2.tar.xz baldeagleos-repo-21.1.2.zip