gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /app-misc
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
102 files changed, 1488 insertions, 954 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0913ce83fa59..6a27906bde97 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
index ba26cc77353d..cd23d3c3a8ed 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/OpenRGB/Manifest
@@ -1,8 +1,8 @@
-AUX OpenRGB-0.2-build-system.patch 736 BLAKE2B cf03e1690f6bc671de860cc2d7346cb8bf97bb0bde16d6931f476794358a682b740f976ffac12c0e3ab8b52a11d785d1b31706120c3323e35cc812cede2a98e5 SHA512 5959c2b2c07f53f583fbb7c6f29e2128343167daff4bad59d652be44dd6b8fb6bcf04e84bf523731ccd2d8f296966bd7239c8edbccb72b3a9c42a3e184db71f7
 AUX OpenRGB-0.5-build-system.patch 755 BLAKE2B bda13d7d9de39d3dd79245ff7a13e22e09381a62ceaa58413b0aaa28017b6e860d032ab6ceb84f1140dc7f6c23dfecc1cadbcf696c8f872016307ea34d8870dc SHA512 50e110c01833113504a3a64e438a404196ae0af8e75007d6c42f3fcab5c20468f3fcb80f83d1f98ac7e1f4f88b1808ee28d0bf342b416d581c354a2388af32bf
-DIST OpenRGB-release_0.4.tar.bz2 2195819 BLAKE2B 6416e143707e5ae48d0f26d205e1cc27571299d7d4b8483d18cc03db237d71ebc3574973fc1540dacc24662c536888e575e89db417e52dc9672d412fe41c540b SHA512 9ecdf0a0aec5916b1c705c1ad0bd567f46f9b0a4409211cb195ec7a4bfbc95c80bde13798839d23e867ed613cb34c6e9629da4aac942490f58ca9528f5f0a8bd
+AUX OpenRGB-0.6-pkgconf.patch 709 BLAKE2B eec83247caac6527f0c0ca80716fc3fc3266cdca9635f643968bb620be3a03f3d3030c97e0c68af8e77a03725eaa46f7393667ceb72a63a665947ae87242afc8 SHA512 0436714eb4e900caa421dba2b3fcba41826ab74ed8f2e42884c48006f4af31fe10a114e84c41212343911b5f52804a27b031410fc55fe234138905779db4cf6b
 DIST OpenRGB-release_0.5.tar.bz2 24183948 BLAKE2B c3e6eaab2224f97287a454375486cdacc6814f35fe6752271293d30110d066998d95a901224929cdec7f57a3983fa9d8f5dc488a2ccb6d128df36fac6bc4582a SHA512 d0bd69de94e7e94b9972c07851602d8437b4485d02e83e2fe84f21292acbeef32624ec82d5cb79de85a4dfec35431c469b124b0cc41cf1f741e6e52803dd82eb
-EBUILD OpenRGB-0.4.ebuild 1114 BLAKE2B fbac5c83ffd46cd98d0665ca8e633508e04688a75ee593adbb094ea87fbf7e41e32f770dbccb596c4528b52d088a99cfce6fb7f155651c5c7bfffaf99009dd8d SHA512 3f80f1865c71f22069c8036cb3d54bf39eee755781ba70f784828bcffdb40a31704cf6e37c5ac0f60a29bc2d63f82aa46aa1b5147dbb9015de7f692131531832
+DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32
 EBUILD OpenRGB-0.5.ebuild 1117 BLAKE2B 7aeb09d188ebf71fb187e20f866f9806ebb02882af669dbb654e8e2f2a22f79350771232abe9ef43a0cc96c14a606a326c8e38872528aad2cfd346ebbada9624 SHA512 1fdf041c54921e0fd9c8bc75ddcd60788692c70bc1cd7c4dbd1358d54b026704d5d3791817be144dd850d88c23db381d1ad8c9e41be7ae699398065d52ce68a9
-EBUILD OpenRGB-9999.ebuild 1117 BLAKE2B 7aeb09d188ebf71fb187e20f866f9806ebb02882af669dbb654e8e2f2a22f79350771232abe9ef43a0cc96c14a606a326c8e38872528aad2cfd346ebbada9624 SHA512 1fdf041c54921e0fd9c8bc75ddcd60788692c70bc1cd7c4dbd1358d54b026704d5d3791817be144dd850d88c23db381d1ad8c9e41be7ae699398065d52ce68a9
+EBUILD OpenRGB-0.6.ebuild 1148 BLAKE2B c67c05a6a8562bb036b39b9f56d2d921efbd49a169232d20dbfcbb5c5c3880bff05b25b2a2c05b622a68e979f957e41d818a1e3b74031b6de1c6d8a00fdd5514 SHA512 896f54875ae900b173b0aaa50dab04e8da6c830faaeed79c0176437574e8effbac616729e3b333e59dbfc83dce3489fce3575afb79e0e3ba71d7f7f8f121a770
+EBUILD OpenRGB-9999.ebuild 1176 BLAKE2B ffa186f6395fde7f33f259ac47dbe5fb13320d6841103e665af9aa2bea6bcd527b02ebd339c43a235522ff5a6264af0581e0a6a2d14b043f94f3157649a26f5d SHA512 3739d5f3d9b82e54ebdb25707d38e9c66c5cea186bf5fb5de688c04096fcf3620460e8dd06c70be1c3f94ca5b91e8b2e5fc3eb08b69da08361d2a3f43093dcdc
 MISC metadata.xml 468 BLAKE2B 995cee43adec6a52c9ee8cef1abd9940cfe501e860cad863ed32161ef04c9bb1fa8d11d87869dea37d882170d8c54b548666ba788641899a3d8364b1307d7450 SHA512 9dab70cc3cc39d8051f93190030aaffbdf5256a4ca68c0ae85c4563021d6c459fa4fa4319efdce25f7dea18f797d4fb52ea63d448dda90e5ac69b79d98f21ecf
diff --git a/app-misc/OpenRGB/OpenRGB-0.4.ebuild b/app-misc/OpenRGB/OpenRGB-0.6.ebuild
index f8119c80c919..c356d7aff6fb 100644
--- a/app-misc/OpenRGB/OpenRGB-0.4.ebuild
+++ b/app-misc/OpenRGB/OpenRGB-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmake-utils udev
+inherit qmake-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -12,44 +12,46 @@ else
 	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
 	S="${WORKDIR}/OpenRGB-release_${PV}"
 	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
+	)
 fi
 
 DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
 HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="udev"
 
-DEPEND="
+RDEPEND="
 	dev-libs/hidapi:=
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	virtual/libusb:1
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
 BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES+=(
+	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
+)
+
 src_prepare() {
 	default
-	rm -rf dependencies/{hidapi,libusb}* || die
-	if [[ ${PV} != *9999* ]]; then
-		eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch"
-	fi
+	rm -r dependencies/{hidapi,libusb,json}* || die
 }
 
 src_configure() {
-	eqmake5
+	eqmake5 INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
 }
 
 src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
-
-	if use udev; then
-		udev_dorules 60-openrgb.rules
-	fi
 }
diff --git a/app-misc/OpenRGB/OpenRGB-9999.ebuild b/app-misc/OpenRGB/OpenRGB-9999.ebuild
index 6c5d8e23cd0c..c1f1eb4bbcb3 100644
--- a/app-misc/OpenRGB/OpenRGB-9999.ebuild
+++ b/app-misc/OpenRGB/OpenRGB-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,9 @@ else
 	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
 	S="${WORKDIR}/OpenRGB-release_${PV}"
 	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
+	)
 fi
 
 DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
@@ -24,6 +27,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
+	net-libs/mbedtls:=
 	virtual/libusb:1
 "
 DEPEND="
@@ -34,12 +38,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES+=(
+	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
+)
+
 src_prepare() {
 	default
-	rm -r dependencies/{hidapi,libusb,json}* || die
-	if [[ ${PV} != *9999* ]]; then
-		eapply "${FILESDIR}/OpenRGB-0.5-build-system.patch"
-	fi
+	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
 }
 
 src_configure() {
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
deleted file mode 100644
index b2cd6cbd1d58..000000000000
--- a/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/OpenRGB.pro b/OpenRGB.pro
-index 91e0079..7f279dd 100644
---- a/OpenRGB.pro
-+++ b/OpenRGB.pro
-@@ -8,9 +8,6 @@ TEMPLATE = app
- VERSION         = 0.2
- win32:BUILDDATE = $$system(date /t)
- unix:BUILDDATE  = $$system(date -R)
--GIT_COMMIT_ID   = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse HEAD)
--GIT_COMMIT_DATE = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ show -s --format=%ci HEAD)
--GIT_BRANCH      = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse --abbrev-ref HEAD)
- 
- DEFINES +=                                                              \
-     VERSION_STRING=\\"\"\"$$VERSION\\"\"\"                              \
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch b/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch
new file mode 100644
index 000000000000..380b1091d225
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch
@@ -0,0 +1,11 @@
+--- a/OpenRGB.pro	2021-06-06 22:51:12.022561718 +0100
++++ b/OpenRGB.pro	2021-06-06 22:51:24.466105358 +0100
+@@ -837,7 +837,7 @@ unix:!macx {
+         # hidapi-hidraw >= 0.10.1 supports USAGE/USAGE_PAGE                                     #
+         # Define USE_HID_USAGE if hidapi-hidraw supports it                                     #
+         #---------------------------------------------------------------------------------------#
+-        HIDAPI_HIDRAW_VERSION = $$system(pkgconf --modversion hidapi-hidraw)
++        HIDAPI_HIDRAW_VERSION = $$system(pkg-config --modversion hidapi-hidraw)
+         if(versionAtLeast(HIDAPI_HIDRAW_VERSION, "0.10.1")) {
+             DEFINES += USE_HID_USAGE
+         }
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 6b32eb8d6b3d..596d31374119 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,5 +1,6 @@
 AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428f9512d1304bd7fd5aa9380a301d92f10ca126a1a319c2ec831d1d5be99c6941c4307a2b674f0a15d2d554b1443fdf053421 SHA512 779806afd6c0eaaac149c89bbe8da2394630aa5a611001307808339f29237b4d7f3db7e1f66241ef67e179a5ab96d64371e1b198044cd9f88389d03a5c9d8478
 AUX anki-2.1.15-mpv-args.patch 856 BLAKE2B 02c80c096ee3971cb781ea57ba8ebd63037c37668d57bef8d63f7c551544cd1eec04d134a835af5c918992172493a3b2933b6652e6872da2fe6bd6acb1bf6886 SHA512 ed44a965978dcb2ce85eab99adff59610c51614673415c7e34d1acdc77fa46e05c6b5eba6a4c3fda07ef5b3d3d5d1c9d844276377daff2189cbdf808168dd402
+AUX anki-2.1.15-unescape.patch 474 BLAKE2B f78067433039e22e335811dac2af3b8237a96f5d5025fe36cbea32d117d015fc1fab8f9ac806135e2ec910cdbd10131f731b8ea5fcdb5e88cd6dedbb8322bd8d SHA512 90e5123991120e696a94119413add54a205d87969b8b7f7167bd66d9ac12c6ad5f4ecba4692d7dddb4f8b47bb13aeea502e95a9be0cb72ca578531fde1473e1e
 DIST anki-2.1.15.tgz 4269571 BLAKE2B 00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e SHA512 f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3
-EBUILD anki-2.1.15.ebuild 2457 BLAKE2B f2507d15bfb47a71350ff5e0201b61f9e84d6812949c7ed4286730125850014da4c3cff6220330c7f6a3a812191589c8322befaa99a65d7f3fe8ce778187fd34 SHA512 2d6767a0237ae0b3ab56d6c2eebd74a895fe7b532ca659bee75f7b758ae588c681250ca0b9d4f604392992c00a7b227d503bd5d36f0407aa86a37cf5754d029c
+EBUILD anki-2.1.15-r1.ebuild 2502 BLAKE2B 4846657c1b97b1f4da76af16551f719729c663a48d36403135a0353e9cdc6c438e72e9ab6602fab525b8e73f40671ebaa9ac3d473f74d146ca34f719523ff94c SHA512 ceb8fa0454549ecb1fea2262228ce858effbc876ebc94d60b9e92234dfc936d476cde59e5f18b5d3a999ae3e3fd32ebd437c8795162e53c831ec087228cc26cf
 MISC metadata.xml 533 BLAKE2B 25491ed8623750ad197813d9504620f588e2df815a844711f057b544cde1e7622df46018ad32f994c689984dd301049caadf481d67737e94714f3fe57ba7863b SHA512 cc621ffca18afc64c6c1f758d919d950a39d5f447ae7740abe21f5b140fec8e2b8cbcfcfa4422fb5cf55f68c1068686344a8d9020e0aa477b3687ad84bbf9bf0
diff --git a/app-misc/anki/anki-2.1.15.ebuild b/app-misc/anki/anki-2.1.15-r1.ebuild
index 7acb0a519044..f97f7bb0fbcb 100644
--- a/app-misc/anki/anki-2.1.15.ebuild
+++ b/app-misc/anki/anki-2.1.15-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit desktop optfeature python-single-r1 xdg
@@ -44,6 +44,7 @@ BDEPEND="test? (
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch
 	"${FILESDIR}"/${PN}-2.1.15-mpv-args.patch
+	"${FILESDIR}"/${PN}-2.1.15-unescape.patch
 )
 
 src_prepare() {
diff --git a/app-misc/anki/files/anki-2.1.15-unescape.patch b/app-misc/anki/files/anki-2.1.15-unescape.patch
new file mode 100644
index 000000000000..7b03c8d8e1a3
--- /dev/null
+++ b/app-misc/anki/files/anki-2.1.15-unescape.patch
@@ -0,0 +1,13 @@
+diff --git a/aqt/reviewer.py b/aqt/reviewer.py
+index f01fcbd9f..5aaf26669 100644
+--- a/aqt/reviewer.py
++++ b/aqt/reviewer.py
+@@ -359,7 +359,7 @@ Please run Tools>Empty Cards""")
+         cor = stripHTML(cor)
+         # ensure we don't chomp multiple whitespace
+         cor = cor.replace(" ", "&nbsp;")
+-        cor = parser.unescape(cor)
++        cor = html.unescape(cor)
+         cor = cor.replace("\xa0", " ")
+         cor = cor.strip()
+         given = self.typedAnswer
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index 0439fb1a56bf..405d4cb7ec15 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -1,3 +1,3 @@
 DIST cmatrix-2.0.tar.gz 205640 BLAKE2B 3d38903b93853afc077c00308b84106664ec2ea3a31601ba7ab858f6571158182858de87392b5940725456bdd8c82232228451a4d30813e2c0a8bec99f285814 SHA512 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530
-EBUILD cmatrix-2.0-r2.ebuild 1029 BLAKE2B b647b4f710a437fdb6905875e3a3d8df95dbf8a762f54a5706740a82cc449bd79f38917835a3823ad24f8d6cf071e57c3eb34ed50b5fd149246ef63b92c47a60 SHA512 4cb93f824a360b6231dae0262f882ba6bf9aae161e3e17391e830370d2ab21e50b5bfc21d357b7cb3bf74925f8d04538fae53543f2a6cf35b8e1c854e254cbae
+EBUILD cmatrix-2.0-r3.ebuild 834 BLAKE2B e21d62ae01d97cca5681c4f7c646b724cb2bf1a937bb123446e0d69564dc08b5e5b473ef8912604d4c9c31caa030442afdebae0db724f27a01682b6146e68fc8 SHA512 b5b5af76c4035fc821a22e72eb8ec65c9df38b4f5e4d5a80d6055855625be6b172619d2d5c7494910253600d1d24db82403192084450ccbba73fd5050a0bccfd
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/app-misc/cmatrix/cmatrix-2.0-r2.ebuild b/app-misc/cmatrix/cmatrix-2.0-r3.ebuild
index 20bbda5977bb..18a688600f04 100644
--- a/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
+++ b/app-misc/cmatrix/cmatrix-2.0-r3.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+FONT_SUFFIX="pcf"
+
 inherit cmake font
 
 DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
@@ -14,17 +17,11 @@ SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="X +unicode"
+IUSE="+unicode"
 
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-"
-BDEPEND="
-	X? ( >=x11-apps/mkfontscale-1.2.0 )
-"
-RDEPEND="
-	${DEPEND}
-"
+DEPEND="sys-libs/ncurses:0=[unicode?]"
+BDEPEND=""
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
@@ -35,18 +32,12 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	font_src_install
+	use X && font_src_install
 	doman ${PN}.1
 }
 
 pkg_postinst() {
-	if use X; then
-		if [[ -d "${ROOT}"/usr/share/fonts/misc ]] ; then
-			einfo ">>> Running mkfontdir on ${ROOT}/usr/share/fonts/misc"
-			mkfontdir "${ROOT}"/usr/share/fonts/misc
-		fi
-		font_pkg_postinst
-	fi
+	use X && font_pkg_postinst
 }
 
 pkg_postrm() {
diff --git a/app-misc/dasel/Manifest b/app-misc/dasel/Manifest
new file mode 100644
index 000000000000..6bdc09e854ed
--- /dev/null
+++ b/app-misc/dasel/Manifest
@@ -0,0 +1,142 @@
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST dasel-1.15.0.tar.gz 2907465 BLAKE2B 9d50824834880bbb26cdcafcf77a8072ead0b0afe1391ea528bf9f403c9c647005c790630a140f6bf2d74949787506841e6fe9080dcf4b2ae44989056af2cd99 SHA512 b1bf7323f567c479a71aec035062dd091ccd363f9131768f14203b218231a6ad54f33c35baffa1a40b1115a6729610ab523f9cb4db25c7dfb704dd767c1116b8
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fclbanning%2Fmxj%2Fv2%2F@v%2Fv2.3.3-0.20201214204241-e937bdee5a3e.mod 44 BLAKE2B 20cb7e847a30143f9e382d50a889b594e856b9e689b215c7de6a4ac6675dcbc8530bb857533ae74cd9869b8ba851111f5511ec5a93e74002630182a340ff4daa SHA512 5841b34574f60e73803d94510aa19d1d5dc7a45ab6f753b0e0d14c8176cfcc9afdd8704e2844c60bdc40f7859496aaeb9e437e557ba430ca3f4b2897ea720b53
+DIST github.com%2Fclbanning%2Fmxj%2Fv2%2F@v%2Fv2.3.3-0.20201214204241-e937bdee5a3e.zip 1163378 BLAKE2B 2af4d7a41f6ad39c8c375bafb5bf7e54374e41ffc31b9a05752ed3599d1f95e891beaf99feb5e9708328254fdc966913f9e088082fe63c91007dc868a0ee4048 SHA512 cb65de0333bb92506171221f72fe6d816df1fe5aff01db19f10a80b06d9e19db25abcc17b435ba8e7c620763ce8e8b13a269879fb6bc6de2d5b33ebfe3f2ded5
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 74164 BLAKE2B 6a3c04c2986b35dcc32f14553534758c3270c294a5e2595487f884e32e76cac2ebbc34cf7e42232eb7d85e71fee7660b513de4e365981e625515b086c341d15c SHA512 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod 88 BLAKE2B d66a44b5b8c2818d6342f621c9821daefd16b262df9fcd630839073cafc65a1352e22aa52662bbd291a65abec09fd0c14576a6aa9f86bda4610db670f8d53e43 SHA512 0e73093ef44bd32ae02910471bd85f6d135cde6d0fbf48780b8a58efb7419e16ac1b01497d451e8d3ee32602b7e32c0673dffbfc822c8f3a2d7670378f47f7cb
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.zip 117762 BLAKE2B 3ef20be014c5e2419f28f7d5db4cf8e7a7589445eee7e34ac4705b5dfa3cca3c441d14df2be10244472dd6599a2b6c45811f9fef11f2b68fc77f75c32ff8a769 SHA512 09cca3645bbd191ffee980c80c747a8952a37a0e1bfb9615cc1d0c0c3fec7783a9254fa3e31239a036c2bfaabe8028525e9113327c6d72c385c8b9bad3b46017
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip 171286 BLAKE2B efa68ba65ecac895de82fc8f8ae470ed9b2e24e7343f24429a5764fa042f7c91dbe8aedcc0ae003fdfa188bca32e7c4c82481b69736a72df76b50fad3e9094ba SHA512 f311c5ccb68a0b5dfe41f993e0867cbe9742dc3fd50904ed688d4b89777f4739f7a9293f548e7c2ee940d1742e921a3cc82cfe1b9d1b210e435d16c8f0c91880
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.zip 47610 BLAKE2B d2156aed5dd1bd0e00f5ed9bd4764c82c1cc65bdc0ce29303198b2d0bf2563b32a51217db23f2b26e17e35076f4f7b3be488ab29fd31bfa877b52b9fd60e0653 SHA512 df869f48e059024d3ed326d37575aaa7f2f2052b4d1b99b458eba43b8af3cc112701f0fdfe45a7c6083068749f60c480ceae96a7ea61dd8b565e118d460946f9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.zip 3167061 BLAKE2B f085bbf0cb1ce6b38a64ae8ca325239f2c55d0d85b56ceb45de65faafc072b6242d1b64e344ab8b39b0d311e07e02262daf34238bda53b6f78c9bf8c395922ac SHA512 b9ec5659504c98278716586ee48f46f1bc77879bcea4e2d47e9710045235df0173952a02634f8248a791a5059cbeb349199fc614ba5397401a1617dbf9041ff0
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+EBUILD dasel-1.15.0.ebuild 7860 BLAKE2B c04a56e45439810159bdea50fd69989e3e4de6a6a77cdf69b2ba837564a6015997a595b28461413a2a2a4651f63123be8db25dd2252215819949942cd69f6f76 SHA512 baa2232d27f22364b7d31ca052eac8129eeca39da2f483c9df113a17e0a7992f2934984e91278c2a13f6befc1294cf5686d1b0b887195bdf74c388aa908c94ee
+MISC metadata.xml 324 BLAKE2B 2989bb2e0065dc6a3c78c6ea22b7a9ef0b50b620a1bfe039170267e7360f1a9d4f9788b9235e431f34adb1773983ad169b635bb6d3ede430c4878f57f9addd98 SHA512 078ef2a4e621a707ee247e2d64ee0df8bc595494cb1cc2968411c03a5866434b03ace8eb07ae87c698210e8f79aac7e40cb127c43ca86f15ccdd1efdd7b1d985
diff --git a/app-misc/dasel/dasel-1.15.0.ebuild b/app-misc/dasel/dasel-1.15.0.ebuild
new file mode 100644
index 000000000000..bf3c37a90da7
--- /dev/null
+++ b/app-misc/dasel/dasel-1.15.0.ebuild
@@ -0,0 +1,166 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/clbanning/mxj/v2 v2.3.3-0.20201214204241-e937bdee5a3e"
+"github.com/clbanning/mxj/v2 v2.3.3-0.20201214204241-e937bdee5a3e/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/pelletier/go-toml v1.8.1"
+"github.com/pelletier/go-toml v1.8.1/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v1.0.0"
+"github.com/spf13/cobra v1.0.0/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v1.0.3"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+)
+go-module_set_globals
+
+DESCRIPTION="Query, update and convert data structures from the command line"
+HOMEPAGE="https://github.com/TomWright/dasel"
+SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+	CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X 'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
+}
+
+src_install() {
+	dobin bin/dasel
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-misc/dasel/metadata.xml b/app-misc/dasel/metadata.xml
new file mode 100644
index 000000000000..344d7ca04a6b
--- /dev/null
+++ b/app-misc/dasel/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+		<remote-id type="github">TomWright/dasel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 1233e79fcc4f..0f26c5fe7811 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,3 +1,3 @@
 DIST ddccontrol-0.4.4_p20200630.tar.gz 173792 BLAKE2B 7a7ef330eb471f1cbddbfd90745e212a8a66f4be6cc6a4ccb8014c41498a86a09e4bc0226a300201102c202da37c0f4b8020aa88f08b5e2acaa92ac0dc2971b6 SHA512 7aaadf98eaf24d4b040073dce6f469e6e4aaae1efde0e8f988fb9c5fb99b776b1836573c069b9d8f12eaa724d3b39df5d4f247aa47ca2b7911dc9a9df727a50a
-EBUILD ddccontrol-0.4.4_p20200630.ebuild 1947 BLAKE2B 18fdaf726bf8c96a5348d19a9db8c04254448e7d390e466886a037208ce139a43fae45ecad16427d4ae5cdb9e8b1e3ca3f3e886b587826ad599b6783c9162874 SHA512 ba41e167774ea1048efb12e519b97634479e323ad866a7289f4f797ed6d1dbe8edc44a76cf7df7c33820bbc709e3daa71ae42350813c4513f73509536ae803cf
+EBUILD ddccontrol-0.4.4_p20200630.ebuild 1967 BLAKE2B 81f65ef049bc913f50764801f7ce5bed9cee26e20662d221fb9e061abf5c2e92ccd551b79544e6f23a807b22a6e9eac0951e6346a74471369bc868b5d188b894 SHA512 844751b33f72dabf73ad999cadd9ee40c727c0e17fa0b35a0dddc2a93a9a5ed97c50e3ca3f0f98b889276481cc5cd73c4f257544b9c1c9e7a2d159131127af58
 MISC metadata.xml 417 BLAKE2B 8bd8767a184790aea7b6a63383a56d25de54c68a044a6549683a979910bc6d6d8d518bcd71acd14b393f12a8c43cd8c7ba6bac1775f7ed28314bf56d4a97f9fd SHA512 8e2d095bfa5e56a10f9187894c34d1b8a4e6b3562c10c29ce374f5efde918f1d097e2678f044a838b31778bd7f9333c7fa7c41d2f9fc2011d263d4ea0831bf04
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
index 2f7c7e8748e4..ca00b21efde5 100644
--- a/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
+++ b/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
-DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+DESCRIPTION="control monitor parameters, like brightness, contrast, RGB color levels via DDC"
 HOMEPAGE="http://ddccontrol.sourceforge.net/"
 COMMIT_ID="f3d003f63aaa0407d3147b04848e0722f78695d5"
 MY_PV=${COMMIT_ID:-${PV}}
 SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc gtk nls +pci static-libs"
-S=${WORKDIR}/${PN}-${COMMIT_ID}
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
 
 RDEPEND="app-misc/ddccontrol-db
 	dev-libs/libxml2:2
diff --git a/app-misc/detachtty/Manifest b/app-misc/detachtty/Manifest
index 78838c3f38d5..20b154e347e8 100644
--- a/app-misc/detachtty/Manifest
+++ b/app-misc/detachtty/Manifest
@@ -1,5 +1,5 @@
 DIST detachtty-11.0.0.tar.gz 23189 BLAKE2B 734489fe35acb5bfb381b8fee1b91d60f15ec795f2ba58f5855544d913957f7da4174c15583dc4090e397c5f562e78a23c1534a741a9812980f4a9cd2d2e291e SHA512 608d68ebe9b8fae55b4295b9c50d8e9065226dbb78818535af79bd2e70cc4a831820b6c673414289548b1063843b5dc80c8b7d2371dd716a16eceb20cd064a10
 DIST detachtty_9.tar.gz 13081 BLAKE2B 28bb6a946d04717bc60ac7f65b791a8bb59a5ce1a2f7d7fabb63776538ade3fe046e874007effe7dd6ba7ebac8d739e16b0b0e2372ce4154385164d7939b498c SHA512 8ae7edc1a1c7727eb4d32a1a4327932e374ac838b441f34aee99cfe83e922f1d70383ab0aab2299808f28fea6229f5c122a7624b7ff992ab92b9c3f53483d035
-EBUILD detachtty-11.0.0.ebuild 592 BLAKE2B 10295df5f463fd693d0f3448c4c8b77bfdcb5efc9e6e7a71fe568e78059cdc4e355f32f9ceb1b914f1d027747a988951e2d79ac467ca939aff197c4dec2cc5bd SHA512 cd9ebc51e2dc0b4064c140bc22987d19380d668b78a3ea9f0414f41f73ee1a53f58df741f9efd7136b7467676f49083a5b972ccd7fd2b73c07b12661aa666d96
+EBUILD detachtty-11.0.0.ebuild 589 BLAKE2B d4762a79e440d4eb3df0c0b1aafcbdc2e943b3f0239e087d8b90d7a07199c8a301b889d8f829cad666ac515d8292415589f10f189bc8453d00f414ee96884816 SHA512 cb394dd6de35e718c86ada3fa5da7aabfa6a9dd14953f7006b7e1cb3ffd16522f97c98be69e92503967121ca2ecd86c27154c3ce6ff81575886c3f9b5b847f77
 EBUILD detachtty-9-r1.ebuild 600 BLAKE2B 26747aa2903250488781353bcf93ecb0f66b086e63a691cd84725f3e9b7e7717927509aada2d64b017ca4a12c6cafb0c566ea7cf354b076c8a88032d8b6f0315 SHA512 4902bab8a023b424d9d6f1d583ab431b50375e878d0ed5e7e08840a762e4176dd56c681e632b01fb8a0bd20220c254af0b945561cbf272f5bdeae1f6a0759cda
 MISC metadata.xml 703 BLAKE2B 68c8ac450ee3a0fba9c9e217653526978c03635b843e9068f6c6e0937d927a030d78a9683f11f81273aaabb8c94f039f1211a1cc5b5ec58b2126d1ffdecc281e SHA512 00e9860010346c6dbad86cd3dd2eaea29f1e91df559b7f5b7dd634a48a0875830a46cab665efd3e3e87eafd6566ecec6ed6e4a691fdc48ebea327f527a312794
diff --git a/app-misc/detachtty/detachtty-11.0.0.ebuild b/app-misc/detachtty/detachtty-11.0.0.ebuild
index 570e3b528b6f..2a826d210e63 100644
--- a/app-misc/detachtty/detachtty-11.0.0.ebuild
+++ b/app-misc/detachtty/detachtty-11.0.0.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="https://github.com/cosmos72/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index 925288359413..38c46d040a6c 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -1,10 +1,5 @@
-AUX detox-1.2.0-LDFLAGS.patch 501 BLAKE2B d0a989cb0a4a251e4c0c73efee3072c4e7a67c23482be0095d8a4c7307d1198b2fa9f3eaa492014e3d2504c1c5513423f8fc39856775b2aabf304c8a1f0835b3 SHA512 a3d59bef705d763be2831d03ccfef5fd69859a8e6f6900a1b6558135d2fa38a7844c16276bedab1b5af15f3e287cada615ea4c83f4c6737919c7c55daa7e55bf
-AUX detox-1.2.0-change-default-sequence-to-use-utf8-table.patch 379 BLAKE2B 753b6c0dc72ff972501787c927aaf77f97a4e9fc33d60151bc9f2eaeb0f7ab05b8876e42da56bdf8702d032ade8d0042596c0766a58cd81d7e2e8ab5d3957be1 SHA512 8804afdb7a5b37b01d2e16d68ae2e7b381cdfe75fd10de7a20388079bce9f137765e11b4e1d8d4cdabc6e521af7deb3309d84e42308e4c9108edb9537cb2706e
-AUX detox-1.2.0-format-security.patch 1964 BLAKE2B 41074dae01426f5a3293ba36dca12d950ffe6175ff2355263d6e0e68ca951f7ef30d07810c00e8456ca68fe03b7dab3a0740cbc5e2adb0d7041741deb00606d4 SHA512 c0ce9ac00500399a28bc4d2bc4dff5c20386817d154c2185ebf29df1544ff400199d2884139f7f68c3f5e260d1742877f0b8b53787d8a585f9ff04028f878a2a
-AUX detox-1.2.0-install-missing-file.patch 642 BLAKE2B 232a89c132c681d47243411c42c0975ec1c0ef493f7015db3591b89abf0b294e7fddeb7afabd992180ad7cd60031fd0f60aa228daa31b59116d7251a697d856c SHA512 32f83f700a508729c27941ae627c544dd2ba1900a647285d4160038e69dbad8f1205c5056daa9c5c19a56a70a6e528db187a59d56dfcfee7d772eb0fd809d087
-AUX detox-1.2.0-parallel.patch 1120 BLAKE2B bccae5f969e1127b8819a5542354ea2aaac765a3667679598d4edd5d3dd6bfac45845718599be59bbebc11d860d6fc56163777e3e3940da0805b9d5cc1bcf0bd SHA512 5a9c964cd46a1cd4463460a400226a80a9c1705bd60655362ca02950a06acacbafed1c039793eb6445988e91a47888dbf1c643bf8c34003e7c34a02398f58855
-DIST detox-1.2.0.tar.bz2 86118 BLAKE2B 2dbde6ebd98b59c18c60f99006731484dcbc698ab77b56991f2af94f4ad45da141046975af47b66242ff42d4e3a8bb3b515d4b70ba30f12cb1b8ceea5832f52a SHA512 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a
 DIST detox-1.4.0.tar.gz 106361 BLAKE2B 5993ded30282a16a81481885cdee41fe0b1c2ac34e5f389b53981e098d13acdfe367c7de462436fe3a4ee8ff86220f4c69d54a47c1122a0f39bde12c4d6ec908 SHA512 9486056b3b58dbb5ae16bc461586a997f8990ddb6e0db5ba561df862c16dfe926911fd09f065ef2578d39c3e3f1a267be201f865cf3f6b576c01910bda39cecb
-EBUILD detox-1.2.0-r3.ebuild 993 BLAKE2B f815c0713756ea76ba6e9d2bbcd04af6c4c67a8605f518567a282713c33f898269953e5ceed216fed83065f6e49588070320a8b139f468fe41b37ecd0c8f34fb SHA512 0de9fdb1ea213e6e58ef4fb8ea3dda4a9ff7b2b2cf9c8f37eb470c7e20f0e971ef8e833bcff3a9c1aaf39a89ce4a01934a98dd87df6514b8cf23ec40c5943239
+DIST detox-1.4.2.tar.gz 106736 BLAKE2B a27f9d93bf6f6c1634517c0f193affe576b2eec6be4b8fc38e91ef75a6f1a01a4376684d5a9b109b3971d0e311b64faeba020a3b7660ff130086956a7ebe92bd SHA512 ca1327e127cf1ba1803d8931aa119c9d11fc5b998f45ad5f7c339cea7f7928a5a6a45f90db9a51a7ccf6d4ee268cd316461c621db62dcc7182cd0255e74a1481
 EBUILD detox-1.4.0.ebuild 758 BLAKE2B 605cda9872bffe8755ece521b9bc7ecfc6ea3300a1cef8e93ff204da7d5da54f6a49e32a77864c54b036a0f571a5b52419d16733de28fa8874294d4e02948367 SHA512 8d083039907bcbb7f935f65b9129658a7b0071c90c6d03224a3d200ad3cf490f1575e77fefb08f66c32552c3db7fd06b0294045b7af091e629cfbc6789de488b
+EBUILD detox-1.4.2.ebuild 761 BLAKE2B 7e57e85fcd74bb94348441557a3ee1afc3885855a675e588fcae59af1e9b10c0370ad7ef272fe2fadba13a381b49da3d9f6f0109ef5b3ba942f6f6ea0df305ea SHA512 8eb75960ac89da5831fd390d0c5008cf9c1184cdab3d1854dccb69daaf8a259eb72ba3c6ae96354a90c430a5ce9758f5fa17ab3a6e7362b4d74cea1107680566
 MISC metadata.xml 340 BLAKE2B 448af504cf3e5e2d644d5a7551d5a0e7775f95601c06704584df7be0fe68060deddd9ad41e04e6240c346bb37a7f6017f5ed54e999ecb36efda481463a10388e SHA512 22cb6a81a6b5001f6ebeae252400eb4a7568a6baf028413d1eeaccad3de9b7b2e5c4d5a3f9e0cd4c87567a2135e7a4e7d0796d2efc377f2f26ddf0b555713943
diff --git a/app-misc/detox/detox-1.2.0-r3.ebuild b/app-misc/detox/detox-1.2.0-r3.ebuild
deleted file mode 100644
index 2ec1846e2a59..000000000000
--- a/app-misc/detox/detox-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Safely remove spaces and strange characters from filenames"
-HOMEPAGE="http://detox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/${MY_P}
-
-RDEPEND="
-	dev-libs/popt
-	!dev-python/detox"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-parallel.patch
-	"${FILESDIR}"/${P}-LDFLAGS.patch
-	"${FILESDIR}"/${P}-change-default-sequence-to-use-utf8-table.patch
-	"${FILESDIR}"/${P}-install-missing-file.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	)
-
-src_prepare() {
-	sed \
-		-e 's:Fl c Ar:Fl f Ar:g' \
-		-i ${PN}.1 || die
-	epatch "${PATCHES[@]}"
-	sed \
-		-e '/detoxrc.sample/d' \
-		-i Makefile.in || die
-}
-
-src_configure() {
-	econf --with-popt="${EPREFIX}/usr"
-}
diff --git a/app-misc/detox/detox-1.4.2.ebuild b/app-misc/detox/detox-1.4.2.ebuild
new file mode 100644
index 000000000000..7a6a540e4cee
--- /dev/null
+++ b/app-misc/detox/detox-1.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Safely remove spaces and strange characters from filenames"
+HOMEPAGE="http://detox.sourceforge.net/ https://github.com/dharple/detox"
+SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
+
+RDEPEND="
+	!dev-python/detox"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
+src_prepare() {
+	default
+	sed \
+		-e '/detoxrc.sample/d' \
+		-i Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	dodoc etc/${PN}rc.sample
+}
diff --git a/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch b/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch
deleted file mode 100644
index 3f0daa088010..000000000000
--- a/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=2166388&group_id=101612&atid=630105
-
---- Makefile.in	2008-10-14 16:37:22 +0000
-+++ Makefile.in	2008-10-14 16:38:17 +0000
-@@ -70,10 +70,10 @@
- #
- 
- detox: ${detoxOBJS}
--	${CC} -o detox ${detoxOBJS} ${L_OPT}
-+	${CC} ${LDFLAGS} -o detox ${detoxOBJS} ${L_OPT}
- 
- inline-detox: ${inline-detoxOBJS}
--	${CC} -o inline-detox ${inline-detoxOBJS} ${L_OPT}
-+	${CC} ${LDFLAGS} -o inline-detox ${inline-detoxOBJS} ${L_OPT}
- 
- #
- # Special Source Compiles
-
diff --git a/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch b/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch
deleted file mode 100644
index 2e54642f45b9..000000000000
--- a/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Patch from Teemu Likonen <tlikonen@iki.fi>
-# to change the default sequence to use utf8 instead of iso8859-1
---- detox-1.2.0/detoxrc~	2006-07-03 19:45:54.000000000 +0300
-+++ detox-1.2.0/detoxrc	2009-05-28 15:34:26.497832449 +0300
-@@ -32,10 +32,10 @@
- #
- 
- #
--# Basically just ISO8859_1
-+# Basically just utf_8
- #
- sequence default {
--	iso8859_1;
-+	utf_8;
- 	safe;
- 	wipeup;
- };
diff --git a/app-misc/detox/files/detox-1.2.0-format-security.patch b/app-misc/detox/files/detox-1.2.0-format-security.patch
deleted file mode 100644
index c03a98aa046c..000000000000
--- a/app-misc/detox/files/detox-1.2.0-format-security.patch
+++ /dev/null
@@ -1,72 +0,0 @@
- parse_options_getopt.c | 8 ++++----
- parse_options_popt.c   | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/parse_options_getopt.c b/parse_options_getopt.c
-index 1f80966..ea2b266 100644
---- a/parse_options_getopt.c
-+++ b/parse_options_getopt.c
-@@ -98,9 +98,9 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
- #endif
- 		switch (optcode) {
- 			case 'h':
--				printf(usage_message);
-+				printf("%s", usage_message);
- 				printf("\n");
--				printf(help_message);
-+				printf("%s", help_message);
- 				exit(EXIT_SUCCESS);
- 
- 			case 'f':
-@@ -138,7 +138,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
- 				exit(EXIT_SUCCESS);
- 
- 			case '?':
--				printf(usage_message);
-+				printf("%s", usage_message);
- 				exit(EXIT_SUCCESS);
- 
- 			case 0:
-@@ -195,7 +195,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
- 	}
- 	else {
- #ifndef INLINE_MODE
--		printf(usage_message);
-+		printf("%s", usage_message);
- 		exit(EXIT_FAILURE);
- #endif
- 	}
-diff --git a/parse_options_popt.c b/parse_options_popt.c
-index 60dad7a..370c3cc 100644
---- a/parse_options_popt.c
-+++ b/parse_options_popt.c
-@@ -94,9 +94,9 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
- 	while ((c = poptGetNextOpt(optCon)) >= 0) {
- 		switch (c) {
- 			case 'h':
--				printf(usage_message);
-+				printf("%s", usage_message);
- 				printf("\n");
--				printf(help_message);
-+				printf("%s", help_message);
- 				exit(EXIT_SUCCESS);
- 
- 			case 'f':
-@@ -142,7 +142,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
- 				break;
- 
- 			case '?':
--				printf(usage_message);
-+				printf("%s", usage_message);
- 				exit(EXIT_SUCCESS);
- 
- 		}
-@@ -177,7 +177,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
- 
- #ifndef INLINE_MODE
- 	if (i == 0) {
--		fprintf(stderr, usage_message);
-+		fprintf(stderr, "%s", usage_message);
- 		exit(EXIT_FAILURE);
- 	}
- #endif
diff --git a/app-misc/detox/files/detox-1.2.0-install-missing-file.patch b/app-misc/detox/files/detox-1.2.0-install-missing-file.patch
deleted file mode 100644
index 97863268bc48..000000000000
--- a/app-misc/detox/files/detox-1.2.0-install-missing-file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Patch by Nelson A. de Oliveira <naoliv@debian.org>
-#
-# Patch upstream Makefile to install missing safe.tbl (#566785)
-
---- detox-1.2.0/Makefile.in	2010-06-20 23:41:34.000000000 -0300
-+++ detox-1.2.0/Makefile.in	2010-06-20 23:42:34.000000000 -0300
-@@ -147,6 +147,11 @@
- 	else \
- 		echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \
- 	fi
-+	@if [ ! -f ${DESTDIR}${datadir}/detox/safe.tbl ]; then \
-+		${INSTALL} -m 644 safe.tbl ${DESTDIR}${datadir}/detox; \
-+	else \
-+		echo "${DESTDIR}${datadir}/detox/safe.tbl exists, skipping"; \
-+	fi
- 
- install-unsafe-config: install-base
- 	${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}
diff --git a/app-misc/detox/files/detox-1.2.0-parallel.patch b/app-misc/detox/files/detox-1.2.0-parallel.patch
deleted file mode 100644
index 73abd73d61b3..000000000000
--- a/app-misc/detox/files/detox-1.2.0-parallel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=2166387&group_id=101612&atid=630105
-
---- Makefile.in	2008-10-14 16:39:34 +0000
-+++ Makefile.in	2008-10-14 16:38:51 +0000
-@@ -131,7 +131,7 @@
- 	${INSTALL} -m 644 detox.1 ${DESTDIR}${mandir}/man1
- 	${INSTALL} -m 644 detoxrc.5 detox.tbl.5 ${DESTDIR}${mandir}/man5
- 
--install-safe-config:
-+install-safe-config: install-base
- 	@if [ ! -f ${DESTDIR}${sysconfdir}/detoxrc ]; then \
- 		${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}; \
- 	else \
-@@ -148,12 +148,12 @@
- 		echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \
- 	fi
- 
--install-unsafe-config:
-+install-unsafe-config: install-base
- 	${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}
- 	${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox
- 	${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox
- 
--install-sample-config:
-+install-sample-config: install-base
- 	${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}/detoxrc.sample
- 	${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox/iso8859_1.tbl.sample
- 	${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox/unicode.tbl.sample
-
diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index 4900094e658f..f3f3fb9cae09 100644
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -1,3 +1,3 @@
 DIST emelfm2-0.9.1.tar.bz2 1217126 BLAKE2B 994fb55f9aed452cf0b01b7a26d0b94b8a02dace54eb34f764fe6d9a8c6ea3820d4fce3242daa452e972fd6e630d564ee3781af6480c3a812d4f4bbc66caae68 SHA512 bd3a1ad2338c80d6824a2a84736470ecfa7e93f455cc8e3243944833807fe9b3544e2fea6bd6ccbddaf0188ad89ce616ed146271f6ffabec80f5dfb2f1ad6f57
-EBUILD emelfm2-0.9.1-r5.ebuild 2230 BLAKE2B 0b5e0c434a7e9400a5a50826790ea5905c7a425f38552980436183fa472c70e7161e9bc9b09c80b1cb29542a269285ce2cf84cd8ee705de7804a4e04795dbaa6 SHA512 fda745f91bcd1ed24d5c7e186dea81dd5bbc66311bc85150e5ad8549d98e2d8848e8d5a8ec78a1a5eede7b1f07b8167794416aba35c426d38deefb2a55fe25c3
+EBUILD emelfm2-0.9.1-r5.ebuild 2232 BLAKE2B c6a43cef14c3bee9039776c898f15e8cf7963979423d60b0b84b52d7225d65c4a1b3883c4d5497f6ead6f3855f96606f91e03086796eaa9b00ad1f8bdc5baaf3 SHA512 cefe5fd46b81691a9bee99ff81fc0c9905a89eab450d5ba8dc418d6172a41207b82388811596022249c714b7cf874008ae74791f4487440ac2a7a3a9d640421c
 MISC metadata.xml 452 BLAKE2B 21a44f257e58a0a62663b759bdbabfe22c548d2be874365eb4584ce196846890f3342a20ed4be0d4515e1350a5c795b051769003602cfdbdeb35e485d77a4282 SHA512 a42d336a0ee1d8949d2b35e98ff372ac8ddd3bdc5d4733b6195abd1c5e5cfa766bab721a9dc63cfa6ae34fb861a9621da5ea041889638d4bcb6ac2ac9b17fbc5
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r5.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r5.ebuild
index ed9ff0f319f1..e41d36d05a2e 100644
--- a/app-misc/emelfm2/emelfm2-0.9.1-r5.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r5.ebuild
@@ -63,7 +63,7 @@ src_configure() {
 		$(usex policykit WITH_POLKIT=1 WITH_POLKIT=0)
 		$(usex spell EDITOR_SPELLCHECK=1 EDITOR_SPELLCHECK=0)
 		$(usex udisks WITH_UDISKS=1 WITH_UDISKS=0)
-		DOC_DIR="${EROOT}/usr/share/doc/${PF}"
+		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		DOCS_VERSION=1
 		STRIP=0
 		WITH_TRANSPARENCY=1
diff --git a/app-misc/filebus/Manifest b/app-misc/filebus/Manifest
new file mode 100644
index 000000000000..d77d87c2f3e3
--- /dev/null
+++ b/app-misc/filebus/Manifest
@@ -0,0 +1,3 @@
+DIST filebus-0.3.2.tar.gz 17310 BLAKE2B 0f30aabcd316f52ea12d12b136befe643085dff5e283f65edf2a459b127cd3e2d48c472ae0dd8f302bb7211e4da5541a6fc7ac274573631ab03fc246bc8b566f SHA512 88ce3cd2d8aec7afd30d16315a6a8a37dee1b21d882571ef87c7dca56251e737d6500a5fad0124c62aea6383aae5ec30abd8abf86c2fac5d582f8fe96049eaa6
+EBUILD filebus-0.3.2.ebuild 1409 BLAKE2B 27687f694af313868388843ae88037ea08b6192adcbb4c64ed79bab64d77c62f6208e356da0f4912f1c23f24640da20a6ac27eb53a6e6125c7c68a8e40412187 SHA512 90475ee64cbe90e844597461ea3e884c95ae12598e2acfeb78491a6accb7fe25be1b18f8cbbe97af174d8e95798f3635466cc6dee3b0290b1f269df98a603553
+MISC metadata.xml 343 BLAKE2B 5c4fb3bd0f135a7698c7733f214e02890e8775b2ea837ebbe8e525e03bb25a8e660a00a9b1957a322cbb210cd5a3b36e2979cf1829ecbceeedd5d76b0a8735d5 SHA512 de474003476fe109709f9c0de51cbb1277c49c4002c1eaa11840800633f61f912a18cafb8f1a4516750ec05148920479c1c4076e1a11e30b9852c05f198e0b79
diff --git a/app-misc/filebus/filebus-0.3.2.ebuild b/app-misc/filebus/filebus-0.3.2.ebuild
new file mode 100644
index 000000000000..cfa1df91be48
--- /dev/null
+++ b/app-misc/filebus/filebus-0.3.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A user space multicast named pipe implementation backed by a regular file"
+HOMEPAGE="https://github.com/pipebus/filebus"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="+inotify python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		inotify? ( dev-python/watchdog[${PYTHON_USEDEP}] )
+	)"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	if use python; then
+		distutils-r1_src_prepare
+	fi
+}
+
+src_compile() {
+	if use python; then
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	"${BASH}" ./lib/bash/filebus-test.bash test || die
+
+	if use python; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	python test/test_filebus.py || die "tests failed for ${EPYTHON}"
+}
+
+src_install() {
+	if use python; then
+		distutils-r1_src_install
+	else
+		insinto /usr/libexec/filebus
+		doins lib/bash/*.bash
+		cat <<-EOF > "${T}/filebus"
+		#!/bin/sh
+		exec bash "${EPREFIX}/usr/libexec/filebus/filebus.bash" "\$@"
+		EOF
+		dobin "${T}/filebus"
+		dosym filebus /usr/bin/pipebus
+	fi
+}
diff --git a/app-misc/filebus/metadata.xml b/app-misc/filebus/metadata.xml
new file mode 100644
index 000000000000..063cf040c7b7
--- /dev/null
+++ b/app-misc/filebus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">pipebus/filebus</remote-id>
+		<remote-id type="pypi">filebus</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/gcstar/Manifest b/app-misc/gcstar/Manifest
deleted file mode 100644
index 7e27d8838b46..000000000000
--- a/app-misc/gcstar/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gcstar-1.4.0-man.patch 902 BLAKE2B 092a745eaa409c8b4c8b44244c99f4012d9eaa25c530b7731ec8e1ee5750b62b25c518917afe112c520f8f38c1ac8d09c88305a4048a34203b4fcb3257194eaf SHA512 eb1f1ec1822927b5885350fd69f26e599afebe240cfdc01adde27894f37ebdfa2fe14fd0e5cda3e0f12acea622d852d5442fef1f08b4ab8e8238b9d1d5b56482
-DIST gcstar-1.7.1.tar.gz 4514370 BLAKE2B 001768d7e2b4d01c97b5a34d078979ce909def1e516166aa305dd03e343bd0188bb54c7adfeb84578f063e860fa78f8faf426f64938eba0688cf5c86feebee4a SHA512 2a37717c6e9bd83758bef99e810ef3321f5558bd5714aa2a332522262182daade9e623f51a256594f74094da3e680ba35d9650d0bc0451226bf41e98fdd57802
-EBUILD gcstar-1.7.1-r1.ebuild 1862 BLAKE2B de724effb778b938921219a4c3376868d1cde1ef794cb2d80486f4cb7993c2825286917f884d1439c5e1aa338a64bad1ec59f10258be0334e7196f29958523e3 SHA512 1ad454d0d95d705418e31f2776e2735c7c0b4182a412981d232933bc9385efbcc71f04b60352916340789486ff25976574aaead03932b1982eba507f39a2eda5
-MISC metadata.xml 878 BLAKE2B 08bd6224a9066bcd47292389f3718d5378934bcf6b76c2d969f0703003ca50b725429dd3c336b4cb9021bd3dd0534d7ec7a5c1b6030f8338b952ae8c187c20b8 SHA512 b086dcfa2d846aab85f413600ba9f8db1bce21d6ff2463d7fd2f4328c10a5343013b049bf5143c0591f52ff111415ddd2863b09d634fa3cf124b384dad4f4dc2
diff --git a/app-misc/gcstar/files/gcstar-1.4.0-man.patch b/app-misc/gcstar/files/gcstar-1.4.0-man.patch
deleted file mode 100644
index dfcade74c740..000000000000
--- a/app-misc/gcstar/files/gcstar-1.4.0-man.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Install man files in /usr/share/man, not /usr/man
-
---- gcstar/install	2008-03-04 22:56:00.000000000 -0500
-+++ gcstar-1.4.0/install	2008-06-06 18:16:17.819918815 -0400
-@@ -107,7 +107,7 @@
-     }
-     
-     unlink $baseDir.'/bin/'.$binName;
--    unlink $baseDir.'/man/man1/'.$binName.'.1.gz';
-+    unlink $baseDir.'/share/man/man1/'.$binName.'.1.gz';
- 
-     # remove menu and mime items
- 
-@@ -187,9 +187,9 @@
-     mkpath $baseDir.'/bin';
-     copy 'bin/gcstar', $baseDir.'/bin/'.$binName;
-     
--    verbosePrint $lang{InstallCopyDirectory}, $baseDir.'/man/man1';
--    mkpath $baseDir.'/man/man1';
--    my $manPage = "$baseDir/man/man1/$binName.1";
-+    verbosePrint $lang{InstallCopyDirectory}, $baseDir.'/share/man/man1';
-+    mkpath $baseDir.'/share/man/man1';
-+    my $manPage = "$baseDir/share/man/man1/$binName.1";
-     copy 'man/gcstar.1', $manPage;
-     `gzip -f $manPage 2>&1 >/dev/null`;
-     
diff --git a/app-misc/gcstar/gcstar-1.7.1-r1.ebuild b/app-misc/gcstar/gcstar-1.7.1-r1.ebuild
deleted file mode 100644
index ea98b214b1e1..000000000000
--- a/app-misc/gcstar/gcstar-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop xdg
-
-DESCRIPTION="Manage your collections of movies, games, books, music and more"
-HOMEPAGE="http://www.gcstar.org/"
-# Gna permanently shut down in May 2017
-# Original SRC_URI was http://download.gna.org/gcstar/${P}.tar.gz
-SRC_URI="https://launchpad.net/gcstar/1.7/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cddb mp3 spell stats tellico vorbis"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Archive-Zip
-	dev-perl/DateTime-Format-Strptime
-	dev-perl/Gtk2
-	dev-perl/HTML-Parser
-	dev-perl/libwww-perl
-	dev-perl/URI
-	dev-perl/XML-Parser
-	dev-perl/XML-Simple
-	virtual/perl-Archive-Tar
-	virtual/perl-Encode
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-IO-Compress
-	virtual/perl-libnet
-	virtual/perl-Storable
-	virtual/perl-Time-Piece
-	cddb? ( dev-perl/Net-FreeDB )
-	mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag )
-	spell? ( dev-perl/gtk2-spell )
-	stats? ( dev-perl/Date-Calc
-		dev-perl/GD[png,truetype] )
-	tellico? ( virtual/perl-Digest-MD5
-		virtual/perl-MIME-Base64 )
-	vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.0-man.patch" )
-
-src_install() {
-	# Yes, ED *is* needed here. GCstar's install lacks any concept of DESTDIR.
-	./install --prefix="${ED}usr" \
-		--noclean --nomenu || die "install script failed"
-
-	domenu share/applications/gcstar.desktop
-	for size in 16 22 24 32 36 48 64 72 96 128 256
-	do
-		newicon -s "${size}" share/gcstar/icons/gcstar_${size}x${size}.png gcstar.png
-	done
-	newicon -s scalable share/gcstar/icons/gcstar_scalable.svg gcstar.svg
-	insinto /usr/share/mime/packages
-	doins share/applications/gcstar.xml
-
-	dodoc CHANGELOG README README.fr
-}
diff --git a/app-misc/gcstar/metadata.xml b/app-misc/gcstar/metadata.xml
deleted file mode 100644
index 8e5a7ab35cdd..000000000000
--- a/app-misc/gcstar/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		GCstar is an application for managing your collections. It supports many
-		types of collections, including movies, books, games, comics, stamps,
-		coins, and many more. You can even create your own collection type for
-		whatever unique thing it is that you collect! Detailed information on
-		each item can be automatically retrieved from the internet and you can
-		store additional data, such as the location or who you've lent it to.
-		You may also search and filter your collections by many criteria.
-	</longdescription>
-	<use>
-		<flag name="stats">Enable statistics reporting</flag>
-		<flag name="tellico">Enable support for <pkg>kde-misc/tellico</pkg>
-			files</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-misc/geekcode/Manifest b/app-misc/geekcode/Manifest
index 9612d643964a..23d5f77404a6 100644
--- a/app-misc/geekcode/Manifest
+++ b/app-misc/geekcode/Manifest
@@ -1,5 +1,5 @@
 AUX geekcode-1.7.3-exit.patch 203 BLAKE2B 119ed822686a89039a0b41376a312c969eb714a7f61a22371779418e7f7699cf43728655f641d9f7226ce99b95db7ac3aea4c54df5c2de85117d7954605d8328 SHA512 34718833c4294f53db35e9d948aecac25fa389a06146a0ab2db2606f50d7de26779415a16689bbe1ef5db09260d3c33fe124aad781c05b1c252e956b1381204c
 AUX geekcode-1.7.3-fno-common.patch 5896 BLAKE2B 88ab358dd1866752e4f994e72e42561dd78318727f12dfefbf55f4102a3209782c9acee81d959c17132d6bcc43aa06d64141405243cc051104a4453a4b22acaf SHA512 bcaf71f3135a1ce1642628badaee5144e625515af09f5ccf119c31458ae14369c794c602cf40a500f7c5cd46f965c7ff92cb5278f093fd87eda9ef3cd0d50123
 DIST geekcode-1.7.3.tar.gz 60617 BLAKE2B 9e848d45054805e21489e59c6e31ba4aa41a557bf9f89754a3423724bbc449415b3033de0383b9e035af6409abfb24c36b5fcb5a25ad90a14602f7d2164b59af SHA512 eca8489dafee507246538bbb8d35cc17c5712571603bad1f470803883cdbaf9658769df77e214704b6a5adec382f76e599a2f6c48ec3759861159ac626131bfa
-EBUILD geekcode-1.7.3-r1.ebuild 724 BLAKE2B 1bfcc76c1fc03eef841af314af5899c3d7c534f0b3300f2a3fe5dc3d826c6f30883e5cc309ff19640773fc8b378a31fdefc8b79578b66688b6d5f352a3418a2f SHA512 91e1e4fef6f00535d1b4c9f7cbe3442306f516555bad8177fe3fc8e9b982d5e466505eb3e90cb62917df4d005bb416472400d8def0c4396b744b0bd7e2f2c67b
+EBUILD geekcode-1.7.3-r1.ebuild 712 BLAKE2B 5e54a1f7e99fde24edcfed296b855e6a9ddc53edb13d79813ee18e2fcd886c39f9767513c7a4143c5fd7c259c441f715d5b191184ca5b7794ff74219834802ce SHA512 76fb927950f9f254cf45b6dc6944d08c4684513f0609e7136ee52319e168a8d797bce7e53f414b771361b69fd76279410551ef21620b6f5b9fb7f8a08a9b8e68
 MISC metadata.xml 245 BLAKE2B 3c0714cdd9bae31bdd4066cdacae1b7f6da612dfb694a03268c1229922ea4b9786750624e77844eb39dd5a239a4cd025b7a520551434481dd133e5f12358f051 SHA512 893b63b0ea6d148dc82926eb61cc86db6ec79b5121f65ec56160f7ccea3610a134851cc82e9161a32ff7bd8094ee5c6b8e16060b4642b046a769bcd85dc19b32
diff --git a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
index 443adb611452..1dfbdd8cccd4 100644
--- a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs
 
 DESCRIPTION="Geek code generator"
 HOMEPAGE="https://sourceforge.net/projects/geekcode"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index ff2380b62f3d..4a41c79c1616 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -78,6 +78,7 @@ DIST github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.zip 76
 DIST go-jira-1.0.23.tar.gz 115977 BLAKE2B 0b5ff8bbe2b2faeedd729daadd0646a89e5a68e26c9acf8e22750f490c7bcbd592485c2b86378036a1bb199a73a0000775b56355731d42460f8d89339b49b820 SHA512 d3fcc223c96cfc1885c7ee54e50518c6d5826b8b2231afa280b8c90c01e6413ddb0569b308ee9eae6d26bf87e59fb0913425481e6aecb78cb339f14e01194f9c
 DIST go-jira-1.0.26.tar.gz 129521 BLAKE2B 9ab96e8c6838d6906050a0ad6d8b96a97b2ea08030910c4e25b7dad2cefa777667107ec1a677fb7c2aa0835f0bbc885a75da057d8030199d1225d66e3bba3d67 SHA512 04b22cdbf95331784177816a60ee6c915a21513d13185062b495c2fe98f5077f9b8e4847ed05f07f69f8dba27c7de8873e9cd1cc51532dc47e6f52d4513a3857
 DIST go-jira-1.0.27.tar.gz 129721 BLAKE2B 259cd38722b4c0c91ae377fb2d2244a416b70a5d8fbd47283812ec12c95957e2e56605124f991b0157711af58841cb98875bccc3261326491cdbcbedb0b65e66 SHA512 b6aed431b90fbedbf057d9c9a40545d475bfee9bf42ec24133d517ca3eb478a20f6205304b36ba1d2ac8983136328a52a1e29ba216a440ecebbca47f50a47603
+DIST go-jira-1.0.28.tar.gz 130079 BLAKE2B 3d2da8ce754afa633b41bc3736e948e249b9bea40bc31aacec1ad18fc6520ea8bb9c5be862dd03440c4667bacdeadb602bed2b0b54dcfb0455415618fa3f4d0b SHA512 4bc2326cce4d076c64916c5d0619a517cbef0440076da987c112743de99af826c39b2f8b6a17d5c87353fd4ed86dc894d21fc0cb47de1f5dcd1f39bcfc0eb76a
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.zip 1744314 BLAKE2B 2c41a3aa7252043bb516dc4933165a1f4340d1bf215c7738dc6b06c80f4fd07dfa69b4a28c19753c86270237dc81dddf216eb02e60276b37d2f09986b4256366 SHA512 f565387ef2ef70d453910177afc66dee6fdf079e03946837f92108e19d29c510de26a647ee12c70f9bbb9d04c4b86007f0d41ca774caec85e597691eb698cd0c
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -101,4 +102,5 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321ea
 EBUILD go-jira-1.0.23.ebuild 5797 BLAKE2B 41a59afd665f8df634a26e09909c5ec46bbc745c7107732ba838288002119fcd8b79a4ac6dabefb9240afd6a92c565e152a7596f21d109709844fbc242e1f1d4 SHA512 fbcd3e5f71753ef4aaa19403911fbc4ab83374f20d45ce9c47b77d5299b3815323ec257987f6f2416b3f98b93743daf5efaedcee659423bc80e5d2c68587f3f6
 EBUILD go-jira-1.0.26.ebuild 5941 BLAKE2B aa0395fc7138d13b9265406bb3080b12ecacd02a2651565720e9b2c95aea0700c06ad54fe8d15bb6e4939b5239c79f6dc279162437848f2deb2d0b1d3ea426c8 SHA512 bb5db222659e28b6f29e4c1c3c0d781a8348985257e6cac199b60d5f8ebdba76d684c4d5bb622258d574f11eece69611dac18b2ee7feb1909b82662ed467fd28
 EBUILD go-jira-1.0.27.ebuild 6034 BLAKE2B ee4f804db7882e3e49438d2f9e54a389d00d15f4c8e88f48561cc2d6f8575b44b7dfdd0f1a8847f148c8052904f2ee065f1ce77a59227562e092fb059678fdee SHA512 140adf3471ff3a1986007af10fdce0fbafd3e9f0f1ed5afe20bac1d2ab1cb8ebbd1c1c7516985a4399d3f5bf3d5b6e42b691269d362492cb636d1675373ef028
+EBUILD go-jira-1.0.28.ebuild 6034 BLAKE2B f082979e374aaf9e9ba2f4d7a8eeb85b7e07b4f66b5598b205d2902618032d23a7478277f140fcf21f0776f20d5690d48ae0e8bda3446e513578087638a520f6 SHA512 57b788489bd402a61f38d335f9921f7c602cb683abb0ecd570af0bd99ea2e6590ff34b156eac86a961460e6265b6fbb551122ab01c0c40db94ba96a1e1846fca
 MISC metadata.xml 339 BLAKE2B 2b1e03ce70c1b7ff8244dc3673ce59305a6c9eabd2fc9d52209f3c85db21da04490378c95fbe647c21a0d26533d078a5b3842b4a41703a46aa670dc8dc569913 SHA512 f05c51962c3d381861ca4486baf4c1e4207c19ba87fb8113c4fd66c3a6b526ee5d9a74c98395631a7fca007fcbe2902464b02fb927dcc45b9f5ea0d4fcd96ef0
diff --git a/app-misc/go-jira/go-jira-1.0.28.ebuild b/app-misc/go-jira/go-jira-1.0.28.ebuild
new file mode 100644
index 000000000000..bd91a78ca641
--- /dev/null
+++ b/app-misc/go-jira/go-jira-1.0.28.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# bash-completion-r1 can be added once we can generate completion scripts
+inherit go-module
+
+DESCRIPTION="A simple JIRA commandline client in Go"
+HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
+
+EGO_SUM=(
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver v1.5.0"
+	"github.com/Masterminds/semver v1.5.0/go.mod"
+	"github.com/Masterminds/sprig v2.21.0+incompatible"
+	"github.com/Masterminds/sprig v2.21.0+incompatible/go.mod"
+	"github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b"
+	"github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/go.mod"
+	"github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df"
+	"github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df/go.mod"
+	"github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d"
+	"github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d/go.mod"
+	"github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e"
+	"github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e/go.mod"
+	"github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1"
+	"github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1/go.mod"
+	"github.com/davecgh/go-spew v1.1.0"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/fatih/camelcase v1.0.0"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.5.2"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3"
+	"github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3/go.mod"
+	"github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c"
+	"github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c/go.mod"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/huandu/xstrings v1.2.0/go.mod"
+	"github.com/imdario/mergo v0.3.7"
+	"github.com/imdario/mergo v0.3.7/go.mod"
+	"github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3"
+	"github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.4"
+	"github.com/kr/pty v1.1.4/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.3"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-runewidth v0.0.6"
+	"github.com/mattn/go-runewidth v0.0.6/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.1"
+	"github.com/mitchellh/go-wordwrap v1.0.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.3"
+	"github.com/olekukonko/tablewriter v0.0.3/go.mod"
+	"github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15"
+	"github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15/go.mod"
+	"github.com/pkg/errors v0.8.0"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/theckman/go-flock v0.4.0"
+	"github.com/theckman/go-flock v0.4.0/go.mod"
+	"github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7"
+	"github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7/go.mod"
+	"github.com/tidwall/match v1.0.0"
+	"github.com/tidwall/match v1.0.0/go.mod"
+	"github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1"
+	"github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb"
+	"golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod"
+	"golang.org/x/net v0.0.0-20171102191033-01c190206fbd"
+	"golang.org/x/net v0.0.0-20171102191033-01c190206fbd/go.mod"
+	"golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e"
+	"golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"gopkg.in/AlecAivazis/survey.v1 v1.6.1"
+	"gopkg.in/AlecAivazis/survey.v1 v1.6.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153"
+	"gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153/go.mod"
+	"gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473"
+	"gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/go-jira/jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/jira-${PV}"
+
+src_compile() {
+	go build -o jira  cmd/jira/main.go || die
+	# these cause failures.
+#	./jira --completion-script-bash > jira.bash || die
+#	./jira --completion-script-zsh > jira.zsh || die
+}
+
+src_install() {
+	dobin jira
+	dodoc {CHANGELOG,README}.md
+	# This can be uncommented once we can generate completion scripts
+#	newbashcomp jira.bash jira
+#	insinto /usr/share/zsh/site-functions
+#	newins jira.zsh _jira
+}
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
index f4b5a6513099..82c61f6a09f9 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -1,5 +1,3 @@
-DIST goobook-3.4.tar.gz 35100 BLAKE2B 8419f79313a68b108f08a0f7a0b6809d01979a01044d011f53acdf554e87f20f3ac41819a4823abd74e1c8ce0350956e91f17ae9a9342551a263af72b7b6c98a SHA512 e58cdee28ee4464548b04800740d0ffd40ce972efd52af9509f3de603eed9e50fad03cc9116f1d0dc42f77621bbab58d73bff98cf35a3cb55b24a0f04b26cd4d
 DIST goobook-3.5.1.tar.gz 38176 BLAKE2B 99a068256ca83e800a2d2e82c88adba85797107dc72edde9fbb3c9790ef38fff627b4db64c21baff14aa8a4c69788c29aeb01dae60533c7f389352aee9401e9c SHA512 58d056d7d76843bc874e55424912bb00068541e674b780511b7753da31f2df9514baa188017dd0a7479b5527cd50c47e35f37afc493bdc973e0eb1624998a611
-EBUILD goobook-3.4-r1.ebuild 1179 BLAKE2B 36a578f5d47e8e327d660c8a09634a3937e4f1e8282123ed07a74ed394aa98b21a36304d1991bbd43b327cda20669f82b0a78269d84af1951787d926d510c39e SHA512 2eb41761a72a33a0a6422ba8066714fdf907df7daf9da51728f3a594724cef204f9ad6edaa9cbb586aa9014cbfdfa3d081579c663a53b7beb2a2397cb5ed25ab
 EBUILD goobook-3.5.1-r1.ebuild 1173 BLAKE2B cc3747e45d19ea46e390031c0566c415b0f571134c420755bfe3576d0cb25615e83ac1ff02c65348c658ed395ed892d34b64d3de9d6d2b0b01984d8388b8dae0 SHA512 1a588455d84feb5184631a44d700ef2c40f1b12b787a25c3b62e09f4ddfd8461ba738a7c6756717e600a647ff1ba641572f77e5af06b26ce448b8eb1786c3b5f
 MISC metadata.xml 508 BLAKE2B d90b6c0e591cc65d70190075968d6c327ed9490109cef726277a42ec2064c5ceb235983ecceb00e28825fcc32318e81745042f29b8e055e7df2139c7fa5f4553 SHA512 ea905765abcb6bfdc1e782ee4addcad84ca275744a0a1793ef3e77a96e0dea3f254a61f39f6b398b1dd338bb1c80c010fcb7b70df8abf4bcdebc4c06410dea93
diff --git a/app-misc/goobook/goobook-3.4-r1.ebuild b/app-misc/goobook/goobook-3.4-r1.ebuild
deleted file mode 100644
index 24389e90a7d9..000000000000
--- a/app-misc/goobook/goobook-3.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Access your Google contacts from the command line"
-HOMEPAGE="https://gitlab.com/goobook/goobook"
-SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/google-api-python-client-1.6.4[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oauth2client-5[${PYTHON_USEDEP}]"
-
-DEPEND="${PYTHON_DEPS}"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-To setup initial authentication, execute:
-
-~ $ goobook authenticate
-
-If you want to use goobook from mutt, add this in your .muttrc file:
-	set query_command=\"goobook query '%s'\"
-to query address book.
-
-You may find more information and advanced configuration tips at
-https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section"
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index f95b4840b5cf..6e4f7f3ae070 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1,3 +1,5 @@
 DIST grc-1.11.3.tar.gz 45205 BLAKE2B 852f58145fe11ceab3e6222b61c18cdb18a09f0666f28df4b8b8a8bc42a22dd01ae7e2bcf6232a6aa0d1f42ac233148f694a0eafbd995fbd5d147e06480f7abf SHA512 abc756a21e039c136bbf9be1ef7c1890aa2415ac21e87fb7377c90ced1def2dcaf9ce5cce22edeac68db20f6d6ccea31a2ec57044a37ba200ff79273bf11d8cf
-EBUILD grc-1.11.3.ebuild 1376 BLAKE2B 1f273c830d3fda83e1d10e29c34c7383513662e7f48ac46a3e7302108df11e08ef475acfb6c55747cc43f2d00c53825df5a52a1e20919b4367bfe98980fea75e SHA512 6b4fdcad9603a2798557ee57e827d0bdd70bc57c1612cdac62e65fef0f6c5ef8aac010315c069f37a2995684d72b8064afc4d89faec22f6654665faa5183fafa
+DIST grc-1.12.tar.gz 48744 BLAKE2B dd7ab01739dfe637c4bf8b1d877e606869f9d11fed33112b499f72714ebb383e7dcbf80f160ac87d07bdc079ff7d589b9ad10b2f005c801fd13bb305466f1f8c SHA512 37ada5c7293bd0240c18b60cd7c60990e26e91b93fe9fb3ba1198c9d665647570191e985ab29de2b6554166ef703d81f449b486e83178b35df302836b5abb8c7
+EBUILD grc-1.11.3.ebuild 1375 BLAKE2B f0d908acc3c543f801ffe84c0c20ef202bc661844c18a07976bb5e4352f2455acb785dd91ac4cec465c2f1dc06fa24d13e63af9fbe6999b5a5df5eeb85819d4c SHA512 18da2c3fa961a819b8ce67dcca33c23f92df1ded61e2eb3cff4df565f4b68ca6cda008f147d0322e38f2bbc1abf4ccc7879787169e77b92e084c46d0314432e2
+EBUILD grc-1.12.ebuild 1372 BLAKE2B fc89b2afafa02b24dbac71c39e2019ca3db87237e9fb79b5719d75458a2e2a9322d3944d93194ee15e56b11cb9fe6a960446bb1e5c599abf44f601b037737099 SHA512 f4a402fcdebed29723c0554b84164fe935c6c5a562392f5af658d2434e7766c40fa9d32be7286fc324c8cf1984af5319aabce39fe9dde7119cebb12af769a5a7
 MISC metadata.xml 351 BLAKE2B b542ab1f09e03d0fcd473a1d364c557732f0ebd865398da2bf6b322987c0bf22d916d642dcb73c0c7c72d57f7eb41caa0aff1456b49dedb0895a5f5c31f3721a SHA512 39fabd038b08bc0fb057be0d211272b65d94cd9f1afedfd576138be1ddc1748fd673684b1c407649409f2834024cad324f78564348e9da570cde26be3282bc8b
diff --git a/app-misc/grc/grc-1.11.3.ebuild b/app-misc/grc/grc-1.11.3.ebuild
index 13d6ac263364..d2532445a53c 100644
--- a/app-misc/grc/grc-1.11.3.ebuild
+++ b/app-misc/grc/grc-1.11.3.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
-
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit python-r1
 
 DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
diff --git a/app-misc/grc/grc-1.12.ebuild b/app-misc/grc/grc-1.12.ebuild
new file mode 100644
index 000000000000..7b18a5b7a6fe
--- /dev/null
+++ b/app-misc/grc/grc-1.12.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{3..10} )
+inherit python-r1
+
+DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+HOMEPAGE="http://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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.markdown INSTALL TODO debian/changelog CREDITS Regexp.txt )
+
+src_prepare() {
+	sed \
+		-e 's:#! :#!:g' \
+		-e 's:3$::g' \
+		-i grc grcat || die
+	default
+}
+
+src_install() {
+	python_foreach_impl python_doscript grc grcat
+
+	einstalldocs
+
+	insinto /usr/share/grc
+	doins  \
+		contrib/mrsmith/conf.* \
+		colourfiles/conf.* \
+		grc.sh \
+		grc.fish \
+		grc.zsh
+
+	insinto /etc
+	doins grc.conf
+	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/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/hivex/Manifest b/app-misc/hivex/Manifest
index 100c2426b43a..cdd587302914 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,5 @@
 DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
-EBUILD hivex-1.3.18.ebuild 1954 BLAKE2B f8f37ab6842487f92cd27d46dd8fcb1314d9744d7102ed230bb1f47b01fc6d22212193fc8eb44079253efbae95525485436ad7c6d8ec382fc31840add3b8303e SHA512 1c155dc9e098b98db0ef7dedb6916c9677ebc576ebeccb18f719ac7dbb422f3f104dd8c44e4cee45f48a8fb4be5313e8f3bff14ab1fd759b0574bdbd46af6173
+DIST hivex-1.3.20.tar.gz 1727498 BLAKE2B db6448242fc4b72d75cc7234a49e146cb165b1b9b9e2e72fb2a05be37cbb1d8ca865ccc51c4d2d50199e69cae2d870743ecd41534290e9a100bb268c2437ee22 SHA512 366e84c2a13ff53c70036df60db6e2b469cd06e3405761df73c47978b4fa0245246a1ea912aa5852b1272221d55c6c100b40b00e4c9a6f5668d12ff7f93c787a
+EBUILD hivex-1.3.18.ebuild 1996 BLAKE2B 4337c1440a1e9bc881dc8c9a7bdd8b9e009abfa19050ea287df50a7bb6da805877c917f69279fea9446dae62563bf7039ddbc817168c454c729d68eaadee7f49 SHA512 ef2f9d1079c4ab579987ea12211eaf6d6718c657b7e560ed03fc5990fdeff5f7dab279534aa8525a591f1266ad2e840cb1518e9d461e8901b64d6b0723ce16d6
+EBUILD hivex-1.3.20.ebuild 2136 BLAKE2B 80812806c43ad9638bdad1033c44234dd857cadbebab6bcdedea5c27530a661588dadc9a98bdfb6510b7d5202433b5d4a8741d69fa81b289cb8cd06985e00de4 SHA512 832d8b149c79ac7995cf4ed3a0db3c56000651b0906b40dd96bc746ad79753ba12b2dda912eae4cd5716eb40bbe5952922bc307ee75e0cd757a1bafef24b7163
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild
index f1c6db65034f..cace53ff05ef 100644
--- a/app-misc/hivex/hivex-1.3.18.ebuild
+++ b/app-misc/hivex/hivex-1.3.18.ebuild
@@ -8,7 +8,7 @@ RUBY_OPTIONAL=yes
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit eutils perl-module ruby-ng python-single-r1
+inherit l10n perl-module ruby-ng python-single-r1
 
 DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
 HOMEPAGE="https://libguestfs.org"
@@ -20,27 +20,28 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ocaml readline +perl python test ruby"
 
 RDEPEND="
+	dev-libs/libxml2:2
 	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} )
+	readline? ( sys-libs/readline:0 )
+	ruby? ( $(ruby_implementations_depend) )
 	"
 
 DEPEND="${RDEPEND}
 	perl? (
-		test? ( dev-perl/Pod-Coverage
-			dev-perl/Test-Pod-Coverage )
-		  )
-	"
+		test? (
+			dev-perl/Pod-Coverage
+			dev-perl/Test-Pod-Coverage
+		)
+	)"
 
 ruby_add_bdepend "ruby? ( dev-ruby/rake
 			virtual/rubygems
@@ -62,11 +63,11 @@ pkg_setup() {
 
 src_unpack() {
 	default
-	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all
+	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die
 }
 
 src_configure() {
-	ruby-ng_src_configure
+	use ruby && ruby-ng_src_configure
 
 	if use perl; then
 		pushd perl
@@ -90,7 +91,8 @@ src_configure() {
 
 src_compile() {
 	default
-	ruby-ng_src_compile
+
+	use ruby && ruby-ng_src_compile
 }
 
 src_install() {
@@ -101,7 +103,7 @@ src_install() {
 		python_optimize
 	fi
 
-	ruby-ng_src_install
+	use ruby && ruby-ng_src_install
 
 	if use perl; then
 		perl_delete_localpod
diff --git a/app-misc/hivex/hivex-1.3.20.ebuild b/app-misc/hivex/hivex-1.3.20.ebuild
new file mode 100644
index 000000000000..3fd24d446ca2
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.20.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_OPTIONAL=yes
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit l10n perl-module ruby-ng python-single-r1
+
+DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
+HOMEPAGE="https://libguestfs.org"
+SRC_URI="https://libguestfs.org/download/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ocaml readline +perl python test ruby"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	virtual/libiconv
+	virtual/libintl
+	ocaml? (
+		dev-lang/ocaml[ocamlopt]
+		dev-ml/findlib[ocamlopt]
+	 )
+	perl? (
+		dev-lang/perl:=
+		dev-perl/IO-stringy
+	)
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0 )
+	ruby? ( $(ruby_implementations_depend) )
+"
+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 )
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die
+}
+
+src_configure() {
+	use ruby && ruby-ng_src_configure
+
+	if use perl; then
+		pushd perl || die
+		perl-module_src_configure
+		popd || die
+	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
+
+	use ruby && ruby-ng_src_compile
+}
+
+src_install() {
+	strip-linguas -i po
+
+	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
+
+	if use python; then
+		python_optimize
+	fi
+
+	if use ruby; then
+		ruby-ng_src_install
+	fi
+
+	if use perl; then
+		perl_delete_localpod
+
+		# Workaround Build.PL for now (see libguestfs too)
+		doman "${ED}"/usr/man/man3/*
+		rm -rf "${ED}"/usr/man || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index b1c122c08c4e..b510292c1a98 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -9,5 +9,5 @@ AUX jail-2.0-openat-syscall.patch 645 BLAKE2B db200b5969f031059a749283d5ee0945ab
 AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982d7c435418a2895a19f9663c8f015ee5992a2484f4dcfa1f7be5a5ac953cc6e76c2b035c63a4410e2a22824f4 SHA512 64e72367dee1f1639a4206280a28228d01702ddb1eefa75c7faabe32cbec699f3083d11b67dccdd56b8953f34646ab4eceb70ac898f1b2a60d142ce564a92b4f
 AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
-EBUILD jail-2.0-r4.ebuild 2228 BLAKE2B 0dc5385363d4b9b52cebd572fd8094613447545f199f665f080bd2dd9cea90f362ec8b369b1f9e782c4ddd20cd657892fd1cf311752bca515374df19748a5ad3 SHA512 38c2769338d5442589f01fde20d19657ad09ace8cc4ac2b821bad9e41a0e40c41000a8b3e3e645b18bfd645a1fa0e58641bc015c2149cdc6d6d2c0d732e319fb
+EBUILD jail-2.0-r4.ebuild 2215 BLAKE2B e60f9e1725860dafcae4d1a6f0a2477b69291c53b58bf1657d5077bac5a23edf85d3a17693db1fe71d1ae176ab7f9c0469d0525807d9b1fcdead1cdbbf57e7af SHA512 e8d95af95bb194c7612222cf5c4e51a737a2304811633eae0083ac0c4a37e92ad19b2abe606df6a3da8b81df4c99465af28cab98339b719cecea9fe3086afe47
 MISC metadata.xml 745 BLAKE2B b3182c8a1f9f31ecfe0526b88d2e8fd4f898af2a6ddc4371a841d2a7aa2e4d89cb462b03bca0f334b952afe910d7c6bd555083c292326f57e2f91755259fc40b SHA512 6b4396d20fb883385246425e04dda03453f7a49b210a30b0863b1b163b664ae5bd55ddc8c6bf862cdffe1087e34167299379c28e06a8ac6aacde2f2993363880
diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild
index b3921ab2daec..884a5fc7c489 100644
--- a/app-misc/jail/jail-2.0-r4.ebuild
+++ b/app-misc/jail/jail-2.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries"
 HOMEPAGE="https://github.com/spiculator/jail"
diff --git a/app-misc/jitac/Manifest b/app-misc/jitac/Manifest
deleted file mode 100644
index 7f369c2432b8..000000000000
--- a/app-misc/jitac/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jitac-0.3.0.src.jar 141514 BLAKE2B 7f8028f2971c55d84710a232f32f187f3239e08461e9c534ad5d014f19741c088cd3a294ed1705ef7a940d94163788fd9749b037385c91c2d1b4c639e18d9dbd SHA512 8a21e80246e450c9afb7e92cad14b8901fab7e039a7312df0b87cdab307c68a3db8a1090cb044b74c50eee47dd480f8c8d1465111e2f508584d38c9ef31511f8
-EBUILD jitac-0.3.0.ebuild 970 BLAKE2B 38bbe49ed817eb37e21ecdc66016f790f9570d86d6e50548a06d6aa077a26f4a63a2be4280ce5435eaf33dcbe46f4c7d61397caf1d1d119baef2ce1c2e31a9e9 SHA512 8fa777453cc7791b9d1fd3e962b0a940738c9d5ed6c9f2523b5096841b412dd4cc768b9756e520a703ddd8597fdcc1dbc8de9855b71bdbc76c4abfa523e68883
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/app-misc/jitac/jitac-0.3.0.ebuild b/app-misc/jitac/jitac-0.3.0.ebuild
deleted file mode 100644
index 7028a28a9b34..000000000000
--- a/app-misc/jitac/jitac-0.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="An image to ASCII converter written in Java"
-HOMEPAGE="http://www.roqe.org/jitac/"
-SRC_URI="http://www.roqe.org/jitac/${P}.src.jar"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/sun-jimi:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	jar -xvf "${DISTDIR}"/${A} || die "failed to unpack"
-}
-
-src_compile() {
-	ejavac -classpath $(java-pkg_getjars sun-jimi):. $(find -name *.java)
-	find . -name "*.class" -or -name "*.bdf" \
-		-or -name "*.properties" -or -name "README" \
-			| xargs jar -cf ${PN}.jar || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dolauncher ${PN} --main org.roqe.jitac.Jitac
-
-	dodoc org/roqe/jitac/README
-	use doc && java-pkg_dohtml -r org/roqe/jitac/docs/*
-}
diff --git a/app-misc/jitac/metadata.xml b/app-misc/jitac/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/app-misc/jitac/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-misc/jp/Manifest b/app-misc/jp/Manifest
new file mode 100644
index 000000000000..210db603517a
--- /dev/null
+++ b/app-misc/jp/Manifest
@@ -0,0 +1,3 @@
+DIST jpp-0.1.3.1.tar.gz 64129 BLAKE2B a3663ee0a6b212a455dbe4c01f83fb450a5d17ff8f2173becc970133ed9a29b102280fbeb13730eebe69ebf481703e382df8456d030abbff695a5cc72a0faa36 SHA512 65844497d988645717363f812c14886e1a5befa925085527029145c4b5c7a3466c193bb6a8f1bc47c66e5cd616ae87eee25077278a48abcc4980dda08d3fc6bb
+EBUILD jp-0.1.3.1.ebuild 1065 BLAKE2B fbc9397857d5d246718e1aa11217292085fb5ca567302d61e82698be78d9f0343b88b68a79b3608e1fc3dad9304d36d2a93fced804f6f36dad4026579abdb290 SHA512 1119475f842618786c14caaa8472010aa9ddcac24ed41ad2ac801c392a7d56d82bcd3bad0418e36a05c7c50a28af73d9ab8d36673ca28f03c76dfb4a240132fc
+MISC metadata.xml 652 BLAKE2B 1dc0df17ce3314f8fef04cad1d8490c5a272964d71bd3328174813afe5e6d68907b98fe95f754947be493f89b0d2f4cc843d5509b26c0cd35924b4eaa8792bcc SHA512 8d543eef7131091cc8064c5371af307674719abd9cfb507cf68b908714a21ea600532fcc1726773f1af83a1549342fb29a1d075bebcfdd0f44274fad9fe4747d
diff --git a/app-misc/jp/jp-0.1.3.1.ebuild b/app-misc/jp/jp-0.1.3.1.ebuild
new file mode 100644
index 000000000000..2d61bd19fce0
--- /dev/null
+++ b/app-misc/jp/jp-0.1.3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+MY_PN=jpp
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Command line interface to JMESPath"
+HOMEPAGE="https://github.com/pipebus/jpp https://github.com/jmespath/jp http://jmespath.org"
+SRC_URI="https://github.com/pipebus/jpp/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+jp +jpp"
+RESTRICT+=" test"
+REQUIRED_USE="|| ( jp jpp )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	if [[ -e $S/go.mod ]]; then
+		die "found unexpected $S/go.mod"
+	fi
+	cat <<-EOF > "$S/go.mod"
+	module github.com/jmespath/jp
+	replace github.com/jmespath/jp => ./
+	EOF
+
+	sed -e 's|except Exception, e|except Exception as e|' -i test/jp-compliance || die
+
+	default
+}
+
+src_compile() {
+	if use jp; then
+		go build -mod=readonly -o ./jp ./jp.go || die
+	fi
+	if use jpp; then
+		go build -mod=readonly -o ./jpp ./cmd/jpp/main.go || die
+	fi
+}
+
+src_install() {
+	use jp && dobin "./jp"
+	use jpp && dobin "./jpp"
+	dodoc README.md
+}
diff --git a/app-misc/jp/metadata.xml b/app-misc/jp/metadata.xml
new file mode 100644
index 000000000000..8a0623114292
--- /dev/null
+++ b/app-misc/jp/metadata.xml
@@ -0,0 +1,21 @@
+<?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/pipebus/jpp/issues</bugs-to>
+		<changelog>https://github.com/pipebus/jpp/commits/master</changelog>
+		<remote-id type="github">pipebus/jpp</remote-id>
+	</upstream>
+	<use>
+		<flag name="jp">
+			Install jp which is the official jp CLI for JMESPath
+		</flag>
+		<flag name="jpp">
+			Install jpp which is an extended superset of the jp CLI for JMESPath
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-misc/jpipe/Manifest b/app-misc/jpipe/Manifest
new file mode 100644
index 000000000000..b132acfd3198
--- /dev/null
+++ b/app-misc/jpipe/Manifest
@@ -0,0 +1,3 @@
+DIST jpipe-0.1.3.1.tar.gz 5957 BLAKE2B ce7570006aa40ca61939c59a93608569898b0327d10a3ebce85e44ca33175a1fcf8412740008a648865ce5098594318154ad415505ed3167664c8726827402c7 SHA512 4dd90c4d59f1a3ca8a2417a20b95db9bb949c380104030a35053edb5e1c3a1bc73d28725cc18c0a3384181899198837f4d4abedaf9c7e374ec905e42ce1af4f6
+EBUILD jpipe-0.1.3.1.ebuild 969 BLAKE2B 4f5c6692c123df3a2fa818af24fdf03ef57a578ae6cee118feafdabda913ffee17431a465f3910082fea954242d50630a1393582b3a200631cf10fb1b4671caa SHA512 c926394af602e1745eee8a327c89b316539a195ddf83811494c8911820b6ceb0463239c603056504c0ad7c91abd96b1857cf730c4d9659f08781d419641de821
+MISC metadata.xml 540 BLAKE2B 48ce177f946eb9958b56d18688f8318f33ef14200c893f4645d2a26ac3d372b10b90775e1caa888c86051c3bc644c8f240581ab5ceed72c14cab6f9188f7a6a7 SHA512 8ba8fadf241f2ed2b25d5312293cf8c0d5410bc78e7f8cdca7607c9cef4a04297377ec13eea075deabaf2788cdd0b53a66488cb41887df6321e3fcf54ddf5265
diff --git a/app-misc/jpipe/jpipe-0.1.3.1.ebuild b/app-misc/jpipe/jpipe-0.1.3.1.ebuild
new file mode 100644
index 000000000000..a7ed62838505
--- /dev/null
+++ b/app-misc/jpipe/jpipe-0.1.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python implementation of the jp CLI for JMESPath"
+HOMEPAGE="https://github.com/pipebus/jpipe"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="jpp jp-symlink test"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	jpp? ( !app-misc/jp[jpp] )
+	jp-symlink? ( !app-misc/jp[jp] )
+	dev-python/jmespath[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	if ! use jpp; then
+		sed -e '/jpp_main/d' -i setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" test/test_jpipe.py || die "tests failed for ${EPYTHON}"
+	if use jpp; then
+		"${PYTHON}" test/test_jpp.py || die "jpp tests failed for ${EPYTHON}"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	use jp-symlink && dosym jpipe /usr/bin/jp
+}
diff --git a/app-misc/jpipe/metadata.xml b/app-misc/jpipe/metadata.xml
new file mode 100644
index 000000000000..c1da5f3b0541
--- /dev/null
+++ b/app-misc/jpipe/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">pipebus/jpipe</remote-id>
+		<remote-id type="pypi">jpipe</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="jp-symlink">
+			Install a jp symlink that points to jpipe.
+		</flag>
+		<flag name="jpp">
+			Install jpp which is an extended superset of the jp CLI for JMESPath.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 77a22776f5ea..e06cf5cdc972 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,5 +1,5 @@
 DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
 DIST khal-0.10.2.tar.gz 182534 BLAKE2B 0c7c4ab1234ebe90ef9ad8291f2a0087a3f6a60d25f5426445eedadb25f236b3598dacc051e959a108ad472efc56628bf7ba11ed714c885d956f1a8f905029ca SHA512 e15449b73175190f02b6fe5774a8feef8a5390966da3836624c94a044d146cc6e8a73985d991042fbb617f736c6759ded387a65292529e71f5b2f34bc80a686e
 EBUILD khal-0.10.1-r1.ebuild 1278 BLAKE2B f88037dcccd4f5bf878687f42a96459b84d4c1e57b3b2e797542db99cafc14efa9c65d08bfad762a450b53d2338087138ed64dc440b1d155a0057d028b7e8dbc SHA512 6e6156925243a298f179b0bd3d9815d7c869fc837ba7c1e26cabb0e4911c8a469e32ece04338c2bf5366da98991ba650938477552492947e04739b74a7608d1b
-EBUILD khal-0.10.2.ebuild 1286 BLAKE2B 321c33092d322a11ba93cd0800ecc062a47d9ded1170e164ba779ce0337a326585938f5b1a1fb7f823e4ba91c316768fb5a863de3306276e5ab0b30bae5719c2 SHA512 ca02801fee34aa421636b14776d4330c57337bd3b86bf666105510c225f010179a7d057b19e1f92c789d9cc663a32d3880353c2be2f43910cb01bd1cbe517ae2
+EBUILD khal-0.10.2.ebuild 1275 BLAKE2B 3a233fea7cbcb682aad88d7ee07d4af5a185820678208c0199092d254015cc5eeafbe69c667820b24822f094172711be28f2414db0e2b92ce8f53914d3d58c64 SHA512 3c49d19a7c5381cac8bab6005a5681cf7bff46410802972933b70aef1397795b40ec94954caa53808774af8dcbd5b44ca49323c384331c601d099e829025bc54
 MISC metadata.xml 284 BLAKE2B c98ae36013f5470384f56f63dc1cf49d8499e20d5062bd5adccbef7e84b9cc5caef1c76da113adfa81272b83099b71e8495282bf52ed2571a5cfe751fac88381 SHA512 0cc5d1286118b00aa801004d68df0c5cc780f4c2e4cec3f4652c5b1ea27cdbcef2fb6403482f56706239fae3dc4bbfe55eb5985da6ee9aaa9a286cdcd660eb50
diff --git a/app-misc/khal/khal-0.10.2.ebuild b/app-misc/khal/khal-0.10.2.ebuild
index aab3b6993446..0c6dcfa5d3e9 100644
--- a/app-misc/khal/khal-0.10.2.ebuild
+++ b/app-misc/khal/khal-0.10.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
 
 DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
+HOMEPAGE="https://lostpackets.de/khal/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -17,8 +17,8 @@ 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}]
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-log[${PYTHON_USEDEP}]
 	>=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}]
 	>=dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 3d8ce5152dfb..0a1118140286 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,5 +1,5 @@
 AUX lcd4linux-0.11.0_pre20170527-python3.patch 1437 BLAKE2B b6b3e3267761d4b8df64687137451bba8cb564e9de2c5e1891061d0adf7927aeb1834ef40d46594569f3fa04141083ef43957efa54dbbac7a83a1ffa742e1f76 SHA512 ea4ddb89702d37200e0118df019d3971dd85f977ffeb1f50b3b54d48536efa91e9f0747bd235a68b0b0a33f7a7a3be76b4a29e852431a17887b370200e2cfe62
 AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c45995d248fd1553f4e967b59fba9e6a4c56a777e013693b743c7939b382dbe9bb1c3d856ca9ec23e1661be SHA512 8cc10e236dcf045f6da955fcbdfd1ecedf24cbe8a31dbb39c7b8830007de790e38b6af31549fa552cb35e63ed4ef75738b4b40f672ce05c72d28ec95c2580142
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
-EBUILD lcd4linux-0.11.0_pre20170527-r5.ebuild 6063 BLAKE2B 7959e38034c5f470bfce599ade759edb4e068f86025bdb49b6bbedbdb3a3cc493c2cb9c8239e04009a823e72a17ff5c6f61dbfa8a12667039b8457c8a642fa77 SHA512 3ee55a04835fc7de4e3dbc26b7ddef7fd3f9d075bae2562ef59c036e51d5bcb77b945530909dd28fa063a0e6b41e0789f4faeb91069af0d25ef50a433eaadefd
+EBUILD lcd4linux-0.11.0_pre20170527-r5.ebuild 6030 BLAKE2B 7d99a860714ba9effb01a8983263f5f0a396a60ccbfed783d44de5ddd112cd5a6573e10f294ea50e2511a05594f64e0bfc38e99892654662705100b585a7bfdb SHA512 cdae279a5df7ee208688eee5542a48f9ea97de2ad75c0ece22f6fa77d96f1ba7be34026336d2fffe77219dc3d59e1201e5ae2bd752e1b013fd07cd0b3c1bcfca
 MISC metadata.xml 3520 BLAKE2B 061b85175547ddd4e0571cfca26438e324313143eb7435f358c9ee4eccc12eef8c5ffcd31bcb0318bd1d7b283d0da8075d1e8bc0338ec9702d42459be25066ed SHA512 9d26b18c84e6f1cff74fb8a5007f5ef1e7ef1b42aba4cc1fb408af1105433db8e1eef8ff24406071f0b7009bd29fdc924855a8a9e0bee954118c736c9e7fe4fe
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
index ef4a8ada7cf3..7e5012fe4204 100644
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools flag-o-matic python-single-r1
 
@@ -142,7 +142,8 @@ src_prepare() {
 		rm ax_python_devel.m4
 
 		# Use correct python version.
-		append-libs "-lpython${EPYTHON#python}$(usex python_single_target_python3_7 'm' '')"
+		# (See: bug #793869)
+		append-libs $(python_get_LIBS)
 	fi
 
 	eautoreconf
@@ -193,6 +194,6 @@ src_install() {
 
 pkg_postinst() {
 	if [[ ! -z ${REPLACING_VERSIONS} ]]; then
-		use python && einfo "Starting with that version, the python plugins uses now python3 instead if python2!"
+		use python && einfo "Starting with this version, the python plugins now uses python3 instead of python2!"
 	fi
 }
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index cc5e127d7d6c..3bea2fea5de5 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -8,6 +8,5 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r3.ebuild 3839 BLAKE2B 87944043792b9073e8485e1253f93bec44bc29dc4406e426205a4f31c283d2fa372c7a3977915ecf2e350bc94802b396298496a51487a1023d3fa49692605763 SHA512 0e474403236a524148c4ad358108bbeff697ff83a9feea9ebade3f1b02a6d0f84cccf649169b3f199e9291f1306e0649b30b5d9845b4572b56a11712e672c002
 EBUILD lirc-0.10.1-r4.ebuild 3893 BLAKE2B d7a0b4ca2ddf368528e7865edc399e9bee9b028328ec7dcba50bdb9e90d8566c51aab85edd222ef90034006689ed98c7bd3969ce0e172f7381687bc7b1dbbde2 SHA512 373788d69845a78ab4e06f8551a0f10e731609a67a054fecb2c725fb0fe3e84c497ecc62265776137f4b5989f77ad5ce228dd49f25b97af8be938d306528050b
 MISC metadata.xml 817 BLAKE2B 2bf367849a5d41cc4a0b5827c41a45ec144e6c180295d8a2e00376a90b88f98fac655812bab6693464417553cb133cba59c982a84a76d54b0b94d302c0ca862e SHA512 3ed7ee97de581de955efc5120f20603dc29f4456cf2b51ec4391cf0811df33472d8b5924a52910ddf88b54733edbd7622ae5e86630bad1fc8527393f60f651b0
diff --git a/app-misc/lirc/lirc-0.10.1-r3.ebuild b/app-misc/lirc/lirc-0.10.1-r3.ebuild
deleted file mode 100644
index 9c104f0a5e32..000000000000
--- a/app-misc/lirc/lirc-0.10.1-r3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit flag-o-matic linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="https://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/-}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="https://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	gtk? ( X )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-	')
-	ftdi? ( dev-embedded/libftdi:0 )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:0 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-	')
-	doc? ( app-doc/doxygen )
-	sys-apps/kmod
-	sys-kernel/linux-headers
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	gtk? (
-		x11-libs/vte[introspection]
-		$(python_gen_cond_dep '
-			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	inputlirc? ( app-misc/inputlircd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-unsafe-load.patch"
-)
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	use uinput && CONFIG_CHECK="~INPUT_UINPUT"
-	python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(use_enable devinput) \
-		$(use_enable uinput) \
-		$(use_with X x)
-}
-
-src_install() {
-	default
-
-	if use !gtk ; then
-		# lirc-setup requires gtk
-		rm "${ED}"/usr/bin/lirc-setup || die
-	fi
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	keepdir /etc/lirc
-	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${ED}"/var/run/lirc || die
-	rm -d "${ED}"/var/run || die
-}
-
-pkg_preinst() {
-	local dir="${EROOT}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED}"/etc/lirc/lircd.conf || die
-	fi
-}
-
-pkg_postinst() {
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT}"/etc/lircd.conf || die
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT}/etc/lirc/ directory"
-}
diff --git a/app-misc/mkcert/Manifest b/app-misc/mkcert/Manifest
index cf18fd5ec174..350827bffc10 100644
--- a/app-misc/mkcert/Manifest
+++ b/app-misc/mkcert/Manifest
@@ -33,5 +33,5 @@ DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip 69738 BLAK
 DIST mkcert-1.4.1.tar.gz 18104 BLAKE2B f1e191994e036676ccf87a3285f07da56aaa044ef4b99f6f0f39cf76a1e281672cebcee9a46b8223b7a25632abccc1d0cd10ba9a4c0a864d89ad5bc19644382d SHA512 23b008a06ba594f7f5a82b12d00dc129d237421f776bcbf4be04e61a99fa92d49977a616846de45ef98292e31d28bbd543bec70566d14ecfceccee8bbe49038f
 DIST software.sslmate.com%2Fsrc%2Fgo-pkcs12%2F@v%2Fv0.0.0-20180114231543-2291e8f0f237.mod 42 BLAKE2B abe664186109087cfb218c4f35147ce524b2dbb26e58a51c2bd57f333bff13172669b394987c58ccbf83a5f3f738077e3c4ac93485dd64d235d6887cdaaeec83 SHA512 a8c989ab7fd82fc4215ace85e81d33156ae354ec09e859b2c42fab1b53d0c3608458628c3371a48c4f0e6f338985f6f7f31cd16f1ba9498c275d5a6c9b812375
 DIST software.sslmate.com%2Fsrc%2Fgo-pkcs12%2F@v%2Fv0.0.0-20180114231543-2291e8f0f237.zip 30079 BLAKE2B 88b9fb9ce055273cd9f6d8881381b83ef472b1c3173df17955d850d64f745a7a963fdd6c5774b14dc5070ec93b41ddcd2152685f5cb562ef9851d0da0b580056 SHA512 2cacf3d5153d36ab2c4840657e2167faa060c1d0b15c349a4a3aeb65261145f4fdf98f30b1ac8560728971e723774de97fcea90ad00397209684f2b0f622cf2b
-EBUILD mkcert-1.4.1.ebuild 2426 BLAKE2B 9e98466b39c990bf8ee0b1dc05bba0e08755537ce857a3b81f80b27f41c6d1b8947b4117f6f76f27b2e5dd9007d582e37aaeebd759b8d147ab2b098b8e7ad52a SHA512 f5570cb5cbb7c3099e0a02c7c3c6de9539f4117b5bd1c0a5ec367956abae7e423192dbcbdc85abf704655897e85d80149c4f32b9cd67476032fdeff9b2036476
+EBUILD mkcert-1.4.1.ebuild 2433 BLAKE2B 38de0460438731e35c9ff334af7a259c1ab99f48ad5082085350122bf2b369fdfd436fb2dd0ea84fac828cedcc010b9ae60b6618d84641802fab0a150a22a608 SHA512 7249bd437bbbc528ba1ec665964733bebe73a30757ab242eda532fe9a6176aad7f9369f5600b191b6b1ba132afc80cb628a3587c1383298df22d273c511991bc
 MISC metadata.xml 250 BLAKE2B b66a738607cc4fc7299cb2075c67ac40558a890c57e9c28539c4eeeebf1edf12288414babb7340a5464fe87ba325d7665a37ec2aadb81934a41f16b467db96aa SHA512 c2fa249b463e4116ba228c35128bdb3d4b8490678cc9e240074bcf4d3569b54edbb67cdb27da45535f2e23bfe4d35607fbc16887e97af285cfd2b1f994fe95ac
diff --git a/app-misc/mkcert/mkcert-1.4.1.ebuild b/app-misc/mkcert/mkcert-1.4.1.ebuild
index 9702e600a1ea..d2e82ea9167c 100644
--- a/app-misc/mkcert/mkcert-1.4.1.ebuild
+++ b/app-misc/mkcert/mkcert-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
@@ -49,7 +49,7 @@ SRC_URI="https://github.com/FiloSottile/mkcert/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 IUSE=""
 
 src_compile() {
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index ee65875c1ff3..f29f8554656d 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,5 @@
-DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41
 DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
-EBUILD pax-utils-1.2.9.ebuild 1887 BLAKE2B ba4f47fff5eb0e56bcb845a04a7cfa61c655503878d66c6684b32a3fd15a19a2e30757c560a1ddecc1e49ace6540b420b2adc6d542c60e2285d63cfba0179d4b SHA512 dad5e4f7c102a6f4a490c5cdcb80759d0e71784081d8e363183d37970ddaa5bdf87a0bae66d010f88ce092cf74a328e719a5b0bacfa579654e8f7c06f99ed48c
-EBUILD pax-utils-1.3.1.ebuild 1872 BLAKE2B 72742c0c848c2a5a9c9697ac7316ed723635d8322af47d5cc6bdfbc02dce9f4247cd933a319dc1294e60f428e213e275637f29840fddc44d0e321c212b755d30 SHA512 3b635f5a72f16c02d6b1f6756c1efeef36bc2bbebe83f7be0e8e71a50c2776b5db385ede07d3bcf810692622a4b4b1d8087813c125b642668318f4d1a4bf3321
+DIST pax-utils-1.3.2.tar.xz 725916 BLAKE2B ff792288b22c185501123d3e152ebae891585d5fbbbb1957f62c68fca3b342b8ca986d53611677aff4566ad4483afb3c69f40738be4cf5d653ca469e72b5661a SHA512 50330a34d9b7b33c67be079eb871e6dafe29c72f2fc42fec0e51aa9a2e0c1eb95e6d27a4dc1affe6647cdf4c9357545336d48c9e27a7e0106d57532a0f53cdcc
+EBUILD pax-utils-1.3.1.ebuild 1875 BLAKE2B 990d153b2a24f2aedfcc54fdfbb2eeb8249f3d4874502da412c9c7f32a9981d54acab6729a037e988943177f6ad91796316da16451d8f6eda2648b12d98e8d71 SHA512 9c0f0ab27270718e52b7c1f386f15a668edf424a46bd477a5c1479f76280e94ecc13dc2b2370b97b921c66433123d0b8452c6ae17fb334075ac5c55b5a770449
+EBUILD pax-utils-1.3.2.ebuild 1843 BLAKE2B 515b433e95e9ddc438d1cc0e8c0b13dafff7b9797ce46d9c5de1c72176757f2e807cf57d9bf5839e879301c9bd69f1ebee2ed1ba46ca8cef5363ba3f736c1b68 SHA512 2839eabd7f534a2e417b13220b87f5bfa386da7024a234b86519bd550b54ba801d5cb0f20637843c211200b14e3e5a5330fb356ab3890e1edbb491df867b6abf
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
index fa769d94228e..84b6622ff9a0 100644
--- a/app-misc/pax-utils/pax-utils-1.3.1.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit python-single-r1 toolchain-funcs
 
diff --git a/app-misc/pax-utils/pax-utils-1.2.9.ebuild b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
index 277c9f68fa7e..9be693bc86f3 100644
--- a/app-misc/pax-utils/pax-utils-1.2.9.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
 SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
@@ -24,7 +25,6 @@ RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	seccomp? ( sys-libs/libseccomp )
 "
 # >=linux-headers-5.8 to pick linux headers with faccessat2, bug #768624
 DEPEND="
@@ -33,7 +33,6 @@ DEPEND="
 "
 BDEPEND="
 	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
 "
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -54,9 +53,7 @@ pkg_setup() {
 
 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
+	if use prefix || ! use kernel_linux; then
 		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
 	else
 		tc-export CC PKG_CONFIG
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
index 476a60986056..8e42c5c27b72 100644
--- a/app-misc/piper/Manifest
+++ b/app-misc/piper/Manifest
@@ -1,3 +1,3 @@
 DIST piper-0.5.1.tar.gz 234944 BLAKE2B 1df33ca6e2d0dae95b34f8e3a98c6829a8f113ae68fb60980ff40374090b9272f86d69103c33fe0a4e1b0ac21a84724e7cabccca4ce8dd23d02f6d56e67d072b SHA512 13368521a9c32b2dc3300b129ed3bb07a6204623fa750f8f75ca31d2a3b60f43ae5f5066ef755814960d4890a489bdfd21b0e1b8f456b3445e0ba35ac06bc877
-EBUILD piper-0.5.1.ebuild 1108 BLAKE2B 587c5cdbbfce87a7d11fa09288106ee7b95c99136142604e8aa2976bf4df4b4c46f0c3b0990eed74f22dd7d2a3e0575317345a885da59127a945f5225bf5ea35 SHA512 50e6cda7b734f6a751047680775bbef5c1390d0a53300bd99b45193c3d169e1e99ebd697c5a94f88b80f4b071594f39060574c9c4942bc89dbd0cedddf4e6420
+EBUILD piper-0.5.1-r1.ebuild 1115 BLAKE2B 940d4dbdaed4f45c9f892816a0fe2bd2dd45f0cc5889103cc06ad922747ba465d75adb607a13458e5b992676434a46f0d520a71d928d5ff60ecb4696e6ff484f SHA512 1237242a5741c795dacb069d1e55998853a35e91728182207f7c56d776c54dd7530df37173b2237e52a79749f108e75b301dd5cc6d941d64610a0c8f7688c1b9
 MISC metadata.xml 619 BLAKE2B b002311b812d313df127db3eb872aa052382550833e5c64f1b575d965958cc266eb2652946491b1a63082403a4740d86ce1672e32fcbea691075acf12596cf67 SHA512 c6ac218834d9b7ac04da0602a64b2f1b56118c9ace6b2769b0d201e8baa6c8984c68984925a0d80b1616546f44fdd742c0edb2c28a20a2c161660481ae6d9b7e
diff --git a/app-misc/piper/piper-0.5.1.ebuild b/app-misc/piper/piper-0.5.1-r1.ebuild
index 52f2296ede2c..594522ebf5c6 100644
--- a/app-misc/piper/piper-0.5.1.ebuild
+++ b/app-misc/piper/piper-0.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit meson python-single-r1 udev
 
@@ -30,7 +30,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
 		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
 	')
 "
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 73b9cbca1555..898b1a81d410 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,6 +1,6 @@
 DIST ranger-1.9.2.tar.gz 265295 BLAKE2B 93e4d8ff1ad41c9bdf94af4a3ed9ab013048d1a601242553592b0e246f000b3a0226644b126ae7ec1c70562ff80b3f6c6711ee0e53dc1b7363c9ddf8f5fa75cc SHA512 5eb4743beaf0478d745cce8e5bfc2ac07c98ab5784e9394772782d06c0bb27dcd5478ead191ac527f21cce76db09a51eb46db0fabc7993684a6b5aaec0d43104
 DIST ranger-1.9.3.tar.gz 280363 BLAKE2B 2698f82773aae0224e7385413a1f939cdd4b3374eddad496781a42b054e26a8d7e5944bf19bc846736a9171df317c0dbc3c8bdf83c6ca9bdb95de17f9229809e SHA512 5cd7bea714a6542d0a5445f5f0cf929b2df4377df3ef710f3786c6c46dd58b017a8060cde3969076637bfaac03c13297d3020fd82f4574dc49546ca223c0e8d3
 EBUILD ranger-1.9.2.ebuild 958 BLAKE2B 8e0141ab238f23237f6f263ef89f27b5c022e52ba6fb5a69f84eeda6ff698017896e0822157faa04fbad95d471d7ef0af3e634375e847725844682d4272fd36a SHA512 c4a02cb06dcae94374bb1759d5eb4bc99ff599a87ba0ca5c779223b5d8f4ec24ce9e82bd00709111d97becac3a9dd365ec1e8277ad6a9f2504346697903b51de
-EBUILD ranger-1.9.3.ebuild 959 BLAKE2B 12548ec7a077daa8121b1ac4879524d2edf2911b8424d7040b82525aa3017aac35c27be941bfdad9e391a43c04d554acac3a91c1ae05dc58da8356d7ef7ecc2a SHA512 72a160f13fd7b387b8c0038de9459d47c7026f9787a5b55979f89db5fe99fd90cc528a7e66b0bbb2e030f1597bbf28ba65d5c04c40adaed1619b528a081aa8b6
+EBUILD ranger-1.9.3.ebuild 957 BLAKE2B 0826e431c2c7094e185c2a5207035b255337a53ada70f129d3eceae00034757b1e26a228518ad8f338a654a415688b1c50f4bd0664e078f328f0587561f459d0 SHA512 5e48c9db83d67343e72460109e78249b754aa66fbfb4635d59bbc5a676d61c1dc6eca661632576d067527bb53569164dc58fdd6aec16e396e8d7577cb351e845
 EBUILD ranger-9999.ebuild 959 BLAKE2B 12548ec7a077daa8121b1ac4879524d2edf2911b8424d7040b82525aa3017aac35c27be941bfdad9e391a43c04d554acac3a91c1ae05dc58da8356d7ef7ecc2a SHA512 72a160f13fd7b387b8c0038de9459d47c7026f9787a5b55979f89db5fe99fd90cc528a7e66b0bbb2e030f1597bbf28ba65d5c04c40adaed1619b528a081aa8b6
 MISC metadata.xml 695 BLAKE2B a6e584fc3731a0a9d7bdf8b6c7fc4bd4c88de12b7beec511ed67db337621c4156c6c3ac86289202e7e94c1378dbc3bbd2217d9005ede45071b310abd8bc1faef SHA512 1dc83811a39cd6a1ff11e976b22f74a15e9ab74c44377b92196cc7962d6d4703b522c9fe9ba2c97f43f5c5935a15cdae2c1a95935b6cdee8007749fcd4e7a34b
diff --git a/app-misc/ranger/ranger-1.9.3.ebuild b/app-misc/ranger/ranger-1.9.3.ebuild
index 786750d7f641..34900fa2ba09 100644
--- a/app-misc/ranger/ranger-1.9.3.ebuild
+++ b/app-misc/ranger/ranger-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 DESCRIPTION="A vim-inspired file manager for the console"
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index ccea8b316fce..194bbf1ce4d7 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,8 +1,6 @@
-DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb5deb363c30728184a9d826c698d8e088cc0420178754131792f0d933f395a4fdb209a4315888b733a1209644580 SHA512 d56aff810e335f8212b908118de8fe12fc8d8f8341ebc281244c00dfe2216e008c655f4d39955b6c71928a28ea0aea073036fed17be5b80e8443fe6dfbe374f6
 DIST recoll-1.27.12.tar.gz 3184471 BLAKE2B 60bcdee44259fa7f8b9decb9258ca0dae4edbf0cee1e8b1353cb59418503f0fcea9b439ecd6352500ff5b4cccfae08fc2a3f7f786fbd096cf18fd21fb809705b SHA512 3701dff056b8200f3b3c1bb2acaa69356c0def00959a0b74c14e1d500bd9e05fc81d82ce8b7db59d7e5b85617a8a7197700031aab65b31e005a4fedeaff59e97
 DIST recoll-1.28.5.tar.gz 3261816 BLAKE2B 6bf9daab0f97ee6fdb4033197d3fa3f4296b2df8a57566195fca3bf170fec621c27e7da00a1a5a8493fbbadca103a0db7b8c3051abe95d5c2aedb7c289c050a5 SHA512 df4c7a5e624933ccc7ce257a767a4621728a4dbcdd5b551b47845ed0fcffdd5a6f7f617a466404c5e8d8b62c81e57986e1f21e01d643899755623a2dc597d712
 DIST recoll-1.29.2.tar.gz 3871580 BLAKE2B ae6ef5628dfac67a192a3d133d5b5d8ddec079ac79be2e8aa7e744669ed0478cb41628a0ed46b4ff2364823f367815b1eb4bca0a6e4b56a9e12d4f78c6842473 SHA512 c87fc054a0c34f1b6bcc10a4f2c84268a51df02b8ba84634c51f9396befe5b2b84fc93d363876158c9d117a164613e91d9c63b228fec5e0e07d234c97c4680c5
-EBUILD recoll-1.25.19.ebuild 3454 BLAKE2B c6850360c618f928644ef8f4b2bb3d8c3b48bb9f49a44e9519800a44751a68a84f1727bf6a30347a66f72fdaa74c78cc42204411d61d34ec7b3a9b85c8825eee SHA512 82869a6a5041bf2f5e5bf431f9ed16fa0ee19981e7b1025ab34b54ce5838f3f1d7ccce149bf75bc04d87fbcde266b213ba396a534c7f48c7268f2ac301214c67
 EBUILD recoll-1.27.12.ebuild 3477 BLAKE2B 95fa8b50e3e2036c4fb6ef72a69f394f04d5aacb9919d41c33782ae8e9688de7b993f9386b0a96e8b8b1a6ff5a0be8d49f21900b69a939e200131fdf7b439198 SHA512 e33fd31fc1e9ba7bb0eca7fe82237d94a8db3049fbf442de72f49f23bf2f7370d5b5e933a5d23a85bf93628247ee7180e3830da2c98b9b83143af09102cd01fb
 EBUILD recoll-1.28.5.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
 EBUILD recoll-1.29.2.ebuild 3485 BLAKE2B 1bceaf054aa3c9cb71994ce9fa590c4adefb24be79896ee91436583587c3664f232693a9dbece75548f2b5b3b59f42cdb5ed23a08005e7a83e91986d7b1e3674 SHA512 3807c9ad45374b444ff5c2886f78d411c368d62c723406e286a5393bea5220b0b1c8d486469750dcc287b81fbc6d2f62141cc400b56f482f27e5a6c840df3201
diff --git a/app-misc/recoll/recoll-1.25.19.ebuild b/app-misc/recoll/recoll-1.25.19.ebuild
deleted file mode 100644
index 33f7f1b8c6b9..000000000000
--- a/app-misc/recoll/recoll-1.25.19.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit linux-info optfeature python-single-r1 qmake-utils
-
-DESCRIPTION="Personal full text search package"
-HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
-SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="camelcase chm doc +inotify qt5 session +spell webengine"
-REQUIRED_USE="
-	session? ( inotify )
-	webengine? ( qt5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-DEPEND="
-	dev-libs/xapian:=
-	sys-libs/zlib:=
-	virtual/libiconv
-	chm? (
-		dev-libs/chmlib
-		dev-python/pychm
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		webengine? ( dev-qt/qtwebengine:5[widgets] )
-	)
-	session? (
-		inotify? (
-			x11-libs/libSM
-			x11-libs/libICE
-			x11-libs/libX11
-		)
-	)
-	spell? ( app-text/aspell )
-	${PYTHON_DEPS}
-"
-
-BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-RDEPEND="
-	${DEPEND}
-	app-arch/unzip
-"
-
-pkg_pretend() {
-	if has_version "<app-misc/recoll-1.20"; then
-		elog "Installing ${PV} over an 1.19 index is possible,"
-		elog "but there have been small changes in the way"
-		elog "compound words are indexed. So it is best to reset"
-		elog "the index. The best method to reset the index is to"
-		elog "quit all recoll programs and delete the index directory"
-		elog "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
-	fi
-}
-
-pkg_setup() {
-	if use inotify; then
-		local CONFIG_CHECK="~INOTIFY_USER"
-		check_extra_config
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	python_fix_shebang filters
-}
-
-src_configure() {
-	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
-
-	local myeconfargs=(
-		$(use_enable camelcase)
-		$(use_enable chm python-chm)
-		$(use_enable session x11mon)
-		$(use_enable qt5 qtgui)
-		$(use_enable webengine)
-		$(use_with inotify)
-		$(use_with spell aspell)
-		--disable-webkit
-		--without-fam
-		--enable-recollq
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake STRIP="$(type -P true)" DESTDIR="${D}" install
-
-	# html docs should be placed in /usr/share/doc/${PN}/html
-	use doc && dodoc -r "${ED}"/usr/share/recoll/doc/.
-	rm -r "${ED}/usr/share/recoll/doc" || die
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
-	optfeature "PDF files support"              app-text/poppler
-	optfeature "PDF files with OCR support"     app-text/tesseract
-	optfeature "MS Word files support"          app-text/antiword
-	optfeature "Wordperfect files support"      "app-text/libwpd[tools]"
-	optfeature "Lyx files support"              app-office/lyx
-	optfeature "GNU Info files support"         sys-apps/texinfo
-	optfeature "RAR archives support"           dev-python/rarfile
-	optfeature "7zip archives support"          dev-python/pylzma
-	optfeature "iCalendar files support"        dev-python/icalendar
-	optfeature "Postscript files support"       app-text/pstotext
-	optfeature "RTF files support"              app-text/unrtf
-	optfeature "TeX files support"              dev-text/detex
-	optfeature "DVI files support"              virtual/tex-base
-	optfeature "DJVU files support"             app-text/djvu
-	optfeature "tags in audio files support"    media-libs/mutagen
-	optfeature "tags in image files support"    media-libs/exiftool
-	optfeature "Midi karaoke files support"     dev-python/chardet
-}
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index fa69f893b279..2fbb2bd51861 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,5 +1,5 @@
 DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
 DIST remind-03.03.05.tar.gz 402481 BLAKE2B 8fabc3269a06aaf3502c2245653442ddf6c101c3f62718769418c28850da467d210f381ef3452e95b6dbc921fe06979b4c38be8b7389a9defd76865da66080f3 SHA512 56b37dfc50a6c6a8a284691d7f1c39d542b7309ec12a029c65b68f7921cd43521d3cef9fc8d21f4a9f4a7609b0e00013e7f2793b529f39f80d63ae1fe5194fd4
 EBUILD remind-03.01.15.ebuild 974 BLAKE2B 4abb01f3621af3f3ef79942c9e90963bc595e5c628a32c47511e2797a39bd6bd97f0f68916541dd2d542ef784730c6a26b0dfafa43cf1a1620a4ed5975b8adda SHA512 c03bfc1521f8ae9e33269de91879d8c66403b873a703f61667540e08299134f620ceb0ca01c4b90cef11ddd93d2076a479966612f15a2565570b8f63291590b2
-EBUILD remind-03.03.05.ebuild 1015 BLAKE2B ac404b7b43e999201424874c13ff654326ccd3c300e4c4b1d77776d8ebebe2ffd53c7d37322aab4cb9748f841e85665f167b23255d43428eeaa6d85501ae3816 SHA512 ecb9b653470caced44953e9c6e5f31e7905f3df50ba4ddb0ac2d45c645cbe76f7c4d9e408746171efdff7bbd2f635f4255b0df589702ccd8a3100e9786a2e63d
+EBUILD remind-03.03.05.ebuild 1012 BLAKE2B 1343d44dc6a267054047afb7afc3839d79ddd78cc8380070c3011f8bafa8b46fb7cfe26b0baca84c188830eed7e961ee2bcec2761e0da0c1543f63f99a77a0ef SHA512 b6d1828068313d87a0d2dfbb9f9edee30546b5c1443abb9e612dd2fd42dca301b95b6480dbdf1ac4ca6c062c34b5d7608d75191ed23995af7bd28721c50f9531
 MISC metadata.xml 404 BLAKE2B 2b778bdd15c3d2f49ebe6bceb0269233ade6420e4f14d137b117ef947f8bca031f228210b7a1c5c92a35a00f33d1b082b6dc34959499bd42d29150e4efa4994e SHA512 49df6bda13c6b41a344f10a275a77e258e810858a9d12db036e9361a3a696ac0649b8c1bf060e35496b3f4dd1596196207b57d99cbb40555345984fc68f3695e
diff --git a/app-misc/remind/remind-03.03.05.ebuild b/app-misc/remind/remind-03.03.05.ebuild
index b083a8f061da..608ff3826b2e 100644
--- a/app-misc/remind/remind-03.03.05.ebuild
+++ b/app-misc/remind/remind-03.03.05.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dianne.skoll.ca/projects/remind/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 2589a3ef338a..d8e12ba0bd3e 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -1,4 +1,5 @@
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 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
@@ -6,20 +7,20 @@ DIST approx-0.4.0.crate 14280 BLAKE2B 8508006fd4b31290b4a3e0b26f521af94d5014774b
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
+DIST assert_cmd-1.0.4.crate 26621 BLAKE2B 0acd8a6c09cfe51594508fa7c4dc27e8831672c4e1ddbd6d392c3b439b21f3cffd8613c4abd379cc69ac500d640433aae61f5ae5a3e5908deaec193fecb70146 SHA512 125d792ab8078a205bdf5cb396c8ac4b0c7330b7773af0014c4f17e23af56dad30f14bee51a87cdf615bdf17c849274dcf7df1ebcd9c479cc8c2223c6203784a
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
 DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
-DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
+DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
-DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
 DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
-DIST csv-1.1.5.crate 886773 BLAKE2B c5da00c6d81b3cc1336edbe462cbca59121c3438d41c55148de21a538c5a3a9d81d10da44177c51898dd6b9d027f794fa15779cf0c01861183efed54fd6b95a3 SHA512 d878a953fd1079b1aef7f23108c1bc5db3cadc2e1a1dc1ceb4e26508e4249db01f957f6626eef721153d3b0cc47f5f3b25380e4c943adbdf28647b9bb7cd8f05
+DIST crossbeam-utils-0.8.4.crate 37279 BLAKE2B 55372ee1bec00b4bb3ad8fdd1df3bae4b0c166aa08898c0400663b4ea8610c956fc5376fd1638492e0d887abe65491e380eaf73459545325a2ef1d23234eae6b SHA512 6147ee3048f2df2c311c6d9d683b239249e6f49f8b2b27eaeaea9361b32fccb1ba37fd8bd3fa147d70b7d7d8d3281d3018939c4a70a75e191da7d86128c4648c
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
@@ -29,40 +30,48 @@ DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d435
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST downcast-0.10.0.crate 4923 BLAKE2B 3e69a1dcd0f2ad487273775b304ea6fa26f225eaab012219072cb5ef3ff60931ff3ffd616e09f3708895b2d01538c8e46e3e91aa1f4a288bdf910bdc7043acba SHA512 f618ec81bcdf74e8851703c6dfe92b36c9a035214635fdae598af20258549ef31a1c23a4d220c67505aa403fcc8a0b99a990fda01305a71b801acd5044f91c12
 DIST dtoa-0.4.7.crate 15910 BLAKE2B e6b4ad0c4a81d73557f93675671735eca3c5c31426319e746c73b65a34847085ee82f50a4f561036dae31a4fedf24a307e6edcd756cc1e6d46f2f20fc29bf456 SHA512 df090a5ea273265ae2f05aac2ae364cd0b606872a392411359548b9e780b2bc8dcb999254186ccc2da0a7353a4e0f1b0f513b2cd83d7e4f1290dcb1f466847f7
+DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
 DIST fragile-1.0.0.crate 10315 BLAKE2B 5f81d144012372be3504f151e9740d422edb9e29224ce2be4105d7aebc8bfc0b882e1a3a8a0eb6ff1f314264e3c70a6054196703cb69cf43560dc9711340fc69 SHA512 bbdd87f97c494495f4db10c68121f4b6f76e3752b9e4b363c0dde24a96a1344868faceeaf7e6df1edfee6ec107f10b69fd26bf271519675463c0235ecec3780b
-DIST generic-array-0.13.2.crate 26715 BLAKE2B c0ec536cd455b82fedcbc201820090db78c798ab69b3bf4e185a5b4860dfa560e0b9d6d87d991cf99ec406867b98e3cf0cb48761b0a91bc25833e12cd59fbe2e SHA512 7039c1d0e4f8f9b0518ddd807adb7e0e86ebee056bc8562eaaa3f7360b6a953b8be4d5c2660ad62a68e42eb242111ee98fa961c0e8a74bde532970bcef3dbe4a
 DIST generic-array-0.13.3.crate 26956 BLAKE2B b8df2cfb4b37543eb1d2803ab7c6d2daf4a1dfe7d652513c259f93e26ab3049aa033072ea486f83744effd188cc53fc785c3e4f3c256677f0fcb221603221ee4 SHA512 d66ea808aaf085c9162fa8c96a5655bc60b42df764c5dc17226e0aa24792d48230d51c9df61db6f551d491cd173da48a5e06d5e4e010901b14c3f044c7f38fcb
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
 DIST libc-0.2.88.crate 514138 BLAKE2B c9c6cd0b5456ee2706e7b572ba8df644abeb2d1297abe4f5d2b480e7b7b6b1024cfde98adea2822045b605949505c133538c74b0676c3ab5a2db8aed04605b4b SHA512 c1ad5dd0efd8117da798fcff84082e3b831cb1ae04c26ca8d87936057155e2ca08f0a693cf2c79c5db2c2dbe6b64e254328439b303ba952559f4c524466ad243
+DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
 DIST matrixmultiply-0.2.4.crate 32929 BLAKE2B bd3c6b2d11202ea9390760ca59b7452beb4094b4a95314c1a1c596ff623eb985ae5cf2b3821d365dd2e2912c1bd25713188de07b4555a996a667cb4d6b0cfb11 SHA512 3ec6846e1342d6dddb81f5bd4495e940f011a3e048c712262cc413318c087aaa137550cff6d969873ac96bb628f6a460e92536674c0d503d5c609d9be5d9d184
+DIST matrixmultiply-0.3.1.crate 40550 BLAKE2B e6ba7aef3ee1ff31da639492e3baf73c127bacedd20c9b08301ac6bc6baca92122d99f313fecc6cda955cb0e3c9f28d6ce26094d006e15afb3041e1c90348dc3 SHA512 d4db1b27a41078a49d6cff5a3d4a723bbd2029f8007b50a69800ab5de7952978d81749b6dde80706f62efb848c4d1577e039828183533a2b68db80b699cfc4b1
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST mockall-0.9.1.crate 44172 BLAKE2B 7f6acce0914d526ffc88f9965142cd5785ccea0633ae163cfaa9266a24f1ff144fc17899e6ffc28585d1c55200deb7278269ed7c475601c4d5030526c0961605 SHA512 351c81daaaf411c4e7bca2a9c74b7eabf4a3a45772b5dd1b15d04994cfa759ad6094230b7410e9ce12db2dc99d8450f949276583ce210d200f12fa95b98ce6de
 DIST mockall_derive-0.9.1.crate 41256 BLAKE2B d6c162162e5a83773401de5582955592c7592490d31d793b5c02aab049f3cde63a40e31df72750d5da74f998a2343ec935844fd2e78c1d2806d6b60ac42e4911 SHA512 dc01d735ca2b05a903f169b9deb2f9dac70e89d2ccd469c988ac93d86d9c2dd101d17fc4bd0ac6d184b0de86f13bfb0c7cc869d884a48509791903b32785735e
 DIST nalgebra-0.19.0.crate 253667 BLAKE2B e8959c237f4fff99e0deb8726e63a0536459b9bb9a2b8a2b2561fccd34d54bca57e3af9a86ef4543dd3bded627367900a5a03b38e9fb3581377b6dedf01c8669 SHA512 d9dc64a9e27af77f77eccd59f2dd672e087153dabc35058f6c7dd0c29bb9c388179606cdb20402f13a325a235e27dda65232194f572b701a3a3ccf38862106f8
+DIST nalgebra-0.26.2.crate 325684 BLAKE2B c8d2d61fa5ce06d15c7830d870c822cb3f71cd3678cfe1d6814beb71912695f5bbe7c2a44a20727c4fac2f6e65857bc8ae80bccabd130b81aa6b8ff642f5a9cc SHA512 579b66dd1dca0ff50fe6e2f4a6237f3b50d155571dd976f2b93b1886f89f02e3a1db7f6d856d3a23f7c60244b0ba84da101f12d236fa42a14f3afc92d27cf7f2
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
+DIST num-complex-0.3.1.crate 24541 BLAKE2B 10777a6df568fb94740a2bf2a84d68c5612efae200f99be1c20114d0adb0672f08b512f499ea4f86e19e3f20e98a7213fe116509651071b979e59515fb9958f8 SHA512 d24d613f20e04dcfdee68e95b2d4b06ba99db637a96e41a55c4f599626951a44cc5f8adf8e8c86003d42c316aaea0c27739e812fcd4d4bb6efca5b2d9cecdd71
 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-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
+DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST predicates-1.0.7.crate 274733 BLAKE2B 5275012b3759356882fc1256119b52526eb8a39f3670d8e38d10ea96918bdc3bd13fbdfc841c6784aa3dbe8147777048f751886427c1ee8c4380b5084c5a70c5 SHA512 6d72f940714d698f5ff92f16a35e26675d995ea94c82de9bddbd386e7783ce0ed726b21c85bac3dd21e8f8a92cd2d4ee37dafe1cbc42e8e6b30ba13f06858b40
+DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
 DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
+DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
@@ -77,45 +86,48 @@ DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa059
 DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
+DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
-DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-1.4.4.crate 241266 BLAKE2B 1f5877002d9fb2eb83146207232ba53fba02e8f19de9afd9f39d7c25acf7fee1be9bde0ead5211a81846ff52f595bd2b6885d68ed2c1e43466de38a323ff844a SHA512 1d7a0303c8a8106278516ecd3dbe3dca331f1a91fecd4bfed6d9744654447cab597f7dbfadf6b0e7ef7b4fcf357a6258bf8d517e5bef71f6e6dc46f7a9b1b2d9
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rpick-0.8.1.crate 40723 BLAKE2B 6fc98b965f392c1db82056096265528500eb84f16d480db476f412ae4a38d23be19b9d991fa71b038d1f3540272238b89b961895a94cf4e8a835995b688656f8 SHA512 e713b1b322f8ea552320f1d4f004a0950ccd09d23605cb95569fb85522b4a5e4383ff30894d2b898c6a47bd8419a2e305123a276518c6bf02bf7c506941d5c8d
 DIST rpick-0.8.2.crate 40556 BLAKE2B 7bd2216a30ec8a8e81c7f1081455460a59875ec304140269df2927ce464e63895ceb2160c3326c89f22ccc5bd26b2ee9f59f437afc30939b1c25aa67aa001480 SHA512 8362e89c6601d6fdc5f4d1c8548e8359625d8f8225399bad6650035fddd3fe6c3e52c25d5eb83dbad7f10adc92cf3e013f851ee435d307bf6d586c266ac2973d
+DIST rpick-0.8.4.crate 40230 BLAKE2B 714c120a39c3bac961015f3a7efd2b121bd41782653d1f7d2b9176dda3d2ecb53a3940a2117193ff7ad5b497cd43957560ccff8d69f2b09954bee56842b181b7 SHA512 8007d5599625d7cceac2c7380c96924de2be3f301e3f2849e91573a794618f692922d7a249d11946c213a1c6b5dcf34aff15beeebd7eac618c1efc4121e31f0f
 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.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823
 DIST serde-1.0.124.crate 74508 BLAKE2B c2201c9f1aa7d3f72bdb5ca56b888d40d7606d019d86f3b2dafa93d67e768a8f79ac281c3e8442a4efae676de3b3556c55ca7234fd962809e035631a7f824191 SHA512 3106e446875b6a45f59f23d5619e62e6b97ba5462f38f768b68bd33a3679ee22f4821f460646133eb626a9e529b704e405388425ee2353a4027b48f7e36623ea
-DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
+DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
 DIST serde_derive-1.0.124.crate 54147 BLAKE2B 313a601e7fba1d23a4029fb40946cd0c54ee100d5eb76e81d33d289debd96b63c862d2797b0b4de49df8b417d711fbebeba7660b4243dbd147cb75d04a2f78a3 SHA512 6da069bd2ffa101bf0c83748417e14cab93b898313a33bbb2584ef4bb85924a92b24c54f61906a42797d409ad47c313089a31549c2e6be1513220e3145a76c8d
+DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
+DIST simba-0.4.0.crate 48743 BLAKE2B f164b4111abe689b943b8eb0f0cbd9c60987e333751a52b3b6839c4c72d8182e5b8a7f2fa754ae389165b7f5f05f6c0c7938fdd352729448b2889dca62c51d07 SHA512 94346886ef76ad2b9631f6d6dad76ca48c4e9b60f2d6bb757db413aa36b45c9df78e66dacd2be2aa62f99501c114694d403ec07afe6097b47d0a3ada555ca69f
 DIST statrs-0.13.0.crate 123300 BLAKE2B 2c4c0f608c261ff6feea282fa28aa4d7bdf6b8dfbc5c8b927c0253bd1ea49e7038513c2f3cd15237ac11a01978c2d5794dc4e104ac6d50b882fb5cda6cf9f485 SHA512 3ce6f35dba25e27535dcff6985ebd2b24093b9b9b1911e151be740da3c1ad0722a3c35fba1fc6ef105e9d1aec122c56e0d3a9f223c3327cf970e3c720d16a996
+DIST statrs-0.14.0.crate 131422 BLAKE2B 9fc474662cf33c94812cd84fab9a9ef98cb60f3bc8a60ede0a4d2af2aa7b97199478d26b9eed4e243262c8cfa0d4cd9cef986214a4d0db842c04ca53222dfc99 SHA512 f007e23423d453e5d70911a3a497855a005defd18f4fd0d3223d77dd91ffdaa82926fad57a53c32f050eaacbdb3920930435050ae475d7ac18b3a9b5661c5c18
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
-DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST syn-1.0.63.crate 231524 BLAKE2B 43398bc3ca9069db4d44af3b28e5e48034d6ac4f38bd1e3da8c77c9d1468d3d9f6f7b7c6711d1dd232d5f2d9477c5929a18368a003be42f6254f270cf5d6a74a SHA512 a0da342e44dc6509f35dad8534acd93bf1a9e3104c2d9eb9d66c38a25036c5aae0503bfee3e09d2e42cc117022b328b6d966444dfb434b780c78fea64dfb14b6
+DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.23.crate 16423 BLAKE2B fd257d34da829c8d0fd2cdce9910e0b5e797ec233af3a6b3be6b47a4fa3f39bc0170edd08cde3fb546d8f3c7be63049ddd94400b602dc73262fba2c323229650 SHA512 e6b6ab7a4a23f3c50e765a16071b65007441ad3f1eb5566e91bc19755cd019fb8efb358cea5663bf7c83cb3be63fae9ee0d019cffb3fddae58233c84b93aea9c
 DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
-DIST thiserror-impl-1.0.23.crate 13269 BLAKE2B 7b570c1a0d122a11fcbb7784e6c0620bee0e4644e6e8e988de6936ba23901ef6549585d1e14afa8240b199e3c92a6471af3e4b63fac902292f46ab7ff0a7a6f5 SHA512 72098ef63a73986c8d6a0f3fff6d5b23e29da0dc8eb4eddb410b7bdfcedb303e73418b2a3518d9315772b0c2c1b9c3d86d6a67bc7cdebd45f4488c13a5b62162
+DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
 DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
-DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
+DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
-DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
 DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
@@ -123,6 +135,6 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD rpick-0.8.1.ebuild 2682 BLAKE2B d26c4f13683788bf7c2f5fed23c90dfc172c0754fe9e8906ea5825774b7c0e3ea94f5906859f203f2f09517ae5181d531256482dfab55ca6806ad3693e009559 SHA512 672ff9eedd557555ae5ab8e80c703e0442e2e7fc4197b45d8ce60bbc5166d73947ba9378c48cd58f07de7047d53e7a6019cc99d7724cfff0c59999e4fb5c868a
 EBUILD rpick-0.8.2.ebuild 2647 BLAKE2B 68028dec9ac8da55d7d8e335ad188581b11c90fb463270ee9a522e1de821182f737df8f30f2a4ec0a42c26519e5daad24d2d373b18ec952a62b7360832b24fef SHA512 4ab8741291f5f1664e1f8bbc4c80ff2330fa7928b41d4d82536fae9d3d5312d941242d714984207ac83f1d7d2e832f929aaa2fe02ca1c8b66d6f1a8ac268c168
+EBUILD rpick-0.8.4.ebuild 2553 BLAKE2B fa2d2ed47f20dbfe50562b85ed74530439aa167ed241c6d4b004c6d6cac43ed9cdd4a2b426ba3709b7fc95f6f381c58f3ec629e0a78d5dda3b0c575472b32b98 SHA512 5810799656057e103542c691e99ff9c0532297aa6cd51cbe7ba17a79061655356a431adaab00756c026563c0930afd7905be252fc0508f2a6940f0234c1c6c88
 MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/rpick-0.8.1.ebuild b/app-misc/rpick/rpick-0.8.4.ebuild
index fd35b49ae5b0..89bce4c4d0d2 100644
--- a/app-misc/rpick/rpick-0.8.1.ebuild
+++ b/app-misc/rpick/rpick-0.8.4.ebuild
@@ -6,26 +6,24 @@
 EAPI=7
 
 CRATES="
-aho-corasick-0.7.15
-alga-0.9.3
+aho-corasick-0.7.18
 ansi_term-0.11.0
-approx-0.3.2
 approx-0.4.0
 arrayref-0.3.6
 arrayvec-0.5.2
-assert_cmd-1.0.3
+assert_cmd-1.0.4
 atty-0.2.14
 autocfg-1.0.1
 base64-0.13.0
 bitflags-1.2.1
 blake2b_simd-0.5.11
-bstr-0.2.15
-byteorder-1.4.2
+bstr-0.2.16
+byteorder-1.4.3
 cfg-if-1.0.0
 clap-2.33.3
 constant_time_eq-0.1.5
-crossbeam-utils-0.8.1
-csv-1.1.5
+crossbeam-utils-0.8.4
+csv-1.1.6
 csv-core-0.1.10
 difference-2.0.0
 dirs-1.0.5
@@ -33,83 +31,77 @@ dirs-next-2.0.0
 dirs-sys-next-0.1.2
 doc-comment-0.3.3
 downcast-0.10.0
-dtoa-0.4.7
+dtoa-0.4.8
 encode_unicode-0.3.6
 float-cmp-0.8.0
 fragile-1.0.0
-generic-array-0.13.2
 getrandom-0.1.16
-getrandom-0.2.2
+getrandom-0.2.3
 heck-0.3.2
 hermit-abi-0.1.18
 itoa-0.4.7
 lazy_static-1.4.0
-libc-0.2.86
+libc-0.2.94
 libm-0.2.1
 linked-hash-map-0.5.4
-matrixmultiply-0.2.4
-memchr-2.3.4
+matrixmultiply-0.3.1
+memchr-2.4.0
 mockall-0.9.1
 mockall_derive-0.9.1
-nalgebra-0.19.0
+nalgebra-0.26.2
 normalize-line-endings-0.3.0
-num-complex-0.2.4
+num-complex-0.3.1
 num-integer-0.1.44
-num-rational-0.2.4
+num-rational-0.3.2
 num-traits-0.2.14
-once_cell-1.5.2
+paste-1.0.5
 ppv-lite86-0.2.10
-predicates-1.0.7
+predicates-1.0.8
 predicates-core-1.0.2
 predicates-tree-1.0.2
 prettytable-rs-0.8.0
 proc-macro-error-1.0.4
 proc-macro-error-attr-1.0.4
-proc-macro2-1.0.24
+proc-macro2-1.0.27
 quote-1.0.9
-rand-0.7.3
 rand-0.8.3
-rand_chacha-0.2.2
 rand_chacha-0.3.0
-rand_core-0.5.1
 rand_core-0.6.2
-rand_distr-0.2.2
 rand_distr-0.4.0
-rand_hc-0.2.0
 rand_hc-0.3.0
 rawpointer-0.2.1
 redox_syscall-0.1.57
-redox_syscall-0.2.5
+redox_syscall-0.2.8
 redox_users-0.3.5
 redox_users-0.4.0
-regex-1.4.3
+regex-1.5.4
 regex-automata-0.1.9
-regex-syntax-0.6.22
+regex-syntax-0.6.25
 remove_dir_all-0.5.3
-rpick-0.8.1
+rpick-0.8.4
 rust-argon2-0.8.3
 ryu-1.0.5
-serde-1.0.123
-serde_derive-1.0.123
+serde-1.0.126
+serde_derive-1.0.126
 serde_yaml-0.8.17
-statrs-0.13.0
+simba-0.4.0
+statrs-0.14.0
 strsim-0.8.0
 structopt-0.3.21
 structopt-derive-0.4.14
-syn-1.0.60
+syn-1.0.72
 tempfile-3.2.0
 term-0.5.2
 textwrap-0.11.0
-thiserror-1.0.23
-thiserror-impl-1.0.23
-thread_local-1.1.3
+thiserror-1.0.25
+thiserror-impl-1.0.25
 treeline-0.1.0
-typenum-1.12.0
+typenum-1.13.0
 unicode-segmentation-1.7.1
 unicode-width-0.1.8
-unicode-xid-0.2.1
+unicode-xid-0.2.2
 vec_map-0.8.2
-version_check-0.9.2
+version_check-0.9.3
 wait-timeout-0.2.0
 wasi-0.10.2+wasi-snapshot-preview1
 wasi-0.9.0+wasi-snapshot-preview1
@@ -129,7 +121,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
 QA_FLAGS_IGNORED="usr/bin/rpick"
diff --git a/app-misc/socnetv/Manifest b/app-misc/socnetv/Manifest
index 985bbd952d5a..4d50930b65bc 100644
--- a/app-misc/socnetv/Manifest
+++ b/app-misc/socnetv/Manifest
@@ -1,4 +1,4 @@
 AUX socnetv-2.2-deps.patch 218 BLAKE2B 8f9900b1f9a6d6e9e4a116d3da75aa743d7a193dce8136582eabfa9c183209d4ead2fa782d7cefa5366eb98f1a5e29ac20c8f0b2350982856c05826130b63fc4 SHA512 30fa3fda847aee54452ebbbaea8ae2439dc99fd5b79bdd41517d12effaf2a8e1355257b00e80dabb40e1502a169a8b46bbb98af8ead5239731d35a75b847db03
 DIST SocNetV-2.2.tar.gz 745086 BLAKE2B 3b520df2bb29f1989f744ec7e424caecd722cf3f903cf494e0fba9c0e5c1def413411768f593a3f8c0eb3cc20d1071d54babbd76eb24aac9f6670b4f2623ceb7 SHA512 12f490fd1f7fc1a6b45f77d23d8825117def0b7720595cd203d171fd88c41d5a0194a70359f55cbe2dab9e545f300156b31bb0680e46d7ab584e070e128e457b
-EBUILD socnetv-2.2.ebuild 774 BLAKE2B d85bb25ead5d9c6e31750b8c6dff9883ec1e3eff6a4413831e8a4319e719ca86691d9e38f377b17347dd00ec5989d3a2e6d4abfee0f28c0e1bce83d0272a1bfa SHA512 f2a3193ab0203b25bfe9f9f6c8f3afcbd79df1683aa5faf6bef58a49ea0612928ed204fde97d804c99aa5d2229467cbe00bab605b27f7a5d7b9c5d6c84e8e5cd
+EBUILD socnetv-2.2.ebuild 758 BLAKE2B 6e2ddd4164d44e33afc0605d0e712fb4161d973f50cd67d74d2d5ebd64a27b871741b8596bdee8cd1d460b2cb01f975181114d2d25ca11cdab3f8c0ad9d13f52 SHA512 bbab328b52850df83062f1ddb7c2b73ee8694a4f5793d79e335be6d4bfcb3588751bdef9c0d97278d6b8cf3092c7b5491773a836cc8071a4b43e8d4d01f8f5ed
 MISC metadata.xml 788 BLAKE2B 6b43e5250ed70aeb8f600e3a8ff344ff547a803619b29294b7290b49cd38e8a96c9e7f4605d667536261028cac19f75f21a9691eabfcd883245c6a8bc5e9b3de SHA512 1054727f278eb6cbd492deac0fee36b79f9b34804956df0c6df0a16a25af3a626aacc0f3476b0cf0d3d8197973cddd4e589be4b70a17f534fbc80fd91bb1b2de
diff --git a/app-misc/socnetv/socnetv-2.2.ebuild b/app-misc/socnetv/socnetv-2.2.ebuild
index 347dc4a70b7f..21357723af64 100644
--- a/app-misc/socnetv/socnetv-2.2.ebuild
+++ b/app-misc/socnetv/socnetv-2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop qmake-utils toolchain-funcs
+inherit desktop qmake-utils
 
 DESCRIPTION="Qt Social Network Visualizer"
 HOMEPAGE="https://socnetv.org/"
diff --git a/app-misc/supercat/Manifest b/app-misc/supercat/Manifest
index 25e42eb2f998..41f3c894b9fa 100644
--- a/app-misc/supercat/Manifest
+++ b/app-misc/supercat/Manifest
@@ -1,5 +1,7 @@
 DIST supercat-0.5.5.tar.gz 103545 BLAKE2B dfe8b823307fe39762d050e8676ff3f296b0ba206a618695fd3c699bc51d1c52cc552764ba52c45cc2eb0af2e8565a5dc4f86871489f082f15ba579aa80a51f5 SHA512 24989935ea7b863638165f7102ae511b9be00ff4399f433fc9ec2fc33543eea907b8bd46e819d815344c8c8467bc702b9a5b32aa55bd21be2670237fa1d711de
 DIST supercat-0.5.6.tar.gz 150193 BLAKE2B a289beceabee0bff8c25b3430803032c1192c470bd9b3ff188cd117dd60b58102ea070c7baa65bd3d5b05dc9ed9e7460fe92812c35de33ae7bed0bee1cf2cf28 SHA512 028c5935290a1e11520928b71024c29b0db437a6737c5f63d0a58dab3d855834b0ce2895fd86f6b5166cc25fe5a87845136fe3d6cf05df333cfbe5713cbd5f50
+DIST supercat-0.5.7.tar.gz 154020 BLAKE2B 8b3852d174863a1249bd71345049791827e2dba41e2d9d3426bdd2f98c395b01e804337813492efc46cd9c0950526aa26cc909f056b2f1f7c2dbdecb8129da63 SHA512 36b9d1e24edc8b83f0e87a401a99188ac53ab8b69c3ba2b196c5dd6d21b034c9522f729e4805238ce6cd28622f78c1e4dfbee93acd23ed2faa87da8e41d5647d
 EBUILD supercat-0.5.5-r2.ebuild 464 BLAKE2B 9f09fbfa9591fda52f33d5b3f9d7ff0669e47cf2eecfb045affb865b3c30eafacc87aa9e1aee87f13880b6c347f6fa1b3b14608c69e31e28c0bbe9743e5ed851 SHA512 b421f6c69d897326f2cb55789c1c55baa59e61b462406299806275a5069bb9ce41af14c559df3cb7344f57d4af586cc360b96c7792ad9d6aedf2b33fd8e50ec1
-EBUILD supercat-0.5.6.ebuild 468 BLAKE2B 476595af688da65c629f1ff51333fabe26f2fae1900ab320b999d5a5c7de39b81a5180f07bf74725a43f5fdbf7ed95de3018ca5cd004a01b30cfdee57113ae5b SHA512 7777e0194220a5f3b7adf33ee56975c01c1c3c9df83bb4861fbd89d2e680701756d462e232fecfa73007013839eda1ca8f5e5443cd8b5522422f71f0ab979e72
+EBUILD supercat-0.5.6.ebuild 464 BLAKE2B 9f09fbfa9591fda52f33d5b3f9d7ff0669e47cf2eecfb045affb865b3c30eafacc87aa9e1aee87f13880b6c347f6fa1b3b14608c69e31e28c0bbe9743e5ed851 SHA512 b421f6c69d897326f2cb55789c1c55baa59e61b462406299806275a5069bb9ce41af14c559df3cb7344f57d4af586cc360b96c7792ad9d6aedf2b33fd8e50ec1
+EBUILD supercat-0.5.7.ebuild 468 BLAKE2B b7efae4f0cf5182980af219af3dde0ddd21c504cf31700e30a563f56a02d5db9b485a7f1812a572d9e6c992dac3ff3797c1a4aed1481b8ec7f22dcb707046745 SHA512 d6dd32b40262c2b8b55e2be5d66cf74f46b9441cc05c2ca602c7c31f134a064daaeed31c13652fe07c1ea9e3cfbbbb92b19602d83bbd8604243c59f29b5ebc47
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/supercat/supercat-0.5.6.ebuild b/app-misc/supercat/supercat-0.5.6.ebuild
index c64ec1a774f0..2a8cb2b56f5b 100644
--- a/app-misc/supercat/supercat-0.5.6.ebuild
+++ b/app-misc/supercat/supercat-0.5.6.ebuild
@@ -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"
+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.7.ebuild b/app-misc/supercat/supercat-0.5.7.ebuild
new file mode 100644
index 000000000000..9edb488358eb
--- /dev/null
+++ b/app-misc/supercat/supercat-0.5.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A text file colorizer using powerful regular expressions"
+HOMEPAGE="http://supercat.nosredna.net"
+SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+src_configure() {
+	econf --with-system-directory="${EPREFIX}/etc/supercat"
+}
+
+src_install() {
+	default
+}
diff --git a/app-misc/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
index 232e0ef0d8f3..b464fca8bad5 100644
--- a/app-misc/tmux-xpanes/Manifest
+++ b/app-misc/tmux-xpanes/Manifest
@@ -1,5 +1,5 @@
-DIST tmux-xpanes-4.1.1.tar.gz 62564 BLAKE2B 195221c5f069048ab42a57a00c4c8b79f0c2acf1b0cdd7096e553c9a5ed0b3e3b3e9dfacb8f2eb141861b34ef52ad0a675fb501e314d7e4bfe4a41ff4bfd9f35 SHA512 789e19136faa939670cf8e91e7e7979fae8e536aeffdad7d39e1861e279214985d40807dc07afcd8b28cc4de140a944c9b2f5fe051a6b53e12b7903baefcb251
 DIST tmux-xpanes-4.1.2.tar.gz 63337 BLAKE2B 1ddc0c0422eec64697aea7eb97c8bbbbd4005f4c470d5d0bf1fae4eab01d8ced50503180f76d0ed5aa9d29e854b54aab8f8216ac945e6c1c2e4b4833c5661ceb SHA512 b18445940052a6af848286b901bfd81abfbdf83356cd1b39ac592e1509c9d63b81440978a8c2632672bfb7a2429a7fcc57b7c55c91a00d751b43aa9f368a5c57
-EBUILD tmux-xpanes-4.1.1.ebuild 691 BLAKE2B b8c175b1dd8fb6679c3d3f408d79c0011a00bf0e4fdc3cde75cb95e08a984eb94fd65260af4137537e2f9b2a3da6ae64d5d85928e547526752e3664e38fc58a1 SHA512 f2cadcf49e4fc4b44cee75bb3a3202469fcfa65022085310d880da0ad23061f66a09e00a6b61c912dff2af81faaf1798f690ee807d35df00ead88e9c7f651251
-EBUILD tmux-xpanes-4.1.2.ebuild 693 BLAKE2B 74fe3d886da59e65519fe1ae3b324c4028ac000c94809fe9e0c5e09ffc8fded90d1ba0594ac545d8088a489e0848c2c2e03447ec2548ddb5eeaa560b444f88df SHA512 7784f7bcfd13c79c5a44f0a5d9f2b08fb4621cb424ac32ca5fb9110770713f4ca41094d264e9bdf5ee6ef8355937a0f0412e53bf56ff587231db3f60035a9f5a
+DIST tmux-xpanes-4.1.3.tar.gz 64101 BLAKE2B ec7e025adcfb2436b416a37de87cbf335bdc92d7653a65be9299c10993d273746a0678ee3e418df483697f1f2dd556063e98d984006e2137e2cdeb6f8634f75c SHA512 6545ec75a522b05eb8079c93830c81ac3c6a9ac338a3cc51c491f69a4602bef5b9f19c9f18b2975d0470c4af0a83ebf2357a4461024508ff0f6ac61d1099b22e
+EBUILD tmux-xpanes-4.1.2.ebuild 691 BLAKE2B c8c07e13c12878e54d347c9e4fd08b99710fcfc449abbba9f4c0c39ae4dba2ad8a5f463d34208ca5d15d60bc9eb9437e41c87ea1c1e9881917d695bfc64c76d0 SHA512 c339ac55bfbd1b01f7d5b2875d99474f1a2bb7185a346102fd48d50152b9bed886d269666571b0e7396b715bdd191f1c702af286747a80e9f75609027895dff9
+EBUILD tmux-xpanes-4.1.3.ebuild 600 BLAKE2B 6a0d2dc689bd865c124399d52f1a01d75e685c737a0bb2194de86dd0b90b23b9a6fc075ed2b817f1ff8b4c0a8741f740ba32c836336f846a2ad565e27623e636 SHA512 06a5f75f9c4d3fed3c8d10cfb191820b639b83e99b88b021aa4b4ae303a1a98c3d43aa87ca045a367984a49b45558b701faf424bdd9afd6fca4e5946a12dbab9
 MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.1.2.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.2.ebuild
index 2b3315319df6..ed4e2949a395 100644
--- a/app-misc/tmux-xpanes/tmux-xpanes-4.1.2.ebuild
+++ b/app-misc/tmux-xpanes/tmux-xpanes-4.1.2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="tmux-based terminal divider"
 HOMEPAGE="https://github.com/greymd/tmux-xpanes"
 SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.1.1.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.3.ebuild
index 389f67028568..1f0e2733e1df 100644
--- a/app-misc/tmux-xpanes/tmux-xpanes-4.1.1.ebuild
+++ b/app-misc/tmux-xpanes/tmux-xpanes-4.1.3.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="tmux-based terminal divider"
 HOMEPAGE="https://github.com/greymd/tmux-xpanes"
 SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
-
-IUSE="zsh-completion"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	app-misc/tmux
 	dev-lang/perl
 	dev-libs/openssl:0=
-	zsh-completion? ( app-shells/zsh )"
-
+"
 DEPEND="${RDEPEND}"
 
 RESTRICT="test"
@@ -29,8 +26,7 @@ src_install() {
 	dobin bin/*
 	doman man/*.1
 	einstalldocs
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins completion/zsh/*
-	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins completion/zsh/*
 }
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 54aa1f7298eb..749d089649b0 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,9 +1,9 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 AUX tmux-fix-bindings.patch 1105 BLAKE2B f84d6e95cdeee0022aadad5895697f0003bd69178669faff688beb740130a1bf87808cf08c0c7cd51f9e4dc3fbb302c43de479fc38bc741b71fa6a22441b5e02 SHA512 01d379bc9f0ac118744323b0c5beeb80c8ee7de307bc120b4e87b2eb64a615c52846c3b66a14272c81b51755ab96f18eca08db49b40c65575bcf394ce679594c
 DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c7cbff15febbca6da9f7626c675fe1820b344637ff0fbe94ae6d0da7f111880ce5d74f97c4b6a90ceef802 SHA512 aad2e6457dd350369f245f711f1936a575d0588b72e660d10e7abc7d373da0d322903b451ad00b96a3e0e6847ca855673da6a4c5447cea91fa756edd23659397
-DIST tmux-3.2.tar.gz 646457 BLAKE2B 64896c4f76f3ea02a7fa2d9a8e6c67779777265e450d5576bc6254f824512826a3a2ce2abb9e11b82b707bd18c70688b69a162c23287d6581874752fec27a51c SHA512 63165495e838871c7f42ac1a6229ec2404acfa7d42c7a0070c89cb38712ac933676930392b0a10cbdd6059910ae46129257b90135c5846e85142e786482fd75e
+DIST tmux-3.2a.tar.gz 648394 BLAKE2B 94527d4d1016caddab170b5bbfd181514768474898314241fb65a53a1f5ae94863bacedf90a7543690c115d15295960dfab4d5ba2ce31cd105585a73fb9b82d1 SHA512 6e52c7f5d03b2c8b8c4c8caac092a166956ba97334b426f2823d74dc5849a1d31a80145924f641f69dd2c244809e9350d9bd7070897fa2e3e1f9f086f9b2f365
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-3.1c.ebuild 1666 BLAKE2B 4e4a0a6cbc7a1976647d5272f7a479b06667d49d496567bcfe38ac8d8575b80bb41231a8e34b98c1ec85871dba2381a8ce875250a99052309b2482446837ce2a SHA512 17cf8aa479294119573612d233a5cbba52e4027d5e6a5707f02b2cec4f8408e898a0a095f8cc7e8421bfcedc8f96c06582400f0ae5117f819c517a8abf600cb1
-EBUILD tmux-3.2-r1.ebuild 1713 BLAKE2B df7ae0b6989eb54fd162cdf44890de8433cbf2bd33f7a47768eebe5abc7bc9c652eaf82f1abcd5d9dd9e0b2e2c377bbbb1e24e5aaefe3f7c2238a77075a54173 SHA512 3d08352544c41f6e3a1f56000a6b4a828e3d307334beb34f4f0a06e886bf1d075b03b26daaff4b077eea94c76f18f6ab6a6ffd79ad110ff447c71d80be3720ea
-EBUILD tmux-9999.ebuild 1675 BLAKE2B dd1f1b897f0d4f01d42a2457c3129bc770aab3071c50d62419fe1f7a417c7268498bbb3587f151deb9b969c270a07d954ef3f647c7d359959c65f53e6bfd22c4 SHA512 334b04203f906c529679e1ea082b7ed7c9756ba81a424dec393924d05b4b6643ec8d12d0e831590d33533e80ec89f2d24dc74c2bb76501146cccb86d33217019
+EBUILD tmux-3.2a.ebuild 1645 BLAKE2B 989ceca7f7360b197023c28bedadc6d2c34546a58a24c8bede8d732df577fda815d0c1ec6d3ce150b052d2880af109bb1fff6a94cf213a7170ff98d49464c710 SHA512 965f4ab18c5f2292b8af638a87277cb56358fcbbe0b8ac170b47810194d530c3bd244fc977bacf227394d19355f9759fe5d3c5be715cbd294db3c405fa2fbcca
+EBUILD tmux-9999.ebuild 1647 BLAKE2B 1e438f3e076ecc281fa1fd71185dda46a094152191c45ce7343d1a888ac5d8fab3d3e7e84b4916ce3153ef57d431ab2065247bc57d57765aaed4641d8006733e SHA512 c1bb99f996aeb30f1faa040ab5b006aedbf7c2dfba381c62d9c95385770b5740b42681436e4c467bc58ddf6f63895f2805f3503fdff8ee571de8ad1f8403c8ca
 MISC metadata.xml 816 BLAKE2B 57b1d27728b6fb3557e53a27bcd0f116fdcfe88175f3ceee0064beaeb14568852b15275051cd6ec8ea5cc3ce9efa7e1f084d74791b60eab12a5e6c835321deec SHA512 d459641a31d19297ef85b8dddcb487221eebd25e4f3d8d0e88c7c394654e9b60e58a60433c21b32ff24226f5c4d16e9e059b5af6330bd0698367019f0740e2e8
diff --git a/app-misc/tmux/tmux-3.2-r1.ebuild b/app-misc/tmux/tmux-3.2a.ebuild
index 11298a03e488..4039d86b4da0 100644
--- a/app-misc/tmux/tmux-3.2-r1.ebuild
+++ b/app-misc/tmux/tmux-3.2a.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+IUSE="debug selinux utempter vim-syntax"
 
 DEPEND="
 	dev-libs/libevent:0=
@@ -42,7 +42,6 @@ DOCS=( CHANGES README )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4-flags.patch"
-	"${FILESDIR}/${PN}-fix-bindings.patch"
 
 	# upstream fixes (can be removed with next version bump)
 )
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 04927c56269f..19d2a1bee137 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+IUSE="debug selinux utempter vim-syntax"
 
 DEPEND="
 	dev-libs/libevent:0=
diff --git a/app-misc/tmux2html/Manifest b/app-misc/tmux2html/Manifest
index caf7b2638a78..b6e9d5baedcd 100644
--- a/app-misc/tmux2html/Manifest
+++ b/app-misc/tmux2html/Manifest
@@ -1,3 +1,3 @@
 DIST tmux2html-0.1.11.tar.gz 20002 BLAKE2B 690e170bf903682a9bdbbfa49ec7a2995d19bfa9372533b5cecff5b7dfa4c389832a8e2315c3438d435c3b4f75bec8b7fc43161691912ef29d910779d46af24e SHA512 b478a697413acd90a92b3a349fc3c477ee1014f47816190d2066058711e2025a9f99e3f973dfd3165782a566d12aae4e3c491f58a924769d1d28c3f48c9e9601
-EBUILD tmux2html-0.1.11.ebuild 493 BLAKE2B c8b6d6cb8ec4797baf493e21353b7202b53b2376fa657322580e22b5195793c7df5d537e327c751f8784a3da60ae3bc18816c19be215ce35a9ee88751bba6987 SHA512 a6004115cebdcdb87cde5689670449ce3f7f71b57730016efc4cefd3391df4f31614515c39f3f72d01c0360a1cb9ddc07f152e2c8cfaf06c05a5684b7f1be1dd
+EBUILD tmux2html-0.1.11.ebuild 450 BLAKE2B 772c68297b86fd079f46cf3bd722495258bf2eae066646eb593ad78ab3e958b8dbf9074a55ac5d259c89f553b454356a7ea6c42fbc57ef30979f3cb2d97d55af SHA512 9a14849fddead3f41b3ae46903b51db2ebf98b73fec9c43270dc84251b71f069472409eb45873ed5a5da6b1e9ce47ab5b01820d33e5cab78942883bfe62dae89
 MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux2html/tmux2html-0.1.11.ebuild b/app-misc/tmux2html/tmux2html-0.1.11.ebuild
index 0fcc41677421..5ce689120ef3 100644
--- a/app-misc/tmux2html/tmux2html-0.1.11.ebuild
+++ b/app-misc/tmux2html/tmux2html-0.1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -11,10 +11,8 @@ DESCRIPTION="Render full tmux windows or individual panes as HTML"
 HOMEPAGE="https://github.com/tweekmonster/tmux2html"
 SRC_URI="https://github.com/tweekmonster/tmux2html/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	app-misc/tmux
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="app-misc/tmux"
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index d452c8fc0913..c35f38e45e69 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -6,5 +6,5 @@ DIST tmuxp-1.6.5.tar.gz 1017117 BLAKE2B 4cc8955f9dcfffd237ffde3e7487496aaf85dd88
 DIST tmuxp-1.7.2.tar.gz 1027293 BLAKE2B 2564d196c9c327584d24f57ce72165a7cdff2209fe6869a4d3519eb0246329cd8159ecaa20c2a39e153bde224201b1f846f4244c4df72ac540cf0d71f9fba75a SHA512 2ccf63c9f5b7049438ca6079894aac92a0f7496a56c68d88e5a9d5c2a42188a4e40d559792857881f492b28392a329697d4d43781f38ee7c49ed592aac8a69f8
 EBUILD tmuxp-1.5.4.ebuild 964 BLAKE2B 643aaf5a7db258f05164547d93e0dc4a63af82a79048a247f08bb8e8cbd5ad5bd71d27e1c708f4f63573424ed70804dd66a6e25b62460e641339bc4426384444 SHA512 f9ed588279ec0739ffe842847a271144c8418d1dcb1aa8190816320eb621a1900b77a1a5bdb5dc037a0b12cd266b10334c72562e8b0444acd5cbdabf3e74a061
 EBUILD tmuxp-1.6.5.ebuild 1122 BLAKE2B 005720290707591c2291ce5f5431fc10484945080fe3d62b437966acab6fb6395f031f24793cd6a9b2321597e7f0dbc8341d541ebf9ccff2870f8397f7485b3e SHA512 f4bf6bfaab0999505f3822139d9ce10128e57f56a74d42ece314c900d128e9a9f8042e40f722e4776ab35cd990041193cc476b1512649a284f34cce88a357864
-EBUILD tmuxp-1.7.2-r1.ebuild 1029 BLAKE2B a264f707e3898bdc8fe68ac47d91c1c8e59f899de1597f47f7fde1f6d1e26574618254a00de7e651050ca8bee83e3b90b16c2f8c9396d3bd82cad181ed45cbf2 SHA512 8cd38a771c382a6c466856d5bc9f0b46ee872abfde0d8d3438e063da87f64fe2a5c5fffddb5fb6e7d0cd95fb11c833084961190bc790ab13bbc86e88dccebe1a
+EBUILD tmuxp-1.7.2-r1.ebuild 1028 BLAKE2B f85c50f310a394e8c04b9becfd180956aad59b4ddb9b24313d107d03a567892032977b1cc6525edfd25d33d582aca9c4b2e3b19d0ebc2b099340a553bce2c558 SHA512 896e236ad5a5b537c7f53b2662c06d07f9c37378f3259e5288a9b28095157f97050bdef41ba46fb7051fedcbff318d7de1e7d58eb42b7d747288c57c68f40f3f
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild b/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
index d18a7db82370..e6a24a27eaa0 100644
--- a/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index d6ad3ccb1b1b..7ff13c0f2820 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -2,7 +2,9 @@ AUX 2.3.5-fix-autostart-build.patch 3518 BLAKE2B e41b39cb8576a533bb4e1bae9b96daf
 AUX tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 857 BLAKE2B 25e6a69bf2d868b5ab9045e4f890079a1edf81fb737e74beef7ac3037366bdc0986991aeb94053f0f027287e824abd2a4e0cc6a9ac94be680f1494bc0c4abc20 SHA512 112772fcf646a4b4c81473ac28a74f31706f41340c3867cd8272ecfb5b512158fdf4ed4756fb2d661883faa8478f51ebed897744582b42891e78039eb170139d
 DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
 DIST tracker-miners-3.1.1.tar.xz 4066784 BLAKE2B 60ae0141b295f08f9fce92b2697adcabfa1c7dcadd32759a5283771e6c98aed03a2f9a2afc8c60138a3c3590d96b59fbeb844dfbd34acb89d83dd40d1476858c SHA512 d7935fd02e0971a377106c65005b6ed4fdcc2c147f698d3cb36fea8e78019050e8b8ae5a407dea9809196c0186b8969c923767445249a85ad8b81a10e07c242f
+DIST tracker-miners-3.1.2.tar.xz 4068980 BLAKE2B ae396ab4bbfd9043c0514f815fa5968da8c6103cd6d734b2a270b450ac6ab0905f080859fd44b94c1e7b08e681f67275066e8ea49b8d14a544163c837a499ba9 SHA512 c5f65d0928512156bad3cc90f51374052afdd5ca70e6c151ca76a2ab971515ba10b967653cc9b1c94ae979f83b1ebfb6355f1d5a452982a89d403aaf7df70d8b
 EBUILD tracker-miners-2.3.5-r1.ebuild 4728 BLAKE2B 5c6b74b18dbe2aebb821d1d2c193c67e3503ee9fc1f9681f1ebc2858b57499a05ffab60cc0f55570f6594ef0d1238628d3777a4d5941ca982013424674d16133 SHA512 d0091dac5a17251612eeaf422bd7f4a62c2dde7be38c936295a8ed3ab98dd0d69a1dd610b8a4b121e2419fd28ec23a4559da4c3895f0188e04095612e64d6b08
 EBUILD tracker-miners-2.3.5.ebuild 5001 BLAKE2B b683e12c111b42c22a1703d14490809af17d54e1bc2943c2f208706eee6b715261a2e39a923d4d622a224f402c32bbae41e0eff45065dcd63848358976c1694d SHA512 ab5f4f7bcb7577ee88d96c19ebace33c85e4b71b54bcaf903a54e837d99e59575ae0c426bf61f9e93e2a85053c4e9609d80d514d2ce85ca1e343bf2ced27f8f5
 EBUILD tracker-miners-3.1.1.ebuild 4668 BLAKE2B 7e785ea49f4e2f4e2e19c9b76889c99eec0a1c642073dfb08b454307c8cc44ed57bfe5cd000e119e3e528da3f4decb5c32f712720d474a2a6e5141ef317422b2 SHA512 c2138579041f5327730ad5522c576a8f68e63b67d684d5ca7c90c416b79f0e94eb9ad355efa621888eb72c6cd335a7045f843c4a2ff91476ba085113b3ebb77c
+EBUILD tracker-miners-3.1.2.ebuild 4678 BLAKE2B 597142a5e3198eb2bfe44e0366e5433cc39ffe32cad39a71a29775409412e4d3c9c442710374b963e3eb9f0c5ac8f6c5fe7b23863b080554b64a46a826bd18b7 SHA512 75f6fb9c37ed38fbe14cfa26a2121b582c0b3b573618ddba9a6373f6cdea1929766b5c877a3fae162a091de525ab4020b6d9a682ed5bfc4dc89b2fda36c1a050
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild b/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
new file mode 100644
index 000000000000..452c580cc45f
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# 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.62:2
+	>=app-misc/tracker-3.0:3=
+	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:= )
+
+	networkmanager? ( net-misc/networkmanager:= )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	dev-libs/libxslt
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| (
+				media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0
+			)
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://gitlab.gnome.org/GNOME/tracker-miners/-/merge_requests/323
+	sed -i -e 's:environtment:env:' tests/libtracker-extract/meson.build || die
+
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	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
+
+		-Dman=true
+		-Dextract=true
+		$(meson_use test functional_tests)
+		$(meson_use test tests_tap_protocol)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature networkmanager network_manager)
+		$(meson_feature cue)
+		$(meson_feature exif)
+		$(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)
+		$(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_dir="$(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 6d82d23be221..dee98745ecce 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,6 +1,8 @@
 AUX tracker-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 835 BLAKE2B 70e949f1e385b237a154cbd7c3f3130acdb53761f6f6eb265ec591d43aa951db538765fb8b6d16f73a8ba99a53691610434a54e491cb85c8fb9350d5a00e8456 SHA512 adaa1d7f468186de0ec3d5ddecbf84518f08b3802c2d62d2f6511c68ae2b455c154e7fce14b57cb091f4a221a7fe32042ceeffa5095c22f8ec70ffbfe49f7de9
 DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
 DIST tracker-3.1.1.tar.xz 1434784 BLAKE2B fa73420736e82bc7a43ef9dd9dce9096e50a22aca3f83737a0c77802460fc307630403bb836a799ff2d03a838cd1e71fbb4a17a54fa0a7c823e122800530e050 SHA512 87e6cc6dbfb34cc17bef42defefc51fc9d9586bffebf7a282a89ec3b294e911c504ea862bb05e5a269e438a83fbeb8938670eb32fa11d0d09ba805e0b02e6dcd
+DIST tracker-3.1.2.tar.xz 1429356 BLAKE2B 2401ee4d73aef29a40ff9c9f917fdf4709884bc26b7e8c5ae52b0e009bfd1934a122a78adea2fe6950480f4ccacb89d11388b4553bd4c0c68f5738118d34d3a1 SHA512 3c5feb658d7d3e35bcc61ef216e59b069df661d6f13de6f26e71da35bd0ca78878099d1ae507da82860d955954f971ab68d5a3b86a3132781c3f03a12dec1f0c
 EBUILD tracker-2.3.5.ebuild 2591 BLAKE2B aa8a651907b383dd6b52ce9097ed0fdab39434245538141b76a8e6fe6bc1bcbc79cfffd607acfa67883cea86b6e55433e4cf5ed552aa97d53ab10d534b07205f SHA512 5578c76065635b94c67319261f7b66d4f222bf12c922b157c880bfc3a15a7ac47d1c389888550981f083417cfea3768aa609f914889eedd2004e973afaac12e8
 EBUILD tracker-3.1.1.ebuild 2506 BLAKE2B 2f2319a938386cefe0a31ea8d11d2770ba2c28fce0e72483fb090052336a8ce49a9eb02b16f740e5c258c972d6da9601895e8e6443b16d07c8288e45ab508c4b SHA512 5e3aa5b23f710302c24eaa681a9ee83d947810489ef7836728cbe780e9beecb7f6b6428b746ce40d223f51d2c8a7704d144ddb595f76842806f7ec39a29bf8ac
+EBUILD tracker-3.1.2.ebuild 2516 BLAKE2B c6c098875b00e9dfdb9c9104c266e41c7dea4154631cdbdb41e24e7d4f285b51dc1446927cd779c8bd525ca7abbefe32b1c449213cf86d70086bf64285267d47 SHA512 55b66a1618c4837d88b93e320c40e9fcc7fa3c3381ec0fc2d6bcfe66f3f502ba8edc6e1885c1cdb8ca0a822157b69fa8d9c21d44f65ab3620c5e2bb7119468bf
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-3.1.2.ebuild b/app-misc/tracker/tracker-3.1.2.ebuild
new file mode 100644
index 000000000000..3071ccc4456e
--- /dev/null
+++ b/app-misc/tracker/tracker-3.1.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3/0" # libtracker-sparql-3.0 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +miners stemmer test"
+RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=sys-apps/dbus-1.3.2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.4
+	>=net-libs/libsoup-2.40.1:2.4
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.29.0
+	stemmer? ( dev-libs/snowball-stemmer )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/asciidoc
+	dev-libs/libxslt
+	$(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
+	test? (
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+	)
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-Fix-asciidoc-manpage.xsl-location.patch
+)
+
+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
+}
+
+python_check_deps() {
+	use test || return 0
+	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+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)
+		-Dman=true
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dsystemd_user_services_dir="$(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/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index 9ebbfe3d826b..c2cabc4b97f4 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,5 +1,5 @@
-DIST trash-cli-0.20.11.23.tar.gz 69229 BLAKE2B f3650a037f00e6ce8cd7bd1ff5f3e11c794ceb09563193e2930eb9b81cd40120dd48f117e8c96d900a8221db9a68360ff633e591367bd544ad07045b1a505304 SHA512 d370687da706677de61c0d234d4cb4db4ff4d9da8cde60c361d11eaccf319e2e418969a7d49ec6edd456524b1275b63d1fcd49bc9a9012afabda1c7a8ad7de78
 DIST trash-cli-0.20.12.26.tar.gz 74542 BLAKE2B 558e3cc043cdaef44bf68317e666c6f757daf9feeb6b731a57aba91ec983e1adb1e404f7e8428a7bd1225d83df6e94e8b9b793942bbb233f09a44127af0a42fa SHA512 d0b0a97014c888ddda95759dc82837385a2809cae04bdf6a84dcf0233dc2cf9370253110bc5fdbc5c4452ebb65c5e7836fe1cfaa9aaabe38d34269724456cd1c
-EBUILD trash-cli-0.20.11.23-r1.ebuild 598 BLAKE2B 1fe9975c5b1f7a8646cea9f25c487ab4b84095c4a010d80ec8bc21dc77cf283ad726d09ee0c13227cbd145aeeae25d2444f6ec0e7510c3c8356992809eb6604c SHA512 8449369b777c9460106660ce57929a67eefb1a3f3e247f020070c5b863340c48c2b79f825eff77a783fb5a44a3a3f0a883c963af22de0319427d9c22ead88c3a
+DIST trash-cli-0.21.5.25.tar.gz 77067 BLAKE2B 5db46b21ba33b9076ea7f024b93e62f30b3671f44a024b30013369607bd580f0ef9831debd9fdc6c64575ab6edde14aa921229bbd16a6a77657b7ed20b58c318 SHA512 75ef338b356048768febc4afd42933d8aa44cde5156e386968dad7b33033b84becaef3d39ccf15c02216394735f37d1c7c8cd499000068d51247710e87590507
 EBUILD trash-cli-0.20.12.26-r1.ebuild 598 BLAKE2B 1fe9975c5b1f7a8646cea9f25c487ab4b84095c4a010d80ec8bc21dc77cf283ad726d09ee0c13227cbd145aeeae25d2444f6ec0e7510c3c8356992809eb6604c SHA512 8449369b777c9460106660ce57929a67eefb1a3f3e247f020070c5b863340c48c2b79f825eff77a783fb5a44a3a3f0a883c963af22de0319427d9c22ead88c3a
+EBUILD trash-cli-0.21.5.25.ebuild 574 BLAKE2B 31409aa4cdf69f1daa528f34c997bfff42ee0b049cbad6c7fa46b15f23aadf8fbfc564ff35f44e9237c861841b3c802bdfe05e2b38c5b6edd62589cc3af2ed01 SHA512 867ab0e00dcac1d6d8d1471772b74e4527a958f0b38d9e272cb080ca2875ee1830adba534f6bd860d1e0e298c0ba6d7b160f54e540ac46d7992e60d9bb7104cf
 MISC metadata.xml 1094 BLAKE2B 25187a31e5ffc666c680bc9970599affa08b76be31618489fb698e9a4581c75e75385c32c1ff65a10c6749222f813e4a783e657f9b142cfa2283ab863be3deec SHA512 81dda2f222de76ddf74f37e19afb498b0cfd37ed6583dcf92adb2a8ce64566c2b8360cca535bdbe9343c04563894257a74fdae3df2d9bac20e486f3aa7c86417
diff --git a/app-misc/trash-cli/trash-cli-0.20.11.23-r1.ebuild b/app-misc/trash-cli/trash-cli-0.21.5.25.ebuild
index c27b8153f31a..de8339c9926f 100644
--- a/app-misc/trash-cli/trash-cli-0.20.11.23-r1.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.21.5.25.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
@@ -14,7 +13,7 @@ SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	test? (
@@ -25,4 +24,4 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index ba9f70c95e81..3280bd27ff5a 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,4 +1,6 @@
 AUX wcd-6.0.2-gentoo.patch 1466 BLAKE2B 2e6834d2f8f742b1582667c0ee3b0ca974600dc26a1e270bb1ea7be39ac266c019c8464f61d332c2919a5543581c9b07000ef8bdcbece7684d1046b808af920a SHA512 33ed7d9812676b5cd478351fecc31e12dce29c8e4c5b28d44b3580ac01074b631906fcd0bcea0ad66a6fcb72ace3cf13004f492c96d8a5533af7c8500ea5e703
 DIST wcd-6.0.2.tar.gz 713062 BLAKE2B 13a745fd698b009aedb19e688a5deec7d62c42acf2dc430b7f586f300712ad684e8530a9b2477cf2d7a6540769efc98c245215cbe756b78c3902d03430b034d9 SHA512 587a52efaf0a585e4fc8a04a0eb08445cf4c78d38abd7592658f61827aa6cc0f1e8af8643c411d22d74145479c9970b018b11fc7a2a08b4ba7c850097813b06f
+DIST wcd-6.0.3.tar.gz 813763 BLAKE2B 2e215c427914705213590d7c5182bebf39becbf24238bd71c5fdd12f7e63894b2ad571793f6d25833edd3f7cd4f3acbb07bbc821880c22d7a5d4f373cd972055 SHA512 b48a6f8a196725b4b570701813cf8a96e13e4fd6289b6c779218acc20ea1ea841e5f8648f717bb389976b715b95856e91bad3ffb20f8d80961d75eae8eacfbe8
 EBUILD wcd-6.0.2.ebuild 957 BLAKE2B 51c8469cbb8aa1e8963424ccbc695c6e0cd4d00b4a3053d17d9111fab43d0df59f4ba6462ac298d054529ddc7a2440eb1e50878628d0ec0d5dcf9861f70dc149 SHA512 e8526905b7d8a0a8f623247bad7ab61a5f0cd21f152cb0fdd5f0f3609fa89dff4a1f600a6afdba7fe391b9fa48d49a49136e90c39d8a87841c3ca93ed5b0a5b9
+EBUILD wcd-6.0.3.ebuild 971 BLAKE2B 764cafb6f5c3877b79b65467f069527c85e2603c38aba63978eab87a0a988c6da43070c461215729fea7af752bbaad7bf82b15e47ac8cfa0f19fcc26f35147fa SHA512 b31928aa7e27ad6aa8883ac0395d43598d72a008c07ed6baf6876befa413a48ee8a2a62187790677265deba90097b0d42efb344893576d311bc93664e1974eac
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/wcd/wcd-6.0.3.ebuild b/app-misc/wcd/wcd-6.0.3.ebuild
new file mode 100644
index 000000000000..7f6410ba6713
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	unicode? ( dev-libs/libunistring:= )"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	app-text/ghostscript-gpl
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
+	eapply_user
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	local mycompile="LFS=1"
+	use nls || mycompile+=" ENABLE_NLS="
+	use unicode && mycompile+=" UCS=1 UNINORM=1"
+	emake ${mycompile}
+}
+
+src_install() {
+	local DOCS=( ../README.txt )
+	default
+	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /app-misc
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)