gentoo resync : 29.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
commit: d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree: 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /dev-util
parent: abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)
85 files changed, 950 insertions, 1789 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index accdc8e57e54..32da1621afd0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index e48cdc745f74..49ee916e7960 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,3 @@
-AUX 0.19.1-no-libevent.patch 2262 BLAKE2B dc743112a7addd9abd0391cad7fd15d0060cf666c0fe13b6edb0eb065b49cab18099a9c812df560ebb456e57bbab64f65a4e2617fd262fff53e88eca62ec9b53 SHA512 6d8aad17f504b862d5f8f093db6cfa0db294b6f4130fc74116059400ca39833d75454c66b78644713480dfb062484354a1c457dc2e39c9f0ff27b8ccba5539d3
 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 EBUILD bitcoin-tx-0.20.1.ebuild 2436 BLAKE2B f8bfc55eadddefe07189dde452ffb72139a7ce54d8fc859bd781dbba02118453c85abe5f47c5d517cbf266b046ec88e2baaf390eedff237612c0859e60aa9502 SHA512 5f2c1b325870bb62756b42541064ee4004cd514ef56505b1fae5d8bd2ed50201e9c774473443349227cfafa53254a131961877e48b7d6351c44adb7b660d2700
diff --git a/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch b/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch
deleted file mode 100644
index fa29f8bbac97..000000000000
--- a/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1271,7 +1271,7 @@ if test x$use_pkgconfig = xyes; then
-         BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
-       fi
-       if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
--        PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
-+        PKG_CHECK_MODULES([EVENT], [libevent], [use_libevent=yes], [AC_MSG_ERROR(libevent not found.)])
-         if test x$TARGET_OS != xwindows; then
-           PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
-         fi
-@@ -1291,7 +1291,7 @@ if test x$use_pkgconfig = xyes; then
- else
- 
-   if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
--    AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
-+    AC_CHECK_HEADER([event2/event.h], [use_libevent=yes], AC_MSG_ERROR(libevent headers missing),)
-     AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
-     if test x$TARGET_OS != xwindows; then
-       AC_CHECK_LIB([event_pthreads],[main],EVENT_PTHREADS_LIBS=-levent_pthreads,AC_MSG_ERROR(libevent_pthreads missing))
-@@ -1545,6 +1545,7 @@ AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes])
- AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes])
- AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
- AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
-+AM_CONDITIONAL([USE_LIBEVENT],[test x$use_libevent = xyes])
- AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
- AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
- AM_CONDITIONAL([ENABLE_SSE42],[test x$enable_sse42 = xyes])
-diff --git a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -523,10 +523,13 @@ libbitcoin_util_a_SOURCES = \
-   util/strencodings.cpp \
-   util/string.cpp \
-   util/time.cpp \
--  util/url.cpp \
-   util/validation.cpp \
-   $(BITCOIN_CORE_H)
- 
-+if USE_LIBEVENT
-+libbitcoin_util_a_SOURCES += util/url.cpp
-+endif
-+
- if GLIBC_BACK_COMPAT
- libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
- AM_LDFLAGS += $(COMPAT_LDFLAGS)
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 2daa568a6d89..30014561f1ba 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,5 +1,7 @@
 DIST byacc-20200330.tgz 872217 BLAKE2B 870ac1eeb439c96875e343223925414115b500d5b22ccdae9d7b30830ff6805d18d5bc43ec6f7ae1237ec500cfa1693aefad6e9607cfcc74188b541abfd16595 SHA512 df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07
 DIST byacc-20200910.tgz 871242 BLAKE2B de0f63b9edfb9451e23d7693daaea59f2661305a6727cd8e986c2557e513ca5dda8f0008d05b5c8f35a153a309bc4b02ecd6f45219bb553f928c9da11b616130 SHA512 491bbde2d5b0fdf2ad57bec5080112ad7c12ce3830b5e14f2289092aad1addae6edd4698368a9c8d69219a95ae5fa47eb32a95a2625841915297972591bebea3
+DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552d522be5de78bc74c0c52a7e0b7fbcdd31e209e7269d9e00e2449cf7162ac5cd0a1f2060e051f8fca2171460 SHA512 95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202
 EBUILD byacc-20200330.ebuild 596 BLAKE2B adb7eb7cb5d6c902850f1b451eb1c22b2d22bb38cfa18f64ad0445ab46a2fb2b440ca99aef7b16e60d56df8ddea63ac0c7b974283fd69960e0f0fa1f6690d694 SHA512 4cebf2976f97b5cc6efa053cda9d1467dea1aa1a1c8d56eabe3530758bffe718948a081e699f4d35ed80a56b6a1d7c1325f54b58935a1a461c2afb617a561e6f
-EBUILD byacc-20200910.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
+EBUILD byacc-20200910.ebuild 597 BLAKE2B 9c1360fd26055fe88c066b075297e576d13954964edc3b1936e8a1ac054ff3ad8b48049ebe5c18b615fd6a984180087b6b011a514ebdff7902cce415cd4edbf9 SHA512 e02f7cd0a7e27a8d4d788e52ae6485baea000526b56ebdde56816980922de717e5a5dc4ed0bbbff1de18393b81fb91f061005825822b40d248a960db50791fce
+EBUILD byacc-20210109.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20200910.ebuild b/dev-util/byacc/byacc-20200910.ebuild
index 556684fdc8ae..a12f6b237a14 100644
--- a/dev-util/byacc/byacc-20200910.ebuild
+++ b/dev-util/byacc/byacc-20200910.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/byacc/byacc-20210109.ebuild b/dev-util/byacc/byacc-20210109.ebuild
new file mode 100644
index 000000000000..556684fdc8ae
--- /dev/null
+++ b/dev-util/byacc/byacc-20210109.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index d0539a8c6bae..2efc755829e5 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,4 +1,3 @@
-AUX ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch 1197 BLAKE2B c15211d1c4a63c9c75aef0cd4cf1a545a6b9a81e48fce9363e20483a7cb8d28bfa2ef978c127c324b2e089eb78bea214bdd7277e75a1a099ea03deb6571c5023 SHA512 c2ea4edd9ba56262e8122c8e0da11210f0c2ca6bfe6f404b0d0e745d5927dacdb1ad11824b5c78e8ea326365b50f55d9a229b3c6055c8b529cea9d6c4fc5fa9f
 DIST ccls-0.20201219.tar.gz 160445 BLAKE2B 8d3f536ec13673e7251f09de992f24d88066787442940e3e0913ee201111e97c0d145d8a57b4fcdfeaa886fd5bf5e5be621ef54e307cd08cca8e516103a9c573 SHA512 fba8cc1ec50e55939b2deb167d9d32e946ccab4b322766191a787719b47a39e887afad26b7364dfb40c4a4f2522964af76fc7f51a5d84c10d2b0125f07a19c5e
 EBUILD ccls-0.20201219.ebuild 750 BLAKE2B b3389e27c7e55d4e29d71a363f1de355bde157d9e45d2c38cfc840ad9c5a3e5dfed6f463ffa52232957b2747297a8324b2440ec05fade52bd8e02f2438f925b7 SHA512 dfcfec985ed57785ae78c73828885e1077c3e2bf8c2033fee15b5ed94d1336970cf4be16799d5e2719cf7c7e02a70ebd85290c9fdd489852c57a947214740775
 EBUILD ccls-9999.ebuild 750 BLAKE2B b3389e27c7e55d4e29d71a363f1de355bde157d9e45d2c38cfc840ad9c5a3e5dfed6f463ffa52232957b2747297a8324b2440ec05fade52bd8e02f2438f925b7 SHA512 dfcfec985ed57785ae78c73828885e1077c3e2bf8c2033fee15b5ed94d1336970cf4be16799d5e2719cf7c7e02a70ebd85290c9fdd489852c57a947214740775
diff --git a/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch b/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
deleted file mode 100644
index e625ba814d8e..000000000000
--- a/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 7e795e9b9ec20f02cab23e63d1e52189aa33ab4e Mon Sep 17 00:00:00 2001
-From: Fangrui Song <i@maskray.me>
-Date: Fri, 1 Nov 2019 10:36:38 -0700
-Subject: [PATCH] cmake: support CLANG_LINK_CLANG_DYLIB
-
----
- CMakeLists.txt | 34 +++++++++++++++++++---------------
- 1 file changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 278e0735..092f178f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,21 +70,25 @@ endif()
- 
- find_package(Clang REQUIRED)
- 
--target_link_libraries(ccls PRIVATE
--  clangIndex
--  clangFormat
--  clangTooling
--  clangToolingInclusions
--  clangToolingCore
--  clangFrontend
--  clangParse
--  clangSerialization
--  clangSema
--  clangAST
--  clangLex
--  clangDriver
--  clangBasic
--)
-+if(CLANG_LINK_CLANG_DYLIB)
-+  target_link_libraries(ccls PRIVATE clang-cpp)
-+else()
-+  target_link_libraries(ccls PRIVATE
-+    clangIndex
-+    clangFormat
-+    clangTooling
-+    clangToolingInclusions
-+    clangToolingCore
-+    clangFrontend
-+    clangParse
-+    clangSerialization
-+    clangSema
-+    clangAST
-+    clangLex
-+    clangDriver
-+    clangBasic
-+  )
-+endif()
- 
- if(LLVM_LINK_LLVM_DYLIB)
-   target_link_libraries(ccls PRIVATE LLVM)
--- 
-2.26.2
-
diff --git a/dev-util/chroot-wrapper/Manifest b/dev-util/chroot-wrapper/Manifest
index 5940f4b5ae5a..d3871a60041f 100644
--- a/dev-util/chroot-wrapper/Manifest
+++ b/dev-util/chroot-wrapper/Manifest
@@ -1,5 +1,7 @@
 DIST chroot-wrapper-0.9.3.tar.gz 12511 BLAKE2B 42528f7786a0855cfde9d6dff336544bb99f41dfdaa09782d5df665de997d2cbb6358761a5952865ae380c39e467085cbb110b1367d0422f07e0c519d4935b9d SHA512 16ae36637f3e966716a05f3e0bc16c784bae141837e13d0e4c1f831fefcac423a7d77ac73f49e2c7efd0261c1f9649a18f55cd2a24d22e768cecce6d95b85a74
 DIST chroot-wrapper-0.9.4.tar.gz 12676 BLAKE2B 7d65a0f85540c9ce06bbbc3527d5d26162fa7f5de3035c25033e92a70aa0e7b61e50c5d73ab1db39905b289d4f7d68bbc38e219dc91c59423accfc8ab249def7 SHA512 42343c30eee4c82f31064244c04475236fd3807765e9edabaf8a8d3561344283dfaf5149e2ba30793bcb65592405c0c953914364cb577bcb7737fb9501f8f602
+DIST chroot-wrapper-0.9.8.tar.gz 12691 BLAKE2B e15079386e3d21de0bb0d1ade4b11a8347588819508764e6fbae9b574e59a490f29fd4032c4be0ed1753272ce68476e171249aa8144d4324aee4f9d77e63aeaf SHA512 6881417a36db7bc153e06d8d91dea78a3669474146449c7143be61b2cd9942535c3853db344a230ba35cbffef67a2324afe03cdf419a07d4380bdebc9df873be
 EBUILD chroot-wrapper-0.9.3.ebuild 618 BLAKE2B 95a223e3a2f477862344b08b4421a130a5466d4a4201f7e56f9890ba354666642b75da19eba0c10d6a4a87f12c8ffe6f32820e7e08c8b84f60ddb85fa07a2426 SHA512 02a0de7916e49219cf359507cbba2a1dcbb453b42173437c5828c0c94d2a97f35076fc868a354d57cc375305ed81cd567a5b3a1635fc5f7c0fca77b02b3cbda1
 EBUILD chroot-wrapper-0.9.4.ebuild 623 BLAKE2B 527a595d4378c51c5787e949357ebf80de58c649cdcb306e65fb309098ba660fc7562883761515f0be1c21d600e130bd3952f3fbf5da1cab47e79c9718581d13 SHA512 9d11d27d7b3e9aa92c0caa982457dc4df15d0ac0c9d8c2b85658b617a6829572938706d23e8614c89d83be0bb594a32574b952e9f22e8e2b6f11d7c380944e49
+EBUILD chroot-wrapper-0.9.8.ebuild 612 BLAKE2B f0fc7aff6efb6a3559cadc3de8f6de902843472f37f39d411f91567b10a8baf0043ba05a9012b6a8d1e998b85f8ec35b4d202459260490817d3cc3cf45cf55fb SHA512 2880af35ae6900b9f632526dc5948ae0e3380df60b0bb9a964f318e6f6427efc8d1afd851d8f346bdeb63dce0298a29fe74d4e8af8d0b510ee37257af90003f0
 MISC metadata.xml 249 BLAKE2B 51ba583d3f040316570785a91020f260c7eacf5a322cc4b905648f547f06f413976d1834f7f010db5b6183aad6d6503f9bccb21e74508b5a5af1a5d96e82c805 SHA512 276a98a5eb50222440ab5bba11bfc895a0f89be2c2f2e561214b97b6138fe7c4341f6ca1fcb29bc03fa5a89844ede7f82a942c20ed649ce3e7da459a1b2481d5
diff --git a/dev-util/chroot-wrapper/chroot-wrapper-0.9.8.ebuild b/dev-util/chroot-wrapper/chroot-wrapper-0.9.8.ebuild
new file mode 100644
index 000000000000..a2ec853be02e
--- /dev/null
+++ b/dev-util/chroot-wrapper/chroot-wrapper-0.9.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="Wrapper for chroot to set up some bind mounts, namespaces, and control groups"
+HOMEPAGE="https://github.com/chutz/chroot-wrapper"
+SRC_URI="https://github.com/chutz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	sys-apps/util-linux
+	sys-apps/coreutils
+"
+
+CONFIG_CHECK="
+	~TMPFS
+	~IPC_NS
+	~UTS_NS
+"
+
+src_install() {
+	newsbin src/chroot-wrapper chr
+	insinto /etc/chroot-wrapper
+	doins config.bash
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 61aab7a6401e..7d7029483c7f 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,11 +19,11 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
-DIST cmake-3.19.2.tar.gz 9264414 BLAKE2B f45727fd6b6e0e324f618577abbc7fb1830f05f01a9afea4f8713f5f62ede3a612a020ef97385cdd6ede4b575a3b6f63deb57123a222b71e2906a42cba3b3d7f SHA512 d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a
 DIST cmake-3.19.3.tar.gz 9265831 BLAKE2B 133ca8b12c0ccff0f9d833543c66cac597d72898d6e8602c74ef2875c90059b0a19d059b8801e407a7d5931b8aa50b253aef970330454789e13e2e63a7bb6d97 SHA512 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
+DIST cmake-3.19.4.tar.gz 9266976 BLAKE2B b5ac44fa426a47031e37fca990130d9289909a5f21eed2ebb0987da9202db16f654a1f3eeaca2465693b2fca09de05b9bb452dd71df9a65ffd27c02da577a1c5 SHA512 e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.17.4-r1.ebuild 6124 BLAKE2B e5e3ae707d53e486d2fc594a3376138067b1e2e0041e04354e1ac3a1f7ae40f2d87b4eb404e457967a3cb62ba437b0b9dcd916cce50e8d6d30c0c0da3ecece28 SHA512 145b100bd219c50de18d94066c5d73cc77051b054ea5822e0fcb86f53c3d381a29e0026c25e115320df3c324a96519ffa670ecf73e8dc24527043dafb51fe443
-EBUILD cmake-3.18.5.ebuild 6119 BLAKE2B 7721f2479c737064a576ee9986dbca604c50c2ca14787e0c3e7f9b9c00b4470bf8a4015cd4abe3d000b79dd1cbcec9949754d2c259ddd2396b3f4ef06291b5d7 SHA512 3462ad588ceaedc9509c0d49ba5803d3c76d149b9054c0c55cf28e29258efca20ad6dc62dc80567c910ef86f775fd4e56d2eea726f0e6e81287cb1fbf28bc038
-EBUILD cmake-3.19.2.ebuild 6733 BLAKE2B 2a2746d24c989a18d6ff8da0bd91bdc71b5d11b52eef3199f9f58d4a6698427da24ec35ff65bfb2e8c9c4ce65568b3c6759aea92a2695bff1185cc6efedd7603 SHA512 360029531687002f68392a3c24870b98ec60c2130b747a3926f5c431d5ca05ab09281a1fe9d26f135da71479ca82d3adbe806515448f160da845010c9d88a8cf
-EBUILD cmake-3.19.3.ebuild 6861 BLAKE2B 7349f361613e4c1279f218a953179bf0fd98f40ea7963540bc3837272ab7b2585cb2ee371f9776ce2a5fb5ad3eddcc5030e7faba9a6257ef6e24780588c70f48 SHA512 6168ff1a5833a7b69d36c5122026e3c848a5f1f67b034b800f627a4bbaf94bfc3d4f5041f26b000c23ff224b8873d6621f897624f13ad7e01c2d82ee99e32cac
+EBUILD cmake-3.18.5.ebuild 6078 BLAKE2B 01cb28e819e3494817ee7cb0f3faa663d7cb2a2a4d8d575e1211e41b4d35bdc1ea9a1ce21fa3ea650f8d69a290ffdad83fd462b305a3a3da19de62aa3180042d SHA512 39c8ea042d9358546100659b25fb7e223afbbf66d404a9b11dd399470f69c5d96ddeb36d160d1be14c1a4b9227c71ae6d79c09f5344abfa4519c2643ab24e1ec
+EBUILD cmake-3.19.3.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
+EBUILD cmake-3.19.4.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index 4c0006310904..4cd2e415b0d0 100644
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
+CMAKE_MAKEFILE_GENERATOR="emake" # Fixed in 3.19, see commit 491dddfb; bug #596460
 CMAKE_REMOVE_MODULES_LIST=( none )
 inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
 	toolchain-funcs virtualx xdg-utils
@@ -44,6 +44,7 @@ BDEPEND="
 		dev-python/requests
 		dev-python/sphinx
 	)
+	test? ( app-arch/libarchive[zstd] )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -108,7 +109,6 @@ cmake_src_test() {
 	#    CMakeOnly.AllFindModules: pthread issues
 	#    CTest.updatecvs: fails to commit as root
 	#    Fortran: requires fortran
-	#    RunCMake.CommandLineTar: whatever...
 	#    RunCMake.CompilerLauncher: also requires fortran
 	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
 	#        debugedit binary is not in the expected location
@@ -120,7 +120,7 @@ cmake_src_test() {
 		-j "$(makeopts_jobs)" \
 		--test-load "$(makeopts_loadavg)" \
 		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
diff --git a/dev-util/cmake/cmake-3.19.3.ebuild b/dev-util/cmake/cmake-3.19.3.ebuild
index 930417171292..99b8eab6c2f1 100644
--- a/dev-util/cmake/cmake-3.19.3.ebuild
+++ b/dev-util/cmake/cmake-3.19.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
 CMAKE_REMOVE_MODULES_LIST=( none )
 inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
 	toolchain-funcs virtualx xdg-utils
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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 ~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="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
@@ -44,6 +44,7 @@ BDEPEND="
 		dev-python/requests
 		dev-python/sphinx
 	)
+	test? ( app-arch/libarchive[zstd] )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -108,7 +109,6 @@ cmake_src_test() {
 	#    CMakeOnly.AllFindModules: pthread issues
 	#    CTest.updatecvs: fails to commit as root
 	#    Fortran: requires fortran
-	#    RunCMake.CommandLineTar: whatever...
 	#    RunCMake.CompilerLauncher: also requires fortran
 	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
 	#        debugedit binary is not in the expected location
@@ -120,7 +120,7 @@ cmake_src_test() {
 		-j "$(makeopts_jobs)" \
 		--test-load "$(makeopts_loadavg)" \
 		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
diff --git a/dev-util/cmake/cmake-3.19.2.ebuild b/dev-util/cmake/cmake-3.19.4.ebuild
index 3dbd001d5376..99b8eab6c2f1 100644
--- a/dev-util/cmake/cmake-3.19.2.ebuild
+++ b/dev-util/cmake/cmake-3.19.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
 CMAKE_REMOVE_MODULES_LIST=( none )
 inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
 	toolchain-funcs virtualx xdg-utils
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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 ~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="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
@@ -44,6 +44,7 @@ BDEPEND="
 		dev-python/requests
 		dev-python/sphinx
 	)
+	test? ( app-arch/libarchive[zstd] )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -108,7 +109,6 @@ cmake_src_test() {
 	#    CMakeOnly.AllFindModules: pthread issues
 	#    CTest.updatecvs: fails to commit as root
 	#    Fortran: requires fortran
-	#    RunCMake.CommandLineTar: whatever...
 	#    RunCMake.CompilerLauncher: also requires fortran
 	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
 	#        debugedit binary is not in the expected location
@@ -120,7 +120,7 @@ cmake_src_test() {
 		-j "$(makeopts_jobs)" \
 		--test-load "$(makeopts_loadavg)" \
 		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
@@ -131,8 +131,11 @@ src_prepare() {
 
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# disable Xcode hooks, bug #652134
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
 		# disable isysroot usage with GCC, we've properly instructed
 		# where things are via GCC configuration and ldwrapper
 		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 62312847943d..48c01ccca220 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,7 +1,6 @@
-AUX cppunit-1.15.1-slibtool.patch 337 BLAKE2B 7c81687721d0aefe02771e526414df2657707a70c549ad93fb323c3ad6d11a80a60b183ac2ba0f2c1e28a0d8d10dcad2905260bedb7f364feb53a076c165b60b SHA512 23c185bfb2038dc5bee102fac96c9f2fe4763359ee2667de8d98d1513fe5efc1709862099e6376a7f4d0733c38cdd55aa546656efea2331683ecfdbd7533e37c
 DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
 DIST cppunit-1.15.1.tar.gz 814363 BLAKE2B a1d1d1ee9b6ef408843a6e989a37653944ad85069b4896f18d0f01410acebf7342f70e8c031e58f7ad0e686a85869d521906816e0f0b1762d238efb606cb7310 SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691
 EBUILD cppunit-1.14.0.ebuild 1692 BLAKE2B 463ebf8ffeb63c9364e87f58edfab50eab27b344ba91f34693e4d6885ee7462cb3684922cceedbcc9a5f76fbd92f2c371776208bc3f235b005a22aef402e67a0 SHA512 e543b16ff04e1abcc9639316b86f68932efd1245b05cd108504869bc3b833584d1e2d4e94ac80a9f79cbbad4da56684f198d107d976402e275a97c3dfb7607f7
-EBUILD cppunit-1.15.1-r1.ebuild 1690 BLAKE2B 3e894991ac9dac6aca42c801d56c171726107dc166e4c3313dc383a7daf2dfd1c4205ce8efed67f26638b1cea4da34f6eb9692adca7ca57ffde473137d813188 SHA512 9eefa19906d8f7df59cf18a152a92ad470a60b27b0092f784d106cef606463506ad1ca3176fa49f656d914519ddad88e4d2b9c085527e882b9c055883a1df391
+EBUILD cppunit-1.15.1-r2.ebuild 1659 BLAKE2B 7c3cf0d50024a180ed3ab62428f2adffb14d3d18605f9938858e94a00474d7ea5e504654b7c339d78ce9b329f7292d55e42ae606e35503f07f73c66af1e3d471 SHA512 fce02a53bb374e6b66ba29072a0775d691562149f9cca21f65ea88fec960740ee3af82b7304a1d45bbe773d40d7e956f61898c76dbbca56bfc47f3026e65ced8
 EBUILD cppunit-9999.ebuild 1654 BLAKE2B 8357d827f94727e3074f5933a97f64b129710fa77033848fe72dd1e8589d545f381989515805861bd53e988fcd227e8a7cc61adb54b965bce1ea8c8aa991e533 SHA512 63b847b7125ae2e2540879ae4e685b337320260883e27b49f3837c83381ca38450fdfb31d70bc05093ad4aaf7939b25a46ab5db25ec599475d4684973ef5c04f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppunit/cppunit-1.15.1-r1.ebuild b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
index 8d7448313a9c..09eb8d15a46b 100644
--- a/dev-util/cppunit/cppunit-1.15.1-r1.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib-minimal
+inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
 if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
@@ -30,13 +30,9 @@ BDEPEND="
 DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
 [[ "${PV}" == 9999 ]] || DOCS+=( ChangeLog )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.15.1-slibtool.patch"
-)
-
 src_prepare() {
 	default
-	eautoreconf
+	[[ "${PV}" == 9999 ]] && eautoreconf
 }
 
 src_configure() {
diff --git a/dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch b/dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch
deleted file mode 100644
index d5bfcb2b7489..000000000000
--- a/dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-This fixes build with sys-devel/slibtool
-
---- cppunit-1.15.1/src/cppunit/Makefile.am
-+++ cppunit-1.15.1/src/cppunit/Makefile.am
-@@ -62,6 +62,6 @@
- 
- libcppunit_la_LDFLAGS= \
-  -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE) $(LIBADD_DL)
-+ $(LIBADD_DL)
- 
- libcppunit_la_LIBADD = $(LIBADD_DL)
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index 008d5854fe39..1c9b3b693830 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,7 +1,5 @@
-DIST crash-7.2.8.tar.gz 32253097 BLAKE2B 26a8a07749cb62947053992ba761b541ba5d06f0f3bf67312d8228c9d851f51edf1201e732574f7f2f2768d6087324b8dd1f843ea47916bd9f95e514df967589 SHA512 3269760a50b49f25af0e1c43d60432e603036793aa542f8ccfb0b8019376da45afa7c053d3860ae2130b6471f3ac72cff78f1096e9ffa8c6f1d34afb52208e70
 DIST crash-7.2.9.tar.gz 1324947 BLAKE2B dac5485742119fce1cdcab37a87a2a417e408108a73bffdd6fa215587e4c5dec29508d5f11285dbe2a21cd8365cee437296168b85f2f43dc743461061fd0a26e SHA512 57b7b7780ad71bad09d962bfb2d5ad729dd167d9aaffd86f7b5467c98f52e8cb2c6ebb317bf1ad285dcb78ffa300b5dd733c63efd7aaa4ef03ddfe076c269984
 DIST gdb-7.6.tar.gz 31437633 BLAKE2B fb8cb9f0c33f360c864c5776c3dd0233ad534d376a9df8157c7bc9f1c4ccfc8698933409561700f134705c0107038d8bfa23844e512cd3a08e24925d37a1ce58 SHA512 02d9c62fa73bcb79138d14c7fc182443f0ca82d4545b4d260b67d3f0074ed75f899a657814a56727e601032a668b0ddd7b48aabd49215fc012eeea6077bca368
-EBUILD crash-7.2.8-r1.ebuild 726 BLAKE2B fabf144cafa8db8a85471125ff2453ff15fa6eacda32c0d95559ff9b06848b14f02d24b4510878668c2d261906be26f284bcb5ebb2a9d5e83000abf2ec7c90f7 SHA512 dfa2ef151656aa2488bf4f836efa377cdd2c73b3ec1839156f4e34057a96f4449f187b9095be313bc73ca44b49f4ee674888a407a545eb5686592bd9bbce904e
-EBUILD crash-7.2.9.ebuild 1042 BLAKE2B a2d2f0242ee64f930fcd24422df62eee63dc66063d0006886250be190704c857a9df78948c699ff2a409fa2e8c7e0d890f7cda46e5411d68df2c9f1ad78a5ed4 SHA512 9b2c7d354c6fa64e028003c5895fab3e4740dcbdc15ee037fe94edc1c471ee4ed6e4de4489eef39dce878d85e55bf2d0930fd4d11bab75d879929c7900c3d883
-EBUILD crash-9999.ebuild 1042 BLAKE2B a2d2f0242ee64f930fcd24422df62eee63dc66063d0006886250be190704c857a9df78948c699ff2a409fa2e8c7e0d890f7cda46e5411d68df2c9f1ad78a5ed4 SHA512 9b2c7d354c6fa64e028003c5895fab3e4740dcbdc15ee037fe94edc1c471ee4ed6e4de4489eef39dce878d85e55bf2d0930fd4d11bab75d879929c7900c3d883
+EBUILD crash-7.2.9.ebuild 1036 BLAKE2B 4747cb1da28dba89dd301699b3dbf63d1072d48043324a5c183cd8ff234e6204cffda5a5c00b39f0b98692ecaf8436ae5f77acd90208250bc8dc7caaef7cd7e3 SHA512 0eb1c85699aecc4cbce0eb9ab2ecd11c93c8117d77144c44ba6a53f4d638fc59fcababc4f33a8a1eb98f20fbae6bd8d325ec55b4d607460b4a27272bb1db3e4e
+EBUILD crash-9999.ebuild 1036 BLAKE2B 4747cb1da28dba89dd301699b3dbf63d1072d48043324a5c183cd8ff234e6204cffda5a5c00b39f0b98692ecaf8436ae5f77acd90208250bc8dc7caaef7cd7e3 SHA512 0eb1c85699aecc4cbce0eb9ab2ecd11c93c8117d77144c44ba6a53f4d638fc59fcababc4f33a8a1eb98f20fbae6bd8d325ec55b4d607460b4a27272bb1db3e4e
 MISC metadata.xml 640 BLAKE2B 65450e02ac8c60f56fa7e82bc8b20f3d6b36bae290ad891265f9cd19ac405bf8452a5712e2c83c85c6635e4bc75f396c1b7976a7b7341efee3a8475f720d6c15 SHA512 c131b6f87a36deff7f2bc599000a692315f016774d0e87aa186c1ebe660ef85da04f2c3e5b89afa90473a65acf40f493d9434d677a621c9e77a0ae8ae81ed0da
diff --git a/dev-util/crash/crash-7.2.8-r1.ebuild b/dev-util/crash/crash-7.2.8-r1.ebuild
deleted file mode 100644
index 45bbff515903..000000000000
--- a/dev-util/crash/crash-7.2.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-# there is no "make test" target, but there is a test.c so the automatic
-# make rules catch it and tests fail
-RESTRICT="test"
-
-src_prepare() {
-	sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
-	default
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
diff --git a/dev-util/crash/crash-7.2.9.ebuild b/dev-util/crash/crash-7.2.9.ebuild
index e807f3d302e0..65a7a71821fd 100644
--- a/dev-util/crash/crash-7.2.9.ebuild
+++ b/dev-util/crash/crash-7.2.9.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://github.com/crash-utility/crash"
+HOMEPAGE="https://crash-utility.github.io/"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/crash/crash-9999.ebuild b/dev-util/crash/crash-9999.ebuild
index e807f3d302e0..65a7a71821fd 100644
--- a/dev-util/crash/crash-9999.ebuild
+++ b/dev-util/crash/crash-9999.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://github.com/crash-utility/crash"
+HOMEPAGE="https://crash-utility.github.io/"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index 35858e63896b..09ab79fd7e3e 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -2,7 +2,7 @@ AUX cvise-2.0.0-shebang.patch 1130 BLAKE2B 50f54e410f978a485aaa08cc7d9b8311211ec
 DIST cvise-1.9.0.tar.gz 249042 BLAKE2B 357d429afc43691e616dba31621d1de89fb1f85fcbc177847b3367aac993ccd2c3bec20226e910a319d5d6194b32d0be9704e4fa7b8fce49f23788d10a378012 SHA512 518c48b7b9d9af9b856bfc46d4fb8064bca3730735bdabf2b3aa981a3f743fa6988594b7cbe39da71ac01fbadb4a45e5212d7c79b510fa36d86055978829495b
 DIST cvise-2.0.0.tar.gz 249307 BLAKE2B ba1a70da71706969a35b1223ad0c0fa1a1d4caf7f70eef184adc4dbc69586be6a33bdf11d7c1b606ea4b20d4cd2bf68170aabc1764364c235fe5f67182419080 SHA512 e49ca9919ced9db67b16af4b8a7cd3c18c7d96dea5724c9ee6d60736c8f34074d68ade151be702794c93b24943d167278e1c1a6e6f67a9a1422f695f3a177e46
 DIST cvise-2.1.0.tar.gz 249215 BLAKE2B e36def48de68dfb91990fd1daced56ae5fc9a32070bae3a696e7c21980757e30ccc8ef2d4940c391a72417296968f0dad680ffe6ca3c88104f09839d86174e27 SHA512 bc239ddb207bc6bb70d1a131df7ca0c13c4a3921382613aebb319f1cb1d5f19be273e82945e4f1c9479eaeac07bbb8a9c4c7f515e0474fe6bede84afd20b560c
-EBUILD cvise-1.9.0.ebuild 1280 BLAKE2B 52763d8bda5418cb30caa2f302351dce9b376fe23df691644ae91b092000b34e260dd7847499d04d7bfc60185874678e79a1975be50b5733fee44dd4908eed8c SHA512 c7a575cd101c62c493e10d52aca53efe0ac13b9f9a22a9349492948a31fdacd3afdb0eb2ae55d06d22da98185003b46e6c9dd3be06baaea2ec3afcecbdca298e
-EBUILD cvise-2.0.0.ebuild 1347 BLAKE2B 8651ce715dccf7bc322a7fae16e5f7b3b1d92eff666ec1faff37ad44541f39d2d394344a60cf1ca7f67f9c05b1efac0123ebdcd76343e9752a844089ceabe0f7 SHA512 aebd0940cd504e4f89ec9ae95e98574168274bddc7c9fac3406207d0e41cec114698af955dccbee6c90b864690d840a9865b707ff2a8d7b22acbeecb696da282
-EBUILD cvise-2.1.0.ebuild 1300 BLAKE2B ba69d6b4394d9145956a0aa16cc10e764488a637b2f7cb38cc66fa9d24460cb720ef3ceb5ba43267608956f5d4a4332f7560a44be4a9d2a81f28271033daac1d SHA512 e0857808a010d4afd063f84aa081420a5da5f48aa17a7b06b91b46bb644314a152835e67d3d5ae360b5b4f96baf73f0cca9fa51cba0280f4f15c5f4fb429ea56
+EBUILD cvise-1.9.0.ebuild 1259 BLAKE2B e5f7997c2b0a7cf9353054b764b6ed92a908109ac0941d6f4fc2b547bb0e5d03965f4619964b4f21c80b99e2ebf4642a0a6048df86f74ce459ad8246de244cff SHA512 18a9511b83145cb57e977ec35c376d08457b201e2316bb37b80da660fdd12531ab881d15fc60b42b0acbb4ee8b1b372c49d58ad786cc5eb1b365704c78e6c956
+EBUILD cvise-2.0.0.ebuild 1326 BLAKE2B 1fb1ef9d4c8da74149de3ce59f38621e8795c8773e2fad6f418031c52c68f476dc98996081e7fc50e5d0ff79cb8a611bea56452952e3f8d622c083dba9351e35 SHA512 cb6d6bdcddf0965838f1573911db3051266bb4a55916374baa19496c780d502ff8f81bdba7b6afebf98b85da25ab5825b5411ba7e0654869e50d49fcbebcbbab
+EBUILD cvise-2.1.0.ebuild 1279 BLAKE2B d4467d2b4b6f7d700dfdba80fce51d2c5c3925f2576707dc4daa0eabad06a79037bd7c36ae2ce598e6eae57242d207167c8bd07a7cd596e63de60a4b8eb23718 SHA512 92a449b2de4ebd7fd49d56674d27c9706fd100b1c184dbfb4e6f1497712e19ad5a79f7f857af8c622e3086f9e3501e0ed9e7e1b698d43899de8b2e29a93761dd
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/cvise/cvise-1.9.0.ebuild b/dev-util/cvise/cvise-1.9.0.ebuild
index ead00c52154a..1ac160246146 100644
--- a/dev-util/cvise/cvise-1.9.0.ebuild
+++ b/dev-util/cvise/cvise-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,10 +19,9 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=11
 DEPEND="
 	|| (
-		sys-devel/clang:12
 		sys-devel/clang:11
 		sys-devel/clang:10
 	)
diff --git a/dev-util/cvise/cvise-2.0.0.ebuild b/dev-util/cvise/cvise-2.0.0.ebuild
index 9ef3d7393dea..82393105e7a9 100644
--- a/dev-util/cvise/cvise-2.0.0.ebuild
+++ b/dev-util/cvise/cvise-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,10 +19,9 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=11
 DEPEND="
 	|| (
-		sys-devel/clang:12
 		sys-devel/clang:11
 		sys-devel/clang:10
 	)
diff --git a/dev-util/cvise/cvise-2.1.0.ebuild b/dev-util/cvise/cvise-2.1.0.ebuild
index 11c99cb7378f..4d7435abda6f 100644
--- a/dev-util/cvise/cvise-2.1.0.ebuild
+++ b/dev-util/cvise/cvise-2.1.0.ebuild
@@ -19,10 +19,9 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=11
 DEPEND="
 	|| (
-		sys-devel/clang:12
 		sys-devel/clang:11
 		sys-devel/clang:10
 	)
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
index d6ec40944dbc..b1be32873cbc 100644
--- a/dev-util/ddd/Manifest
+++ b/dev-util/ddd/Manifest
@@ -6,5 +6,5 @@ AUX ddd-3.3.12-man.patch 571 BLAKE2B 88f499833e47ae279beac8dbc4aadcfaa80e8c19f38
 AUX ddd-3.3.12-parallel.patch 621 BLAKE2B 57446f5c7e797d7ddab5ed6aca01a5ffdc6af314bb797d96cfb357e214f1cf49153387635f9b585c53ebbcf7b06dcd6119b6bb2cbcaffa7d4382c4fbe9fdd181 SHA512 1157bec9212ffd4cbf86e8d36f68c80e9170091d09318effd800ce154f2b738e730db95e1e954c632dc25390e78cf88a9f1f3d14426df4069c0e5523f2dc6646
 AUX ddd-3.3.12-tinfo.patch 330 BLAKE2B f0e29f408f1e5e7fa40e386ab2a1f6786a9a14dc6722aef3fc8132558b624c233102b4290c0ba0e5d55b27aa4b25e6bcdd6fcd1b4ae237540621f3961e92bffc SHA512 a3cd3d59bdcce6c106d4488ec9a6c32d8baea49963f61e8e493a01131fd604664dca2e9e548852ff4c538c7123f5c1572bc54d6143340167fcdfa754002eb224
 DIST ddd-3.3.12.tar.gz 5687115 BLAKE2B 52c448eda46bfdc4f5720abda569a0c70f3680c3fdd543f6101c9af8c4c448496414c1c2a7be91590d9f14d0c8c2bb053a234d179bf900ca52df0ea8c2642131 SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3
-EBUILD ddd-3.3.12-r4.ebuild 2368 BLAKE2B 111b6b82dadbc5c40a4bc0eb03108622f7c355bd9bdd3858e72984f8c060e5bb5a913539890661a0223785598c135907e22ea2f2ea7ae6a4cda93aa01df1c491 SHA512 f07f39d5ab6feac708af7ec15cfb1b3942088bc1b328d73dba63175ff77e8805b43b4f12b924b752311d4d1dca0c9c45068a3113ae61c6548ae694630cd4a772
+EBUILD ddd-3.3.12-r4.ebuild 1978 BLAKE2B dbdca3e7d991fc07bd407c4c8aa22f4966961f2e57264282625ae8dc89c5e8a8e4570eb4a7e9fb6d9560cec2949a4054ed9ce2d589a967f57d6f3fb1ce303f4b SHA512 54c904194aac6beae0125317826d53d5a8d5f3a3be9087ce62ceaf9f9fb3f414dddeda8cfb50f4cee21034d8467cf58c7044769a041463165eed0b48ba1189b3
 MISC metadata.xml 658 BLAKE2B f2b35a9e08da89197aa56157e5d3c9adbc991d888cf798849bf7edf33fe6d9fd7dab16e0ea3068d20a836f85d133a570f3bbbcb9e57399c095292fa3390f59bb SHA512 8b304bbca5e836ff3032079f5dd2afea432b8f48e2c57575644adbefba0ddc4f64e3682f35f53c2804c27e950785ae8040f8704c05162acf302c6fb61b70c51d
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
index 101061bf64f5..b0279808edf4 100644
--- a/dev-util/ddd/ddd-3.3.12-r4.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools eutils
+inherit autotools eutils optfeature
 
 DESCRIPTION="Graphical front-end for command-line debuggers"
 HOMEPAGE="https://www.gnu.org/software/ddd"
@@ -74,24 +74,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! has_version sci-visualization/gnuplot; then
-		echo
-		elog "To enable data visualization in DDD, install sci-visualization/gnuplot."
-		elog "For flat file package.use layout:"
-		elog "   echo '${CATEGORY}/${PN} gnuplot' >> /etc/portage/package.use && emerge -va gnuplot"
-		elog "For directory package.use layout:"
-		elog "   echo '${CATEGORY}/${PN} gnuplot' > /etc/portage/package.use/ddd && emerge -va gnuplot"
-		elog
-	fi
+	optfeature "Data visualisation" sci-visualization/gnuplot
+	optfeature "Java debugging" virtual/jdk
+	optfeature "Bash debugging" app-shells/bashdb
+	optfeature "Perl debugging" dev-lang/perl
+	optfeature "Python debugging" dev-python/pydb
+
 	echo
 	elog "Important notice: if you encounter DDD crashes during visualization, you might"
 	elog "have hit bug #459324. Try switching to plotting in external window:"
 	elog "Select Edit|Preferences|Helpers and switch 'plot window' to 'external'"
-	elog
-	elog "To be able to debug java, bash, perl or python scripts within DDD, install respectively:"
-	elog "    virtual/jdk"
-	elog "    app-shells/bashdb"
-	elog "    dev-lang/perl"
-	elog "    dev-python/pydb"
 	echo
 }
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index c73f0d36faed..1b50c0538fed 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,3 @@
-DIST diffoscope-164.tar.gz 1568354 BLAKE2B ee9aea028e8719d45cc077108c42e36b1a74eff0c6c191e81daf43e68c0f3307eb4335ce8dea547377cd7146f1aa5020ac5b56f24239789a74bec5bc6c3048bc SHA512 816f19801b200a05c01cbc2da408074915b626847eb133e96404a4dce883d5626f31bfd525373e899bf92592d790a4b5ca9920c168859e41f81cb6c4b78bf79f
-EBUILD diffoscope-164-r1.ebuild 2187 BLAKE2B a2e6f968f5dab8e641a85bdb892c07038e33adf59781fdea3eca1e32542ad77c33d70d530c974d68808bc98e315b351941337f207975358813a764c9714e9a31 SHA512 0a1af94edfabeca89f8b4624a6ec84b041f9de8ba40e3139c018e82bf9a78719824a9194a49b94e6cf3a9bef6eec9c2d24497c3d381cfa627cee74dd5816ab72
+DIST diffoscope-165.tar.gz 1568656 BLAKE2B 606b2f11bc03da085d51fd10ceefbfe1ba4bf5599e45cc317ec0f555633e1f58219098fc59418dfa380f5afdb143af89e71fd7b90aeb8a77959a4abdbe410722 SHA512 0adbb7032bfff196d7028c6c140268b27d00adbbc253f3914b89dbe0505cc128ecb2c11db6a1efcdcffb8188031aad2557000a7f4de04e0598c9ef6ac05f1f28
+EBUILD diffoscope-165.ebuild 2187 BLAKE2B a2e6f968f5dab8e641a85bdb892c07038e33adf59781fdea3eca1e32542ad77c33d70d530c974d68808bc98e315b351941337f207975358813a764c9714e9a31 SHA512 0a1af94edfabeca89f8b4624a6ec84b041f9de8ba40e3139c018e82bf9a78719824a9194a49b94e6cf3a9bef6eec9c2d24497c3d381cfa627cee74dd5816ab72
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-164-r1.ebuild b/dev-util/diffoscope/diffoscope-165.ebuild
index 3dc64bbf263f..3dc64bbf263f 100644
--- a/dev-util/diffoscope/diffoscope-164-r1.ebuild
+++ b/dev-util/diffoscope/diffoscope-165.ebuild
diff --git a/dev-util/dropwatch/Manifest b/dev-util/dropwatch/Manifest
index f9319673f681..3fc5d0a3b735 100644
--- a/dev-util/dropwatch/Manifest
+++ b/dev-util/dropwatch/Manifest
@@ -1,5 +1,4 @@
 AUX dropwatch-1.4-binutils-2.23.patch 1767 BLAKE2B 2d5a39985393e61daa1a197edae420391d6d56b2a9cda8a46b2bdb6d5d0289933961837489fa7da66b2920a984bc0f36d4c33764ee5c2f3f60258d4907e1d87a SHA512 678749e2f37c9e8c5613a884919e0ebf9039850f5fa9a62829d66783e703f6aa3c69a2d040b37f4657d2c43edf46d4792d9d87270a4fe4b590bcc36114470b45
-AUX dropwatch-1.4-makefile.patch 639 BLAKE2B ee87268a51705bfed07eae5bcf4a75972d35f7f0075919279c916f2eb502d31b437bf0cbe0fb4587605cadca12d8bf55a8d14ca49bd177ab5344a6a649bf0516 SHA512 cf9756fe238041d5a9a764e81f5294832146905a809fccff999cf45d28015fc70ac0239b57b2e7d994095d5b45b484ea2b14e36210cc10bc1e4ef8ad3d9031f5
 AUX dropwatch-1.4_p20150706-makefile.patch 563 BLAKE2B db75ff88089272f9f0603b4e6ffdbe669e312188c03eba712fcd01152f1cb00bf2b17a720c0dc7137d95158db83b10c7a8f1bb2ba3a647cfd469abb778b1445c SHA512 763781d0a3718978c2fb98ad42183633f6e93c122739bd4b3020698674b4c3c35592337be5f7a3c839ab3bc4599cd10a85a19f1d19bd9635961fcc08c78f0b01
 DIST dropwatch-1.4_p20150706.tar.xz 14880 BLAKE2B 4df44a517447a7e99fe5d84a79421c9810c3b67524eb1d208c36ebb503dd43c715e57c678c33a90689707680d1f42b9d30d00080894f22889553e551a23adfa6 SHA512 f78f19f063408cb655869e662e92709b1cec820ab35b11272b87a990c380e0799c6e9067dcf53edab795916347dfe3fd04932f9699c3f5649f96d62567957fbd
 EBUILD dropwatch-1.4_p20150706.ebuild 867 BLAKE2B 86dd6191da4827c62a18db05a01f3163bf6c6af8df1574ee0783d3969e87bfedda4376450e6a465181cc0afd3b547c302f5596259b1ea81585dd93d3167fd969 SHA512 466bef588bc88d7b02439386b3d4e6659922369f05eb1cba5eada751b1271b813723ba5382ddcc6903c9fa3491f1d1d33a74568a7dd087808d0ec81a489c4e81
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
deleted file mode 100644
index 14ffcc83513e..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.orig	2012-10-24 13:27:12.000000000 +0400
-+++ src/Makefile	2012-10-24 13:27:47.000000000 +0400
-@@ -1,14 +1,14 @@
- all: dropwatch
--CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0`
--LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3
-+CFLAGS+=-c -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0`
-+LIBS=-lbfd -lreadline -lnl-3 -lnl-genl-3
- OBJFILES := main.o lookup.o\
- 	 lookup_bfd.o lookup_kas.o
- 
- dropwatch: $(OBJFILES) 
--	gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) 
-+	$(CC) -o dropwatch $(LDFLAGS) $(OBJFILES) $(LIBS)
- 
- %.o: %.c
--	gcc $(CFLAGS) $<
-+	$(CC) $(CFLAGS) $<
- clean:
- 	rm -f dropwatch *.o
- 
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index bd16013bddd1..3a223cf6a4f3 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -2,6 +2,6 @@ AUX geany-plugins-1.36-libgit2-0.99.patch 2345 BLAKE2B 8cbaf858dd62c692279b863a8
 DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
 DIST geany-plugins-1.37.tar.gz 4711239 BLAKE2B 7f4fd121f6f0784aecf2dcc04d208c89e502b23debcbc40889f93c1421e414c33c8634376cfe01e91c370f70818d33b373b88698f5cb0ee23dff5edee9d781cf SHA512 47f8d7170593114c773067a8132c724471cbf881582a0a739da578ca42533783d8ecbccb04e039f2990ceed440bbd2d94e4be4a28e336c7f74b8e11a15ba4ce9
 EBUILD geany-plugins-1.36-r2.ebuild 3041 BLAKE2B e25759bbd4f9a48e3fbafb3c4b90ea1e8b648ed137d226976003796df82b769da8f9752e573b6276d940235bd1c8993329b2a56a0ad34c5f2eee99e6ecb98f55 SHA512 51ae6f610441056d9572133c18e61d7f01f7c1cd6258e8e18e4828525cbe05d8e2dc5129291ae23aef52a45d7c75e70ba47a5e98a153a80c900c8913723ca516
-EBUILD geany-plugins-1.37-r100.ebuild 3060 BLAKE2B 507bb742cb0c583a2992867ae1e2548679b90225a8045027e45b3598b281054ae4bf1046d1f3f190c2d9ceeddf0b3231abe830ab48f4743dc9c53ef3b9203a53 SHA512 b6e7c462bd77c681d81de54c0dcd6b9e97042d3ad65fe18ee414f2b5062229a8e9a6d681eea74fa1a52d93ee123641cad81ef2342cc137846a803547ad664724
+EBUILD geany-plugins-1.37-r100.ebuild 3055 BLAKE2B 9983e26e9c6321b54e88e8258044983df16416982b9f64fe4285900e6fdae9f8775e63fbbf1c6314038c37ffec84ca825ecc72e5899418387f23daba6050c2e5 SHA512 2191e647cb73b6fad45127943109194fe7d6042032b6d3444fe7f09814e71a579da87e471347eac4a17532db77c6f1ba41efb8bea0b64c25203d4090aa28f8d1
 EBUILD geany-plugins-1.37.ebuild 2992 BLAKE2B 0c9d6f96df55650387d8077e6da25367f4077445ed77071199e8f2e21ccdf10419fd656ed7aa34177b498c9748c2bb77adbf27c956854fccafe642564997945c SHA512 48402ae37f4eb61a1b437d36235e97b95e775a8b8ee0b458454f11c4265bfae3528c5e25dc82958ef4638d08415078419b71f9b49a3305081268ec6420cc24e4
 MISC metadata.xml 1278 BLAKE2B d7069dbc82acd4fae0939c09f867e557a1b214d4ebe48add0cb483aeeec073ae362d35033c0017117e614793de109790c0c17c399327ac4e823f378948301e8f SHA512 5effdf6d8adbb1d63835c55d9a5e97a5596c59027b7c250dbdd6e0d88c7bedc6c1a4c1d8150cd00da538d40bcceb7b819c50080262737255eb2e5463904a4eb3
diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
index 3c2413baa959..a7b45aeecd51 100644
--- a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 
 IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="gtk2? ( !markdown ) lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 696b482db216..649c87c288da 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -2,7 +2,7 @@ DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a2
 DIST geany-1.37.1.tar.bz2 4689173 BLAKE2B fe17674294e314204b490d0586bc360229a95348236f48a9d25bb49b0d1face415a11e60925501f22018ad047061521258d90af55d8d250499bbf6a09b02028a SHA512 9dafaa540ba4d37ae66f3cc1c4d9670aa8ea30e74e960f0ad010dcbcd1647d1dc2eea4ae7454f589fc6ec0ded0da2de98d85fecc92d8d1ff36cd62d3255a47f4
 DIST geany-1.37.tar.bz2 4689385 BLAKE2B b726fffc18cc780fb399472a93a1787ec06ec47caf5dfe9a89f88e5939f071bdb90f337c7dbb9f8681c8383a89fa9d4a8c42d9361771a3e8bb7103cab4629f21 SHA512 ffaa906eaa6198d24e91e21dafc4acc0811c8d90f714a36f646d70aa9f4eee7c53c29a063c39db41857de3c7729282ca7f88419ddc6b67b73ac35e91a376ea62
 EBUILD geany-1.36.ebuild 1690 BLAKE2B 5ce4cc4e24de8e0e8aa738912558fadd6aba5e5d7d9588d412ab941bfa16497d78450d1aaf5244ff8af65b2eb77adb01e2e19d82ef72471af2e68bfd9b17f31d SHA512 29f31f63d8187082d9d4be721ff96774380e7196b342dd1d9fd25be7b7e39a37bd93bc9b6d2d14e0fa2f3012433d3f68a72e7637797dbe1e44234d003795ac98
-EBUILD geany-1.37.1.ebuild 1714 BLAKE2B 6d66deeb5ffc669dfbc0a83e45928c0c0a4bfbf68411684c6e069f74c9c7d4713578f4f480b96c77954019b5e0c50bb8707ee26aafb40f915f912ad63ba5a456 SHA512 f2cea29289f870630fcabca0e10bb1445760f6458bed833dbe5ff0808c5fe03b0cafc4ac3d3de47b49484b02f38e5f6bd31aea6e63f55c4c415ad316984db909
+EBUILD geany-1.37.1.ebuild 1709 BLAKE2B f530e609ce4739268dd9beccb1fef8cea4a2ce5497fed21acc4a71d4db975608e377915d1c2e7950c91f7b0e9571f3a2259cd5af7ccd9546291c3f745a355d32 SHA512 16ccfa9d39ff1b77cb5c44a73601566a6f73ec7953b4e26c861dcb32f7f088123725533cab8b632e68eb737f629774be8cd5a939316e12e1c9b3bd31dee40154
 EBUILD geany-1.37.ebuild 1714 BLAKE2B 6d66deeb5ffc669dfbc0a83e45928c0c0a4bfbf68411684c6e069f74c9c7d4713578f4f480b96c77954019b5e0c50bb8707ee26aafb40f915f912ad63ba5a456 SHA512 f2cea29289f870630fcabca0e10bb1445760f6458bed833dbe5ff0808c5fe03b0cafc4ac3d3de47b49484b02f38e5f6bd31aea6e63f55c4c415ad316984db909
 EBUILD geany-9999.ebuild 1714 BLAKE2B 6d66deeb5ffc669dfbc0a83e45928c0c0a4bfbf68411684c6e069f74c9c7d4713578f4f480b96c77954019b5e0c50bb8707ee26aafb40f915f912ad63ba5a456 SHA512 f2cea29289f870630fcabca0e10bb1445760f6458bed833dbe5ff0808c5fe03b0cafc4ac3d3de47b49484b02f38e5f6bd31aea6e63f55c4c415ad316984db909
 MISC metadata.xml 2032 BLAKE2B 54b3618b43f780191a7beac778aaf9663fbd5f9c92053db9d0be5fe9f15762be554b5e3cd2f3fd474af947dbe4b24eb8b010aefb564cd99a28c323fb0bc08401 SHA512 e7c85e1609236337edba5c321cde1e7d816e672c84cd55bcc98cf76231b04b3c2419d95ea9a040f5f28784a6016cff7f0e75d8b24c1f7fcfe8dc20a60e6c90bf
diff --git a/dev-util/geany/geany-1.37.1.ebuild b/dev-util/geany/geany-1.37.1.ebuild
index 2dde606ada78..82a87ba680cd 100644
--- a/dev-util/geany/geany-1.37.1.ebuild
+++ b/dev-util/geany/geany-1.37.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ "${PV}" = 9999* ]] ; then
 else
 	[[ "${PV}" == *_pre* ]] && inherit autotools
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index a53e392da0aa..4af89c83527d 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -11,18 +11,12 @@ DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c0
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST github-cli-0.10.1.tar.gz 257623 BLAKE2B 5b2dfb95ef4f4880524cfcae178e1c30dda608fc0d437e7f1090d04124cf4a6b1aaac8314baa9f27e2215758f44a1067b7807e61fa3271e75b9150dfa3b739ee SHA512 ab7e236b3aa14d4cb24e2af96fca07aa1a9cbacf4b80fcfce8ed157e24cca3c8c6e5ffa05240dabb8494e308960237d5b6920a4c426de6c00b655b201439d769
-DIST github-cli-0.11.0.tar.gz 267416 BLAKE2B 4200693f4e63eec6c7123240f0eee871e82fc58e2714896ce85a09b791450d275a77681ad4f91f044c8f5041b3d3d35e1e4131ade1260d1b46e275468e172ace SHA512 9b4bac9750c38170817f4f818723f1b2a48caed0e49a706f6de3a151c9c84cd492b92c65bf1c9251d672831bf81fbf76c64ad2611fbd70b745fc091754db8eb1
-DIST github-cli-0.8.0.tar.gz 225839 BLAKE2B c460405973e73374d393f19a6315a9b4af4de2ec3634b37a1669b8683e0cf5c1e5872dae4d130e9fca15dc88881e9abc4888d706b1050883361f378c8da5916d SHA512 5fca1f148a2973eafffa25df052ad09a8407dbcd2e41b9c5152011b990f02c27e1dc75b41d5c2b985bb18c6f1070839e8d526032230a910f9f776147a3a31c19
-DIST github-cli-0.9.0.tar.gz 236398 BLAKE2B 8a1004b8fcf54179e2538d71471b4952fbe9ec2b67d97bea130afcceeb0b6dfd93ce9a9a477f54c1f689a0c5707cae5550445719a7badd81c66748543909d4fa SHA512 75d09cdcff4f31d6cad0e9570af3aafcffdfd8bdb925596780abde24c0ba20a212cfc9426aaa29e7409c7fbb7061bb8c88c15aef11fc9d9490265fa51aae5cd8
-DIST github-cli-1.0.0.tar.gz 337523 BLAKE2B 8b7e2c507da77224d03f0c349eb0cb9538f3293a3684994cec1a8fc3f6f9f261d71f8febf54936afdfe734b0595ae052a2c6c83db803331b4991c453b50284d2 SHA512 c4b9c041ff8e63551ea6d94ec65017f8d264bc5b5c5b70b0525fcaea672c34f5e6aa57d096decef35891fb8d51a732c15835b0354e712b9dda353b7c869988c4
 DIST github-cli-1.4.0.tar.gz 386950 BLAKE2B 68126e45886e1bc38ac6c3a541e52f69299a6e12f1b6c5baafa6d5c3fbf5be8c30854b5c85294de6b50dd6bfe9e12262758a4751aad1aa4f310206ac10d4cf2f SHA512 cac1675bef1bcf749c87cb1d196fe687e32b304d73e16d4fc21dc4f429d18d4c04aa00be713a6b76e1261df565ecb589b8cf2ad322e4f7d49ea102369c5bf644
-DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.0.7.mod 731 BLAKE2B 1ca410dae120a2ec12efbe7c1d8e0fdd2a38ed1ed76ab770e37aa6ba449da6b5ef6e32a51e6ee263a982f1a593e2ee239fe0a774063d4295261f9ff63e09fc1c SHA512 72213e0d0609572f5e749a4f295a8b3ffd13bfe38f786fa3174e53ec318a623e9122c69718944034aa70b05ddad1771cbfa62d2fdc49df2152c5c9679a681ff9
-DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.0.7.zip 90292 BLAKE2B aa2accf4630d73289f2ef94ad870fc8599f25b7eff43d56b08c0b72464848181845db5b9c4b6bde5c91ad0969f2baa02d1d2f2aaca27287952895ab547b60ab3 SHA512 aba8a60445568ecb8f68b5d85604845e2a77a216f747b15b8012be59f5609a4e71d367aec4c6a222c9ec93d1b8063a190d9d529075be19ef633ef7f26b138216
-DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.1.1.mod 719 BLAKE2B d95afef5c101e842eb6754ce837753f0d953c76546b5cfa0a25b672e42db57b78e7fcf9fbc48dab261301c448a811818f53aabb251edf6cb209adf196a5cc0a8 SHA512 11355981fa0cc2c28a274175a123c7a3ac5dab596ea08faa429da137611bcfacfa15b38110943b520a99565776039f2c48c5474eade25aa64b8eb5a3fdb3f098
-DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.1.1.zip 151157 BLAKE2B 9580dddcd115d6a103153197f520eec62845acd051b3ab0771826cc4e5c34fe81173fca5878f92bff5513633b630fdb8efbab3b25a8e6d2fdbeac167307774b4 SHA512 37e1f668ff036df4352f8d612975d050bb8e70be2b02b3fbcb44301c26d48951aad6ca7857fae36e418edd68bcab4d3a56b2ff195dc396e890993b1d73454303
+DIST github-cli-1.5.0.tar.gz 396453 BLAKE2B 728939040d263bea4a623571d03589628f69bf3887b0bd79da14d36da8fa515c1d646c00b2aff154685369d0e1a4ea5b16ed788f4989addff28af233568f3208 SHA512 a75bf4ea913310f097dc158a1b8ce73453402af0647d918007afe7fa05cb5dbf1bdff1f4dfc4b4b0a301d68ed447428088e956fbcbc755ea9396ffb6cb77152c
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.mod 719 BLAKE2B d95afef5c101e842eb6754ce837753f0d953c76546b5cfa0a25b672e42db57b78e7fcf9fbc48dab261301c448a811818f53aabb251edf6cb209adf196a5cc0a8 SHA512 11355981fa0cc2c28a274175a123c7a3ac5dab596ea08faa429da137611bcfacfa15b38110943b520a99565776039f2c48c5474eade25aa64b8eb5a3fdb3f098
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.zip 154742 BLAKE2B 1eb9644a4458d70e3d0ca66969cd4c50ee3ac3ec89a3840a0168d703fb4d716cdbdc703e07b9c60775220dfda3d48791d7410484314b7263f231155d51ec0d1b SHA512 765d4137f91984faf60380e9a67726cc679c26dcf421445b932aa18db9f2b29ef9c58d69c3cdbb97c3f1703fb880152d53c6eeafb639392a35218afc6491d8aa
+DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.mod 707 BLAKE2B 3f7da997d7cb7e3ed2426497741ee7b4517adb66588f268b095f9abe4ab12842a5e14df940a1b89d1e5514c0c377a0a71e5460ab22073a1639c6dbed892fe8fc SHA512 6f0c6aa88ce38abfa9bce0992b75b8ef5a2f58c743bc96ef49b8a97d7e04ad7071c0f63f65c3ff82e5014df91d383f5ab84a2c0ac8e54739048de9aede5443c5
+DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.zip 155695 BLAKE2B e9e29d2b6d215b75a9de1d33b80d827bf7403f940fd106651a0b00e87672d9f1f4a8c084139a2da9a92998cb3327c978c228bdd781f2dc8c45ba7f0a6b7ab4fb SHA512 8152f6fe278a329ab4518c77143b36e1bdd6f3f48ea0853e2e5a07b545728502776d61ad877e1819fb7641bcd57021d6343b979276a836a9b12d4f45b492ab48
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
@@ -33,44 +27,38 @@ DIST github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod 36 BLAKE2B d0745757255951a92d471fdb1eeaae2e118d367caf0fcea00a405536d7e30609f22276e7a453aac1ca38063635df798a0843f279c178d394a7cbef9c9f9b3c27 SHA512 87ff97fea3e25aa903503e56fe5afc337918f7253dd7175833adb144a7296451a7d4ebd76df504737a5b4c5237b1102920728d21a587957d5d25db5d38e1217b
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip 73310 BLAKE2B b0aaa346be477c14bd504f98219659c8a82ba08afdd94f1a5ffbb44cfcb6cc9b014c1ee35aec6071d4733134931e6d2a569940e9f1f06a5e69b00f56d82579e9 SHA512 adf9a3b8bda92edd028f497ca10648900a7aac4dae9372469b511afc74e79f8b990e448f375ab2a8df651a491bab5413196c06db531adc10358865f74de6f26b
-DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200304075647-34d9c7143bf5.mod 674 BLAKE2B 41eb6ab1dedaf85f4eae33fd39f9bcaab0aad42ade09b145bb36f0f1e254c8e0b55584f4bfedd0c813ba7bdd0c26ba2ea09b8af9e8c7b622710550918d9c02fe SHA512 b8d1d453815756d8d12d6a5009921a7967dee726884bef700ddfe5318b16a29f834734857f223c6d6a5d8d676c65d1c8ccdfbdbda849969c0c572c63adb59fa3
-DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200304075647-34d9c7143bf5.zip 786894 BLAKE2B dc1bc0aa2f01b05838b07dd0a951d6b7ec12fa995369137d512118da8d29ceee92b0a5da466adb0acbb079a49ae9aee21b73d2f0201054cf96bf15d8322bc668 SHA512 6487bbb54c3dd4690b8d43543f344b47369bc09b46e0ebc9f74d4fe276a196dc8f5bb63a92c1e253cea6fd1d8dfc9b90d851040ac2d7a9f773057bc433c2f497
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod 687 BLAKE2B b987855d98e0e6181e8f28c12976081b5e0699cffc79b0721c811eaf6962e6edc5a01135519f787eac6d38e742517aa4d6e061ac4e5ba986e5c5e0cbd2a19177 SHA512 bf5c7b4933d685d90882099aa8c5bc33f8ec58e5a35138180b58771185306b6119cfaab319a43ade929b4560be9746f9155c8d55d1755df12b177613982c7617
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip 780356 BLAKE2B f1e5a30ad9e46d9f59c5fa3ef7732bc5071f5012ff3205d23b67a52b0c90eda2b8ecf370de54d3cab98d0f4695122f478cd70bee8751d68c3bbfd627418a0583 SHA512 74f74db02dd92d45ae77cbc64ffce73b87066cdeebc23a4f5cd509660accb72d72be398fd0571871e651191e62eef30da7e104ba4a4e88db323a0609cfaa48e2
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod 36 BLAKE2B 60ece6720c6735e5b01efc335fef7d7f1186087068e573d5fa073b811053ea60b761350f9c371dada8cdeb5b285911c4ff87495b800f9c19ffeb69739f4b143b SHA512 971e35af5346054a0930f5543dc936c5f32ca801433d3ca26461ae7c1583b4f814376e8880f4d5329c46c36a3bde5ee4290b825bf19fd70c6bf2fbbab03f8ff1
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip 4919 BLAKE2B a939fbc897831f04ef6995f3d6220d56b8b3a8e3ae4486b605b9601aeb5bf764249cdd619248ba55b650e15e208a720fe1571df99a850a0b742755ab36f86c0f SHA512 7947f0ed3b2b42b8454af3cfb0fb27ec38af8234936d7cfe29017d1168b80873dbb6ac1345719fc5c405df9c814bd732a4ecf6f985da880f4ad83cf2f25b7834
-DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod 219 BLAKE2B 188d73a4d4cf4bcb52cea7b32d8d8898086532d50e8ed0e92825e2b34ae1e035111dbc27b995b9a12d70e6be509d99bc693a0af8e3734641dc23cd1da39cf984 SHA512 165cb7ab17309c66d509af018c8a521bd90f9a58fec8fa9437e5b32aa2105ef1be19a1a0a1b13a51300e308c5e63c6cb74897ad938bd6f8b3bfb2d372347d02f
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod 34 BLAKE2B 6b3b01c8066b701d0ea30efa5b144fe9bfe8e9f196ce4f0dce058e0947890e4f2d458bdade3816c3df1e35a972bbeef478c91e02579f81116603d0dc20855315 SHA512 5896c9174737c300a726f70b7d6300b892e790e41598b5f82ec82aca020f93159f9ea94afb6a4db605aca196d527a7a42df9b1babb73b8d182fe6749e95975d0
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip 5773 BLAKE2B c1026dc04da3122194368b90c597d7a3b7a90279d5ca27e6f3b397f0054c4f51dbb61205804fb0257c07ce078ec3b328fdc638e752411b379474cd51d2337488 SHA512 0c048e8778641577f394433483fdd4f916c9ff16ddd4d7b1b37c4b999b5107353e6867c2b2430b183027807e53f160ebb2419ad85f1d1b2e0bc0b190efe47352
 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%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
-DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 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%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
-DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.10.1-0.20200410162419-bf6cf7ae6727.mod 140 BLAKE2B e7d82ecc42519dddcefda566053466b04af58afbcb422079068dac90c384ca38cbc6e44d044986ac3f753ffbcbbcbc1b1c32c334f1b26d1abcda487599d7630d SHA512 f9cc1a1c738579aedb37b69badb2624e4fd936756de67b2656849c406497bb547208db7a29f70e98a3e7ba5081878227f69680e53dc3dceb0b46ecb8c509c43a
-DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.10.1-0.20200410162419-bf6cf7ae6727.zip 225908 BLAKE2B 81a35285be6dfb797ed4621426fdb05f6ebfcb4358222548bc161141b73488ed4bf2206374a44308a99f300039fc04e783e11343146c375f601ed7d43c867efd SHA512 6890d10b3d8c02de2f3d0ff0e69eb772a4cbf3d293e6cc065f96ee4919ddcfac34d380f89d19381c02fd5312d9e54d7217f13b8e94cedf5c0bdd5b8e01f9e2bd
 DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.mod 140 BLAKE2B e7d82ecc42519dddcefda566053466b04af58afbcb422079068dac90c384ca38cbc6e44d044986ac3f753ffbcbbcbc1b1c32c334f1b26d1abcda487599d7630d SHA512 f9cc1a1c738579aedb37b69badb2624e4fd936756de67b2656849c406497bb547208db7a29f70e98a3e7ba5081878227f69680e53dc3dceb0b46ecb8c509c43a
 DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip 222552 BLAKE2B fb3c69455ae61dbab0af62eaa9eaeb936f3c749165f1fe646b651ebf7c557378094936d536a4a4664e63c29ca844c915886bc06501463412799a22dfb5bf4a0b SHA512 4d2a46d4e92b8ec6e2c3600d21d063d0f386cd92ab2fce4a3c52a0e3689a9d814ee90c57d5ccf09a0417f42f029e827f33b8a5acdb7d736a321ba6256970951f
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
-DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200320173916-301d3bcf3058.mod 315 BLAKE2B 8df0e2009d27da74972a7e67c996f4968738c3dc87fc68ad7fd0d74a0fd661e2a6de497efe742ef3f5cc8739011f49f58dad708cd9e89e829489fd61d1e686e4 SHA512 0b385c4ffe887f5023645af413daa5df47a9ec840cbc9d886088050885732cf1246a88c930b8005290f5005cd017c7fbf9e4a85c0a7304d8058353e7ee61f1a9
-DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200320173916-301d3bcf3058.zip 553185 BLAKE2B f8157149a821cd527c9b9a4980e7d18038f4be550b20c3fef3b7f45818812773cebc35ab2955fcfeebfaf469a160c780a20a52323907848db0764e1c633b13b6 SHA512 aed0a7f014eac4cb07dac7e4fd446523e5787903d7bfe3dbf187055cd7ed81bb398652a7219af6cbee158599fa6739d4b615d41007d26d00b01b078813f2aff8
 DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod 284 BLAKE2B c24bea0833ca93fe4e43e639f601cf7c2123aa21320193a59abed6a8dbc18530e1d2a9e90eb8a27d6b836978d5f79066b2b6ee328f3cd24508bae3f03a47d021 SHA512 55e98df741d1b7d2376e26b8c23f322e5425fa346d98f571d4f5c22cbfd63b6ca88c8caeb2f538b355a4cb8eab39984d1cd0029ab7570184ba80eb2958e8382c
 DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip 553508 BLAKE2B 0e613623ae7238b16c77b0245577bbc65ee903fcd36f2a970f0e62955e2aea4b7ee36fc3b20bf892f95ed02417ad1a7288b09776bb4f8cdbde800dc364883d6c SHA512 31dd378d0006e449b88ac2ecef5e47198c10f86204e4ee0e1128c211ab31da3d4c62dddb594b5c34cf446e9aa7228c9ead3cc83895e5157d8067d728fdfbfb12
+DIST github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.mod 79 BLAKE2B 88ac27f2b8a39d11a8ba8be021428e51a3b79e5b61332e0cca0e6eae5703fdd4c8ec05ed2b581c3b91857eba4691eeef56ab69771ccda4f6f91512f64edfe031 SHA512 7837a60a0d2374201f1d3157daa3ff78e82f8c42f2d8794096d4ed67bfd9c4000ba2eae465b8c4b2e52f5f9c653ff22a3e4f2f0a8fdd06346ee85e395d32b50c
+DIST github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.zip 6846 BLAKE2B e7f0ef97ee4e1cdd0c1b2ce01dee8deebdf3569079e0d576e4d47004a2c3ac5b9bd5833e801a2863b3cc57ba86873ff13bce0bfc3f9fc9ff86ca0a3128949b30 SHA512 c37691f53b0e2633d81c9969542c86c0e7da45133ea85e5ea8b87a12ffe418f5d05f65a9c023b6a6ac31f9fb36dfaae053fd1ee0779475a9d0fc3f6fccc937de
+DIST github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.mod 76 BLAKE2B 15951b79ecd3f5e6202a54fb23dd685f0a1f6ea54e82b3bf484c89cb0a6b5add5d785128054693d1ca6ad8c03791397f24cd889a307531c026205c93e772e577 SHA512 43470604fd7bc424682721688b15a1fd343febee02228d4826b98f2975364cbd62cee6306826d3ed2cc76c56ea586e1d2334781c0ef3564ac7fe974db9dec914
+DIST github.com%2Fcli%2Foauth%2F@v%2Fv0.8.0.zip 21519 BLAKE2B a5473cc8eee97c02a2dd2ea1e81654c3d7d0fc4eb62f88d7ed2bfcdf51edf498af50974e2a44b0d823a0703b50ecbb3e76d0189233b86b775ae784d469242de6 SHA512 3f1f1c0d7173ebfc9aba5d84b5919d040a1b2c5485af2a3c61e3b2d545eacbc3c46f87a0754902d9bd7b76fa903306cb130508529a794865d134047db43b1b89
 DIST github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod 40 BLAKE2B 7ab19e087a8058fa51d0e17ecfe123b7187acfddc96633385d54e68cd4522de69b5005da6f6f47970cf92a0c1f6164c2dfd439b620fa51c0d64d13dc0945bf05 SHA512 427d6b45641cc39b572963ab5d482860e50d5727ea8591598787d0bcdf00ca5cb12d24dd28bbbac45855f38d07d07bc686af5276f75ff5b0f6fc94eaffce150a
 DIST github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip 6901 BLAKE2B fefb4882a93946812fc98c20dbb38cc8172fd207742552d233f3a3076de1da102a58188662e14bb86cb1b1b1ff50b898e0642f151c42f3cb13eb19d02e83cd14 SHA512 7b037e25dcc46063606f753e419143a8baa19a817fead39f7322370f8f4cc8abb3937c8790db85799d8a86582c0dbd9e7f2ef74408d837ecc646f23bec2bc6ad
 DIST github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod 182 BLAKE2B cfaa0b1b2ef310b9950e6e41ffa374e1e4c19ddb07519f493c5c2e7ffab9d7e8a1da63646d8e56b603075a93a3dcb9fa6b5acac9f183dbabe78e00bb28d3f660 SHA512 f9514e587a38fdf0bf2d29c6d908b242645341b4b5e1616bc2257ebd2eb1afa45ffc41132077957112c3d23d833c102dd7291efb8cfe32f326db40e99d20b6c2
 DIST github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip 25883 BLAKE2B 40e18b6c3af8a28922261454d82fca14c83f2153d3d84f2729f15a19b6cd8e61cdf6d31908d259ef3eca51527ee0cdc162ed114d48c24c9a03d82912e436507d SHA512 eacfdd76948c11b063d041db27fb51b28e2c3dc434113a668678905106907adf10cc8004117ccc8d312ebeb33c81201d1bd90392b4a96707dadc2f2d4b0b5bab
 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%2Fetcd%2F@v%2Fv3.3.13+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-semver%2F@v%2Fv0.3.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
@@ -83,8 +71,6 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84
 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%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod 34 BLAKE2B 900b7c39f85b3c32ae1cdcb56063defb238ec2dd7620f1a13b0a7b7a5c1eb237854d00d7a6063cc546fb6c7a41bb0fe6d71ba4589bca57d8dd1183a806685f9e SHA512 91475e539eb45a642590606c6174f07b3461691aa18cc232362694890b446a7f033834676273e33cac54db288a793fd70d07d5997997716f954d1806ac879091
-DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.zip 689531 BLAKE2B 959fef9198d29d7ba6696cd8b1f273c14284566490efa47b6ec768a5a9e77fa251083451a3f3f589abb00bdc4d00051dd8ad1850b5f660e3a79d40940ee6168b SHA512 fd02c0253ca30ebdcb5d34699d66ad8333192672f89b89db5b6ad00ebf3c8a8a7280f8e650e2080572fdbb86d0e09f4535bd08e7dfaf8dc6e276e7a3c92ef0d4
 DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod 34 BLAKE2B 900b7c39f85b3c32ae1cdcb56063defb238ec2dd7620f1a13b0a7b7a5c1eb237854d00d7a6063cc546fb6c7a41bb0fe6d71ba4589bca57d8dd1183a806685f9e SHA512 91475e539eb45a642590606c6174f07b3461691aa18cc232362694890b446a7f033834676273e33cac54db288a793fd70d07d5997997716f954d1806ac879091
 DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip 691188 BLAKE2B a59e078427dcfedf06e31b212306e6c1bf0ba16248a86b5b3bfabe913acab2ef35b6d3f9f6b165cd773cffc9f030f1aa930e1a3dea7e066820949703962614bb SHA512 009731d05f05cfa69b710df82c894a2f31a53bd90aa3554b34bffc9f304548e5ed5c1142338e8917fd526e0fc54d1b5cb010eba8508a689efa0d852bdfe484c4
 DIST github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.mod 43 BLAKE2B 251da0399d8aebbab22fccd29d618291bd01442d1940107774496a444edabc62bfa9daa58f49ac6fcfbd09e5160af4543b458b9f02ed55957d1df864a6575838 SHA512 df166f886fa04fce87433dca9cc4889cc91eb8ef03999a17fea64d2415e1e8ee2fa6fa214ce8a749b6e1cae1a806f1d84373edb0a3382e5eef0c150013fdf1c2
@@ -115,8 +101,6 @@ DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f
 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%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.zip 107826 BLAKE2B 29a78a894dafce98587969d844470c650fd2dd5284b0801a7a63a052279ee60f9c95c65398b3d5448b7ea5dfa67f971c3c8cbd5261ebef63b437b0a945fe8d38 SHA512 bdce84633bb5e735b6500b4d3da15894ab2adb34af81bdd053b2b19ffd5286b9fd3f66c73d13c930d72521627486bd80f10f8d3945cb50bb161981aac6e4ce7e
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
 DIST github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod 32 BLAKE2B b4a6a587860fd47f9340df6d0af6ec2cae0f503dc71c715ba513bf266e707f02df445c0a0006cf9839a647ea613703bb9fdcf6b002de99a5383dd33ed960173b SHA512 c1830b7804ca1b5a7c6d258f0dbc92c733b70551b1fa44ea0144f0b263e3f7283047c19770971565386d197fff2e8685cd67c2870f85e0dc1f9143016f9bc572
@@ -130,7 +114,6 @@ DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip 8
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
-DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
 DIST github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod 106 BLAKE2B 1a65e75a7724f3ab30867040585056b7f0697393e038fdde69d8b6f6173f6cd0302e3a4e65f42405878680707c40bb3163e422a5da49edfc78ef47ee1c503ad3 SHA512 470fc9dd28cd76702e86a4a6e1df812506dfb9bc0e0cdbed8be2bd6859344a575b9ada6f9d7f53eadc44300f1e4e50e47c65dc4171f50ddd2ebfaad3146f780f
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
@@ -148,8 +131,6 @@ DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a
 DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
-DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
-DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip 16706 BLAKE2B 3077f81adf72f995a24e9e8e0fd90e0457d5c210cba7b820dfed7a2cddb06eef4ad4747ff0da2e663419ba891df9fa7ff374e1bc73f2326faddcde17bd3e6bae SHA512 c44bca4c63fc38ebd97c2abb7b5bfa2af635548723697d9533590242b936f1b55b119d0f4a327f1b02c546d571cd0d085f727c00057634d8c2316d1c7249fecd
 DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
@@ -160,10 +141,6 @@ DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
-DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.4.mod 44 BLAKE2B 94ad329f624923cf978da8c5a6ee75345463bbca80f0165433c6e2221795f0fc9d5751ba2f00a815dc4ae9320c3a2994c8ba70e5775eefdd315dba02561d6d70 SHA512 40bca3f1c4e260519e554e71f0578c9e8c6e0ee064d65446f869fe24ae73c84beb01b91db4e48cc324cde72b43ea695721b490606dfa2aff17f1037b51de7fda
-DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.4.zip 50127 BLAKE2B a1be6b96e421a711f6bbb67520724fd3723a0f218bb530e77f5f34916d8d8f526a56614ab5b0336b6f3707cdbb47ab96e7b1c4a32917f3d2e76b74daaec636b7 SHA512 e094a536e0a8de13a21272073bfbffce16e27f2971c5426a34199859828f014c8c2e60c105d2765ddaa46fd1340f6550c052160dcb16b97383c2f0269395a094
-DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.5.mod 44 BLAKE2B 94ad329f624923cf978da8c5a6ee75345463bbca80f0165433c6e2221795f0fc9d5751ba2f00a815dc4ae9320c3a2994c8ba70e5775eefdd315dba02561d6d70 SHA512 40bca3f1c4e260519e554e71f0578c9e8c6e0ee064d65446f869fe24ae73c84beb01b91db4e48cc324cde72b43ea695721b490606dfa2aff17f1037b51de7fda
-DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.5.zip 53497 BLAKE2B 805e5717032f2fcbb5821f2315fb8745b11d9603be4debaf9271872de45428a5b1ddf97049765c71e1dc080f53291ba2c06426f41cb5081c99c65e76e83cbdde SHA512 3be5ef1b956bffda1a8e1b7eb2536cb0384d8c66baa21d16cb6ed75eb3019651721631d00277804355133ff6cf72d7b913b617532f41bd09736745f342fe5786
 DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod 44 BLAKE2B 94ad329f624923cf978da8c5a6ee75345463bbca80f0165433c6e2221795f0fc9d5751ba2f00a815dc4ae9320c3a2994c8ba70e5775eefdd315dba02561d6d70 SHA512 40bca3f1c4e260519e554e71f0578c9e8c6e0ee064d65446f869fe24ae73c84beb01b91db4e48cc324cde72b43ea695721b490606dfa2aff17f1037b51de7fda
 DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip 54484 BLAKE2B af7a19565d04fd3948b7e993058eaf38ff83e18fc8a648ac59875aa2b4185195f3f2c80eb30cbc17da74f85672fbec5eec151849f06c74baf9599adf3362d9fb SHA512 bfcf27f8b1703d50af88ffd871398b5c56d2bf8f2441d6c97ee416d64eabe7badc9df11d588aafa7d98bb5eaa3163e335eae4c03bc186ac38bbf8aa0bccfaf26
 DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.mod 32 BLAKE2B 4d59f879c5dcc4dad7245ab234981ff0906c2c3ab979d0e264fba1741785e5bc33a20d7177c58a8cfbfcd2d0f7b83ff141634bdc1e277b70fd68d23e83e9c5e5 SHA512 acf5ab31222c39f98b7bdbdeeaea6ac7daa0acd3440de82fe67537da6c735968bc442901aa3617fbb02602d5d90f255fc92501c1239a62e6f57c683990588cbc
@@ -190,26 +167,20 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
 DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
-DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip 12177 BLAKE2B 8089c6123a976fc954dc76f74aadea87031bef339aa263aa38e80d3f3ee0fe87c58d9986b2961e29b746618617e2cb6b2cfbacb5c413acf963a2464d36dd0bc0 SHA512 54509ddbb3aecd1980215f73a53739d2f3c757daf67c78e54c508474678cb5df929a3b8e17f8d2b66438c1e78989a2268db2b32d6a0a6d5236abb6936a09ac04
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip 19130 BLAKE2B 85321c6a52022df0bdd9672de52cb5b7c1a652432047d94c088a71d612a81fa71d0cf9fa611c713f8f57c4e540ee0212223e987eae040e95014bea07e135171e SHA512 9ea745a6ca03c046d7b77707616fa756c01f58862286fa9805e99e3a0090be2fbdafd763f432f3c9ca927518db73ee0ef74e0b95248e515f50c2c2c1d9b14065
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.zip 19769 BLAKE2B 0e0f4d4ad5d19d5a0c7ffec0007cb04d9703c8d27f90db5f5c5a367477bdff68feb50278ce3d9f01be1b6e44f579c15e9f65a88b0e9bfb83b4ad4beac6a62ca3 SHA512 e34dcc87f0141e505d455ef9ccb83c11fb0d4625bdef6f30ed3ed21957dc4356cbcd370b005c2c9aac25763e36b367866690682c0bb4ae4cab24b799e70f2b99
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
@@ -233,8 +204,6 @@ DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
 DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod 87 BLAKE2B cb79e46ab6a5bd617d293b588909a6b6c130c9349047eba687a75012c179f3a5efefa43939160cbb2074790d1cdfa2fa40085e9998233d305c38452478bac527 SHA512 578e4ad956f847509c7aa800374a036919c08d5cd6f26821e6ad4ca773c4ca64c38256e5f98e9127cc61ff9ecae8e12fbc02ee369f674e27eec6d2bd9523af30
 DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip 21720 BLAKE2B 4d088d303d11be2734aad265a65981ac006f824d1564cc9a1517f1ad85192c042d1d00da87647d012522f477372f4816b9b15af5ab187d8a3d5a9ddeeefbd7ec SHA512 65c5012688d4e6d6730a2a50d770aab99e6664948ff2375b76b44283c7b0ebd3f35d1c2a460830e936743a1a9267b9fd1f9986ada7c8b01c459199dcc54b2d4d
-DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.4.0.mod 195 BLAKE2B 199a83e2d16de25f166542ce1be5be51a5bf4bc80c4dd5d5f2c28851591ff97922d09a8da44f685ab0287f7e01ffbf7a6dcb260ef3eb804b606db72effafc31d SHA512 247fa27c3b947eb1808a687fc67732cab9ccf48ec075375096f93b64490243f04f76da7cf4338a3200ff379cb97448f29abaf981190da5e44d82a87d9eaad96a
-DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.4.0.zip 408235 BLAKE2B 597bcf10b4edb3914744517a09fb0e33c521968f5df27cd3faa53da57ec3b5c7749e4040da26cde39baf3b6a0ea51a0180ec21962a01b10a4808802993d5fb01 SHA512 cb5f2fc5b32eb4f0608c0b6466a1b5a19c99bc309ab1f83627ad7d576c872c5d2d5d9b52c774825e77e6d863d9d395f853fd4f705aa3608d097d09583a07a764
 DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod 233 BLAKE2B 57f3b11b63eef192fad7cc8ba14b9be56ea9865b650d85d1db2e5a5a67088e03bb7948b61033d616df25454d795f33b9e6c65ad5c791a80f2db135728072774d SHA512 fc2d84b74177bfa1208cee1965ed421f6527bff59c2b0b3a10d31b41f1ce629e2537eea56f42e4e6f438607578dacace1ecd1cc4e81fa90d8530d048ae1e9a9e
 DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip 411922 BLAKE2B 7e7334afdf133c56cad4c63d9ce3add449c688750065c3e1da5f2bb28c75f7ce8afe58642213dc4cc19bf8e64ec25b7f1baedb5a4caa28da066e9a4035f8968e SHA512 d3c0cbbe1681820cec2c117223a838c5346bb48216262152de5faca819300cfbda8def7db03d3e6c07ce0223df5177164d39f593ec43ffd52aac872f0e39e520
 DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod 225 BLAKE2B a5466467d259693afe121c04b8096e3f979bf0d5440801898d135e97c1c52af157a9224f984739d9e73e5bfabb619ae23738c63934a67d72ba11abe81dee3d58 SHA512 505a79466a4a2d5368afbbef355e0abd7f41936f8c489e3e584430d6d59aa0a2d28679de67e0e087b34ada18c0241ae61232fb5ad797909de49c41b1cbc6852e
@@ -272,18 +241,8 @@ DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
-DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20191127044304-8f68eb5628d0.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
-DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20191127044304-8f68eb5628d0.zip 45580 BLAKE2B ed68c72fb2932b8ab97a1e2aa07369fd9b1bad8e84f52f2011c5b04c2ebba65195d2e76c6204c4b9ee665bec1d2fbc6e42c8205bcde3a0f554027f4e3f5670ea SHA512 ecdd4476bdc234a006dfca0d2d34ff6d3914fea3438bfaf1d2bad4fc72498553190a51eedf752f5a9ef21908ac95d18363c6693f22d11e0c3f731f8081d69ce2
-DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200414012201-bbc966b061dd.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
-DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200414012201-bbc966b061dd.zip 45974 BLAKE2B d00a240342b45f910424c2824a863fb850a7765d0cb5ff7e9bcd978a8349cf269797c4370c40f04f57b98738344b26a631f427527f69bb8b097485858dbb9423 SHA512 6ffbfc7a957698eb531f5b8a8110da5103c8498f7b7d02c843ff827e54557fb77227f0126aa6c2ac772746ab1aeedf3bea1b86a2cf03a328ba38cc0480f879ed
-DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200627185320-e003124d66e4.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
-DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200627185320-e003124d66e4.zip 46033 BLAKE2B 59549b4f19c4fd761b4135263a814c1bc61f881e2d45bf906f2aec010eaf890e93fd02c9521f760d9f1ca7d6fe324b964fdb73326e160f79e867f6a236a06913 SHA512 c8d68af95fd6ced0708a9704fcad645a9b964b1e567c961108e57fcdc3f3866a753b70d912f87477eb2651da01d0502818c2af33e94d27529db9539bec6a5187
-DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200802174311-f27d2ca7f6d5.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
-DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200802174311-f27d2ca7f6d5.zip 46371 BLAKE2B 2f5c65a91c534f7ab58e2593dd0b17bb7f8758a8fedce35cd77eb7ab97faff1d15b0bdf4fa6b1dc0247aa8fa07f3820d9cccc8f26f88583b326533e2c24fc076 SHA512 d889227fa22c06934e9a5169abcf25620d4aa97e9ff35520b427a1ead2c306697020d904d8b31a22c0166d9a5b4e5c4ade7e0e7a07905d4c1123207799858d6c
 DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
 DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip 46247 BLAKE2B 076a9097d8b814a9adc9d0d7139f3543ed4ebb19944d40e78de4032502fa5e0edfa608fb789b26faecd0ff9de2c40b05c6c266949ccc9eb1659a40e72516f6d9 SHA512 b35c5139ac1af16afecb0d1b89c19032613dd7f4ff4843bea89fa7aff01d2d43ee9ad000367d467fe80dd7e2bc0f35a0cb357597f307e144245bf418bb8bf16c
-DIST github.com%2Fshurcoo!l%2Fgraphql%2F@v%2Fv0.0.0-20181231061246-d48a9a75455f.mod 35 BLAKE2B 5203f9130c17196d735630eeea5f692c85ad9cb9c1f2884507fd31715329724313b852c5182ea175cd9ba8ba61d0b26259f42d83f46bf6bbd24c3e0a0864b141 SHA512 9a08a375efbecd30f4d479810be1dc4bba52e1f7254ff4a527a390628e2396b6b1838d305a7f417b932f82c53a4f45df7938c0d30aceb3d478790233bb0028d7
-DIST github.com%2Fshurcoo!l%2Fgraphql%2F@v%2Fv0.0.0-20181231061246-d48a9a75455f.zip 24322 BLAKE2B c3cdee6186b0847db90eeeb6e21ce38d0f14227db33d9ac4787ac22325e942a5b9882da4a47d0786e11c4f0967a4776f2434cbfbd44e18dcce95eb5be0da0f85 SHA512 b4a8986187ca882557f6780663433eaadf51ea0395924590773396ed89b0aeff2d2b31a6a63419e16cc4231cfd7f07817d6e51254238f42893ba47ebbb405ea7
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
@@ -293,10 +252,6 @@ DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b392
 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%2Fv0.0.6.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.zip 157199 BLAKE2B 89d593030de5748d0e310af24beb7b2fe51c52e4bacdf0de35e08fad4f02a907a2baf60439d5164e80aa8ef6d9fe67534960674736e642f7125e408622120cec SHA512 8755633ce43afae068a8d5ab6366965a97c08a5fdd5e199fcade8fcd5a00524f668d78b97e70269b59b321d901356ab1d0fa83e11c75bb30705c6b3de85370aa
-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%2Fcobra%2F@v%2Fv1.1.1.mod 265 BLAKE2B f7a8de886a358b7d2910807ee16a26c210850980541aea7d179b7880ee57af17f0aa62d0bfff1f1116d8b32c9ee05bb6ac7482313e9556494e92c60ccd03ba1e SHA512 383bafdea96d9fb12cb72123ec4c5bfe3669be7867fca80e2cf4dc7a64e5a69948272da4e74851d1464dab1430362efb9a43914985019bec4fcdf942fc21193f
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip 186061 BLAKE2B 795662b91cebff6b3c8dadd024f73e29ff310deeb2a48d515ebe1726b6979e38ef7912940b8e6f322dee23da9ccc298f31567fce33d4af60979bb0baf4de0d92 SHA512 e764426cfda39a67fc94424affd4073caf26aca0145f7dae44dd5b8dc9c8fb0a0ed490092e58c07ea9586e4c48d0308a7ab2efca1c7b2e510b4546fa0e39f77b
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
@@ -304,7 +259,6 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf8009
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
-DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
@@ -313,19 +267,11 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod 35 BLAKE2B 0357260904c9ba
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
 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 github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.24.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
-DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.24.zip 260015 BLAKE2B a7f83264cdc1f7cbae1e7e62301557b3ae2f268b0c5d134cb363eb62382960e81dac038d3b570c6fc33815bd29f64f91805f314d0c0222138775401562059336 SHA512 fcccb3f27cb8d64c5eb644cfc65c8623ef2c8030eb7f2c4a29bd930e3962df54e26f554f026ed99e96b276e8aca58a9682e367e5ac25567e49eb1392de70d5b1
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip 263448 BLAKE2B 91fc28eb885a3030886862073f55978d2d1d7bd1186d3173f107809d09b0093bb2d4af45e812a4756fb8406bf00eeb6ac0c512fd19390154e91302d75232a6cd SHA512 e67fa8a6dbd35966bd06f6e2fcd346e09417dc3d8f7f093163f2dfeba4523ae567a0cf8dbb491e0a85d1911ba0583b61fbbbeec4b5e3a01847621cd31649b507
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
@@ -341,14 +287,8 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip 1818028 BLAKE2B 780438aca52569a5aa173a84eb785dd1897527ba1df9f2d9721f4abc5691334bc2304f0a159385269891b901b651d65ec1976fa2b78a5c3a8945c7d14d110211 SHA512 da0fa1ae69abd433993ddb19224de1cecbeac65f0fcbf5999fb481cce9a5bfe534ff7790fe29bd15c87021907433b32c1baa55fd146eeeb4d735472f2c0a852b
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200219234226-1ad67e1f0ef4.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200219234226-1ad67e1f0ef4.zip 1867609 BLAKE2B 557c84a0ec76f04d716fd9a3b551d73bc73957b042fc0c55f20f10ee55ce0503edbb32a9c4bd119fff0c6aa32e3239f9b5b028ce032f425477231efe42333dad SHA512 d81eb52177d8cc00238467ce73286fa179c0b99d5c891a6160a5b515cd7f51e29d5dca5d2c3d4f3d2a21a5327a57391459c8db624f596bd502ad34f866c82e0e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip 1878103 BLAKE2B 6fd01482411bd53a283186c07bc0b84b11186b0b1ed95b385389d967095fd99924059c3b02fb66bd5392e2c53da2c8c91dc0b41c0507be7a8ca9149a17bfc365 SHA512 4290ed77e7ccfd512faccf2b9a07ba2c8b3770646436f5318cb93b549f798dde3188735595100be1ca4964af378083a662edb872b99e6e7febeb2b6cfd1eb7e8
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
@@ -382,13 +322,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip 1277629 BLAKE2B becbc737f58b56645d8b449a7cdaf786a6bf70ab4db8d1876a4825b2f3d52b85e506fc9caf6a23a5857f992104b662e0f824e6fa23e7c92e27ba0ada574b255d SHA512 0d740cd05300d902cf60f54692cbdf91758457ac21a66738beac133b3a31930b3833b10978750efb59450d75f0b750985e28218d04e1d8e3e68c4c883fadab58
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.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%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200219183655-46282727080f.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200219183655-46282727080f.zip 1499823 BLAKE2B 56ae13cf7caccf0e779d9013c54f4abb44492a58b75c9a6891f2a0fbe38e565e2c1f23e275ae9ce32bb11b2ed98dc31bdd98419eb1467eb9b5607e9d19b13e0d SHA512 a1c1e015efd689d7fc8db14196486c4400d4783d70dda7bda5969a996478e2fede5f082cc9f3a67bb11d64f53a7dc3fe616c398d3a3c0e405576454abb3fdaaa
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.zip 1501930 BLAKE2B 3bca1dfeb32b0b0075cdf47d43657aadf2dc9acceb7bae17d28b380084cf3c4d91648531222fe3fa0faa3683f44077b3ddd82f9b2433a9c96da1f56ea2159f19 SHA512 8fa4c8eddd02873549dc831dc270e8682a16777269fc0a09bddb09ac5bd006d48d7a3bda22fceb9941fb5e60ce68d3261213e6343958c4398debceaf704bb150
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
@@ -407,7 +342,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.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-20181128092732-4ed8d59d0b35.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%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -428,9 +362,6 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c99852
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
@@ -477,7 +408,6 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.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
@@ -489,16 +419,10 @@ DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307
 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 gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.zip 101288 BLAKE2B e67aaf35537a57e2fd73a0ebf74e6a15924c43ad58ad5cdb7acb67b82031ea86b79eec9a11548c08a08664f6812bc9066fcffa918496591c1f0ddd15a05a4a29 SHA512 e89999a0ccf811c36b476a131197084fd1ad30f2c801cbcf3e9184adac69587ddbc9df2650e8be47bf1a1e1b89422a62484076c3d124470f8013e72a379b0740
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200506231410-2ff61e1afc86.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200506231410-2ff61e1afc86.zip 101681 BLAKE2B 0021071f9f09d21a14b9a6ebcd6167081656046b0ee1a7dddf9602863a01a5d35c260d3a458ce22e8993c58ed7409556109a4e32561ca85ac2a335720b8c1680 SHA512 4e57cd4228ab4745b75f1681faa9da20db355a01d11a1f50fc90423145d41105203572e1c12545861d003ee3b1e0e4a6047f45b487f437e42d07b91e32b6574a
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -506,11 +430,7 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
-EBUILD github-cli-0.10.1.ebuild 14811 BLAKE2B 9271544dc3dddb30c8261aa8a959a2bd7bec1c6bf613814f2bae0338f7d1f819eea8d53f99655ec134d28db74d75fbd0d2aca9d7ea1e3647e89bc2944d93c09d SHA512 56db74f5460b742ffac3a6a0800c2fa4f3ffd439772c174051906eadf1d8d7dc4145aecd3d45fdab13219d8bf26952b2a65081bd2affdb4cb9db2ffd5de7cb77
-EBUILD github-cli-0.11.0.ebuild 14955 BLAKE2B b6fb74ce2981d0fb5632f816659d451decf84dd9a4bffd34d8e6c70abee466e9cad21a61656b740ad106572b7175da1c6884950a00f4ee23b9f147281e2418dc SHA512 c8ca77588f33fefaf00ba941f443ff93bade89a2ec0ad8fe4f076e6b6fcf4903f901cb44866f2a465ea900df03750b84df2d3678d25ca5b8232e796056d7bb01
-EBUILD github-cli-0.8.0.ebuild 13976 BLAKE2B 4f07e3c272f93aaaec21d91e87d6e9dcc5a4727f98e3d37f1aeab73082b653debe44274d54a9bc9a71065f260c1eaa32aa0e0be76846237b4f06255d730287da SHA512 daf47d0f292f8f8bcfc1137cba8cf67df3677daa99f08d7bf2d4c2db080e581c7a7c5cc398ad223a0126e72a31407eaa135deeca3c5b71651af7ae51dbbc4d76
-EBUILD github-cli-0.9.0-r1.ebuild 14428 BLAKE2B f50d76ca95adf375bef2be3a8e514b1839c1dc1778ae29cf9b851dacfa127ea71bd8a639c65d63e326a21436acb0ec23bbdf6e7ab3f4efc1154bd4e24ee5241c SHA512 e2fbaca1d718798501aabc8362b1f62c7eab0b4d48314d2650b5fa203927618237ea51b583c38b70ed5afae5ce7ed090e89a98dcd4ffa3e6b468d201c7e24798
-EBUILD github-cli-1.0.0.ebuild 15257 BLAKE2B bf13252169a4a9acf8e896d1cab65726802b0668ff30fdf6efe2f3a95288e8d220411919b4e3c2dc39f5078f7b5241d2b6f03deaa7045c7222632d5850d0dee2 SHA512 4625ed04e5cee5574c4159824b60ada8a306131c3b0f7d9656304f01f4f0a1adc46ccbade49080b97ad95e54938a829f79f9f523aca0022a5c049e415705098d
-EBUILD github-cli-1.4.0.ebuild 23926 BLAKE2B b78b4f53a3ae09bdbd5c839f42a879fda1d5f4b86d7d4aa5855e41a74376861f2ccd310026d2f2bf301a873321169aa567e5890ba2487120d1034a43c0b9b9ea SHA512 d93c2d141ca27ad43797b54f24ae5fe0f623840335e67b6ac75e82cafa51630642d61e92f811ed58f011efb722f59c1a0f1dbdea3f8012410055f166657472c1
+EBUILD github-cli-1.4.0.ebuild 23946 BLAKE2B 92bed0b0cdb4dfbaaedaaa0a1422469442e0e29c09b82693afd9f06ae170a7b52ecbad5e8e8a14bf6b26c8fe3eba9439ccacbd0991ff0eae7682e7efa6ace240 SHA512 31d547fa6b05903ca5cd486c28c59b4aab8babe5f6ddec9e6650adb8f17a9883573bce1fb457dc5770187a6b3271f9fbf0cc738b617df3416ded496627c99f8b
+EBUILD github-cli-1.5.0.ebuild 24088 BLAKE2B 915dc87d77bef29406bbf88aba29c98c197bdc9d6a9a4cedef87a2f909b9070250da3caa0bd9188f1a2cba823eb42e1dbce60f20bc9d96f94df020c87b282a6f SHA512 6844b174514097335920afaeccd08266b312202b3c9d8064ba12ee9b8956f1126f8edc73479f33c07aef1e61e718c7d91383eeed3ef323fb7bc972f981082026
 EBUILD github-cli-9999.ebuild 14428 BLAKE2B f50d76ca95adf375bef2be3a8e514b1839c1dc1778ae29cf9b851dacfa127ea71bd8a639c65d63e326a21436acb0ec23bbdf6e7ab3f4efc1154bd4e24ee5241c SHA512 e2fbaca1d718798501aabc8362b1f62c7eab0b4d48314d2650b5fa203927618237ea51b583c38b70ed5afae5ce7ed090e89a98dcd4ffa3e6b468d201c7e24798
 MISC metadata.xml 332 BLAKE2B 54306af02dde121faa49501abda73a96982f0e2aa0c34b1bc3698594d558b52aa4f98cf2c966a5d3cc2df698cade7461d99de437a92edc41958d0057c8cfd339 SHA512 f3aec1ccc8b69282598c560f63162fae9fadb47e784725e0d05631d2b4686bfd001f6b0a899dab39c977a9da5788b5c38f796723653f80be2b65525ea5e7f930
diff --git a/dev-util/github-cli/github-cli-0.10.1.ebuild b/dev-util/github-cli/github-cli-0.10.1.ebuild
deleted file mode 100644
index abbcc1780032..000000000000
--- a/dev-util/github-cli/github-cli-0.10.1.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"github.com/AlecAivazis/survey/v2 v2.0.7"
-	"github.com/AlecAivazis/survey/v2 v2.0.7/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/MakeNowJust/heredoc v1.0.0"
-	"github.com/MakeNowJust/heredoc v1.0.0/go.mod"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
-	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5"
-	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5/go.mod"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
-	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/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/briandowns/spinner v1.11.1"
-	"github.com/briandowns/spinner v1.11.1/go.mod"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058"
-	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058/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"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
-	"github.com/davecgh/go-spew v1.1.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/dlclark/regexp2 v1.1.6"
-	"github.com/dlclark/regexp2 v1.1.6/go.mod"
-	"github.com/dlclark/regexp2 v1.2.0"
-	"github.com/dlclark/regexp2 v1.2.0/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/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"
-	"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/google/go-cmp v0.4.1"
-	"github.com/google/go-cmp v0.4.1/go.mod"
-	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
-	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/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/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/henvic/httpretty v0.0.5"
-	"github.com/henvic/httpretty v0.0.5/go.mod"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/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/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/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/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/lucasb-eyer/go-colorful v1.0.3"
-	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.2"
-	"github.com/mattn/go-colorable v0.1.2/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.7"
-	"github.com/mattn/go-runewidth v0.0.7/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
-	"github.com/microcosm-cc/bluemonday v1.0.2"
-	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/muesli/reflow v0.1.0"
-	"github.com/muesli/reflow v0.1.0/go.mod"
-	"github.com/muesli/termenv v0.4.0"
-	"github.com/muesli/termenv v0.4.0/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/olekukonko/tablewriter v0.0.4"
-	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"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"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shurcooL/githubv4 v0.0.0-20200414012201-bbc966b061dd"
-	"github.com/shurcooL/githubv4 v0.0.0-20200414012201-bbc966b061dd/go.mod"
-	"github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f"
-	"github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"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/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.4.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v1.2.1/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/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"
-	"github.com/yuin/goldmark v1.1.24"
-	"github.com/yuin/goldmark v1.1.24/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/crypto v0.0.0-20190530122614-20be4c3c3ed5"
-	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"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-20190404232315-eb5bcb51f2a3"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2"
-	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
-	"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-20181128092732-4ed8d59d0b35/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/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-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/appengine v1.1.0"
-	"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"
-	"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"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86"
-	"gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	)
-go-module_set_globals
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
-			${EGO_SUM_SRC_URI}"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-	unset LDFLAGS
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-0.11.0.ebuild b/dev-util/github-cli/github-cli-0.11.0.ebuild
deleted file mode 100644
index 0323879d977c..000000000000
--- a/dev-util/github-cli/github-cli-0.11.0.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"github.com/AlecAivazis/survey/v2 v2.0.7"
-	"github.com/AlecAivazis/survey/v2 v2.0.7/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/MakeNowJust/heredoc v1.0.0"
-	"github.com/MakeNowJust/heredoc v1.0.0/go.mod"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
-	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5"
-	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5/go.mod"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
-	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/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/briandowns/spinner v1.11.1"
-	"github.com/briandowns/spinner v1.11.1/go.mod"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058"
-	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058/go.mod"
-	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e"
-	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e/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"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
-	"github.com/davecgh/go-spew v1.1.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/dlclark/regexp2 v1.1.6"
-	"github.com/dlclark/regexp2 v1.1.6/go.mod"
-	"github.com/dlclark/regexp2 v1.2.0"
-	"github.com/dlclark/regexp2 v1.2.0/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/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"
-	"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/google/go-cmp v0.4.1"
-	"github.com/google/go-cmp v0.4.1/go.mod"
-	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
-	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/graph-gophers/graphql-go v0.0.0-20200622220639-c1d9693c95a6/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/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/henvic/httpretty v0.0.5"
-	"github.com/henvic/httpretty v0.0.5/go.mod"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/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/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/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/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/lucasb-eyer/go-colorful v1.0.3"
-	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.2"
-	"github.com/mattn/go-colorable v0.1.2/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.7"
-	"github.com/mattn/go-runewidth v0.0.7/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
-	"github.com/microcosm-cc/bluemonday v1.0.2"
-	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/muesli/reflow v0.1.0"
-	"github.com/muesli/reflow v0.1.0/go.mod"
-	"github.com/muesli/termenv v0.4.0"
-	"github.com/muesli/termenv v0.4.0/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/olekukonko/tablewriter v0.0.4"
-	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
-	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"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"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shurcooL/githubv4 v0.0.0-20200627185320-e003124d66e4"
-	"github.com/shurcooL/githubv4 v0.0.0-20200627185320-e003124d66e4/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"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/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.4.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v1.2.1/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/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"
-	"github.com/yuin/goldmark v1.1.24"
-	"github.com/yuin/goldmark v1.1.24/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/crypto v0.0.0-20190530122614-20be4c3c3ed5"
-	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"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-20190404232315-eb5bcb51f2a3"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
-	"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-20181128092732-4ed8d59d0b35/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/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-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/appengine v1.1.0"
-	"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"
-	"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"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86"
-	"gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	)
-go-module_set_globals
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
-			${EGO_SUM_SRC_URI}"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-	unset LDFLAGS
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-0.8.0.ebuild b/dev-util/github-cli/github-cli-0.8.0.ebuild
deleted file mode 100644
index 0cdc3f07d7d5..000000000000
--- a/dev-util/github-cli/github-cli-0.8.0.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"github.com/AlecAivazis/survey/v2 v2.0.7"
-	"github.com/AlecAivazis/survey/v2 v2.0.7/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
-	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5"
-	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5/go.mod"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
-	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/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/briandowns/spinner v1.10.1-0.20200410162419-bf6cf7ae6727"
-	"github.com/briandowns/spinner v1.10.1-0.20200410162419-bf6cf7ae6727/go.mod"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058"
-	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058/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"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
-	"github.com/davecgh/go-spew v1.1.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/dlclark/regexp2 v1.1.6"
-	"github.com/dlclark/regexp2 v1.1.6/go.mod"
-	"github.com/dlclark/regexp2 v1.2.0"
-	"github.com/dlclark/regexp2 v1.2.0/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/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"
-	"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/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
-	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/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/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/henvic/httpretty v0.0.4"
-	"github.com/henvic/httpretty v0.0.4/go.mod"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/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/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/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/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/lucasb-eyer/go-colorful v1.0.3"
-	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.2"
-	"github.com/mattn/go-colorable v0.1.2/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.7"
-	"github.com/mattn/go-runewidth v0.0.7/go.mod"
-	"github.com/mattn/go-runewidth v0.0.8"
-	"github.com/mattn/go-runewidth v0.0.8/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
-	"github.com/microcosm-cc/bluemonday v1.0.2"
-	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/muesli/reflow v0.1.0"
-	"github.com/muesli/reflow v0.1.0/go.mod"
-	"github.com/muesli/termenv v0.4.0"
-	"github.com/muesli/termenv v0.4.0/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/olekukonko/tablewriter v0.0.4"
-	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"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"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shurcooL/githubv4 v0.0.0-20191127044304-8f68eb5628d0"
-	"github.com/shurcooL/githubv4 v0.0.0-20191127044304-8f68eb5628d0/go.mod"
-	"github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f"
-	"github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"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 v0.0.6"
-	"github.com/spf13/cobra v0.0.6/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/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.4.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v1.2.1/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/stretchr/testify v1.4.0/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"
-	"github.com/yuin/goldmark v1.1.24"
-	"github.com/yuin/goldmark v1.1.24/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/crypto v0.0.0-20190530122614-20be4c3c3ed5"
-	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
-	"golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4"
-	"golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"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-20190404232315-eb5bcb51f2a3"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20200219183655-46282727080f"
-	"golang.org/x/net v0.0.0-20200219183655-46282727080f/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
-	"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-20181128092732-4ed8d59d0b35/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/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-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"google.golang.org/appengine v1.1.0"
-	"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"
-	"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"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71"
-	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	)
-go-module_set_globals
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
-			${EGO_SUM_SRC_URI}"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-BDEPEND=">=dev-lang/go-1.13"
-
-unset GOBIN GOPATH GOCODE
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Golang LDFLAGS are not the same as GCC/Binutils LDFLAGS
-	unset LDFLAGS
-	emake
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-}
diff --git a/dev-util/github-cli/github-cli-0.9.0-r1.ebuild b/dev-util/github-cli/github-cli-0.9.0-r1.ebuild
deleted file mode 100644
index a85b465b8d87..000000000000
--- a/dev-util/github-cli/github-cli-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"github.com/AlecAivazis/survey/v2 v2.0.7"
-	"github.com/AlecAivazis/survey/v2 v2.0.7/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
-	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
-	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5"
-	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5/go.mod"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
-	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/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/briandowns/spinner v1.10.1-0.20200410162419-bf6cf7ae6727"
-	"github.com/briandowns/spinner v1.10.1-0.20200410162419-bf6cf7ae6727/go.mod"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058"
-	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058/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"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
-	"github.com/davecgh/go-spew v1.1.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/dlclark/regexp2 v1.1.6"
-	"github.com/dlclark/regexp2 v1.1.6/go.mod"
-	"github.com/dlclark/regexp2 v1.2.0"
-	"github.com/dlclark/regexp2 v1.2.0/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/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"
-	"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/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
-	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
-	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/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/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/henvic/httpretty v0.0.4"
-	"github.com/henvic/httpretty v0.0.4/go.mod"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
-	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/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/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/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/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/lucasb-eyer/go-colorful v1.0.3"
-	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.2"
-	"github.com/mattn/go-colorable v0.1.2/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.7"
-	"github.com/mattn/go-runewidth v0.0.7/go.mod"
-	"github.com/mattn/go-runewidth v0.0.8"
-	"github.com/mattn/go-runewidth v0.0.8/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
-	"github.com/microcosm-cc/bluemonday v1.0.2"
-	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/muesli/reflow v0.1.0"
-	"github.com/muesli/reflow v0.1.0/go.mod"
-	"github.com/muesli/termenv v0.4.0"
-	"github.com/muesli/termenv v0.4.0/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/olekukonko/tablewriter v0.0.4"
-	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"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"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shurcooL/githubv4 v0.0.0-20191127044304-8f68eb5628d0"
-	"github.com/shurcooL/githubv4 v0.0.0-20191127044304-8f68eb5628d0/go.mod"
-	"github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f"
-	"github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"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 v0.0.6"
-	"github.com/spf13/cobra v0.0.6/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/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.4.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v1.2.1/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/stretchr/testify v1.4.0/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"
-	"github.com/yuin/goldmark v1.1.24"
-	"github.com/yuin/goldmark v1.1.24/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/crypto v0.0.0-20190530122614-20be4c3c3ed5"
-	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
-	"golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4"
-	"golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"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-20190404232315-eb5bcb51f2a3"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20200219183655-46282727080f"
-	"golang.org/x/net v0.0.0-20200219183655-46282727080f/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
-	"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-20181128092732-4ed8d59d0b35/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/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-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"google.golang.org/appengine v1.1.0"
-	"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"
-	"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"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71"
-	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	)
-go-module_set_globals
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
-			${EGO_SUM_SRC_URI}"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-	unset LDFLAGS
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-1.4.0.ebuild b/dev-util/github-cli/github-cli-1.4.0.ebuild
index 7a42da97bc62..50e86ca6b940 100644
--- a/dev-util/github-cli/github-cli-1.4.0.ebuild
+++ b/dev-util/github-cli/github-cli-1.4.0.ebuild
@@ -449,6 +449,8 @@ SLOT="0"
 
 RDEPEND=">=dev-vcs/git-1.7.3"
 
+RESTRICT+=" test "
+
 src_unpack() {
 	if [[ ${PV} == *9999 ]]; then
 		git-r3_src_unpack
diff --git a/dev-util/github-cli/github-cli-1.0.0.ebuild b/dev-util/github-cli/github-cli-1.5.0.ebuild
index 29df95f86bca..a1e5f51cda98 100644
--- a/dev-util/github-cli/github-cli-1.0.0.ebuild
+++ b/dev-util/github-cli/github-cli-1.5.0.ebuild
@@ -13,10 +13,23 @@ if [[ ${PV} == *9999 ]]; then
 else
 EGO_SUM=(
 	"cloud.google.com/go v0.26.0/go.mod"
-	"github.com/AlecAivazis/survey/v2 v2.1.1"
-	"github.com/AlecAivazis/survey/v2 v2.1.1/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/AlecAivazis/survey/v2 v2.2.7"
+	"github.com/AlecAivazis/survey/v2 v2.2.7/go.mod"
 	"github.com/BurntSushi/toml v0.3.1"
 	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
 	"github.com/MakeNowJust/heredoc v1.0.0"
 	"github.com/MakeNowJust/heredoc v1.0.0/go.mod"
 	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
@@ -33,20 +46,30 @@ EGO_SUM=(
 	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/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/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
 	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
 	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
 	"github.com/briandowns/spinner v1.11.1"
 	"github.com/briandowns/spinner v1.11.1/go.mod"
 	"github.com/cespare/xxhash v1.1.0/go.mod"
 	"github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684"
 	"github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684/go.mod"
+	"github.com/cli/browser v1.0.0"
+	"github.com/cli/browser v1.0.0/go.mod"
+	"github.com/cli/oauth v0.8.0"
+	"github.com/cli/oauth v0.8.0/go.mod"
+	"github.com/cli/safeexec v1.0.0"
+	"github.com/cli/safeexec v1.0.0/go.mod"
 	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e"
 	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e/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/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.3.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"
@@ -60,10 +83,13 @@ EGO_SUM=(
 	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
 	"github.com/dlclark/regexp2 v1.2.0"
 	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/enescakir/emoji v1.0.0"
+	"github.com/enescakir/emoji v1.0.0/go.mod"
 	"github.com/fatih/color v1.7.0"
 	"github.com/fatih/color v1.7.0/go.mod"
 	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
 	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/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"
@@ -73,26 +99,58 @@ EGO_SUM=(
 	"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/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
 	"github.com/golang/protobuf v1.2.0/go.mod"
 	"github.com/golang/protobuf v1.3.1"
 	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/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/google/go-cmp v0.3.0/go.mod"
 	"github.com/google/go-cmp v0.5.2"
 	"github.com/google/go-cmp v0.5.2/go.mod"
 	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
 	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
 	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
 	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
 	"github.com/graph-gophers/graphql-go v0.0.0-20200622220639-c1d9693c95a6/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/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
 	"github.com/hashicorp/go-version v1.2.1"
 	"github.com/hashicorp/go-version v1.2.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
 	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
 	"github.com/henvic/httpretty v0.0.6"
 	"github.com/henvic/httpretty v0.0.6/go.mod"
 	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
@@ -100,6 +158,9 @@ EGO_SUM=(
 	"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/json-iterator/go v1.1.6/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
 	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
 	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
 	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
@@ -116,13 +177,15 @@ EGO_SUM=(
 	"github.com/kr/text v0.1.0/go.mod"
 	"github.com/lucasb-eyer/go-colorful v1.0.3"
 	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
 	"github.com/mattn/go-colorable v0.1.2"
 	"github.com/mattn/go-colorable v0.1.2/go.mod"
 	"github.com/mattn/go-colorable v0.1.6"
 	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-colorable v0.1.7"
-	"github.com/mattn/go-colorable v0.1.7/go.mod"
+	"github.com/mattn/go-colorable v0.1.8"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
 	"github.com/mattn/go-isatty v0.0.8/go.mod"
 	"github.com/mattn/go-isatty v0.0.12"
 	"github.com/mattn/go-isatty v0.0.12/go.mod"
@@ -137,18 +200,30 @@ EGO_SUM=(
 	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
 	"github.com/microcosm-cc/bluemonday v1.0.2"
 	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
 	"github.com/mitchellh/go-homedir v1.1.0"
 	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
 	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
 	"github.com/muesli/reflow v0.1.0"
 	"github.com/muesli/reflow v0.1.0/go.mod"
 	"github.com/muesli/termenv v0.6.0"
 	"github.com/muesli/termenv v0.6.0/go.mod"
+	"github.com/muesli/termenv v0.7.4"
+	"github.com/muesli/termenv v0.7.4/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/olekukonko/tablewriter v0.0.4"
 	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
 	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
 	"github.com/pelletier/go-toml v1.2.0/go.mod"
 	"github.com/pkg/errors v0.8.0/go.mod"
 	"github.com/pkg/errors v0.8.1"
@@ -156,6 +231,7 @@ EGO_SUM=(
 	"github.com/pkg/errors v0.9.1/go.mod"
 	"github.com/pmezard/go-difflib v1.0.0"
 	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/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"
@@ -168,27 +244,32 @@ EGO_SUM=(
 	"github.com/rivo/uniseg v0.1.0"
 	"github.com/rivo/uniseg v0.1.0/go.mod"
 	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
 	"github.com/russross/blackfriday/v2 v2.0.1"
 	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
 	"github.com/sergi/go-diff v1.0.0"
 	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shurcooL/githubv4 v0.0.0-20200802174311-f27d2ca7f6d5"
-	"github.com/shurcooL/githubv4 v0.0.0-20200802174311-f27d2ca7f6d5/go.mod"
+	"github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b"
+	"github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b/go.mod"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
 	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/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/cobra v1.1.1"
+	"github.com/spf13/cobra v1.1.1/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/pflag v1.0.5"
 	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/spf13/viper v1.7.0/go.mod"
 	"github.com/stretchr/objx v0.1.0/go.mod"
 	"github.com/stretchr/objx v0.1.1"
 	"github.com/stretchr/objx v0.1.1/go.mod"
@@ -198,48 +279,88 @@ EGO_SUM=(
 	"github.com/stretchr/testify v1.3.0/go.mod"
 	"github.com/stretchr/testify v1.6.1"
 	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/subosito/gotenv v1.2.0/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"
 	"github.com/yuin/goldmark v1.2.0"
 	"github.com/yuin/goldmark v1.2.0/go.mod"
 	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/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-20181029021203-45a5f77698d3/go.mod"
 	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
 	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5"
 	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
 	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
 	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
-	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
 	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
 	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
 	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
 	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
 	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
 	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
 	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
 	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
 	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/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/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/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-20181026203630-95b1ffbd15a5/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/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
 	"golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
 	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
 	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
 	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
@@ -249,36 +370,76 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
 	"golang.org/x/text v0.3.0"
 	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.3"
-	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.4"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/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-20180917221912-90fa682c2a6e/go.mod"
 	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
 	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
 	"google.golang.org/appengine v1.1.0"
 	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1"
+	"google.golang.org/appengine v1.6.1/go.mod"
 	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
 	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
 	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
 	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
 	"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/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/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"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
 	"gopkg.in/yaml.v2 v2.2.8"
 	"gopkg.in/yaml.v2 v2.2.8/go.mod"
 	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
 	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
 	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
 	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
 	)
 go-module_set_globals
 	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
@@ -292,6 +453,8 @@ SLOT="0"
 
 RDEPEND=">=dev-vcs/git-1.7.3"
 
+RESTRICT+=" test "
+
 src_unpack() {
 	if [[ ${PV} == *9999 ]]; then
 		git-r3_src_unpack
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 8e5fea0b7abb..75607e3f6f9a 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,6 @@
 DIST glslang-10.11.0.0_pre20200924.tar.gz 3246618 BLAKE2B e4353a9cf06273f6a5fc79004c5f97df3da3444a793ddefb6adee96cbcf541d6088bf2f2edc65dea53363cbcb254f7da80fefb8a93b8650adf2ed283b243fa24 SHA512 01551b2347f25e6135ef82f5ae838dbf275cb3f20300659b830c85fded334a8dea3928c017ff7d48d58d89ddf93f5429191f0a326f310db9ee989f622e23477f
 DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc2490e3eb817c5cc0e2bf2416f29842b45bb1efb83ea439d72c823c981e2f37803e203077ea01d1c84c28391fb78288c107510a47d2241 SHA512 4b9e300152dc2ec3b14657b3a745d5b26b5da49e5ff3da0d75680f84126237ec6af0f7cee5aaa74b2d4a123a386522cd7342b5f25e4c01f114da3d5d92057128
 EBUILD glslang-10.11.0.0_pre20200924.ebuild 891 BLAKE2B 8e165d654410d5a8c2be32c5bf59d3dd7c083e58731651760abf380e7e92bcb8f13b4cdd41bc0603193c673e9ee87911c38ca11b317fdbb493a895aff9205d5e SHA512 1934b386247d8389e6b346e937aef0e94c3fdc87de9bacda0fda7abe188248ef31a3255e74a7c20e4a76c81e72775596c84e8f100ccd3b5e31744e65abc0dfcc
-EBUILD glslang-10.11.0.0_pre20201216.ebuild 898 BLAKE2B 4ce47780386eac2f393b79e9ddcbdd94ed455669bedb85a63b855deed9ca719ffb01063ae11699eda61b445a383b1579f2cbf065558b997c0ea37c5aa90658b6 SHA512 a86ce43f8afa66bf9d1df56cc8ba1e679338d2f85c9e87e60ffc2dcf50731cb993c291c39b5b5df18dcec6336dc7db54a7c042d1b23c13ab22fadab280d9fc09
+EBUILD glslang-10.11.0.0_pre20201216.ebuild 893 BLAKE2B 25f8bc24246179d9559cf4bce48518947600069aa383533fab7217f451a42ccc2fe4a72469f8f28f1fae08be81414fafc40b56a160739a4ad2cf9746cce3f7b7 SHA512 cafa874f81fcdc4f149d1267d3507a1b915eee69b5072b94f120d223916ef618bd0fdd5438fbd9bb064d0139880cf0f5e6a355f7d26aa5d6ddc1bac155dc871e
 EBUILD glslang-9999.ebuild 760 BLAKE2B c5653ce28262fc6dd00c8fa38fb7188c7892e40ab339eaa19d90c7d2c8b90050ea4d8002eaf81f4049ab7aae853d6adae178fc441c3637f2b6c7f16922023ce7 SHA512 127fd825c4cd0e8b690e3163b0e12c35d39744cf52b01ad717b38028c932932aa2d9b6bc6e260b5478f964e6e4ce7eb88e9c83685772d4666611e7164b6c451a
 MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
index 7e40994e48ac..c13a82d8e338 100644
--- a/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="c594de23cdd790d64ad5f9c8b059baae0ee2941d"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index c56b10979277..0f840bce6025 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -3,5 +3,5 @@ DIST gtk-update-icon-cache-3.24.21.tar.bz2 91918 BLAKE2B b9cf0f944f13c3280ad615a
 DIST gtk-update-icon-cache-3.24.24.tar.bz2 91902 BLAKE2B ed0ad6b501c31745eb40d56523ac78609d793d1389e4222a3e26c585d467aa57c17b188de8fd0c5847a7e773bcd174b25752a3b4c613c8f2a30e0d3237e9f484 SHA512 6dd7237d5f2e3bdbccafef2114c88aa4cfe6ba027f451791c981e8cb2cdd134ddc7bd20d2252d4605dab260567dbb78ba639f985baa2ae8ca8cf4c7d41deef26
 EBUILD gtk-update-icon-cache-3.24.20.ebuild 884 BLAKE2B 63830fae35e08408a5f65874cdbce4c6a5c8235508e1dec4b994a1a2ff15afdae4a31700b4172b9c1b3a42d6488c25ea84f878eb4efbc6743aab88108181c353 SHA512 847e0b3e70971ca53b6e5b1c0202135f79199e8f919f115dcb658f786735e6fc2add758fa554e93d3c24ef56f1d30145da75dd673f192678d4d711f15f28d68b
 EBUILD gtk-update-icon-cache-3.24.21.ebuild 891 BLAKE2B 3f0624e0b7e5f9c6de546d656deb5493ce4f4e549810e3cf76bd935cd57ecc987da693bcc298e308196726976093d04ef2b86fe9c40c68bb116b2d28929763e2 SHA512 18b0292291330e263af174acd179c36ab2e283eb36a29163e78774ae7461ae3057b49dfc183d57e04f12517dfad8e5f4b5acc06f709b44575f5ce1dbb0171f34
-EBUILD gtk-update-icon-cache-3.24.24.ebuild 899 BLAKE2B 3c6deea073dc6034fc8d9a8c58295066445af479b4f7116a7203a4c7bdbd1729dfe7695259f53945bd3b813f315daed32276277fae3f6290ac35016d5091653c SHA512 3216d5f465b0740229c0d97ebe7f8104129b3537bcd3cffff0145dc2ad2f18c58cc18caa0694ddd06bbc25ce040a4182ff625972aa09685ff8662455a15cfff8
+EBUILD gtk-update-icon-cache-3.24.24.ebuild 895 BLAKE2B 99aaff2457b86bb9053ccf56b814e7041353025b7358c97eda335c64f930ab461f309a18399277cb3f3eac1ec788b2d68bd18a6ef825a9071b3884028e135cde SHA512 78b2ef9531a5da1360970489dfe4687e0a15799ab9f7941a59bef06ad4ed3bc9c30acb3f489578b046e9965daa1e5da6c2b68c1c0848bc1007d3227aa9d5032b
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
index e69d4d6239b5..eb99ed63ac2c 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 8af5dd094cd4..cc2e627a25fc 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -5,10 +5,14 @@ AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 DIST jenkins-bin-2.263.1.war 67270143 BLAKE2B 2c59b2d58632c741a0ce9ba66e4d177779899be01d3e0b9f7ba2e8fa5ff8bac667c2e2c98b9c199a8d55f9c873c1937b80f4aa6ea5f7ff6bbf256047c9a6ee94 SHA512 320dc0d4b365c0b9e11e76d6753b5ba3fbdf81e1acb9a7bbb4082fba1c57f22126810b75c563c4aa75ef3ff1633f2fe1a953c8aa1a25af5f3a0a9b2bc3a104d9
 DIST jenkins-bin-2.263.2.war 67285886 BLAKE2B 6bb4922536370744b5e69ebc50b79937865bef13183d48b0cd725e78921bab4433fd63ab1a1a32d52903bd448c31acf29a47a3c03bda8ef2cc2fcdaed673d985 SHA512 f25158373963fd4dfa988381dbb6c84b16129899a596a447ae35dbce5ebed27a796d0b1aea0c4213032ee37a17df7b3dc50d393cf13156944813cbed1e598351
+DIST jenkins-bin-2.263.3.war 67287051 BLAKE2B 376612f444d6827ad270f1121c2df3f134893eb9a501b919e2c1b506f0536b506a1158152541c46a211f55ecc62b39930024bf3457e2e550900e5aa98f368f39 SHA512 c8badbb4704ad60ede50d32b9df36ca8f78da7e4238e9277a26eaa90a16bd27106bf7e04497cf2bf2ef086befc8cfdb64db9af7f4ceccb1dc22d4e21e5898e68
 DIST jenkins-bin-2.268.war 70969355 BLAKE2B e24424c8cd0535c04134cd22b8fc5e73de80c8eaa090e9fdf512dfeda4a9d029b0657e7ecaed4934ff996c1f5e8e59e9f10a7bfc31a313792cf759017780aeeb SHA512 b0e55310a21039fc57a7bdcc3b190ec61141f253d084a8279d279cff1778a3a4edc281bcc2cd1f872389d160a77dd2c9ebdf1b6cbc5d90272f2aedd66296535a
 DIST jenkins-bin-2.275.war 70809238 BLAKE2B 876d7215f55c80352336f4b3a8b47ff655930666e545bf81701c311e7b2ef756e9afbf286fdb8cc33d9dc64502dde3ec4d84c6b9c636d8503df79b8176ea8b9a SHA512 6c473e8d117ba99fa6a25820f0e0793f5b95f2d4c8ae2969c3e6c38fa076cbce91003d9d3e5c41c158a6d9ac69c192addbd3c0487af8b220878a1c08435b2a5a
+DIST jenkins-bin-2.277.war 70882207 BLAKE2B 241606f7fcd3b37393636f9075fe8ab6173ca379664914c5e32b81dcb16a311e2877080a5c804545b2e30ae8be67def51c19bdd906605297120cee8047750e94 SHA512 7a5e5083e525005968727d3b4bb2a80e7cc87f79e6b8ed7f803a9c7bd045ec48498e6336e88830bfb72b4c4dd66ada530020c5db345834657983781c7ab3e9d0
 EBUILD jenkins-bin-2.263.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
 EBUILD jenkins-bin-2.263.2.ebuild 1105 BLAKE2B 96354716d929d2e229fdada62b1998ec7450849d9a519e974d22f9ad33c209150f1c43aa78c1016c61bbf68126f52d67c4055f683b6f50af99773309dc197b20 SHA512 7d056a9a3f7c321fc22bb4980de0d25bca8f72dbb828b1ddda06d65a4edcbc02353e6fc9bc227ee9e960b3d054e6d21c20ad0cc883327e0fc9eccb76550f5ffd
+EBUILD jenkins-bin-2.263.3.ebuild 1105 BLAKE2B 96354716d929d2e229fdada62b1998ec7450849d9a519e974d22f9ad33c209150f1c43aa78c1016c61bbf68126f52d67c4055f683b6f50af99773309dc197b20 SHA512 7d056a9a3f7c321fc22bb4980de0d25bca8f72dbb828b1ddda06d65a4edcbc02353e6fc9bc227ee9e960b3d054e6d21c20ad0cc883327e0fc9eccb76550f5ffd
 EBUILD jenkins-bin-2.268.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
 EBUILD jenkins-bin-2.275.ebuild 1105 BLAKE2B 15c84a6e246eb72decbf8eac284db1cf74e4502424a3caec2564007004205995f06b2dc2690974a28ff5823a565ee16e082f544c7d2a308d026ba877622f8922 SHA512 4898f7440514a649891c69e47d421282494be9d642bbb00e5c5b1bdacdc3e410be7ef95a9525ec9142d8085e172ba6b08af50d60a78629a4569a993f450c0507
+EBUILD jenkins-bin-2.277.ebuild 1105 BLAKE2B 15c84a6e246eb72decbf8eac284db1cf74e4502424a3caec2564007004205995f06b2dc2690974a28ff5823a565ee16e082f544c7d2a308d026ba877622f8922 SHA512 4898f7440514a649891c69e47d421282494be9d642bbb00e5c5b1bdacdc3e410be7ef95a9525ec9142d8085e172ba6b08af50d60a78629a4569a993f450c0507
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.263.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.3.ebuild
new file mode 100644
index 000000000000..e24da02245e6
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.263.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 user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.277.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.277.ebuild
new file mode 100644
index 000000000000..2eea44d52656
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.277.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index a84871e8ba9b..dcf3799944b9 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,11 +2,16 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
+DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
+DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.1.ebuild 2335 BLAKE2B 1e8212cd840aa2898451bca1c2670f443707738b4c8ca9c673f9e940fa918d0f742b04273f9d2899791aebb2db499bf210605f9ed90479029d4c25add49a310c SHA512 86f5ded28593601e21abf270a0dd0ff703c1ef863534cae87ec72f67ddf8de4fc3394b7088be9d38dfb39a79c1593a57b3df4f5a167e96e6aa1a34c2b1c8f656
 EBUILD lldb-11.0.0.ebuild 2383 BLAKE2B 86df01e0663b79c93b5816c6cbf4ec9a995cded9350d100bbdbad9b9ab7529fedf0244274718a919a003209ad0c48580192a06aeb19f3ca4c06bea0c9d35f9b7 SHA512 ddc49fda9558b794f08ed9c3b0f91ea3fffc67ab171354a7f229790a7b2f05d0b144da8bbc686571a5f9dc1f0fbf5fc502bf99ec3f8897d4537b0ba9ad69a7e4
 EBUILD lldb-11.0.1.ebuild 2346 BLAKE2B aedd0dd380e2ea658c1d3d7ab1528062f20b04c7231232812d11d880722cd4084640650188a2a60a9faa7d1c8c347f693c3bcb104868c0dd74fd6aef5b02e1db SHA512 1ec66bc790920c758a7cadd91652640ce20284e01c15b2c213d249f6efddd854b7839aebc32ff96575686cdff9d2fff1012cc4f99d61344055482fc5c01c5bec
 EBUILD lldb-11.1.0_rc1.ebuild 2323 BLAKE2B 03b635bcd827160b2e17bc37026201a9d6f68652920af99536d66ac924fd2f9cb409c6d75dab95ba44aca8cd8d38790beda778d6867cab3f289021d245ef7219 SHA512 63188a50b66295d238414eef3b72509cea75fded8f6edc7033af738c47fc6e519229010bfbae7db6791b9fd7fd1f8fd958dea9c4866338c1138fd54496d6a318
+EBUILD lldb-11.1.0_rc2.ebuild 2323 BLAKE2B 03b635bcd827160b2e17bc37026201a9d6f68652920af99536d66ac924fd2f9cb409c6d75dab95ba44aca8cd8d38790beda778d6867cab3f289021d245ef7219 SHA512 63188a50b66295d238414eef3b72509cea75fded8f6edc7033af738c47fc6e519229010bfbae7db6791b9fd7fd1f8fd958dea9c4866338c1138fd54496d6a318
 EBUILD lldb-12.0.0.9999.ebuild 2323 BLAKE2B 109888de2a70965bf611190aee56cdd6af1183e0282b1cccc4a9c149963516bf2eb44000f11ca17c2a6d8fea5d1b9694458cb09bf41c6528f73a13510229f292 SHA512 708b848850018c42256ddaae593d5dad388f906376514b0bfefe898d44ccf325bd8ccbc4ffcc65b25a3effc45b8e961a376916af1368a8459818f0b14d06deff
+EBUILD lldb-12.0.0_rc1.ebuild 2323 BLAKE2B 03b635bcd827160b2e17bc37026201a9d6f68652920af99536d66ac924fd2f9cb409c6d75dab95ba44aca8cd8d38790beda778d6867cab3f289021d245ef7219 SHA512 63188a50b66295d238414eef3b72509cea75fded8f6edc7033af738c47fc6e519229010bfbae7db6791b9fd7fd1f8fd958dea9c4866338c1138fd54496d6a318
+EBUILD lldb-13.0.0.9999.ebuild 2323 BLAKE2B 03b635bcd827160b2e17bc37026201a9d6f68652920af99536d66ac924fd2f9cb409c6d75dab95ba44aca8cd8d38790beda778d6867cab3f289021d245ef7219 SHA512 63188a50b66295d238414eef3b72509cea75fded8f6edc7033af738c47fc6e519229010bfbae7db6791b9fd7fd1f8fd958dea9c4866338c1138fd54496d6a318
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-11.1.0_rc2.ebuild b/dev-util/lldb/lldb-11.1.0_rc2.ebuild
new file mode 100644
index 000000000000..00b5d55d6be5
--- /dev/null
+++ b/dev-util/lldb/lldb-11.1.0_rc2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/lldb/lldb-12.0.0_rc1.ebuild b/dev-util/lldb/lldb-12.0.0_rc1.ebuild
new file mode 100644
index 000000000000..00b5d55d6be5
--- /dev/null
+++ b/dev-util/lldb/lldb-12.0.0_rc1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/lldb/lldb-13.0.0.9999.ebuild b/dev-util/lldb/lldb-13.0.0.9999.ebuild
new file mode 100644
index 000000000000..00b5d55d6be5
--- /dev/null
+++ b/dev-util/lldb/lldb-13.0.0.9999.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 31497ea90d77..d211d7769ba7 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -3,6 +3,6 @@ DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e
 DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
 EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
-EBUILD lttng-ust-2.12.0.ebuild 793 BLAKE2B 78c843d79973eed4bc91ae0a291ab0a64282de8af37e9824c2e2a6df7720dd465bfd6c8f9bf82a704454e5f1270860e94e989c88687e8d76633ab7ede2645f44 SHA512 9a8cf5b2ca0665213e14ad1089edf03221febe643db26235e5f1c29c78837ecbd6b1a0226c46dedd046328208a48d628b5a4d0488f030bccb9f5416d9d0966b3
+EBUILD lttng-ust-2.12.0.ebuild 792 BLAKE2B db0089b19087903b2010a3aa7cfe065a7b47e13f54856b4a1c89553bb627537befe77f999b0b11d296d520d2337f4b1766ed95a9900716751738e9eb705c074c SHA512 90a432237f7f4c638daedeba98c70345979a95f03455dd5f77e68572ba7ccebd1d61976e3eb4a8edaea4ff57d11f2488a2afe1bbc28d1419165f2fb5304106ce
 EBUILD lttng-ust-2.8.1.ebuild 661 BLAKE2B e08924d8e984f5fcaf64e18254c3cb84e1595299c6657081250bcc7671568d61be48289f80200697a8e9a8bc592edacb71f45c5d490edeeb962d0a1deab64ab3 SHA512 ca86ec9950371c87faa5f84d16a3ad9778c80cbd2b896657f6f4481e6e2623d5ddc53bd15b3c5837f7a5320bcf41d3a96a5dbdf231d1dcd8e07bfdc5f7e080d8
 MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
index a0aab3946489..5f6e79436694 100644
--- a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 3de69b03ce5f..ebb69a898d88 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-build-tools-0.7.0.tar.xz 24436 BLAKE2B b3bc9a62c530e682cff5412400d0fb14958d6aabddaef8c76b0073b01d356a9e7b227436428a3810f6b442dd77e57f4efb080a4902261679ad2c7898cf3098cb SHA512 7b6fd30e6ae8355ae36be55f8f7d47d78f507c11ebd9cbdd1d2ce5f14db68b845ad0bb8ca05fa1122bfd4c41f6dc792dff5100dcb8e61167517c3704527c7cde
 DIST lxqt-build-tools-0.8.0.tar.xz 25340 BLAKE2B c83524a5688cf38521406e50ad08e93b20d246c0fe779929905cd5aaff67ece6b7dae483d1d4f21657b913ab2ffc7ec821a3025ac6fe3585028146d1746f7565 SHA512 7c235df623ae8c88fa551f38bf24d0621958ce3586296a798b50bbce87084cb624298f4e5aaaa40d3244afae17b7fa373d2b8b6084377f9d7a355fc4bfcbb531
 EBUILD lxqt-build-tools-0.7.0.ebuild 521 BLAKE2B eb7b9f78ca0768842c4bf5cab81eb36e03a83f12212d87544afdbe2c3281478449c1abf0f464ad1243fb9362302ff6f8650c0720d9ee8448b40b996e30fa39a7 SHA512 f09c1e84e0f31a3732596bc641ebd165f2dcb0785be533c31c8db54b49ef8a9ab564b3c0f14e0c34c3a33308997cab10c814fcd478fef521f4a2157acc51f753
-EBUILD lxqt-build-tools-0.8.0.ebuild 522 BLAKE2B beb558377dcfe2aa13391e347e3c39d0cc8030c800b2ea9b0d052f4c02f273f9ca265a18ed59ad29d2ad3e22426530295a93f94bc660cc0ba576564c498de792 SHA512 03202697b180a6b4e49b5c582f35c1156117be5ab5e8b8876406d6562a4f3c233404c3ea39d1e2ed64cb657cf05f82a2b545d3a99dfc6d4925f3301db613bd39
+EBUILD lxqt-build-tools-0.8.0.ebuild 521 BLAKE2B 29c94964ecb76b8264a56fbc2c0aec8c0159ccdfb8485bfba914fb968f2c063183f016c0772b182722e543bf0aca4a3b8c999d12e725f4ccf4af70d52b6a03e7 SHA512 782dc789d83ae028ac55a80cc0a8d7686f1912e443a2be13204fc22151a74587ba6dd3f2caaeff8f74f42f76254d92cf72f3c66a4411a6b0763c94e7e4e7bdaa
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
index dcb00e896952..1c71c8c84462 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index a82d4456ec19..e974d260478f 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,7 @@
 DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
 DIST pkgcheck-0.7.9.tar.gz 275854 BLAKE2B 4a98d801fc4e628f6b116fa6d05a5e31bf259f7774fc724c5ca497ea29c5e475a4679fdc4d5c2256de307af740c7bdb95a1d10e30adba94e8336a1e8a3657838 SHA512 1af7d90dcc1c13882f946f470746f7d03638762ed12d97094977c05eb11208f00a19d3a8789ce074efcc91e15258ac784027018016487213ae17e91ed6916630
-EBUILD pkgcheck-0.7.7.ebuild 1414 BLAKE2B 01638e4375ff92e362b168ffae6c79b3f736232701e0b391458eea12060d8445190781f7d81bf0db6506f7d4cc7ee2f64276184d01cab4eeda2c26ccb0c8a981 SHA512 fd0c558a38cac10ed4c8a9ebd63df097d48d41bac5f52a7aa94d9e48685cc1c0f9d76922f1cc2bc386824ca182131c6957c4aac4d98882e32700e101412e1908
-EBUILD pkgcheck-0.7.9.ebuild 1422 BLAKE2B b003499b4686b50a1129e81450e3f92394922841284796729ed6e3e7e1d8bc8ad396334844f797496eb13a6f61e2e0bb3f1b35929fc9e1d4fa2a11735708abe2 SHA512 3cf15a66e2c9bfa159b1a51001eb0c0ebecd99ad0e47d7731d5345cf2ddac734f1a0ab88a20eedadb2ae955c6dfa7bcbe017dce0872076c938284b9fca917a25
-EBUILD pkgcheck-9999.ebuild 1468 BLAKE2B e86c456ffd7e7ad84e3d50f2a01236e32c0d561899a3bf92dc68dbb602aa33f75aaba166ea31ce9b5466102523940dee727104294f2d7e1c2e9b883b28397e1f SHA512 dabe7b1a9a7e77fa920c25585a9c387abb3fe05a637c1360eccbdfe589b879e18b1e84fb5ff29be4f83b77a624fb772e019ed252a531052194eca55a93ac1e7c
+EBUILD pkgcheck-0.7.7-r1.ebuild 1439 BLAKE2B 119d16039b070ce4c7ce4d52fac350e51a3e1cb13f96bf50a0dd59786bc097ff508a5ef08b637f599a050d21b8d4bb82f1fd17735d3a722d140d074d73886a48 SHA512 80580afd199abc27974b9e46e433d521a2e49a92fbdf482afa88992a94693e49ae02c592e91dfcbe6a270591b88089bbee667fad38209d2f73151ace488bd30d
+EBUILD pkgcheck-0.7.9-r1.ebuild 1446 BLAKE2B b7d1fcc843cb5af9b6413e17eeaa7c40167ec21ee2cddc54ba5806f11722562c0342ec7c3d20fa94764eab618c85ef4aee9d5f6eb956338a603be2176df80fd0 SHA512 9146d5ab33160c5619ee17719b1c45688b5e62459fcc6abca8f2a069c2b5c576393b707fa975c1eb081b8dafb1a3a6a488a37b0c4a9a282ce681a38785d601aa
+EBUILD pkgcheck-0.7.9-r2.ebuild 1447 BLAKE2B ddbd3beddb0ecfd71c9120eab6d338d398b82f7dc3813698a115c74a126fb0464f6c077a7ea1b4aa35787517538c23531d58233da0d61ded74db7e2bb4b57e5e SHA512 eb46f428631af94a1095bb3f9df59ff7ec9cc6b57621f38b745e1755ae50f5b830f4c4ddc45f86b0a76afd6ef36cfef159a1f92723be3432195b08d3b1c507c1
+EBUILD pkgcheck-9999.ebuild 1376 BLAKE2B 9f9f2cd48f1d064df36e52edc07ad5190a58247b8a06731bae12dfa1070a650a5d292443d54cc3dbfe5e5d9a8af58615c64ec45838e7af08d8cad4b942134707 SHA512 5c9accc1bbd4a46b075ef3bc3ff9f6128f1bc2495e34463c09ac3176a1b0d841d8fd79c97488b34aac366d6d0618120d2d7cf1f41866a604e0e68bb12cce4b58
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7-r1.ebuild
index 3c1b4083146f..9a1ac968b480 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,8 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild
new file mode 100644
index 000000000000..dc30511adbd7
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.9-r2.ebuild
index 72a9c7ce56f1..2d0a341c2bf1 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.9-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 optfeature
 
@@ -29,7 +29,8 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index ae82d9f6d150..1fba97972fb5 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 optfeature
@@ -19,8 +19,6 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="
@@ -28,8 +26,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.0[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -37,14 +35,11 @@ RDEPEND+="
 	dev-python/pathspec[${PYTHON_USEDEP}]
 	dev-python/tree-sitter[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	local DOCS=( NEWS.rst )
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 5df742846bc6..a80e389de493 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,8 +1,6 @@
-AUX radare2-4.5.1-docdir.patch 627 BLAKE2B 08df5ec6965d61eeb5d22f1c50d6a63fd6ee5fff7f57d2dc1c46c6eff025ea2166498d0397a8443fdb8a3a109ac81605d63a1dafa0058846a483aa87cd1b018a SHA512 b8c3d3fb4a735b68953155dbb86256d315d2924d42cc707d5b8bc58babedd30308c9418618775b797845ffb139478d366593560133443a778e399331d90a9351
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
-DIST radare2-5.0.0.tar.gz 7897849 BLAKE2B be785b693e9de7264f21b857291286849e054e807d87b4c56a6177a132f9fa141c25661f9d28ea10b61fd298161693794f2ee70279cfd076a2b1a98c563dd2a9 SHA512 059bc341bc34c5f39ef7493af9e2d3b7e52667a2d16f12ef19c9c6ba83c911fd02e07cd527599caea503d5e81a5fedbd8ff343db4d41257e0f48ace9dd52f3ba
+DIST radare2-5.1.0.tar.gz 7908690 BLAKE2B 4757eb0f729d6fa0de9bdf41b697c2ba722f8a2815e4ddb267ee1e68d50530596eaf549a7b062fd798aede214f982e309693f27df4f26257968559d35afe3076 SHA512 f973aeeb4d3a1e9eaf889a14bba4d54568dc2527d1160c7d999a7b2c870270cec7dc11a0eed12ae8f1d0aeacf63f14a92c7ca99f44e38573a6ce2276a08180f1
 EBUILD radare2-4.5.1-r1.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
-EBUILD radare2-4.5.1.ebuild 1478 BLAKE2B 73427252b80a87cb3effef53826478ce43d5e94809cf321a712c513a64b6f9df9250c6ab37658add505fc9481e3da62ac47097ad5834d3b595b097548e6cb7cf SHA512 ac3dce06f0dad3d383f33714d7615424ee6368be8cfa98dfc59d57a0a7a4cec6dee08fe3992a75bd7540833a340315b666d8bd3d3d351387210a9133e288c8d0
-EBUILD radare2-5.0.0.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
+EBUILD radare2-5.1.0.ebuild 1700 BLAKE2B d66644f48b043f437e1161b57bd40f97d5be9bdc29a6df60fc631ec781461f1e7ba67aefe2c4100e6641beb947d06c79dcdf586c4613d88fb6c4d987b7b35353 SHA512 9084fb753207d024beaca63143781b7f9dc73043845118a2eb86e6230bd5394964c8638bb657fb463ea3fc01ed28270cb325d1bccda49c29a3164a73c908ba7d
 EBUILD radare2-9999.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/files/radare2-4.5.1-docdir.patch b/dev-util/radare2/files/radare2-4.5.1-docdir.patch
deleted file mode 100644
index 51dcd7b16e1b..000000000000
--- a/dev-util/radare2/files/radare2-4.5.1-docdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Be closer to ${PF} than ${PN}.
---- a/libr/include/r_userconf.h.acr
-+++ b/libr/include/r_userconf.h.acr
-@@ -53,7 +53,7 @@
- #define R2_ZIGNS            R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "zigns")
- #define R2_THEMES           R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "cons")
- #define R2_FLAGS            R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "flag")
--#define R2_FORTUNES         R_JOIN_3_PATHS ("share", "doc", "radare2")
-+#define R2_FORTUNES         R_JOIN_3_PATHS ("share", "doc", "radare2-" R2_VERSION)
- #define R2_HUD              R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "hud")
- #endif
- 
diff --git a/dev-util/radare2/radare2-4.5.1.ebuild b/dev-util/radare2/radare2-4.5.1.ebuild
deleted file mode 100644
index 036a151c8c76..000000000000
--- a/dev-util/radare2/radare2-4.5.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl"
-
-RDEPEND="
-	dev-libs/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=("${FILESDIR}"/${PN}-4.5.1-docdir.patch)
-
-src_configure() {
-	# Ideally these should be set by ./configure
-	tc-export CC AR LD OBJCOPY RANLIB
-	export HOST_CC=${CC}
-
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-}
diff --git a/dev-util/radare2/radare2-5.0.0.ebuild b/dev-util/radare2/radare2-5.1.0.ebuild
index 963c0b6b6e74..fb93a9ece984 100644
--- a/dev-util/radare2/radare2-5.0.0.ebuild
+++ b/dev-util/radare2/radare2-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
new file mode 100644
index 000000000000..1da95a25de92
--- /dev/null
+++ b/dev-util/roctracer/Manifest
@@ -0,0 +1,4 @@
+AUX roctracer-3.8.0-gen_ostream_ops-toPython3.patch 1496 BLAKE2B 951878e73412f08de88e073e2f790620c4a0f97d479211668cc9eb0e1d9cb3245070df8d0a81374d2a22d6c3d68591f85c99114639fc620a8c742167eb5a5044 SHA512 7a8808b33cf2c4280e70773768b4a5997aafe8916262fb4be562d42867847e6d4600a6559955c901d0841059a1b3764c6acef5b755b61f1ee116bc9b9d7a62c0
+DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
+EBUILD roctracer-4.0.0-r1.ebuild 1572 BLAKE2B dbdbf598991d569c3bc4788d5be653678431df80f8dd5229f5be5a0dda05146ca9417d738ecae08eb6eb10f9056e09403b5289a25badddf5b24d1a863ea778fc SHA512 b4dc5f0f4b189139df9ffcc854daedb0a59547ad99156814ae50b95c888a209d2b4b4771e39599cc3bc5afb5fa44a4010d0fc77b8e80299ecd7a275b7bbf4647
+MISC metadata.xml 588 BLAKE2B fa0a772d2f9c1b7c838f62faa1eb05c451dedd2c58f9164aea2c57a8f0e81d1f599dc0fe337143d7c2d705492b67ef0e9e890b518b07ca2c168b18723895805e SHA512 3581cd68135fccfb9504071b5d388cc101a19180ce5311b0ba404f0c0c6d0e14a3a9fea08c7e5d3e641b475ef6c616a3c6baf38470dcf2e02a2d08b29904fe07
diff --git a/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch b/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch
new file mode 100644
index 000000000000..b73949b92331
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch
@@ -0,0 +1,28 @@
+--- a/script/gen_ostream_ops.py	2020-09-27 11:23:37.833756185 +0200
++++ b/script/gen_ostream_ops.py	2020-09-27 11:21:25.763756688 +0200
+@@ -176,9 +176,9 @@
+             process_struct(f, c, cppHeader, "", apiname)
+             global_str = "\n".join(global_str.split("\n")[0:-2])
+             if structs_depth != -1: #reindent
+-              global_str = string.split(global_str, '\n')
+-              global_str = ['    ' + string.lstrip(line) for line in global_str]
+-              global_str = string.join(global_str, '\n')
++              global_str = global_str.split('\n')
++              global_str = ['    ' + line.lstrip() for line in global_str]
++              global_str = str.join('\n', global_str)
+             f.write(global_str+"\n")
+             if structs_depth != -1:
+               f.write("  };\n")
+@@ -199,9 +199,9 @@
+             process_struct(f, c, cppHeader, "", apiname)
+             global_str = "\n".join(global_str.split("\n")[0:-2])
+             if structs_depth != -1: #reindent
+-              global_str = string.split(global_str, '\n')
+-              global_str = ['    ' + string.lstrip(line) for line in global_str]
+-              global_str = string.join(global_str, '\n')
++              global_str = global_str.split('\n')
++              global_str = ['    ' + line.lstrip() for line in global_str]
++              global_str = str.join('\n', global_str)
+             f.write(global_str+"\n")
+             if structs_depth != -1:
+               f.write("  };\n")
diff --git a/dev-util/roctracer/metadata.xml b/dev-util/roctracer/metadata.xml
new file mode 100644
index 000000000000..eec4ce34fdda
--- /dev/null
+++ b/dev-util/roctracer/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm-Developer-Tools/roctracer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/roctracer/roctracer-4.0.0-r1.ebuild b/dev-util/roctracer/roctracer-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..04c9a3080f20
--- /dev/null
+++ b/dev-util/roctracer/roctracer-4.0.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake prefix
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
+SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocr-runtime
+	 sys-devel/llvm-roc
+	 dev-util/hip"
+DEPEND="dev-python/CppHeaderParser
+	dev-python/ply
+	${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/roctracer-3.8.0-gen_ostream_ops-toPython3.patch"
+)
+
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+src_prepare() {
+	# do not build the tool and it´s library;
+	# change destination for headers to include/roctracer;
+	# do not install a second set of header files;
+	sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
+		-e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
+		-e "/install ( FILES \${CMAKE_CURRENT_SOURCE_DIR}/d" \
+		-e "/install ( FILES \${PROJECT_BINARY_DIR}/d" \
+		-i CMakeLists.txt || die
+
+	# do not download additional sources via git
+	sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
+		-e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-i test/CMakeLists.txt || die
+
+	hprefixify script/*.py
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHIP_VDI=1
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa:${EPREFIX}/usr/lib"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 200ec07cee3f..0c479d7faf91 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,4 +1,4 @@
 DIST crystal-molinillo-0.1.0.tar.gz 23932 BLAKE2B c9bcd707a3208f5d80e6e3030523d50f86cb5977799de8ea6035d014094e3c2fff9bb189fa98f566e72e1e7ad161e47e44c89d9b264d47f109b2e891ecb469e5 SHA512 8d74d95896cd7ff510c87e2ffba6ae5f04ceeddde574930ee609851312b65d713a315cc24f9aa3fab02f9447ccb25ef2dd2e8179640b8c5cfb3d7d6b52d1ded5
-DIST shards-0.12.0.tar.gz 52205 BLAKE2B 6aed0be06f1f7e336861705fc0e29fbc3a97336f37d3a1eef09d3ea2ebaf2e61f1e5594f893974a6c13114ee575a69cf6a71fce0cc5f8985b8c365392735e8ca SHA512 3dfdf09be8701e568614923ffd5be90c63bdefc06f310c35b1b38e4b92f8bc1f432398656c08cadd36be52491f2ae8fda3c9b4117dbc4d53dbc8068b78300468
-EBUILD shards-0.12.0-r1.ebuild 1054 BLAKE2B 0915ae7c2dac36c73051551c3def48c4acb1eccc0c6243f16591f6b7a8acd76691ad6ad7a5a2e2c114dd69450ad3c3f88e6181b3d2d49e2e0c6e12058cea4834 SHA512 446706165bc7dda679c93423feb5868a3d5ed661a0783d6a4cc12e8d87bb56535d100a23f95004177d206e8cb146dfba11656d8dd0ed73dbfa5111ea9856c5ec
+DIST shards-0.13.0.tar.gz 55407 BLAKE2B 430abf54b5b035e966112a5b300a8924e0d6c6c4866e4cefba816c1b901876210990678a2d9b0c6bbc9da095decc217b64da32da61a5501e6045dfe64e10bfdf SHA512 7b5540b009f23cfc9630b206884a81c80a63991f64e84eed29545fef0e6a888e3854c6b0c8d958d4af3d6cef4718d7cb08d7948dcd2c9629c82b552776500b2b
+EBUILD shards-0.13.0.ebuild 1054 BLAKE2B a0df5a35bc945b59d7200469f771309a1bd046b21ba684c6b61955fe10b84e1df6eb36ba96366164591a328e6a82b0678af26e18d7f0ff4381a0d57b140cc087 SHA512 734b4b5bff2e1c8c7a2de794a14812f2d5887db86c8461c235e83996b66b721736f8517522661bd083f0b01fc6081216ca875895a45c66fa9d2705c3331c495a
 MISC metadata.xml 334 BLAKE2B 9958fd270de05b67ac94b791633635bd62770ad0ebe44630e43c26933d2059d042bc00997a8b5b8983c0e839a8adaf238359a17285e4bf8321f082077baaabbc SHA512 8010e36b15550ce7e599e30f1716b3df9d17f464f01cad097e829f3ec97624578f9bb7e24f832e14c67b4cdd5c8d25c998282e39ea0341e81baff39c1bcae658
diff --git a/dev-util/shards/shards-0.12.0-r1.ebuild b/dev-util/shards/shards-0.13.0.ebuild
index fca8719df787..ed35979dd3c2 100644
--- a/dev-util/shards/shards-0.12.0-r1.ebuild
+++ b/dev-util/shards/shards-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index c333efdb2f53..906537da3f7a 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
 DIST spirv-headers-1.5.4.tar.gz 394957 BLAKE2B c94d0ab2e98242aeb78c6948ac915467ba2cc9568483b8e3d00d5c5e1f422a23e9645161ea6b958cb3a8f7b2d51cf8e8040b7479712dd32382c5c5cbba30e4f3 SHA512 050ae8ded345bbef3d94e91f22dd72860fdeed3072f943bafaa37f86f2d522e59d7c4ff2e6aa5bddb3c3df55f124200394a91e6d99eb95933463e7b8ce360aad
-EBUILD spirv-headers-1.5.4.1.ebuild 526 BLAKE2B 4843ac3173d4b943d7bac8b0a0f090f63ba3554463642a2a09eb49091c1b8101de70d7ce385e430b7cac7788b66b03a8c5145590cdadc52bab63a6b354a34163 SHA512 a99b7e8b4ea4a57d36c23bfbcc21c2375757b9521f1a69a78162332cade62198527234ada1aa8d42def89e0af0d5078d2e1f4785a40603e57ec5759c58e0a835
+EBUILD spirv-headers-1.5.4.1.ebuild 521 BLAKE2B 5a10cd5499873e0eb1d02a0da4634acabf218ebf894d58e52f73341fb8d3cd42f7a35b322f550a9c3cfb3fe14f229f348ac9b75375cffa093365262023d83a72 SHA512 8e4b7ebd5aff39331d10f86095bed449cd599796020aa6920bc1dabbd130d8924bcef99228882f020d4f8a3d5df68ec01840c3c8983e6e198d996e9ce6b9180b
 EBUILD spirv-headers-1.5.4.ebuild 486 BLAKE2B 70210f64f9151c4676d41bae9eef920ce25fa4da56531c2978d67841757a76c4f250932ccf2c90b810e6df0343a9329bcc9e677d3cf94e8bdf839d5ff07c07a8 SHA512 d5c18b4b5938377b4795364b1013e28c5c2793fa35cc8307456495d25dbc08d65987bbf2e49d1abdf298a0762c1e45f5a4918cbcd094d9951f6d6396683f94f0
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
index 90856517cc36..04183969c896 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index f7df9e319561..29dee6d24691 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-2020.5_pre20201107.tar.gz 2583541 BLAKE2B f234e34142af47a98268d85fa12861b9c66c78d74af7e44d4aa9150ad5cfce8e65780d89344ec947b4866de9811a8198e174480c23c30f690193feca7cc136a6 SHA512 a65174e5f1b7cad3be80e0df0d46e8fbfbb62f397fe98eb1b2c37bb85cf8f92d7b4c9103b5e9e8181240bcf97e5a7e3f09323f78159d4b25f7f02176e982f542
 DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
 EBUILD spirv-tools-2020.5_pre20201107.ebuild 1229 BLAKE2B 4493da79760291e9e80b746c41007c71141092a18df7535555a532f219f3f35ce4fa5c76f7e3f66b3a848c15c02f057da95b1fb9fa5ea4aaecd6504073751b8e SHA512 2856838caa18ef9387b66f5333c12122afb48318b092c506e3e53fa93c363b6835f2a93a1832d317e94a8a2618d6bc1777b538aeae5ba71985e1a1f484ddd266
-EBUILD spirv-tools-2020.6.ebuild 1205 BLAKE2B 4e74e0c95341d93f71be441da32b0ee04a8b29834242c668a6f87378497fd8463537a7a15b61d40a70cbc953f9522918fb8965c581e37fb135ad379313d7a47e SHA512 7fa96042df7287684db7bc86dba3e5baa2ff266ea0442d324b6660ec9aee791772f3ae600b687d62d4913010981d48928111b9bbe380088abdf7d117a9d75365
+EBUILD spirv-tools-2020.6.ebuild 1200 BLAKE2B 87cc9654a8286758ec4f9ca3e0b25b4b46cc61659aeaa02e393e7ec2c1049d1bbf4a17d13bfdb08a8d4496f923c97e9023bc9a93fa5f7870b4b313c87ded2392 SHA512 221ed0dba905d58d6a7ff0f5ef55d539923dfd50520c101e6c814d4ab27ef50cd0b09e172b90d61133389fac771ff099e0348e571eed6d45c31c751a2623435c
 EBUILD spirv-tools-9999.ebuild 1232 BLAKE2B 0c5acd106fbf664a8f9f1d82ee921e1ad8f8f73ee1b7182f69c7dc1f6303dd6f53ce9bbd96a0b2dd6ded7b73baf7956e2cd757540e7b36a57923b1a4afdbfb70 SHA512 c6d27ddeed7cfa4ec06d6dfa9366082ed1818f4a87dea5c4b01fa6aef87bda429c93776e9d5c7187ee018a10dc5b68d058710425dd11f8271ad61d3e19236733
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
index d6ecf835b95b..c9d0aee51f86 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/tkdiff/Manifest b/dev-util/tkdiff/Manifest
index 69069a7c0f02..35a8a79e3f9a 100644
--- a/dev-util/tkdiff/Manifest
+++ b/dev-util/tkdiff/Manifest
@@ -1,3 +1,5 @@
 DIST tkdiff-4.2.tar.gz 92063 BLAKE2B 4c3d1fbbc4bc76c8a39dca454a6630b8022acf33aa11b899db8960534f3df91fa068162fd0a7f16a00c6dde697d8cfd6dbcc4157035a340e162e113ceaf102ac SHA512 6c16475b808a9ac4d51a3e0b348d12739d821743eb205281473408a722ef7329e7dee61b4e0536741fab0c88eb67b00080d84598fca5e3215d4b183a858f6984
+DIST tkdiff-5-1.zip 233467 BLAKE2B 711d5bf0ea1d919d235e5cfcb76c2597a849293652544a5bc5ed969ca8d1a9720a406504b07d382a1ae84447709984fddf627129e70f4d043648731bea54039e SHA512 76301e74a1396ae540470fd0f4b8c7b4e214bdb4027f5ed52d98e5ea48afd99971a7880d1ec54812f6f13a3f1e92c7cd0d2c4d6d0b6e098e47fd36759fe7a047
 EBUILD tkdiff-4.2.ebuild 474 BLAKE2B acdf9395852bc4dfb3d5fd61ac4d29a702e91b036a9e4ace9cc4e7ac909fadfc63055f9e42e696d987416226f1e4a2a90483296e2611d25b5a70e02618271733 SHA512 d721ae135b7b59c989d2992603ba4999104e264f418f912a515162d014585cd8626396072c85d2ea3652beee268391bfd8738d1be19599171d1e752c61aefd90
+EBUILD tkdiff-5.1.ebuild 520 BLAKE2B cd3b63a5c5853e73b10fe82ad584f96c8c62258de73f8f43b5b5ea3ba091135308a83562341d67ae60e1300a2f55149722ef6b9a8d45b9ca7eb3567b35447a94 SHA512 a4f1f3e12c9c4bd12e82045e214fd5a644a225a90b245a4e28d0f9e66dc0ea8569ae9ae7a6cb5eb9b1cf1c97679c0e862444010e125ac9da33d1110c8197ef60
 MISC metadata.xml 329 BLAKE2B d6b5ca29071f1300d73bcbf1108d5f6652c69622aef916262e938a2247c49b09f4957b5781e25e70c16f71e12727dfac975edcdf86ca480765919f6afa07bcab SHA512 b4d8e2c6df1cba67c191b95e7381da88c9d50715dcb2dddf74b91927bcf5509b2beecfac337a5e06657f3e3ec045808cb1f912c9ad9736b68ef3ed270b93c957
diff --git a/dev-util/tkdiff/tkdiff-5.1.ebuild b/dev-util/tkdiff/tkdiff-5.1.ebuild
new file mode 100644
index 000000000000..6b7e55a31918
--- /dev/null
+++ b/dev-util/tkdiff/tkdiff-5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYP=${PN}-$(ver_rs 1- -)
+
+DESCRIPTION="Graphical front end to the diff program"
+HOMEPAGE="http://tkdiff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${MYP}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/tk"
+DEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MYP}"
+
+src_install() {
+	dobin tkdiff
+	dodoc CHANGELOG.txt
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index a448f2b92685..46158cfa691b 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-headers-1.2.154.tar.gz 817069 BLAKE2B 66b073daf01741d74a8c2524e6f2692a4c2143340bba8349f3c85408ce12cd7405f960fac0b6ffe3cbd6dcddfcbb04a6481b2743428c66a527d51c16cbd326c6 SHA512 97f9b56b57a762a3616ff3e9795de01c9b9327b80903adf2b141f33be45b30980acd50007ac6af9562ee1897491929d23f7f5dc6a8bafced59e14df27dfca6a9
 DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
 EBUILD vulkan-headers-1.2.154.ebuild 612 BLAKE2B 64c4431737365668e9e0625218152e4299dd9fc06b60a341ae93b7642667663f0ee7a8d3d19e709d484826f34a9c37d9901942c42659d1e1f9ad7e4bb5379642 SHA512 e6fd884d43405daab2ad3df6c02fc2d3e029647d1facecb79acbaed0a456d41e7709e56aaa8d752dab8ce59a82de51cc6bba7cd365edbe911f329e788c084c98
-EBUILD vulkan-headers-1.2.162.ebuild 617 BLAKE2B c9b53f7d664cca2f4f793712f2db1d41eb37a837602813ec1462302779bc5a63d10e8fa87bad10de41577a2339cf55cfe99340271d398470272849b4917df486 SHA512 ae8aae0d72ee4de778d818ee0865313de580d3585c95f3eb1415e7ef57bae3373f790d25af1f7d37b0c31196c43200da4061476b8bd6b85b5d5948af1ea3b657
+EBUILD vulkan-headers-1.2.162.ebuild 612 BLAKE2B 8f4c58ec70eebd34081a75e13bf2057d5305556d3e8f12b71955b55cc8b3abf56d6365187e68bb237cb1a457dc2aa9b677c9f1eee0d08925ab70943727907298 SHA512 aa8d6cb7888780b6802dac47c9fc57eb362804612dd95fe5fd214cb793836de90b782222b6680aa5a47a9771d35f0a4672ad7dafed52e16e9bde9d3081ff21aa
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
index b7d53089df0c..118ed20a994a 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index bec96618d2ed..77929b685f06 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-tools-1.2.154.tar.gz 719166 BLAKE2B 351fd168be69615691bf956f65c0a6f2050c1061897745ecc227cc11336d2d3b39b0475a0c941c0ccdb011b9d37ef0417b22e0935ec956c5d37bbb8c6cd2e6d2 SHA512 51d6521af4f65c5b93bc5a10ef921f3770f04d6a363a9c4f0941421bf762e17cb8948bbdd3ed1d5449d015e1ac86e42e63583aee4a442cc275a1d410f61813a7
 DIST vulkan-tools-1.2.162.tar.gz 724232 BLAKE2B 16eb2dde35883fb2c7c263a72a615818ff8e1557ac9d74553ec3784d96a827e6900efa4e42218cb9081f7501d9b1a53eac82c360c2d20922043308515ab48983 SHA512 7827f6775dfb26820a2a2cbc60e7da8c7e7bdcb57b65523fbc6b2e989ae6869b04a57ae458c72715722c67d842660574697834c92f9b909dd5673da1945ac6dc
 EBUILD vulkan-tools-1.2.154.ebuild 1885 BLAKE2B 145b76e22548ae638ec3eedf9b3692d03b026484a2cc611221c25a9dc4ac4d57a077531ff34533579f983d997fdf5eae9ded0c2c25e5573daa99a698e6eb9b49 SHA512 2d76c2ff116686ed5d6bfd3cca4de4c8e2bd227bd7a4373e0b1f7ef12f9c26d871be9048c92d0f9569ea11b04369215f6fe6bd7b31054db4dca675f3cd2d57e1
-EBUILD vulkan-tools-1.2.162.ebuild 1888 BLAKE2B 7635fd4593b06c176a16b09aa251b9825d155edbfae0160f314ea23c2c14fdaba7e1652709fbd89934df5374157d75aa260b028958e96366495599335fe1478c SHA512 024da45078e75055b6a66bccef0835d21699e2e457837e359ca5bc0307a1edd99f16754329e473ade28e3ef527f413428beb3148c15338403287570934f32b25
+EBUILD vulkan-tools-1.2.162.ebuild 1883 BLAKE2B 7338721b4a1a171817ee30db81625c98709676eedb469b0c8048e2e379dec1c2e10f5a0f7de419392921043cfea739ad75275f3441c45d93f202ea8964ffc8de SHA512 5176895eb0b07be01b82286eb665a49dab866eb527a6f3832bfe568987d2573aebdb825d7d1cf8e8c6f96ad77d568626bd0017262bf781bce47511d99ffd06df
 EBUILD vulkan-tools-9999.ebuild 1888 BLAKE2B 7635fd4593b06c176a16b09aa251b9825d155edbfae0160f314ea23c2c14fdaba7e1652709fbd89934df5374157d75aa260b028958e96366495599335fe1478c SHA512 024da45078e75055b6a66bccef0835d21699e2e457837e359ca5bc0307a1edd99f16754329e473ade28e3ef527f413428beb3148c15338403287570934f32b25
 MISC metadata.xml 500 BLAKE2B 2b03cd2296502530b43020bacbbef0edaabacc6b8d2458ef6d5f653fbbdf6b02ff5fba9988fd19ee9c9e14e41df359c150cbc2fd141769960f2f1b95e213d8ed SHA512 327529a5a8a57115e116c31c5b86a00f978c8612a4905eed90ad3b33671acaabbaa5e7e82bb140ad5d9b1574b0f37a53882d117c50ec320c1ea0c8d5fc25994e
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
index 484eb9bb156c..1495ee55e608 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+	KEYWORDS="amd64 arm arm64 ppc ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index dc05bac08840..ef4e8ab87774 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-1.18.91.tar.xz 453500 BLAKE2B 6e234fa637bf4329fcf37c7372e3d02a50742812e2f61477ce302da4c2a1b9377874b0e4e2da899c726ede417081c4d459e40863169352825dd38a8fe0dcf267 SHA512 5ab770c87507e8248aa5197a253f27f3cca984bf1a69c52b438e9aaf512e6b0d841321f81c20643a49ef62eeb6c8b3a6391eadfee5c8822c3cf0d63bb0a8e0f8
-DIST wayland-1.18.92.tar.xz 456320 BLAKE2B bd88156773b5ca817544e0aa496101dc144723dc7f4602011ce1bc4fedbbb20081d99fc882866c0f572139cf4bf4dcf1e7b181af48653b2c67622af07c7ab650 SHA512 837afe1accc632c445868a85792e708daa5d7dc5942888c2fa0981cfb0dd34a3d37667407f1875f04aa5710a07089f3b620a6b78dd19030b477d8b25941e6305
-EBUILD wayland-scanner-1.18.91.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
-EBUILD wayland-scanner-1.18.92.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
+DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
+EBUILD wayland-scanner-1.19.0.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
 EBUILD wayland-scanner-9999.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.18.92.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.18.92.ebuild
deleted file mode 100644
index eeb424d9d3c1..000000000000
--- a/dev-util/wayland-scanner/wayland-scanner-1.18.92.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	S="${WORKDIR}/wayland-${PV}"
-fi
-inherit meson multilib-minimal
-
-DESCRIPTION="wayland-scanner tool"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	!<dev-libs/wayland-${PV}
-	>=dev-libs/expat-2.1.0-r3:=[$MULTILIB_USEDEP]
-"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocumentation=false
-		-Ddtd_validation=false
-		-Dlibraries=false
-		-Dscanner=true
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.18.91.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
index eeb424d9d3c1..eeb424d9d3c1 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.18.91.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
commit	d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree	1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /dev-util
parent	abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)