gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-p2p
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
41 files changed, 2611 insertions, 905 deletions
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index a2237fe499ee..341d02f209fb 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index a6d859bd00d9..30b4514077d3 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,7 +1,8 @@
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
-DIST airdcpp-webclient-2.6.0.tar.gz 903873 BLAKE2B 7a82891efef14e8d3c2da9a15165698084daf9c044d420c271dd1401710f030fc3c6fd83d7f58cee746767624b1292e7fcb7a48387e03b0eca2cf779753686d8 SHA512 d6d029638e69d19743d2e49185b08a808d95d725c3f40bd98ab42c384d3eae6d07e4528ac28ac9db50011f8a68592ae60f49cedbbccb45a78e82a5e424bb731c
+AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508
 DIST airdcpp-webclient-2.6.1.tar.gz 908393 BLAKE2B 8734cdfc1b0e380d231cf6e571d215b7cec196fe012bf842fd2257496f252dd803eee0a308e97033f959652dbd4d21bd2b96559c4a4262a8f7ddd2c491c7d263 SHA512 bad35d09475ef9a95f358bce99d1143586e3eedb58b3c5c74570c707f099ed1b1214714c093f74c6e2bbfa733077dcaf3e590ae3d821330938f9ec32c75a7152
-EBUILD airdcpp-webclient-2.6.0.ebuild 1426 BLAKE2B d94c8917282b654323af2d0fe782f4903b450a24bb8f7a27d8209bbf402cdf3456110aa24107aa7a4499a0196a330d84613b483d26da7419878e45a3aefff784 SHA512 21a0c3545af4979ebf9d178c99b30ee1dd3d5b1aba147287162c804c43d307bc8f8fee92079a61335f534980917c48dc49e5fdbe2416623fb0e0d286224a1419
+DIST airdcpp-webclient-2.8.1.tar.gz 945274 BLAKE2B e98ea603d52f041fed1a60a2c6dd4bff141c230bd554ccc6e7f013a28bd2ef8f2001e5343d3233d09b7cc9ef7e1af8b45a18757f59d29cdfb592763375c01e0c SHA512 c75b20591deb62a62dfb26df1536c521073643d3d7893d2ac85f2206c52a1786349a980994084abf840d1610000128247e6ae94aecf31b1d5266224086257ca7
 EBUILD airdcpp-webclient-2.6.1.ebuild 1426 BLAKE2B d94c8917282b654323af2d0fe782f4903b450a24bb8f7a27d8209bbf402cdf3456110aa24107aa7a4499a0196a330d84613b483d26da7419878e45a3aefff784 SHA512 21a0c3545af4979ebf9d178c99b30ee1dd3d5b1aba147287162c804c43d307bc8f8fee92079a61335f534980917c48dc49e5fdbe2416623fb0e0d286224a1419
+EBUILD airdcpp-webclient-2.8.1.ebuild 1374 BLAKE2B 60939f3eb247d73a9d9f428d92743b5623603a61c55567910caa253d2789026fe29fe05fed70222f325ad21eb2c4a66e6783d0fd26b4d7eb157d47a390704d45 SHA512 abdb3ab03605fe5d5dee77c1ab08d43bfe071b6c9f25a3b42aaccd597d3dd9801c43151c80dce6903de9042db5c3221d04a67484febe35b1fe52b8166927e8c2
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.8.1.ebuild
index 8f278445821a..acb5cd4995b0 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.8.1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
-inherit cmake-utils python-any-r1 user
+inherit cmake python-any-r1 systemd
 
 DESCRIPTION="Cross-platform Direct Connect client"
 HOMEPAGE="https://airdcpp-web.github.io/"
@@ -13,9 +13,11 @@ SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="nat-pmp +tbb +webui"
+IUSE="debug nat-pmp +tbb +webui"
 
 RDEPEND="
+	acct-user/airdcppd
+	acct-group/airdcppd
 	app-arch/bzip2
 	dev-cpp/websocketpp
 	dev-libs/boost:=
@@ -23,39 +25,32 @@ RDEPEND="
 	dev-libs/libmaxminddb:=
 	dev-libs/openssl:0=[-bindist]
 	net-libs/miniupnpc:=
-	sys-libs/zlib:=
+	sys-libs/zlib
 	virtual/libiconv
 	nat-pmp? ( net-libs/libnatpmp:= )
 	tbb? ( dev-cpp/tbb:= )
 "
-DEPEND="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	${PYTHON_DEPS}
-	${RDEPEND}
 "
 PDEPEND="webui? ( www-apps/airdcpp-webui )"
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-	enewgroup airdcppd
-	enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
-}
-
 src_configure() {
 	local mycmakeargs=(
-		-DINSTALL_WEB_UI=OFF
 		-DENABLE_NATPMP=$(usex nat-pmp)
 		-DENABLE_TBB=$(usex tbb)
+		-DINSTALL_WEB_UI=OFF
 	)
-	cmake-utils_src_configure
+	CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
 	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
-	keepdir /var/lib/airdcppd
-	fowners airdcppd:airdcppd /var/lib/airdcppd
+	systemd_dounit "${FILESDIR}/airdcppd.service"
 }
 
 pkg_postinst() {
diff --git a/net-p2p/airdcpp-webclient/files/airdcppd.service b/net-p2p/airdcpp-webclient/files/airdcppd.service
new file mode 100644
index 000000000000..00d4ea071865
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcppd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Cross-platform Direct Connect client
+After=network-online.target
+
+[Service]
+Type=forking
+User=airdcppd
+Group=airdcppd
+# Grant write access to group members
+UMask=007
+PIDFile=/var/lib/airdcppd/.airdc++/airdcppd.pid
+ExecStart=/usr/bin/airdcppd -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index a62173759da5..40f33b79936e 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,10 +1,13 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
 DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
+DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
 DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
+DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 EBUILD bitcoin-cli-0.16.3.ebuild 2401 BLAKE2B 1f372febaea711cab1ba45ae3b9e29a55138d34b01235f3c6e375b67621b98086bf5b1982c305c50e050164238723e7e4550f686e86fcd80e35d734109d81b8c SHA512 e836b2ff0c3127febca2574bc09bc7e7e98171eafed08af54a8f5f19c9c87410acdb0be2341b8142f76d90ed450bf3ced1bfe57ecf106a77c865c2e72ce018d0
 EBUILD bitcoin-cli-0.19.1.ebuild 2453 BLAKE2B 1fbbf8ad13506dd93e72ebbfbbd9053bfad31081a0394f58b05aa9a87d509fe34fc7ccbf78733553dd6770d86ad80d41a2c191c41d164c6425ae476de16c876d SHA512 a424629336678ebd6374e2aaa32d63cdcb5e7afb910e7622426d875d964cb1d4144d43b6e0fc79c0abfc498494f8d9e5e98f88e043785f67937f3f059e695c0c
 EBUILD bitcoin-cli-0.20.0.ebuild 2414 BLAKE2B 0f11b26a50f9e8b94fd91c3d789c5f4aac469ac3bbddec712a05218e398f70fa5c1d8498f2a20774084966a4c66464f19ba91c915e8175445b72050049fa5674 SHA512 dedebb1eb160907c49cb9d383a1b00b4317fa4139661942a830e759820a6e5eb4be86bf409635f643f68f841613f498d24586fa91aea60d45615320ccb75c110
+EBUILD bitcoin-cli-0.20.1.ebuild 2405 BLAKE2B 61bdf7f5fb5b43ab71c44770140b8b6be1084025a8819ea1488a5a269dbb83be5e4b474006059b943f54cc6bf991fa3cc17cd013e6bc23db297ffd190f81be77 SHA512 140ae66b79d8e0ade5a36371f897199ba86dc1d75cab2c9e6857634b612a85838516dd1e869609e9c5e00854af0434b48cdc8d590a1fad0a0db237275b42a8fa
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
new file mode 100644
index 000000000000..2a9e1703837f
--- /dev/null
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a"
+KNOTS_PV="${PV}.knots20200815"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitcoind"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	dev-libs/libevent:=
+	>=dev-libs/univalue-1.0.4:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/autoconf-2.69
+	>=sys-devel/automake-1.13
+"
+
+DOCS=(
+	doc/release-notes.md
+)
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2020/08/01/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-cli
+		--disable-util-tx
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/bitcoin-cli.bash-completion ${PN}
+}
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 42a7ca65cea0..888bdb053f7e 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -4,10 +4,13 @@ AUX org.bitcoin.bitcoin-qt.desktop 468 BLAKE2B e00d41612be14770d1f34b83f98a104ae
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
 DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
+DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
 DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
+DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 EBUILD bitcoin-qt-0.16.3.ebuild 4655 BLAKE2B 66c93d17b35aed2be874b64ebb1bc124a1b8e27d45967bf9bdd5b3c1a7c370fccb00b11c962f00de2427a8b686ea52e2ffa9ffada10d6f4138272587bad266b2 SHA512 2fbb05e0e11e5af8f3cce588756d0e8bde1481d880991e746b09a41236d5891abf2e39d4faf4df8c76af80ed1b034a196f05ff8f62e0d0cc84378741eaa0596e
 EBUILD bitcoin-qt-0.19.1.ebuild 4909 BLAKE2B e8689372c1dec02458190ad7d2286b550ddd38644aa3110d0f80e2bd7ac24a22d47cfab2b865e1e9e726a56edc19e310be8e70a153d7e41eb5b36f1ce97d58f3 SHA512 70e965cefe59b2e94af363b916bc4910c34787f751e9a415c09380f864ae9435c3ee82b0b30d7c8ed2c67736564842f64626e037c7a3c28318478c0edb47cad7
 EBUILD bitcoin-qt-0.20.0.ebuild 4798 BLAKE2B b330b64f0e724a13a286d8f292f00633f0a203c60ecaa08000d1508ac81c2fb79cc8c8917fb43930ce3da7817fe9886cac2df1b8880f63e0d8ed08302d745cde SHA512 9954cb606376fa0b78f7894f75989596879264975e2c626d7e039f45994446c23e1545f6f2a26cbfcadfaf4406fb72d53e9f07076f70024d66160cb7679a7c61
+EBUILD bitcoin-qt-0.20.1.ebuild 4789 BLAKE2B 9848de256b24bda7e9d3b8daef3216f9784647a6c8b84eb1d799f882e7140adccdfcc1fa1574aa76428637a68329306a8183917f582542973d3d49436db4eb62 SHA512 0557f9c88a0704d5ee27b0310ed6d4dbb083cddc1d339d102e61320d4c3e0bc8b363325b8fadc21e87286ed236503319e8642713eb3c03d9b2555e27eb1f3951
 MISC metadata.xml 1216 BLAKE2B bda0caaaa5e249b66b397de19a8cf57d5c21c0701814a8dc7c91b1434158a27d43347a006cbb260cf86358925a6e6635c19f493a22ab426c1cd7265b79c19108 SHA512 b54fe817a2edf65e388a2fd018b079ea745ae4950b384424f3a932a1f84ee9fe2fc3a62043933c5e3ec4eb617d14009cc3191588d2e016ac3902e8aed25266e9
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
new file mode 100644
index 000000000000..cc3760916ae0
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use desktop xdg-utils
+
+BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a"
+KNOTS_PV="${PV}.knots20200815"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="+asm dbus kde knots +qrcode +system-leveldb test upnp +wallet zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	system-leveldb? ( virtual/bitcoin-leveldb )
+	dbus? ( dev-qt/qtdbus:5 )
+	dev-libs/libevent:=
+	qrcode? (
+		media-gfx/qrencode:=
+	)
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+	zeromq? ( net-libs/zeromq:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/autoconf-2.69
+	>=sys-devel/automake-1.13
+	dev-qt/linguist-tools:5
+	knots? (
+		gnome-base/librsvg
+		media-gfx/imagemagick[png]
+	)
+"
+
+DOCS=(
+	doc/bips.md
+	doc/bitcoin-conf.md
+	doc/descriptors.md
+	doc/files.md
+	doc/JSON-RPC-interface.md
+	doc/psbt.md
+	doc/reduce-traffic.md
+	doc/release-notes.md
+	doc/REST-interface.md
+	doc/tor.md
+)
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2020/08/01/release-${PV}/"
+	fi
+	elog "Replace By Fee policy is now always enabled by default: Your node will"
+	elog "preferentially mine and relay transactions paying the highest fee, regardless"
+	elog "of receive order. To disable RBF, set mempoolreplacement=never in bitcoin.conf"
+}
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
+
+	# Save the generic icon for later
+	cp src/qt/res/src/bitcoin.svg bitcoin128.svg || die
+
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/secp256k1 || die
+	if use system-leveldb; then
+		rm -r src/leveldb || die
+	fi
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		$(use_with dbus qtdbus)
+		$(use_with qrcode qrencode)
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-gui=qt5
+		--disable-util-cli
+		--disable-util-tx
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		$(use_with system-leveldb)
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}/usr/bin/test_bitcoin" || die
+
+	insinto /usr/share/icons/hicolor/scalable/apps/
+	doins bitcoin128.svg
+	if use knots; then
+		newins src/qt/res/src/bitcoin.svg bitcoinknots.svg
+	fi
+
+	cp "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop" "${T}" || die
+	if ! use knots; then
+		sed -i 's/Knots/Core/;s/^\(Icon=\).*$/\1bitcoin128/' "${T}/org.bitcoin.bitcoin-qt.desktop" || die
+	fi
+	domenu "${T}/org.bitcoin.bitcoin-qt.desktop"
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/bitcoind.bash-completion ${PN}
+
+	if use kde; then
+		insinto /usr/share/kservices5
+		doins "${FILESDIR}/bitcoin-qt.protocol"
+		dosym "../../kservices5/bitcoin-qt.protocol" "/usr/share/kde4/services/bitcoin-qt.protocol"
+	fi
+}
+
+update_caches() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	update_caches
+
+	elog "To have ${PN} automatically use Tor when it's running, be sure your"
+	elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
+	elog "correctly, and add your user to the 'tor' user group."
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 48050a2a61fc..08bc2f798365 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -5,10 +5,13 @@ AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
 DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
+DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
 DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
+DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 EBUILD bitcoind-0.16.3.ebuild 4590 BLAKE2B ed0aa66c675d03225ea9d543e183f0e683fd12bc5e17575b678ac78f3aff0dd1890303b28f0fa950b3db8f716445061a4d785055defe82f296726d26a98e3e9c SHA512 2c000cbece2b8a934f13007d907a69a33732d7be014d56b41251bf0387da17865539ceb7287c6767d8289e5e5e5e29c3895b1d685d5e0240cd0d63e7a5f67675
 EBUILD bitcoind-0.19.1.ebuild 4749 BLAKE2B a73f39d8bb38dc7464f1095e7f83afef371b9896286e480e7684f218b4e9c396b4059ba64795cec504722549a4e3ba55f9dba278c1c9cc78c02411fc6ff84844 SHA512 33d8c951151f6bdae49ccc5e6ca207a8ce938acc07d00118077cce1621e4718f1d7add84375c6f332aea50151c9a3a61d159d4f07902fea1878d358807d75b39
 EBUILD bitcoind-0.20.0.ebuild 4792 BLAKE2B 0b9defb6c378a668a26ed18d11507ff687de93de4cfb378cfb22ce84c134cb688e991c7dbc09fd5af36d459526cde71ded889a9e699e6bbee9822efe2e96682b SHA512 9c783a19a2e2e7d4db7f0e072b10f641c8cb8df334ece4f4251c93e8620748e7dce794747d478d59489042b2ed1fd761f03db1638b33f50592bfa397afa5bc07
+EBUILD bitcoind-0.20.1.ebuild 4701 BLAKE2B 365bb0d8e440a6f33cc0b34cd7afbf2aa6dd411e10289b0bb2882e002a112172eddee7658efb144b3a0d06eecc4a5311cc6258fa3b3d885c1b736358f97b8c45 SHA512 d9a6f0b9f3a5274aa44da192a64e679f84227cbafdc1ef475a739862d2578698d033ff906dc02a6509fd3a00e142373426b73e81681f5a209d5ee3779bed943f
 MISC metadata.xml 952 BLAKE2B 93d018a58c2d352e122b848dbd124804c840be806e88f4e11d38f958aeb0a834ba686d542f4bf16ff73aaf8d7f1d13071a79cb7b813d30ca4c6998e1ec581991 SHA512 f812e5ea4a2f85d750817c18b92bb9e00c0a466697830ff4371a1bdee456c1876a5935edce1e4a4ae0be2262855a6982c65038347d3394df1aff4d7baad3a831
diff --git a/net-p2p/bitcoind/bitcoind-0.20.1.ebuild b/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
new file mode 100644
index 000000000000..8611fe0564cf
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use systemd
+
+BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a"
+KNOTS_PV="${PV}.knots20200815"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm examples knots +system-leveldb test upnp +wallet zeromq"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-group/bitcoin
+	acct-user/bitcoin
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	dev-libs/libevent:=
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+	system-leveldb? ( virtual/bitcoin-leveldb )
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+	zeromq? ( net-libs/zeromq:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/autoconf-2.69
+	>=sys-devel/automake-1.13
+"
+
+DOCS=(
+	doc/bips.md
+	doc/bitcoin-conf.md
+	doc/descriptors.md
+	doc/files.md
+	doc/JSON-RPC-interface.md
+	doc/psbt.md
+	doc/reduce-traffic.md
+	doc/release-notes.md
+	doc/REST-interface.md
+	doc/tor.md
+)
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2020/08/01/release-${PV}/"
+	fi
+	elog "Replace By Fee policy is now always enabled by default: Your node will"
+	elog "preferentially mine and relay transactions paying the highest fee, regardless"
+	elog "of receive order. To disable RBF, set mempoolreplacement=never in bitcoin.conf"
+}
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
+
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	default
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/secp256k1 || die
+	if use system-leveldb; then
+		rm -r src/leveldb || die
+	fi
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--without-qrencode
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-daemon
+		--disable-util-cli
+		--disable-util-tx
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-gui
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		$(use_with system-leveldb)
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}/usr/bin/test_bitcoin" || die
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
+	newinitd "contrib/init/bitcoind.openrc" ${PN}
+	systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service"
+
+	keepdir /var/lib/bitcoin/.bitcoin
+	fperms 700 /var/lib/bitcoin
+	fowners bitcoin:bitcoin /var/lib/bitcoin/
+	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
+	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
+
+	doman "${FILESDIR}/bitcoin.conf.5"
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+}
+
+pkg_postinst() {
+	elog "To have ${PN} automatically use Tor when it's running, be sure your"
+	elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
+	elog "correctly, and:"
+	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
+	elog "- Running bitcoind directly: add that user to the 'tor' user group."
+}
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 52a77335ecf5..cbd484a5c903 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,7 +1,5 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-3.12.13.tar.gz 1809807 BLAKE2B c971153fc1099dc29ae93ab341e905b3d0252d02468e0f125692a38d00121f82a2825d61e8303e45f4b41f64280d780a02f742eb61d117601a6ce47db57d4d2d SHA512 830371c4e2931101d33d124c86733e9f079ace5b4b59e3b5149db0655c93031dcbbb2dd370d4729b7e697670117c0b6874214a8aa569dcca92c6750dbc88a8b8
-DIST cpuminer-opt-3.12.4.2.tar.gz 1811456 BLAKE2B a19dfa37b726020f3143bd0a11fba52aae0eaea5295e8fc568815a12ade1e5c55d560ac964316f4ed3f272873ce1a393f581dc6143504eeadeb302ba83f3c017 SHA512 97222820c321cb34748a9e0550d7b1ded3d0d3980b7855d72cd0eabf5f6a03e121552e62ee52389bf0d5182c54f226b61f0549e787fdc0b0351d2fffa7a7e7c2
-EBUILD cpuminer-opt-3.12.13.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
-EBUILD cpuminer-opt-3.12.4.2.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+DIST cpuminer-opt-3.14.3.tar.gz 1822560 BLAKE2B 82e632577b0bd910c8a5bf1fa37bacc27c45ade178456113b986d070b46b7394eddaebcbff675d3cf842dc4f63253133244af1a706159a714ab8c043cd762e8c SHA512 ad8700a1ca0eca34cf9b15235e8c413ab7250dd47c6e1eba6a0b8c81665e7fa4aaef981f601a876d3973ef06cdbe7df56ce2d3827a5bac6de63434f1faf1d771
+EBUILD cpuminer-opt-3.14.3.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
 EBUILD cpuminer-opt-9999.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.4.2.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.4.2.ebuild
deleted file mode 100644
index a5d436b3b8b8..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.4.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.13.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.14.3.ebuild
index a5d436b3b8b8..a5d436b3b8b8 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.13.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.14.3.ebuild
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 97104606ff52..975c93f2af0a 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,4 +1,5 @@
 AUX deluge-2.0.3-UI-status.patch 1406 BLAKE2B 7da865fa6d87fbfc0443572d34cbf7324cc76037c603b7d2199081533fab04362d78e15dcaf37ceeb606f04017e8b1b5ad9ceb2028a9bd4d11bb859f02d3d898 SHA512 4860c7147ff4ec6da072a4245be7a80e6512f6cf2eecfd4db8260a206e76d1cb44b9f063e82e5a57ef70ab3d7dd020d9ba5ddb1c96b2bbb72ed9d3b2f20d85c8
+AUX deluge-2.0.3-fix-pickle.patch 3843 BLAKE2B d4b15eac2d0f114f4efbbf21d94164bd2ec3cb1819f02e3cc48af8fc7c5a02abc3d8c40e1a46d02680bd4d63c1a8167405b57ed312ecaceb513050bd95fc4661 SHA512 b4507292eb47ad054f0a0fef716951aae305bd0a4c0ec8f26cf0ababda5b181c1ba9eff1c977ac374d6740928bd1e5bde1488a4a183b5f9af81b753ad212aef0
 AUX deluge-2.0.3-gettext.patch 483 BLAKE2B 5c0c4462a27c9e8339979593c7868cca6a3f56549cba094d7f3932b76fe65c5f6d50390db7bbfc39268de05ebaa92bf1a22caffe6ae858e6adf222f17cec15d4 SHA512 122127744960786d7c3b247feb69fa4397ceb70bb1a4f2d30be4a683f163096f120cc5a0f72602cab39374eae5351bd5b3cf8bfd527bf036cc8e5e7f0700cf32
 AUX deluge-2.0.3-setup.py.patch 428 BLAKE2B f9469cac78d66cf71b510d846bceb1e59e6c887d89b239d39f67aa3757434dd2f3e384531733ceb332b8b57d62b56f34244caa592a279aa812269cde6106b1cc SHA512 d2f23dd8a27aa5537610c34b6197962b986f4811a89dffbfc82fade0dc8c0942a8f58480e0235d11d049f89dd38c48da43bbf1dc8a66f26cbc16db764b672af5
 AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999
@@ -15,5 +16,6 @@ EBUILD deluge-2.0.3-r4.ebuild 4551 BLAKE2B ca627923fdbb7144d4e4891916e5ef9f6e85f
 EBUILD deluge-2.0.3-r5.ebuild 4498 BLAKE2B 36a76f2ac7e3729c02fbe55778a4e03f180bc9a786a2e588f9824a2da3f30a01bd414b114fcf00e41f4be7dc35190f204fba5558718894f5ebc7c49aaa0b7e99 SHA512 eb2175efa677e713c9f4f43f8eee4dffbd152b3b15e9344ee402d056504c62a87851bebdc6e5c9b899f58bf24ddf1dfaeed58a402d6bc5ec43558a8de9e57ad5
 EBUILD deluge-2.0.3-r6.ebuild 4536 BLAKE2B 2e364f8ab18cd863e062883a44347e25d1013423fab81731b8ed5ed12f16d46d7bf1dd3c334092ad8d2d4f6a8a827036a3432dca0a287c430e021b3d27d192c3 SHA512 907108811c97d88e8ccdee666623f8a130503e45ca4c148ce9266d802654075136940fbcc5563a6ce7de82bf602c6339e277d3e14fd66e3569895ec98dbfb97c
 EBUILD deluge-2.0.3-r7.ebuild 4544 BLAKE2B d04ab2b41c9f3080a6743768f844daa65673f19d105e616d8398f6015674c8570e28d996ce809ac2fb6028caeb590c55d36f64cd407ffb929d91b397798aaa43 SHA512 71bbcefe5ede6133321753afa10739936878e214b7df56881abe1db4348c0feb0eff07e01f376f2fba338ffe1f2f425bc72336764f9b5c2feaf071dcf8206ef9
+EBUILD deluge-2.0.3-r8.ebuild 4581 BLAKE2B f4963cadc822339bd3d4473ddc81bef2f15738d02dbc87b9dc28bae903569cf1c41059ef7a1393127bd6507dd5b63cd59541e666579e12d5247c2bf553cb894c SHA512 2e49d3f71fcb466f34f065d3b2c41297fd57e0e38c60a93cd5c36a9a78213103419f2440e227d99e2337c23c33685bd4230f8718e8b4344eef02a3faf6ddda1d
 EBUILD deluge-9999.ebuild 4544 BLAKE2B d04ab2b41c9f3080a6743768f844daa65673f19d105e616d8398f6015674c8570e28d996ce809ac2fb6028caeb590c55d36f64cd407ffb929d91b397798aaa43 SHA512 71bbcefe5ede6133321753afa10739936878e214b7df56881abe1db4348c0feb0eff07e01f376f2fba338ffe1f2f425bc72336764f9b5c2feaf071dcf8206ef9
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-2.0.3-r8.ebuild b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
new file mode 100644
index 000000000000..8c09d112b658
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 systemd
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( gtk )
+	sound? ( gtk )
+"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
+	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
+	"${FILESDIR}/${P}-fix-pickle.patch"
+)
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${ED}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch b/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch
new file mode 100644
index 000000000000..446ae2e9a0e1
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch
@@ -0,0 +1,143 @@
+https://dev.deluge-torrent.org/changeset/23b3f144fce3424ae
+
+Index: deluge/core/torrentmanager.py
+===================================================================
+--- deluge-2.0.3/deluge/core/torrentmanager.py	(revision 8b62e50eb8bf81a177c4d62484a44b766c6f54a6)
++++ deluge-2.0.3/deluge/core/torrentmanager.py	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
+@@ -26,5 +26,5 @@
+ import deluge.component as component
+ from deluge._libtorrent import lt
+-from deluge.common import archive_files, decode_bytes, get_magnet_info, is_magnet
++from deluge.common import PY2, archive_files, decode_bytes, get_magnet_info, is_magnet
+ from deluge.configmanager import ConfigManager, get_config_dir
+ from deluge.core.authmanager import AUTH_LEVEL_ADMIN
+@@ -810,5 +810,8 @@
+             try:
+                 with open(filepath, 'rb') as _file:
+-                    state = pickle.load(_file)
++                    if PY2:
++                        state = pickle.load(_file)
++                    else:
++                        state = pickle.load(_file, encoding='utf8')
+             except (IOError, EOFError, pickle.UnpicklingError) as ex:
+                 message = 'Unable to load {}: {}'.format(filepath, ex)
+Index: deluge/tests/data/utf8_filename_torrents.state
+===================================================================
+--- deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
++++ deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
+@@ -0,0 +1,85 @@
++(ideluge.core.torrentmanager
++TorrentManagerState
++p1
++(dp2
++S'torrents'
++p3
++(lp4
++(ideluge.core.torrentmanager
++TorrentState
++p5
++(dp6
++S'max_download_speed'
++p7
++I-1
++sS'move_completed_path'
++p8
++S'/home/calum/Downloads'
++p9
++sS'paused'
++p10
++I00
++sS'max_upload_slots'
++p11
++I-1
++sS'prioritize_first_last'
++p12
++I00
++sS'max_connections'
++p13
++I-1
++sS'compact'
++p14
++I00
++sS'queue'
++p15
++I0
++sS'file_priorities'
++p16
++(lp17
++I4
++asS'filename'
++p18
++S'\xc2\xa2.torrent'
++p19
++sS'max_upload_speed'
++p20
++I-1
++sS'save_path'
++p21
++S'/home/calum/Downloads'
++p22
++sS'time_added'
++p23
++F1573563097.749759
++sS'total_uploaded'
++p24
++I0
++sS'torrent_id'
++p25
++S'80d81d55ef3b85f3c1b634c362e014b35594dc71'
++p26
++sS'auto_managed'
++p27
++I01
++sS'stop_at_ratio'
++p28
++I00
++sS'move_completed'
++p29
++I00
++sS'trackers'
++p30
++(lp31
++sS'magnet'
++p32
++NsS'remove_at_ratio'
++p33
++I00
++sS'stop_ratio'
++p34
++F2
++sS'is_finished'
++p35
++I00
++sbasb.
+Index: deluge/tests/test_torrentmanager.py
+===================================================================
+--- deluge-2.0.3/deluge/tests/test_torrentmanager.py	(revision c6b6902e9f3e37f5b15184eb509b48b43817a331)
++++ deluge-2.0.3/deluge/tests/test_torrentmanager.py	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
+@@ -8,4 +8,6 @@
+ from __future__ import unicode_literals
+ 
++import os
++import shutil
+ import warnings
+ from base64 import b64encode
+@@ -29,5 +31,5 @@
+ class TorrentmanagerTestCase(BaseTestCase):
+     def set_up(self):
+-        common.set_tmp_config_dir()
++        self.config_dir = common.set_tmp_config_dir()
+         self.rpcserver = RPCServer(listen=False)
+         self.core = Core()
+@@ -119,2 +121,11 @@
+             InvalidTorrentError, self.tm.remove, 'torrentidthatdoesntexist'
+         )
++
++    def test_open_state_from_python2(self):
++        """Open a Python2 state with a UTF-8 encoded torrent filename."""
++        shutil.copy(
++            common.get_test_data_file('utf8_filename_torrents.state'),
++            os.path.join(self.config_dir, 'state', 'torrents.state'),
++        )
++        state = self.tm.open_state()
++        self.assertEqual(len(state.torrents), 1)
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 8895f55e6342..2d3b4cb6d276 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -7,7 +7,9 @@ AUX freenet-0.7.5_p1474-wrapper.conf 949 BLAKE2B 6832683015aff6db0ad2b4116a6b8ae
 AUX freenet.service 271 BLAKE2B 7d47ad525f4bb13e07c50a0bdf19f1ef234d5219e82f426254c316abc4517180c22267a245ca022edf68e615a2865fe0dd08f694ee5ee2ced8c5391b3c5e33ad SHA512 2f3d4ec0ba05eff328e8176cbe130176a82a1bb432599de44ab78ca27e9c96e0eafe0871f12b0165247f941a2e929635a6abe6cd61351b1305c0d0e8cff83d2b
 AUX run.sh-20090501 16217 BLAKE2B 249254104ca2d0a20131a5d6b36a07b14fe6407d1915d75ecf98a617de6e532def710975ff1b2e0b580f7148099cd7f6915d8adc0b15e1f67af4fc4713e0e5af SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67
 DIST freenet-0.7.5_p1484.zip 5584092 BLAKE2B d5be70eae9ae40134d8aed92e649a50ea5c967b13c84bb327b1429a2b709caf9a37443a5ca3e54df520a775ab4705cd7656d7060b9c29c7af1d894936991f2ee SHA512 126e794972c65e9caaca2baa3724f199e1ad432c92351826222be54ee184ca4076fe1b13394914f60b5449731763e00ccb097639092b4c724e5bca1bb10f5ac2
+DIST freenet-0.7.5_p1486.zip 7804344 BLAKE2B cb04c2be678b2ed7e656781d4aa1b34f16f7dfa7c80d757de4cd6b1269d6e5768b1fae3b39f891a5b13f6e089c8c66606f2ffebbbccfbd70627e5b9fe5b776a1 SHA512 e390c079313f3d2d89577331c1346e9b25a3008fe9a9766f6c281b232fa185af037d6e47ac66d0f1732e46de37797220a51e7e93f010b79300a81888a359bfec
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
 EBUILD freenet-0.7.5_p1484.ebuild 4782 BLAKE2B e69759a971aa1ea227b3cdca41e6d6c47fb1b4412906d48547ea57327f902147fbf6414d0662aef8c1094a0f6e7c64eac99df084809afd31dbc2d6d42c1767d4 SHA512 ae3599b00b246c9691cbf81d7df92c41c687d44b596b30d7188d8f298dd1548332883bc44ad684a2e3026f131ec7d9c01b9a477a608d23f0c3b933dfa6d0ff0a
+EBUILD freenet-0.7.5_p1486.ebuild 4768 BLAKE2B 76c84d0a24bc9c13f9887f3a9f9ea4a7e1f39dc544e4c08fd031001b1740992484ad46c500b392ec7f01e32c7c179e0b8d26a4e6bdec25ae9fb8d4493e2c145b SHA512 2fd06deeef1955d65566fbcdc01f29fc73589eb477388e1debfc94baa87376534216f1dd4cf2c81ce38f478a4713eacd70083dbe29e50500a50e45f89a54e71d
 MISC metadata.xml 430 BLAKE2B 330d7821440f7a30d4eeb6c8586cf4de79358d9387d99cd6a3f8fc240d91fa78155dcca40ad3998bb158322c463166de729bd350bf132bb84222287df2d374fc SHA512 54fdbe9930d42e885eed81f57adcec04155e63aa6b4cd538d75094a4016405e9155b717bce464ad40ce16a3aa1c4e6b020913c5900eaed8d7f6f8e5de98e7a64
diff --git a/net-p2p/freenet/freenet-0.7.5_p1486.ebuild b/net-p2p/freenet/freenet-0.7.5_p1486.ebuild
new file mode 100644
index 000000000000..acc6f106e14a
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1486.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 multilib systemd user
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
+SRC_URI="
+	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
+	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+nss test"
+
+CDEPEND="dev-java/bcprov:1.54
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	dev-java/java-service-wrapper:0
+	dev-java/jbitcollider-core:0
+	dev-java/jna:0
+	dev-java/lzma:0
+	dev-java/lzmajio:0
+	dev-java/mersennetwister:0
+	nss? ( dev-libs/nss )"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.8
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	dev-java/ant-core:0"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	net-libs/nativebiginteger:0
+	${CDEPEND}"
+
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="unit"
+EANT_BUILD_XML="build-clean.xml"
+EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna,lzma,lzmajio,mersennetwister"
+EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S="${WORKDIR}/fred-build0${PV#*p}"
+
+RESTRICT="test" # they're broken in the last release.
+
+MY_PATCHES=(
+	"${FILESDIR}"/0.7.5_p1483-ext.patch
+	"${FILESDIR}/"0.7.5_p1475-remove-git.patch
+)
+
+pkg_setup() {
+	has_version dev-java/icedtea[cacao] && {
+		ewarn "dev-java/icedtea was built with cacao USE flag."
+		ewarn "freenet may compile with it, but it will refuse to run."
+		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
+		ewarn "if you plan to use it for running freenet."
+	}
+	java-pkg-2_pkg_setup
+	enewgroup freenet
+	enewuser freenet -1 -1 /var/freenet freenet
+}
+
+src_unpack() {
+#	unpack ${P}.zip seednodes-${PV}.zip
+	unpack ${P}.zip seednodes-0.7.5_p1480.zip
+}
+
+src_prepare() {
+#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
+	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
+	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
+	cp "${FILESDIR}"/build.properties build.properties || die
+
+	epatch "${MY_PATCHES[@]}"
+
+	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
+		freenet-wrapper.conf || die "sed failed"
+
+	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die
+	if use nss; then
+		echo "wrapper.java.additional.5=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
+	fi
+	local i=2 pkg jars jar
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
+		jars="$(java-pkg_getjars ${pkg})"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
+		done
+	done
+	IFS=${ifs_original}
+	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+	eapply_user
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/freenet.jar
+	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+
+	if has_version =sys-apps/baselayout-2*; then
+		doinitd "${FILESDIR}"/freenet
+	else
+		newinitd "${FILESDIR}"/freenet.old freenet
+	fi
+
+	systemd_dounit "${FILESDIR}"/freenet.service
+
+	dodoc AUTHORS
+	newdoc README.md README
+	insinto /etc
+	doins freenet-wrapper.conf
+	insinto /var/freenet
+	doins run.sh seednodes.fref
+	fperms +x /var/freenet/run.sh
+	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with /etc/init.d/freenet start."
+	elog "2. Open localhost:8888 in your browser for the web interface."
+	#workaround for previously existing freenet user
+	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
+		freenet:freenet /var/freenet
+}
+
+pkg_postrm() {
+	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
+		elog " "
+		elog "If you dont want to use freenet any more"
+		elog "and dont want to keep your identity/other stuff"
+		elog "remember to do 'rm -rf /var/freenet' to remove everything"
+	fi
+}
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 927d5b027dc3..c34ce6db1cad 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,3 +1,5 @@
 DIST gtk-gnutella-1.1.15.tar.xz 19606508 BLAKE2B 3c699f2c5e8b6962265c9fc9bc6720d740c447afb33bef8968e8c8f1f7ec8b88ec3381419cdcee8e2ec8f4e10be2c6e5707d5f89365f347a33990fffd0f18395 SHA512 6b2bee08fba463b66890c8c5d7f7815a8cc4106824e598bed8cffe4601b1e591fc14903ce8d587815257f795c854d459b3a4fa7cc90de2fbc109daef025e5968
+DIST gtk-gnutella-1.2.0.tar.xz 20467452 BLAKE2B 8884c74e5c7ba52ce870289579cb26608fd8eb0fff14986fba40e200181e28908aa42c7a345f1c69dd5b1099135b4a0458d266abdf94361cc0a37b8949867322 SHA512 8d4da23acce22af42b39ca4af2ee4d250cadea9f8c549d712ffdfb797b53311ce8db9fcb38bc1f5547b7df32e95ebc53676bff1127805e867b23d0598b1fa4cd
 EBUILD gtk-gnutella-1.1.15.ebuild 1889 BLAKE2B db599d86c14d85badd9d7290c9b717a9b19376c26d233d15d5b75de6c66fa828162ae554bc01e14b418f3555c414df1912f02a70f1e92ba028a63e61e65ea2ee SHA512 c5efa25051678b375791fbd30f7bad7886a4dcc155f8b22fd5af43c898614f84c1a3c6c048e0c379e6b3d6b95d0a0c8b68cd12ab38bf2aa71a72fb35a413304c
+EBUILD gtk-gnutella-1.2.0.ebuild 1906 BLAKE2B 82595556eac617b54ff524b6e2834167ac26c63d432d7ba02c51d185747433f038934c87c4450f001df8aa3560af7e4f5cd3d08c0d6a6e3afef0dbc1cc88d100 SHA512 7d16d7af7134190cac402fb49fc5f82735d902d22d204d827d40dc73a60b2a4fae3339e791361faad473ea1ef5303ec44d548b0c7c5dc81d6c8c72333448861a
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0.ebuild
new file mode 100644
index 000000000000..d35f1bd7d232
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils: strip-linguas
+inherit eutils toolchain-funcs
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="CC-BY-SA-4.0 GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	<sys-libs/binutils-libs-2.34:=
+	dev-libs/glib:2
+	sys-libs/zlib
+	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+	dbus? ( >=sys-apps/dbus-0.35.2 )
+	ssl? ( >=net-libs/gnutls-2.2.5 )
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	strip-linguas -i po
+
+	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+	for ling in ${LINGUAS}; do
+		echo $ling >> po/LINGUAS
+	done
+
+	default
+}
+
+src_configure() {
+	# There is no option to turn off optimization through the build.sh
+	# script.
+	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
+
+	# The build script does not support the equivalent --enable
+	# options so we must construct the configuration by hand.
+
+	local myconf
+
+	if ! use nls; then
+		myconf="${myconf} --disable-nls"
+	fi
+
+	if ! use dbus; then
+		myconf="${myconf} --disable-dbus"
+	fi
+
+	if ! use ssl; then
+		myconf="${myconf} --disable-gnutls"
+	fi
+
+	if use gtk; then
+		myconf="${myconf} --gtk2"
+	else
+		myconf="${myconf} --topless"
+	fi
+
+	./build.sh \
+		--configure-only \
+		--prefix="/usr" \
+		--cc=$(tc-getCC) \
+		${myconf}
+}
+
+src_compile() {
+	# Build system is not parallel-safe, bug 500760
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/bin
+	emake INSTALL_PREFIX="${D}" install
+	dodoc AUTHORS ChangeLog README TODO
+
+	# Touch the symbols file into the future to avoid warnings from
+	# gtk-gnutella later on, since we will most likely strip the binary.
+	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
+}
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index c035ff802b53..4f50bde5c873 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,7 +1,5 @@
-AUX ktorrent-5.1.1-singlefile-torrent.patch 4654 BLAKE2B 8bef064068df9db5b82eb16e5ca04bb618378c94a5d218654aabb5e49dcc5db1a8b8fd92a4ed6e3e922f8a2eebdf23f4d460261fd396b7a7b8319cc102dce9f8 SHA512 e74632a86967440733ed0d3da9249a04dfe401d3966bc385581b5ba5e50e864b288fb0ca4e1ac17b754289fd8aeb70119f8c1981e9478afff434e17138beb151
-AUX ktorrent-5.1.2-crash-on-exit.patch 13261 BLAKE2B 735100f666ad7b6d0dccfcf3b5cd8582b52a6d818cd76e6ceb10e5a4a57e488eff625a94002156a5d01480c6f87e4dd05d5d5669b9accbe2973ac586bd4ef820 SHA512 5ba7b1c9bea3eae2886d2e6c6394464077b56cf1e77322a504ddb200db7a0b4130d6fdf75bfe7d3d9786c7c5507d8cb0b48c387cdf0eb77c54f9e8510287568b
-DIST ktorrent-5.1.2.tar.xz 2048604 BLAKE2B 761df1e0aab5c4457311ae821a47ebf7b5b82b2839b4bf238491231caa213370cc649a1c0cafd332b42bbb84230f4a313e5172db722ff3c7af81c0daba450a98 SHA512 b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621
+AUX ktorrent-5.2.0-fix-start-in-systray.patch 769 BLAKE2B c9832a15f75bd5495fb59e2521bb82e0bb0fe530d3132ea52147c8dc531162f96e165011fd7f61fc046a4d5dc7e52ca1a9be74a0790b0b2b62ca968bd8c9d45d SHA512 67b9ce967fc295ece3607f909f80cf1362fdd88d7172c9ec556275fab2019d016440b9f605a49e50eb0fd82f7c7c0bc3b78195204215630aba0d848df6d4ba15
+AUX ktorrent-5.2.0-taglib-linking.patch 8105 BLAKE2B 232c167489c139973b1c57cd2330c4f27c5878843593ecfd3c5020384f5bf891c06ac21c0a5644d0881cf846ed712441e7501f560a711b8d4e72481599cb40d6 SHA512 4dc3d63e07c8f8c56019ab95230dadf3e9fbe37eb7d7f9ed31e58ebca9219b47e6bec78049e36ce1b783620b82b386e71ca9fc1d6bb797e56ac521daa5f0d996
 DIST ktorrent-5.2.0.tar.xz 2056012 BLAKE2B c59cb34675b9c4e023b6c22f795bf146d64acaea069efa1f1663888a0ada6f7c8328a15bdc2fc453e31a9f451c6b0203dfdfd02098cc52f5d828b87c23d857b5 SHA512 141976612cfe6bf4bd06e96842d7bc51ced7a3ab8e13c25446a00c031054698f851fbb1a31f3425dda5a428408bb1ceb51a4a420eaf2e79193b17a0cc7d7a387
-EBUILD ktorrent-5.1.2-r2.ebuild 3347 BLAKE2B 5bb90db40f6f451603cd3d0c4d56ce0db5965839ae708830494448aec38fc42fa21b10acc31fa4428af68baee41d3dcc6d7ffc385105b70552d67ec1f356834d SHA512 2d3e7220badc77282b556acaa31722e1a5beb227a610c55cfeabbc226744bc17137de8548a1c4af2327549b80041ae85718cc8eb2b2e1bc3fd2e8293d80469b6
-EBUILD ktorrent-5.2.0.ebuild 3138 BLAKE2B c0400151e7080a0ffb77cb81aeba5280637789e04feebd4bf88e34ae180464579a9e7ce41feb4a63c2e111561d274857e72c7f34d82693210239d077b8ea95de SHA512 6f63bbf9ee5c05356feec99a2679d6bbe8158faee1fff7e0852adaf10fc915bb8dac0c13b739649424ea7b077f5f911d3c7e0a317d029de37306418a3e2f1814
+EBUILD ktorrent-5.2.0-r1.ebuild 3329 BLAKE2B cb56fcfc302edcf3f89ba9e56c3965628be4efc04a40a982bbb27b64f74b1ae12c7a36d99ee5b005834001003f069547c78494dd61242c3c373ef5f036f48090 SHA512 b63d6e04ba9e8a75c1474dce575ad3e2ace468dc20b108b4c672d2e053d8282047ac81567a0dad079193a8f3926708c9b5d903cb4efd8066f950e2c6535ed2cf
 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-singlefile-torrent.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-singlefile-torrent.patch
deleted file mode 100644
index b22518656288..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.1-singlefile-torrent.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From dab5abcd2172155c511e0666d867c37382829226 Mon Sep 17 00:00:00 2001
-From: Jiva Totin <jiva.totin@gmail.com>
-Date: Sun, 17 Feb 2019 20:00:11 +0000
-Subject: Allow creating torrent for a single file.
-
-Added 2 new radio buttons. One for choosing directory and the other one for
-choosing files.
-
-BUG: 384452
-Differential Revision: https://phabricator.kde.org/D11728
----
- ktorrent/dialogs/torrentcreatordlg.cpp | 18 ++++++++++-
- ktorrent/dialogs/torrentcreatordlg.h   |  3 ++
- ktorrent/dialogs/torrentcreatordlg.ui  | 56 +++++++++++++++++++++++-----------
- 3 files changed, 58 insertions(+), 19 deletions(-)
-
-diff --git a/ktorrent/dialogs/torrentcreatordlg.cpp b/ktorrent/dialogs/torrentcreatordlg.cpp
-index bb3710d..b46b291 100644
---- a/ktorrent/dialogs/torrentcreatordlg.cpp
-+++ b/ktorrent/dialogs/torrentcreatordlg.cpp
-@@ -54,12 +54,17 @@ namespace kt
-         adjustSize();
-         loadGroups();
- 
--        m_url->setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory);
-+        m_url->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory);
-+        m_selectDirectory->setChecked(true);
-+
-         m_dht_tab->setEnabled(false);
- 
-         connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-         connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
- 
-+        connect(m_selectDirectory, &QRadioButton::clicked, this, &TorrentCreatorDlg::selectDirectory);
-+        connect(m_selectFile, &QRadioButton::clicked, this, &TorrentCreatorDlg::selectFile);
-+
-         connect(m_dht, &QCheckBox::toggled, this, &TorrentCreatorDlg::dhtToggled);
- 
-         // tracker box stuff
-@@ -428,4 +433,15 @@ namespace kt
-         m_progress->setValue(mktor->getCurrentChunk());
-     }
- 
-+    void TorrentCreatorDlg::selectFile()
-+    {
-+        m_url->setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly);
-+    }
-+
-+    void TorrentCreatorDlg::selectDirectory()
-+    {
-+        m_url->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory);
-+    }
-+
-+
- }
-diff --git a/ktorrent/dialogs/torrentcreatordlg.h b/ktorrent/dialogs/torrentcreatordlg.h
-index 12a1a43..b59d880 100644
---- a/ktorrent/dialogs/torrentcreatordlg.h
-+++ b/ktorrent/dialogs/torrentcreatordlg.h
-@@ -73,6 +73,9 @@ namespace kt
-         void accept() override;
-         void reject() override;
- 
-+        void selectFile();// required for radio button for new torrent creation
-+        void selectDirectory();
-+
-     private:
-         void loadGroups();
-         void loadCompleterData();
-diff --git a/ktorrent/dialogs/torrentcreatordlg.ui b/ktorrent/dialogs/torrentcreatordlg.ui
-index b954aed..02bf390 100644
---- a/ktorrent/dialogs/torrentcreatordlg.ui
-+++ b/ktorrent/dialogs/torrentcreatordlg.ui
-@@ -15,26 +15,46 @@
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
--    <widget class="QLabel" name="label">
--     <property name="text">
-+    <widget class="QGroupBox" name="groupBox">
-+     <property name="title">
-       <string>File or directory to create torrent from:</string>
-      </property>
--    </widget>
--   </item>
--   <item>
--    <widget class="KUrlRequester" name="m_url">
--     <property name="sizePolicy">
--      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
--       <horstretch>0</horstretch>
--       <verstretch>0</verstretch>
--      </sizepolicy>
--     </property>
--     <property name="minimumSize">
--      <size>
--       <width>0</width>
--       <height>0</height>
--      </size>
--     </property>
-+     <layout class="QVBoxLayout" name="verticalLayout_2">
-+      <item>
-+       <widget class="KUrlRequester" name="m_url">
-+        <property name="sizePolicy">
-+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-+          <horstretch>0</horstretch>
-+          <verstretch>0</verstretch>
-+         </sizepolicy>
-+        </property>
-+        <property name="minimumSize">
-+         <size>
-+          <width>0</width>
-+          <height>0</height>
-+         </size>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <layout class="QHBoxLayout" name="horizontalLayout_2">
-+        <item>
-+         <widget class="QRadioButton" name="m_selectDirectory">
-+          <property name="text">
-+           <string>Select Directory</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QRadioButton" name="m_selectFile">
-+          <property name="text">
-+           <string>Select File</string>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </item>
-+     </layout>
-     </widget>
-    </item>
-    <item>
--- 
-cgit v1.1
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.2-crash-on-exit.patch b/net-p2p/ktorrent/files/ktorrent-5.1.2-crash-on-exit.patch
deleted file mode 100644
index 5cb6640d16f4..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.2-crash-on-exit.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-From b819ef6a35495e12a204cbb241cdb2502c4cd11e Mon Sep 17 00:00:00 2001
-From: Valerii Malov <jazzvoid@gmail.com>
-Date: Sun, 22 Sep 2019 21:20:47 +0300
-Subject: Cleanup ViewModel a bit and try to fix crash on exit
-
-Summary:
-removeTorrent makes changes to torrent list we are currently iterating
-on per-item basis, this causees heap-use-after-free in onExit
-Just call removeRows which should be functionally the same, but should
-delete all items in one batch
-
-CCBUG: 383127
-
-Compact ViewModel::Item::update
-Fix a few warnings (0 as nullptr, c-style casts)
-Remove useless ViewModel::torrentFromIndex variant
-Remove unused headers
-add CMakeLists.txt.user to gitignore
-
-Test Plan: build with asan, run & exit, see asan stacktrace before changing onExit
-
-Reviewers: stikonas
-
-Differential Revision: https://phabricator.kde.org/D24149
----
- .gitignore                  |   1 +
- ktorrent/CMakeLists.txt     |   1 +
- ktorrent/view/viewmodel.cpp | 197 ++++++++++++--------------------------------
- ktorrent/view/viewmodel.h   |  21 +++--
- 4 files changed, 63 insertions(+), 157 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index 2ad76d6..d88e731 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,3 +1,4 @@
- build
- .kdev4/
- ktorrent.kdev4
-+CMakeLists.txt.user
-diff --git a/ktorrent/CMakeLists.txt b/ktorrent/CMakeLists.txt
-index 75ba8a1..bf605a5 100644
---- a/ktorrent/CMakeLists.txt
-+++ b/ktorrent/CMakeLists.txt
-@@ -91,6 +91,7 @@ set(KTORRENT_ICONS_PNG
- ecm_add_app_icon(ktorrent_SRC ICONS ${KTORRENT_ICONS_PNG})
- 
- add_executable(ktorrent_app ${ktorrent_SRC})
-+set_property(TARGET ktorrent_app PROPERTY CXX_STANDARD 14)
- set_target_properties(ktorrent_app  PROPERTIES OUTPUT_NAME ktorrent)
- 
- target_link_libraries(ktorrent_app
-diff --git a/ktorrent/view/viewmodel.cpp b/ktorrent/view/viewmodel.cpp
-index 6834186..b9feeab 100644
---- a/ktorrent/view/viewmodel.cpp
-+++ b/ktorrent/view/viewmodel.cpp
-@@ -32,18 +32,17 @@
- 
- #include <KLocalizedString>
- 
--#include <util/log.h>
--#include <util/sha1hash.h>
--#include <util/functions.h>
-+#include <groups/group.h>
- #include <interfaces/torrentinterface.h>
--#include <interfaces/trackerinterface.h>
--#include <torrent/timeestimator.h>
- #include <torrent/queuemanager.h>
--#include <groups/group.h>
-+#include <torrent/timeestimator.h>
-+#include <util/functions.h>
-+#include <util/sha1hash.h>
-+
- #include "core.h"
--#include "viewdelegate.h"
--#include "view.h"
- #include "settings.h"
-+#include "view.h"
-+#include "viewdelegate.h"
- 
- using namespace bt;
- 
-@@ -80,125 +79,45 @@ namespace kt
-     {
-         bool ret = false;
-         const TorrentStats& s = tc->getStats();
--        if (status != s.status)
--        {
--            to_update.append(model->index(row, NAME));
--            status = s.status;
--            if (sort_column == NAME)
--                ret = true;
--        }
--
--        if (bytes_downloaded != s.bytes_downloaded)
--        {
--            to_update.append(model->index(row, BYTES_DOWNLOADED));
--            bytes_downloaded = s.bytes_downloaded;
--            if (sort_column == BYTES_DOWNLOADED)
--                ret = true;
--        }
--
--        if (total_bytes_to_download != s.total_bytes_to_download)
--        {
--            to_update.append(model->index(row, TOTAL_BYTES_TO_DOWNLOAD));
--            total_bytes_to_download = s.total_bytes_to_download;
--            if (sort_column == TOTAL_BYTES_TO_DOWNLOAD)
--                ret = true;
--        }
--
--        if (bytes_uploaded != s.bytes_uploaded)
--        {
--            to_update.append(model->index(row, BYTES_UPLOADED));
--            bytes_uploaded = s.bytes_uploaded;
--            if (sort_column == BYTES_UPLOADED)
--                ret = true;
--        }
--
--        if (bytes_left != s.bytes_left_to_download)
--        {
--            to_update.append(model->index(row, BYTES_LEFT));
--            bytes_left = s.bytes_left_to_download;
--            if (sort_column == BYTES_LEFT)
--                ret = true;
--        }
--
--        if (download_rate != s.download_rate)
--        {
--            to_update.append(model->index(row, DOWNLOAD_RATE));
--            download_rate = s.download_rate;
--            if (sort_column == DOWNLOAD_RATE)
--                ret = true;
--        }
--
--        if (upload_rate != s.upload_rate)
--        {
--            to_update.append(model->index(row, UPLOAD_RATE));
--            upload_rate = s.upload_rate;
--            if (sort_column == UPLOAD_RATE)
--                ret = true;
--        }
- 
--        int neta = tc->getETA();
--        if (eta != neta)
--        {
--            to_update.append(model->index(row, ETA));
--            eta = neta;
--            if (sort_column == ETA)
--                ret = true;
--        }
--
--        if (seeders_connected_to != s.seeders_connected_to || seeders_total != s.seeders_total)
--        {
--            to_update.append(model->index(row, SEEDERS));
--            seeders_connected_to = s.seeders_connected_to;
--            seeders_total = s.seeders_total;
--            if (sort_column == SEEDERS)
--                ret = true;
--        }
--
--        if (leechers_total != s.leechers_total || leechers_connected_to != s.leechers_connected_to)
--        {
--            to_update.append(model->index(row, LEECHERS));
--            leechers_total = s.leechers_total;
--            leechers_connected_to = s.leechers_connected_to;
--            if (sort_column == LEECHERS)
--                ret = true;
--        }
--
--        double perc = Percentage(s);
--        if (fabs(percentage - perc) > 0.001)
--        {
--            to_update.append(model->index(row, PERCENTAGE));
--            percentage = perc;
--            if (sort_column == PERCENTAGE)
--                ret = true;
--        }
--
--        float ratio = s.shareRatio();
--        if (fabsf(share_ratio - ratio) > 0.001)
--        {
--            to_update.append(model->index(row, SHARE_RATIO));
--            share_ratio = ratio;
--            if (sort_column == SHARE_RATIO)
--                ret = true;
--        }
-+        const auto update_if_differs = [&](auto &target, const auto &source, int column){
-+            if (target != source) {
-+                to_update.append(model->index(row, column));
-+                target = source;
-+                ret |= (sort_column == column);
-+            }
-+        };
- 
--        Uint32 rdl = tc->getRunningTimeDL();
--        if (runtime_dl != rdl)
--        {
--            to_update.append(model->index(row, DOWNLOAD_TIME));
--            runtime_dl = rdl;
--            if (sort_column == DOWNLOAD_TIME)
--                ret = true;
--        }
-+        const auto update_if_differs_float = [&](auto &target, const auto &source, int column){
-+            if (fabs(target - source) > 0.001) {
-+                to_update.append(model->index(row, column));
-+                target = source;
-+                ret |= (sort_column == column);
-+            }
-+        };
-+
-+        update_if_differs(status, s.status, NAME);
-+        update_if_differs(bytes_downloaded, s.bytes_downloaded, BYTES_DOWNLOADED);
-+        update_if_differs(total_bytes_to_download, s.total_bytes_to_download, TOTAL_BYTES_TO_DOWNLOAD);
-+        update_if_differs(bytes_uploaded, s.bytes_uploaded, BYTES_UPLOADED);
-+        update_if_differs(bytes_left, s.bytes_left, BYTES_LEFT);
-+        update_if_differs(download_rate, s.download_rate, DOWNLOAD_RATE);
-+        update_if_differs(upload_rate, s.upload_rate, UPLOAD_RATE);
-+        update_if_differs(eta, tc->getETA(), ETA);
-+        update_if_differs(seeders_connected_to, s.seeders_connected_to, SEEDERS);
-+        update_if_differs(seeders_total, s.seeders_total, SEEDERS);
-+        update_if_differs(leechers_connected_to, s.leechers_connected_to, LEECHERS);
-+        update_if_differs(leechers_total, s.leechers_total, LEECHERS);
-+
-+        update_if_differs_float(percentage, Percentage(s), PERCENTAGE);
-+        update_if_differs_float(share_ratio, s.shareRatio(), SHARE_RATIO);
-+
-+        update_if_differs(runtime_dl, tc->getRunningTimeDL(), DOWNLOAD_TIME);
-+        const auto rul = (tc->getRunningTimeUL() >= tc->getRunningTimeDL()
-+                              ? tc->getRunningTimeUL() - tc->getRunningTimeDL()
-+                              : 0);
-+        update_if_differs(runtime_ul, rul, SEED_TIME);
- 
--        Uint32 rul = tc->getRunningTimeUL();
--        rul = rul >= rdl ? rul - rdl : 0; // make sure rul cannot go negative
--        if (runtime_ul != rul)
--        {
--            to_update.append(model->index(row, SEED_TIME));
--            runtime_ul = rul;
--            if (sort_column == SEED_TIME)
--                ret = true;
--        }
-         return ret;
-     }
- 
-@@ -223,13 +142,11 @@ namespace kt
-                 return BytesPerSecToString(download_rate);
-             else
-                 return QVariant();
--            break;
-         case UPLOAD_RATE:
-             if (upload_rate >= 103) // lowest "visible" speed, all below will be 0,0 Kb/s
-                 return BytesPerSecToString(upload_rate);
-             else
-                 return QVariant();
--            break;
-         case ETA:
-             if (eta == bt::TimeEstimator::NEVER)
-                 return QString(QChar(0x221E)); // infinity
-@@ -237,7 +154,6 @@ namespace kt
-                 return DurationToString(eta);
-             else
-                 return QVariant();
--            break;
-         case SEEDERS:
-             return QString(QString::number(seeders_connected_to) + QLatin1String(" (") + QString::number(seeders_total) + QLatin1Char(')'));
-         case LEECHERS:
-@@ -397,7 +313,7 @@ namespace kt
-         connect(core, &Core::torrentRemoved, this, &ViewModel::removeTorrent);
-         sort_column = 0;
-         sort_order = Qt::AscendingOrder;
--        group = 0;
-+        group = nullptr;
-         num_visible = 0;
- 
-         kt::QueueManager* qman = core->getQueueManager();
-@@ -635,7 +551,7 @@ namespace kt
-         if (!index.isValid() || index.row() >= torrents.count())
-             return QVariant();
- 
--        Item* item = (Item*)index.internalPointer();
-+        Item* item = reinterpret_cast<Item*>(index.internalPointer());
-         if (!item)
-             return QVariant();
- 
-@@ -699,7 +615,7 @@ namespace kt
-             return false;
- 
-         QString name = value.toString();
--        Item* item = (Item*)index.internalPointer();
-+        Item* item = reinterpret_cast<Item*>(index.internalPointer());
-         if (!item)
-             return false;
- 
-@@ -796,28 +712,20 @@ namespace kt
-         }
-     }
- 
--    const bt::TorrentInterface* ViewModel::torrentFromIndex(const QModelIndex& index) const
--    {
--        if (index.isValid() && index.row() < torrents.count())
--            return torrents[index.row()]->tc;
--        else
--            return 0;
--    }
--
--    bt::TorrentInterface* ViewModel::torrentFromIndex(const QModelIndex& index)
-+    bt::TorrentInterface* ViewModel::torrentFromIndex(const QModelIndex& index) const
-     {
-         if (index.isValid() && index.row() < torrents.count())
-             return torrents[index.row()]->tc;
-         else
--            return 0;
-+            return nullptr;
-     }
- 
--    bt::TorrentInterface* ViewModel::torrentFromRow(int index)
-+    bt::TorrentInterface* ViewModel::torrentFromRow(int index) const
-     {
-         if (index < torrents.count() && index >= 0)
-             return torrents[index]->tc;
-         else
--            return 0;
-+            return nullptr;
-     }
- 
-     void ViewModel::allTorrents(QList<bt::TorrentInterface*> & tlist) const
-@@ -854,10 +762,7 @@ namespace kt
-     void ViewModel::onExit()
-     {
-         // items should be removed before Core delete their tc data.
--        for (Item* item : qAsConst(torrents))
--        {
--            removeTorrent(item->tc);
--        }
-+        removeRows(0, rowCount(), QModelIndex());
-     }
- 
-     class ViewModelItemCmp
-diff --git a/ktorrent/view/viewmodel.h b/ktorrent/view/viewmodel.h
-index d4e0a64..6422396 100644
---- a/ktorrent/view/viewmodel.h
-+++ b/ktorrent/view/viewmodel.h
-@@ -22,9 +22,15 @@
- #ifndef KTVIEWMODEL_H
- #define KTVIEWMODEL_H
- 
--#include <QList>
- #include <QAbstractTableModel>
--#include <interfaces/torrentinterface.h>
-+#include <QList>
-+
-+#include <torrent/torrentstats.h>
-+#include <util/constants.h>
-+
-+namespace bt {
-+    class TorrentInterface;
-+}
- 
- namespace kt
- {
-@@ -98,21 +104,14 @@ namespace kt
-          * @param index The model index
-          * @return The torrent if the index is valid and in the proper range, 0 otherwise
-          */
--        const bt::TorrentInterface* torrentFromIndex(const QModelIndex& index) const;
--
--        /**
--         * Get a torrent from a model index.
--         * @param index The model index
--         * @return The torrent if the index is valid and in the proper range, 0 otherwise
--         */
--        bt::TorrentInterface* torrentFromIndex(const QModelIndex& index);
-+        bt::TorrentInterface *torrentFromIndex(const QModelIndex& index) const;
- 
-         /**
-          * Get a torrent from a row.
-          * @param index The row index
-          * @return The torrent if the index is valid and in the proper range, 0 otherwise
-          */
--        bt::TorrentInterface* torrentFromRow(int index);
-+        bt::TorrentInterface* torrentFromRow(int index) const;
- 
-         /**
-          * Get all torrents
--- 
-cgit v1.1
diff --git a/net-p2p/ktorrent/files/ktorrent-5.2.0-fix-start-in-systray.patch b/net-p2p/ktorrent/files/ktorrent-5.2.0-fix-start-in-systray.patch
new file mode 100644
index 000000000000..50049afae35f
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-5.2.0-fix-start-in-systray.patch
@@ -0,0 +1,24 @@
+From 9747a8f524942b57e2fd42254c3de73f9d42918c Mon Sep 17 00:00:00 2001
+From: Matt Scheirer <matt.scheirer@gmail.com>
+Date: Sun, 17 May 2020 02:36:09 -0400
+Subject: [PATCH] Fix starting in tray by removing redundant show() in main
+
+---
+ ktorrent/main.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ktorrent/main.cpp b/ktorrent/main.cpp
+index b5866c22..8e532c9c 100644
+--- a/ktorrent/main.cpp
++++ b/ktorrent/main.cpp
+@@ -208,7 +208,6 @@ int main(int argc, char** argv)
+         bt::InitLog(kt::DataDir(kt::CreateIfNotExists) + QLatin1String("log"), true, true, logToStdout);
+ 
+         kt::GUI widget;
+-        widget.show();
+ 
+         auto handleCmdLine = [&widget, &parser](const QStringList &arguments, const QString &workingDirectory)
+         {
+-- 
+GitLab
+
diff --git a/net-p2p/ktorrent/files/ktorrent-5.2.0-taglib-linking.patch b/net-p2p/ktorrent/files/ktorrent-5.2.0-taglib-linking.patch
new file mode 100644
index 000000000000..1d02dcbfd9c4
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-5.2.0-taglib-linking.patch
@@ -0,0 +1,247 @@
+From f4c1c91d9b091941ebb4dae6aef95bcf9bc1c388 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 21 Jun 2020 14:19:49 +0200
+Subject: [PATCH] Update FindTaglib from ECM.
+
+This fixes linking for me, there was just nothing in TAGLIB_LIBRARIES
+on my system (taglib in the same custom prefix as KDE code)
+---
+ cmake/modules/FindTaglib.cmake     | 191 +++++++++++------------------
+ plugins/mediaplayer/CMakeLists.txt |   3 +-
+ 2 files changed, 74 insertions(+), 120 deletions(-)
+
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 13db60b2..1e1b9075 100644
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -1,135 +1,90 @@
+-# - Try to find the Taglib library
+-# Once done this will define
++#.rst:
++# FindTaglib
++#-----------
+ #
+-#  TAGLIB_FOUND - system has the taglib library
+-#  TAGLIB_CFLAGS - the taglib cflags
+-#  TAGLIB_LIBRARIES - The libraries needed to use taglib
+-
+-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
++# Try to find the Taglib library.
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if(NOT TAGLIB_MIN_VERSION)
+-  set(TAGLIB_MIN_VERSION "1.6")
+-endif()
+-
+-if(NOT WIN32)
+-    find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
+-       ${BIN_INSTALL_DIR}
+-    )
+-endif()
+-
+-#reset vars
+-set(TAGLIB_LIBRARIES)
+-set(TAGLIB_CFLAGS)
+-
+-# if taglib-config has been found
+-if(TAGLIBCONFIG_EXECUTABLE)
+-
+-  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+-
+-  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+-     message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+-     set(TAGLIB_FOUND FALSE)
+-  else()
+-
+-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+-
+-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
++# This will define the following variables:
++#
++# ``Taglib_FOUND``
++#       True if the system has the taglib library of at least the minimum
++#       version specified by the version parameter to find_package()
++# ``Taglib_INCLUDE_DIRS``
++#       The taglib include dirs for use with target_include_directories
++# ``Taglib_LIBRARIES``
++#       The taglib libraries for use with target_link_libraries()
++# ``Taglib_VERSION``
++#       The version of taglib that was found
++#
++# If ``Taglib_FOUND is TRUE, it will also define the following imported
++# target:
++#
++# ``Taglib::Taglib``
++#       The Taglib library
++#
++# Since 5.72.0
++#
++# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
++# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
++# SPDX-License-Identifier: BSD-3-Clause
+ 
+-     if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+-        set(TAGLIB_FOUND TRUE)
+-     endif()
+-     string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif() 
+-  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
++find_package(PkgConfig QUIET)
+ 
+-else()
++pkg_search_module(PC_TAGLIB QUIET taglib)
+ 
+-  find_path(TAGLIB_INCLUDES
+-    NAMES
+-    tag.h
++find_path(Taglib_INCLUDE_DIRS
++    NAMES tag.h
+     PATH_SUFFIXES taglib
+-    PATHS
+-    ${KDE4_INCLUDE_DIR}
+-    ${INCLUDE_INSTALL_DIR}
+-  )
+-
+-    if(NOT WIN32)
+-      # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
++    HINTS ${PC_TAGLIB_INCLUDEDIR}
++)
+ 
+-      find_library(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
++find_library(Taglib_LIBRARIES
++    NAMES tag
++    HINTS ${PC_TAGLIB_LIBDIR}
++)
+ 
+-    else()
++set(Taglib_VERSION ${PC_TAGLIB_VERSION})
+ 
+-      # 1. get all possible libnames
+-      set(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})             
+-      set(newargs "")               
+-      set(libnames_release "")      
+-      set(libnames_debug "")        
++if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
++    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
++        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
+ 
+-      list(LENGTH args listCount)
++        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
++        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
++        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
+ 
+-        # just one name
+-        list(APPEND libnames_release "tag")
+-        list(APPEND libnames_debug   "tagd")
+-
+-        set(newargs ${args})
+-
+-      # search the release lib
+-      find_library(TAGLIB_LIBRARIES_RELEASE
+-                   NAMES ${libnames_release}
+-                   ${newargs}
+-      )
+-
+-      # search the debug lib
+-      find_library(TAGLIB_LIBRARIES_DEBUG
+-                   NAMES ${libnames_debug}
+-                   ${newargs}
+-      )
+-
+-      if(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
+-
+-        # both libs found
+-        set(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE}
+-                        debug     ${TAGLIB_LIBRARIES_DEBUG})
+-
+-      else()
+-
+-        if(TAGLIB_LIBRARIES_RELEASE)
+-
+-          # only release found
+-          set(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE})
+-
+-        else()
+-
+-          # only debug (or nothing) found
+-          set(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG})
+-
+-        endif()
+-
+-      endif()
+-
+-      mark_as_advanced(TAGLIB_LIBRARIES_RELEASE)
+-      mark_as_advanced(TAGLIB_LIBRARIES_DEBUG)
++        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
++        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
++        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
+ 
++        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
+     endif()
+-  
+-  include(FindPackageMessage)
+-  include(FindPackageHandleStandardArgs)
+-  find_package_handle_standard_args(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES)
+-
+ endif()
+ 
+-
+-if(TAGLIB_FOUND)
+-  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
+-    message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}")
+-  endif()
+-else()
+-  if(Taglib_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could not find Taglib")
+-  endif()
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Taglib
++    FOUND_VAR
++        Taglib_FOUND
++    REQUIRED_VARS
++        Taglib_LIBRARIES
++        Taglib_INCLUDE_DIRS
++    VERSION_VAR
++        Taglib_VERSION
++)
++
++if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
++    add_library(Taglib::Taglib UNKNOWN IMPORTED)
++    set_target_properties(Taglib::Taglib PROPERTIES
++        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
++        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
++    )
+ endif()
+ 
++mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
++
++include(FeatureSummary)
++set_package_properties(Taglib PROPERTIES
++    URL "https://taglib.org/"
++    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
++)
+diff --git a/plugins/mediaplayer/CMakeLists.txt b/plugins/mediaplayer/CMakeLists.txt
+index 8bbeeb74..5fbe056f 100644
+--- a/plugins/mediaplayer/CMakeLists.txt
++++ b/plugins/mediaplayer/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ find_package(Taglib REQUIRED)
+-include_directories(${TAGLIB_INCLUDES})
+ #find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Multimedia MultimediaWidgets)
+ #include_directories(${Qt5Multimedia_INCLUDE_DIRS})
+ include_directories(${PHONON_INCLUDES})
+@@ -34,7 +33,7 @@ kcoreaddons_desktop_to_json(ktorrent_mediaplayer ktorrent_mediaplayer.desktop)
+ target_link_libraries(
+     ktorrent_mediaplayer
+     ktcore
+-    ${TAGLIB_LIBRARIES}
++    Taglib::Taglib
+     Phonon::phonon4qt5
+     KF5::Torrent
+     KF5::I18n
+-- 
+GitLab
+
diff --git a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
deleted file mode 100644
index cac1657e6a9e..000000000000
--- a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent"
-[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
-+mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=net-libs/libktorrent-2.1.1:5
-	infowidget? ( dev-libs/geoip )
-	kross? (
-		>=kde-frameworks/karchive-${KFMIN}:5
-		>=kde-frameworks/kitemviews-${KFMIN}:5
-		>=kde-frameworks/kross-${KFMIN}:5
-	)
-	mediaplayer? (
-		media-libs/phonon[qt5(+)]
-		>=media-libs/taglib-1.5
-	)
-	rss? (
-		>=kde-frameworks/kdewebkit-${KFMIN}:5
-		>=kde-frameworks/syndication-${KFMIN}:5
-	)
-	search? (
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-		>=kde-frameworks/kdewebkit-${KFMIN}:5
-	)
-	shutdown? ( >=kde-plasma/plasma-workspace-5.15.5 )
-	stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 )
-	upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 )
-	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	ipfilter? (
-		app-arch/bzip2
-		app-arch/unzip
-		>=kde-apps/kio-extras-19.04.3
-		>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.1-singlefile-torrent.patch" # git master
-	"${FILESDIR}/${P}-crash-on-exit.patch" # bug #632588
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
-		-DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
-		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
-		-DWITH_SYSTEM_GEOIP=$(usex infowidget)
-		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
-		-DENABLE_SCRIPTING_PLUGIN=$(usex kross)
-		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
-		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
-		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
-		$(cmake_use_find_package rss KF5Syndication)
-		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
-		-DENABLE_SEARCH_PLUGIN=$(usex search)
-		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
-		-DENABLE_STATS_PLUGIN=$(usex stats)
-		-DENABLE_UPNP_PLUGIN=$(usex upnp)
-		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
-	)
-# add back when ported
-# 		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
-	ecm_src_configure
-}
diff --git a/net-p2p/ktorrent/ktorrent-5.2.0.ebuild b/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
index 8118ca15987c..196bc3c2fee4 100644
--- a/net-p2p/ktorrent/ktorrent-5.2.0.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
 
@@ -76,6 +76,16 @@ RDEPEND="${COMMON_DEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-start-in-systray.patch" # 5.2 branch
+	"${FILESDIR}/${P}-taglib-linking.patch" # 5.2 branch
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep Qt Script
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 2c3943782eae..8898c9c39f49 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,3 +1,3 @@
-DIST nicotine+-1.4.1.tar.gz 3824830 BLAKE2B def211a4d06b1cb6a409917579652b3a1c8c36ec5ecfe5e295b9fabeaaca02cd4999fd20935c8999d4cf989f3ecff0a0a2c7f52a40f8c2b03e05b6c9dc2feca9 SHA512 894dfb318b205b6be21face0308f183da15772f329158c6a9a8a816dfdf231ad89245188acad5538821b2a778c8a8a6201ce8548cc58550c4eb6c0763db9d66a
-EBUILD nicotine+-1.4.1-r2.ebuild 779 BLAKE2B b84742e79cf7d919a2b4cd47ba13021e591676a1671067655ca6cbe7a78f121bbd2cf84ed1120fc188d9f7c53c8ca35fac1933f9e4d8d82b76a61434fbedb2a9 SHA512 b9063b9ae3560908b975636f21d46ab2b8ccecb47cac9e63711d87afeefcdb8b09b5437688fbb98151410a6da9e023c8b527a70564c197ebf0f44a13bf1cea8b
-MISC metadata.xml 257 BLAKE2B eefbd95091b941aef3073689259e7bed1a9cd7db0a4d46ca77608a0d6bab835122b56ce9047e7fb21d7ca706b331f3b6b50f2dfff68561da40b3b8d6e63de62c SHA512 a7df7842124c688e7ed9fc4ca49372517e3570f1c461e78f32364902fafe04255a6db8fde42a72cbe2ed61426a5d49e89baa792aa3c9900cb4a83cc647c56cd5
+DIST nicotine+-2.0.1.tar.gz 5140065 BLAKE2B 01af7eb58ea6800c17042ef73b9caa8b3d5712e33226486e648fee824c0d0934440ee51f659199a5276f6a460005df89359b282b09aa07941c70e29bddc97a26 SHA512 0a16c0c289a4f4d54eba773ad40952baadf73333ea4a6b4a4524cc500d007f6de0bdd7a847e3f68978a3247c9bc4a6eab3b77db34605fda79da34c352e89a1b9
+EBUILD nicotine+-2.0.1-r1.ebuild 844 BLAKE2B de30da2f0c9529e5d05ff7218b006f495254aa2200d88236ed1be79bcdd010f51d1a8191d42963cb0ed88edfe2bbca85b4badc52e116052f7e385787063f4c36 SHA512 290935ad926fab80e53dbaaf40e77ca203a94aa5c1eca8bd87938adb3b827c821fda41095abacd5e0c49cb09dc0112b005ede9b05c47eeb8f57d7e4841012c00
+MISC metadata.xml 344 BLAKE2B 3e990579dbb468a2dc76bf5ea791367f8009fd3a21508de4ec40e7cc5d4ddca825488a139a63f7424a05e92246ed7e8d193eb6d2aa58a68244169ae77f588472 SHA512 a62b54ffb9368e5a5aa8a119146ae5330797ac7034b1d403bed87550b976daa25bcc7d68b2089122f287c8ecb1ca3f3679609eee3bfac518abbd251545adc3f2
diff --git a/net-p2p/nicotine+/metadata.xml b/net-p2p/nicotine+/metadata.xml
index 0749c16e26e3..ecc5a052b27f 100644
--- a/net-p2p/nicotine+/metadata.xml
+++ b/net-p2p/nicotine+/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Nicotine-Plus/nicotine-plus</remote-id>
 	</upstream>
diff --git a/net-p2p/nicotine+/nicotine+-1.4.1-r2.ebuild b/net-p2p/nicotine+/nicotine+-2.0.1-r1.ebuild
index bc288ddd9ab0..301bedcae815 100644
--- a/net-p2p/nicotine+/nicotine+-1.4.1-r2.ebuild
+++ b/net-p2p/nicotine+/nicotine+-2.0.1-r1.ebuild
@@ -3,25 +3,24 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7,8} )
 
-inherit distutils-r1
+inherit distutils-r1 xdg-utils
 
 DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
 HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
-SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+DEPEND="${PYTHON_DEPS}"
 RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/pygtk-2.24[${PYTHON_MULTI_USEDEP}]
-		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
-	')
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	${DEPEND}
 "
 
 DEPEND="${RDEPEND}"
@@ -32,3 +31,11 @@ src_install() {
 	distutils-r1_src_install
 	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 0f3b2ec0b7ff..8db127f28cd5 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -3,6 +3,6 @@ DIST qbittorrent-4.2.3.tar.gz 7932722 BLAKE2B d16aa81ce683578eea5186a505a5f33da4
 DIST qbittorrent-4.2.5.tar.gz 7961612 BLAKE2B 61d2f2154a291a6d1ddab7d4775d4ac4d19f471dceb783cb7933015ed9159afdca4075f429891dbbd7249f09d910ef643d27da4c4b7307adbf29354222265027 SHA512 8808029bdb3a1638fcf792e92c36bd39889dbc2ceb26c8d45ff17b086bd076f0b3a8ed78dd6a1e3debd32e5b0ce212eea194ec601210ae29093cfb567eb4ca0f
 EBUILD qbittorrent-4.2.1.ebuild 1433 BLAKE2B ee6acccad072a08419d38c1b71ae9f538a741a9404ecaaaf9d898c27366576a333f85f54a449d9b6c6c3459e63b8f1c3a067d44bd8f03c662e69a3cdb489cb96 SHA512 d60e293956da684fda7abce234e7ed568b067e83cd975d3e48188d6fd74969df1658992dfe9be9063d7c76af6ce2cc117bf7b41b17061b684fb03fc8d0d28433
 EBUILD qbittorrent-4.2.3.ebuild 1433 BLAKE2B ee6acccad072a08419d38c1b71ae9f538a741a9404ecaaaf9d898c27366576a333f85f54a449d9b6c6c3459e63b8f1c3a067d44bd8f03c662e69a3cdb489cb96 SHA512 d60e293956da684fda7abce234e7ed568b067e83cd975d3e48188d6fd74969df1658992dfe9be9063d7c76af6ce2cc117bf7b41b17061b684fb03fc8d0d28433
-EBUILD qbittorrent-4.2.5.ebuild 1435 BLAKE2B c66c8c832cca9c7d4edce15b8a708347246abbb97163e8b3ddf2eda854bea5fc63982037e3e8b374b0aeb4ce8aa75ca13438d9295b1b30b472e8d7af15933281 SHA512 f660e2ffe5615022930f0e056d7aa9f26ae3df7bd5da925d9f32e1e14b2bdc92c67e533f922646667acf75494ba3c6dbf10dfc457235a7523edf6642ae743cf2
+EBUILD qbittorrent-4.2.5.ebuild 1433 BLAKE2B ee6acccad072a08419d38c1b71ae9f538a741a9404ecaaaf9d898c27366576a333f85f54a449d9b6c6c3459e63b8f1c3a067d44bd8f03c662e69a3cdb489cb96 SHA512 d60e293956da684fda7abce234e7ed568b067e83cd975d3e48188d6fd74969df1658992dfe9be9063d7c76af6ce2cc117bf7b41b17061b684fb03fc8d0d28433
 EBUILD qbittorrent-9999.ebuild 1433 BLAKE2B ee6acccad072a08419d38c1b71ae9f538a741a9404ecaaaf9d898c27366576a333f85f54a449d9b6c6c3459e63b8f1c3a067d44bd8f03c662e69a3cdb489cb96 SHA512 d60e293956da684fda7abce234e7ed568b067e83cd975d3e48188d6fd74969df1658992dfe9be9063d7c76af6ce2cc117bf7b41b17061b684fb03fc8d0d28433
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.2.5.ebuild b/net-p2p/qbittorrent/qbittorrent-4.2.5.ebuild
index 3244261dacce..7813f67cbfa8 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.2.5.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.2.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
 else
 	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S="${WORKDIR}/qBittorrent-release-${PV}"
 fi
 
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index b54ab8f64063..18fb30e7eb59 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -8,5 +8,5 @@ DIST rtorrent-0.9.7.tar.gz 610149 BLAKE2B 3f1316b0142dade9662630ad40132c5968d7b0
 DIST rtorrent-0.9.8.tar.gz 647523 BLAKE2B 3562ed03dee3baa4a702d20c7c91b9248d9de0f25d1f8cd182863101f293a0ef13cb49164e4d16b25e72a4fbe1cc1a2fbde176d3068c749edbcb2287ef260b2b SHA512 016685948d0290694ab9635ae218c7acd876e6d45bea1bdba3a29c545e64f5d824c5e2f6693a4c2e9200196177881d54f312d72e0a19742bd74a03bd19ca05c7
 EBUILD rtorrent-0.9.7-r1.ebuild 1904 BLAKE2B 11d517d63d3c2f6ee14a6b20a2b5f9d18f82e35989f0c98aab345c2a69da11f30c2f83f1a0294d5f31c74dca946e0745a54218901f143d2b18520c7388d917df SHA512 c7af7a5f7d64969bf8c3c72524664bf4d4d9a661c5431ddd1d4545330cf68af323431b71745bbe411974b9fcda8bf6d7d07607247c821e1f0141425d14efdba0
 EBUILD rtorrent-0.9.7.ebuild 1854 BLAKE2B 25515629843a6d9a927c639c09aaf500d22659d2dd5ed8ec8c1afe5970e9c16220aad1214bbb2afaff2ecfe7e37739eacf3f5d5a048f58368343c4992ff0300d SHA512 804454f0ab73c5eda1d8988119a0a4643ef6c14caae5d7407a01ad07c2cc657c12466c38f1d947e406c83418b927024f7f51f387d038aed8c676c415bb2a8fce
-EBUILD rtorrent-0.9.8.ebuild 1770 BLAKE2B 2af3086adc74934a95b6eb4da846ec722dfc0b2e28f6f0bdce034619e28673d4a57d11ab1170fa6ba202a1ba08596f28da6cf1451281f44f65d6fb8b4d5922be SHA512 afce5e062ffe3296f4bfb87be7584f5136589f08671946ce509a00e3e6b5513538e5495aabf0275e218b6770c3d2f1b15cd0f900d15286fe7aa28649d048436b
+EBUILD rtorrent-0.9.8.ebuild 1777 BLAKE2B e0af7257bca0927893bfccaea14d700afd444d1acb4a0fd66d5350cd3a015f44ee3fcf9fe1386e357dfc02253943fc659a54e58d400a899ab4a0da06d30ec045 SHA512 782d80641d9a9110c97c260271e3bfb7c22e5b7389b42e8e59c4403b9f3942106bc20625f10fe014375adea9bd818b23da53c62611a5887dbf5b16ebedb9cac5
 MISC metadata.xml 676 BLAKE2B ec4ff11bbb2ba69ce911f527e77d14f2891307bf9f321a7da4eda884dd0bb93961275592617e19070f958b9ac91372133130f33770f527623076f5b5338e0969 SHA512 f2e5e3a709b1be52e3947529e4aa4bc9d279820333287d562c0254b761962ebb19ad9a47c8c9f181eb103ae1580ebd4d68b8ce1684598cde0aad0faa126dbbd6
diff --git a/net-p2p/rtorrent/rtorrent-0.9.8.ebuild b/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
index c7f4827b1c19..89c75bbe962e 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug selinux test xmlrpc"
 RESTRICT="!test? ( test )"
 
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 1cc7c935cfe4..d7c56053830b 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -22,7 +22,12 @@ DIST github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c5
 DIST github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.zip 4497 BLAKE2B 64510cc32a8b5746ce455fe341fd624e42e0eb0792c175437eef95650fc53adb2d6d5753e4d2f7f76ddb91f9535f25f69a8d2b2447c5a00988111bc36d8d873c SHA512 4f3452c6f509eee18307828a4c96666b42c3406085451588fb05f3ff6bc41d2e292f2bcdfe0acf341697adbea546a715ab648414f1d6e4463c709e2096bafbca
 DIST github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.mod 117 BLAKE2B 1da3888c74efc4f2015613e4a6333b95a605cf2380db82bae62105aa8a1c46d5d8645f759c8a11261eb279def199a74a577cfa7b2cee65752d84fc5f24447a78 SHA512 ed20b9b2de010bf9e3c6c14267bfd680edf332218548be96b5ede6b465202aad997be2513779d7bef7752a2abff841739d9cd5fbcf13b440764c84b70337de2c
 DIST github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.zip 14847 BLAKE2B e65d02da04d93e6f443b31a380d966f85bd52eeb3a507ae486c4f0c8e759782e900014296923e473d27a8c3b7964cb1db4c9c89f616ffa3ddbf89397937f1e78 SHA512 760c69e2a215b485694046b8e9cf6f9f69b0e41475e517bc21fddd60abec2e7fa66f3f6cdffe0c117f34f47e369b616cc2527df7cf2012fb1cc920bb9cfa183e
+DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod 35 BLAKE2B cb1abbb2d5d094d5946f868ec3fd1b6ce72721b5e220ddf2be7c8376195fda1659112b93b7af24b08c66b441c950e6d555c858e51e81c9d3d29bc5b72271379f SHA512 b9bb8b7bd45785e18073235507b6e570ae27df026d38676e0b36cb19bae6b53a085099fd23d4a0bc456dd9bcf3459f1f53d0e8d11b6bfc7e61a88f8673a3ca9c
+DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip 13778 BLAKE2B cb389977b9c081b3531f0d62708b8f0202deb17ac651100343b6e59c668c7135e1eb0ea0c0dc4ebb953b6d8c8df40498e09362e8415f6daa8725e4c768813082 SHA512 0b87ddabac154fad7ea06ed88d28fc4586dd41afac9a2eedb2b0b3a695ef52354d3bb6f087c2422b88cc58778afa0e6a4da19fd2fb0fae5a125aaad79fc92d53
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod 31 BLAKE2B 3f699ae120e91b47e91e35449ae06e146a77a3b8c6834a6494ee4809e3f524bcfbb7b0d9a53b6c64b6ba9f3b1814a7cefa525030871557e52e54be629bae3aee SHA512 5d47517c29477f39a7f12d63ee80c1c64cbbe8065ede96732c133a0159e541b95bb17f10fea0ed5acde361deb84cbb66e79a38cf4be0dc7b28d8b8e342d45a88
+DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip 565502 BLAKE2B cdcd85a821838a709b28b3d7e8dae6af9d562f7394ae155624f9975900cad193d91ed80e6183aff82d95a367a8ce0af28c575cefd5f8cd16b7bc16596f6eb22c SHA512 e4551cb3fb58cc60e1e141c2c11952c524c07280e530309ffee13ade0e9cadc873def7b279d024b3efb3d6aada5817c2d248aaf140323507172fca2d2d5a1855
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip 14852 BLAKE2B 33a7c997772bc0ab89312c06940938a0e447b81d5613c95585ec3cf395189edaa92a8e9801649f91ebf9e65dad30af94725436d5849ca1277ec4126989d3b023 SHA512 55765137bbfcb45b4c9962044502458f1e7944487946604fbc7604d48b9b576c522b9316a99cb14dacc3c613c99ddb9c51f1a9cd92f4a729bdf76b834d7d2fba
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
@@ -36,6 +41,7 @@ DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.m
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip 5447 BLAKE2B 9b79de84354305adc2019db61eaa5f84daaf0ba088b1582776b4973d85fda9055264b14218a00ddaa3c23696f5c57574eecbd48c2c7dc4df84348bf5c507d559 SHA512 eb9b80bd07a9586681ccb20b48644c404ad326e65251571531776ffb51eed20dfc79cb34dba332dea2fb4aa1a766da2cbad597b59db3c7f770b56febe1956ed4
 DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
@@ -55,6 +61,8 @@ DIST github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.0.0-20180726100737-be486d185f3d.mod
 DIST github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.0.0-20180726100737-be486d185f3d.zip 25977 BLAKE2B 8ce16d132e87fe61952d6854574161ba5f2756bfa7d0e9ce158f67a4e6afd169c26f5d9230bf65bf14a29238618faffdf35aabe296a58475644e669a2afb5d8c SHA512 2c13aebc7293a4651cd1d33eeaa86ce3ae913eee5de4d65d7b7403c70f53f5b3c3aeae7d46a7f81fec57d26b1df23c9f6593305daecbb58fd609b217bf0115f8
 DIST github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20190905060710-a5e0173ced67.mod 36 BLAKE2B a885dafb64c571180b1b437aacd6bf64aefb607cb92449c16066dfeb15fe1416c43e84d1e6a695a95a6255678212de46ea2e33225d2626e483a458d3e325bb36 SHA512 92dc32886b5a77300452e6af4c0850e8bde83a37cd321c0adbcef480c246ae1b6e562c2a211fcf0eac7854938457cc1896112fac87dc6a4b8d1ec5dc5c707337
 DIST github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20190905060710-a5e0173ced67.zip 156457 BLAKE2B 8ed969a3c1465f370396fd237ada2f465b458237b1cd7806f01617312df65bff91790b86647fc900e54ffd874297b03ee36908f7a248d549919b6f4da804e5a4 SHA512 39a4f147e19a07617099cdb748e68cacdbbf3cb6ab28da520fc335762216ce23a94df3a5b319202b09336eb3852a3530cf4c407fcebeb7d3fa14fb62ad00003e
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.mod 45 BLAKE2B 294b4032890409da39f83e21947cbe4e039ae894cac4e044f4c91830c531ab543b510f7cb30dfc1fe05ea58b90733480456824361bf26e8f6e5445ef66346485 SHA512 2710d436147bc9075072e5e51a0df952bd39743f704d8d125ac27ea864bfa47a3ac6f0f6cd1bdcef9639736c11846176fd6f04e4e6c7c306ebf2177446eee066
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.zip 11905 BLAKE2B 311593d226c9bb209ef9fc34e4cc9e4402d289053865f8d5d7dece81d7c83b6d0ec4fac25329c5fe2a07015c36bb0963222e59b94dd8a94544d83eb51fa54e03 SHA512 a21d54d64ea7494b69fd7249b1c580e2b20193062c99050115c0376f5dd24ed99dd15d8caaddaec8d31b3f462393f81889bcbd1dfcba14e79b13fa151607dc5f
 DIST github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2447b3f6b52bb0ab4eb8af5ac3ca818b65bff046e0743cc8d8dd3d7e336ad121a8d017e3f7d7b83b0203b86392a82cdf56641acddfcd377a168553dfc28f3ac9 SHA512 f7d31069b4207aabc1683b00d85decf9e883387d598ec9125128724cad3b7d1f3462ffe616486e35579c97b178d703999c243a3a3aaca9223d9f661c07fe9d03
@@ -62,7 +70,12 @@ DIST github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip 35021 BLAKE2B 06b4f88edb2
 DIST github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.mod 42 BLAKE2B c69822c9901d4d0900857ed29160ed0260d0bb3c2492a884131e1214f236b62b432b255c7d2e73659b6ddc9e5309a35e6f1d1f1b58f0bf171b4e677a64c87bb9 SHA512 4c7242bad2f810efcccbb6c46bf78d5ae033522cfd6e18ce35d488eeb8520a99e560b078f7bbc3994e5f0ed9f254e50e0977fdf020feff22ee16ce5d23173471
 DIST github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.zip 42904 BLAKE2B 19cc03c2ee5b4b377647822d1f4e938b2dfa0470047d6b63b04c5adba9fd181d70631a3784c43485c89abececc9ffb26693e823b70ce326de77ff6259beec3c3 SHA512 d4a5ee9c5c9b5a4966d08132571d9c8ac56d918984531a635c17d8850bed0d0a8ac1435ad2e55b7e87ae330d83b37ead1935eb8434a3493ae07fff29588b74ff
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip 8850 BLAKE2B 9053d9c01c92faa257ed0623eb06b27e7d9d93ff9c155ce862183bdb9da6483d57873290eb5bc7bf8f906d7b18dd29d856a7cfabec69b84a2f5400f6e43c616c SHA512 9d35a6f2ccc2b51fb2561891311d5ab33737ba76c61f190fa6b4276eadee8b09d008b2c925fb8dd5bf9202bf3e1ec944c0b5026b080d2adf050fbe8e88a74def
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip 12266 BLAKE2B 93705895ca63c348ac5397fe8531214f5745a3be6f5760f9d3fbf67fd85b917dab4a2077376251a005bcf07450df1fe0b0114feacc5f92c6facbb2da637beacd SHA512 284116b4f2778ee7981e3aa5583c4e685afd8434e36ca647f0c72c5bb308e87bc3bfae8c83acd259c9da75549339aa382663b7103e4033b2418e314106923c0f
 DIST github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.mod 36 BLAKE2B 2fbffbbc9d93f190725375410dd0c03c2c4fe8ce1db212f19941bbbf543ea36306063c7cb06a543b68a893fb29fb2871d419f4b2c08c89a18c8141ad2c856cca SHA512 d47635af97282cff417a61ae3003cb78d368f53f224da849ec110eeed7f091533815196d7b4f5adc8bd22682052020d999ff7281d0b80003e3aeb50c922125e5
@@ -70,7 +83,17 @@ DIST github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.zip 11706 BLAKE2B 082def12d6
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod 33 BLAKE2B 8a7ad09e58eb232d947fee3583f03948dda02432dc94ae8916330347dbce328b9e1e445aa96b9ce00cb770583eda50344d160662eaee8f2d8290fe1c63511bdb SHA512 e9671d1c7e7aa422e139098e1977bdcd61f48b382d75a7234cdb3849eec4232b0cf7528ed37d534430317f7b2649b3c5b3476a23c0aca735279940f89fae11ef
+DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip 17069 BLAKE2B e70bcfb611691e43750b11f6e4e655ead44526d3c72a5bcbbb18732e0f23dd891da22b7f5961baae4cfb9d3d0e07af60f5a6afe48e3241bafef76333ef901f0f SHA512 fb9f43083ab6c28d26cf729ab56ca3e85a876fa50bd445f714da5de404578f35ae094b7619a6f10011f98b442137ebbc016b639138679fffff28bcc944e05e55
+DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.zip 366135 BLAKE2B a75298ebcc118ec2a7ffe6157b74fa3eb3009e584343d29e0ee208bb28d596e6cb955b8c1a9fc26081653155907488f878c0007da7d527243ee6b2fb933c7798 SHA512 7cbad8e1b638c05d89d1347f4c6f6a973271b82392cdbcf4bc472fef6051a167a244bbf459f7f883420a1f8380d956522b79b3eefd59bb9c04eccbeadd629f0b
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.mod 723 BLAKE2B 22933810a8ab28f5ffc24d64ff91f943d614d8e7f64bdd959645288a55a9657216e755837c3ec524f88a39d4997b8de2037cad5c3b49de51c095213db6a75461 SHA512 f5012f7bc69dda2837c6d2bff93da5bfabe4e2aeab5a5b2c7a0d812a67577247bad1ec64eb9522d4d0daca8e8ce57eefe36ced93ff71d3fa26aea773d156a3dd
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.zip 407974 BLAKE2B 39e2adfe3e3ad5d627adce9ff78da88d164a3d1ae579d9c663e144231d5b3139ab03efdb5166553019224636008e56ef3f71e31069d899c9fb9fa1bcab42c4bf SHA512 7f17e54f307755306b73ffebba8a15a994a1822f3b694e3b52e35f15efc9aeb1e2aead590bdbb5f4a05976f2b6b10fca47c93d56187e858e869caff078de0243
+DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.mod 193 BLAKE2B 0938da2ee0a3bc0acc3416db8387be68292b8848b72cf3b44c28e11d6d456037f7ed998fe08fd142f42ccb447bd0f0a7cb75ff72e72d73a5649a85f7def42070 SHA512 7752f28d6ae3da6cd4f2b5d23ff373a4bd8b8b24879d9bde17bd22b1689aa5b87ccd1c206f4f70aaf5acfd89f4e1f11a04ed822266a576abc0a1f979cdce2911
+DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.zip 54509 BLAKE2B dec6fbe5781132bb74b414da959392904b8db04e2e150c3611ea750ecd953d86ee860eae15b63a74af40c949c61298fd2c2155804cf4e1cc4d0091c3aae787c4 SHA512 dd76f220cc14f3b380c8b13ccae067c8da0588c94320bfef0d6a4e964fbf1e5432bdc76c00b2e5134cd4d079fc769e2b069c909395168bc1af7bd40a2efdc9bd
+DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod 34 BLAKE2B 7db9f433942253e04513e9a7e88b2a76cecb28837e808c9fd2fa444f19bb75f1567358ccdb5537dc6caf0aebffa08898127dc93f8f464c838da838f7ed70615d SHA512 ee0f8fff193e70c23c830494ebc2bbd182c1882ba443baeb4a8ce03166f399765ab8e4ac85047306b27c03e84fd0980f93b5b5e29f94129569ec8021e8d127fa
+DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip 31667 BLAKE2B 7114afb863d419c80d539e287e76ee6471163aa5fee433de95276174d1c1e9030097543afe97a6131356979bc88a14108679a98bca3cb8b38e833468e80d321d SHA512 f04577670a6649bfe5d40fb743df38fdb9499b3f584e38197eed2d958d4f3e77635e82c057aa643ab3268bb99e7478aaeccfc687be36b9723ccfea3551b45366
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
 DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
 DIST github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 41 BLAKE2B 8cb27fa41ecf3a16c79ccf6f4d49a7f6d93435150a8c1f3044e1a75fc672be6b3c5d18899719d64b7588e753c5c4b3f20402502dc476d7e453a48b234049e166 SHA512 377c0d12dd298b07a2c5a91ba01d0c9b40a02bfcd40578ced147a737ffdc47d04e552d48f9da459abee04129276bdaeea492da940e56de390143413a7efc4b37
 DIST github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip 9798 BLAKE2B 522a4dc6430c6e9a311ee925f7209686607d36b302453b4d3de1ca2afb9904e6c8215f0516aa4cbf9895fa3c9d126bc49157f405799c7b322fe086099537dc5c SHA512 8eae75152694b708dfc0d14eb311856ace92a2dafb66d26bdedaf8e49f7842f4557291353ef096a54eed39f8c011777465527029e0a8cd134fc3841c99257013
@@ -84,6 +107,8 @@ DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536
 DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
 DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod 48 BLAKE2B dc30053a3f292ba19e5dcf7d7f287a15a970703b98bc83525dad946a8719b42e5a12575baa4206ed4237a202f1c4d57874813badff88aa80723d743a61c5e86f SHA512 e129ba3d01fa1a966c010ec4b453dccdb191dd7f8cf4f8295294e0a69f1a03d9d8cbc738d3fd3347a28beaccb205e443a40786866953f1c4dd761ebd2c889bbc
 DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.zip 27991 BLAKE2B 16de59a646f413d826d20767c04d7798dc94bd609006a62c9c955593acde14a44463be06c2284c16e6f72a3a6150a9c993eab739ccbcb0c3169e9058dec5d170 SHA512 9751a484559783aa997d2c60904e477db2f66bd39d2ab3ef84ac55583b376c7277dfd5aede2d4f2766474b9209e1733cf45098ad6879c938a830ca018e2c9927
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.0.mod 48 BLAKE2B dc30053a3f292ba19e5dcf7d7f287a15a970703b98bc83525dad946a8719b42e5a12575baa4206ed4237a202f1c4d57874813badff88aa80723d743a61c5e86f SHA512 e129ba3d01fa1a966c010ec4b453dccdb191dd7f8cf4f8295294e0a69f1a03d9d8cbc738d3fd3347a28beaccb205e443a40786866953f1c4dd761ebd2c889bbc
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.0.zip 32748 BLAKE2B f4d62399bcf7b38471500856dd379fb57bf21cd5739ec232fc05feba8a025bb71e7d7b20cb35debc55f21605c646e988466d237dbe2af5e0d764810ab4e10751 SHA512 8fed4c5df63f1b2bf8e3acbf4be4ac40158f8898a8031c5b83f25c42221bb3dc8a3fbd4068d0b7efbbf3bfac859d98e4716597bca6f403062220af658cb788d5
 DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod 35 BLAKE2B 088adc516e2f6f0a693c745963d6daaee2c196b1407e36a469eec392b232ed26b03f9c515d422b8e536c2b2ac8bf199cb3db5ba4ad19ab71fc338919f57a3a53 SHA512 787962ce037cb9143f496d5a7dd11ab1a487180cb57ad498e6c24a8da7a5bf36737b0b2730d2e0837c60a08bc7467ffba744026ce6962885fecdcdd1bb6c07b7
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
@@ -91,6 +116,8 @@ DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.mod 91 BLAKE2B 5246926cf567
 DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.zip 52605 BLAKE2B 9199c0e5c7f08ee42fcd0523c445310bdf99cdda4a86089d9b7ca81e0ee5f87b7bb26cfe727098fc7fdfc417916790d09608be7720914c7225321de3cf1d7d3c SHA512 21144e7e2e54d498e7e86451a4451c6dd8eb713390ccb2a7849c4729df215730fde7fa8bd5a3e89a9cf0e0614adf7bf7d91b2732e1c82ef8a692c1bb389989b9
 DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.mod 91 BLAKE2B 5246926cf56768959aa69eff9fcc70c7a880bfe1879c03dc933d798595640dc81ff1d018a4e05f5867de5afb40407b4c2803e883b8eef005b1d6e1ef3f1e7bee SHA512 03e84e2a11f843cf54622151d4e65aaa1a783a258250acb54fd432d9f175fc1a6c92db5ebe11f6e35a8deed537a805cbf2104b57beda3b34e96ebb2c499a768a
 DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.zip 51040 BLAKE2B 087d0721061dc7f7da7f7c8d4a0072cc8bb342f83947e98939868a3074029b69a152f55657ee7ae5ca5045787fb125931321c09175abca345b7da627dd542828 SHA512 95a1145399fd9d0fa9c028538c0a66d190008e391a3dc9195086667fccca0720f85ec67660c99badc092402003e8ebb4a4458f0f0902721037a937194d0ad417
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.0.mod 91 BLAKE2B 850eed97e45b26249eda8e178272411ac8f59ba28862bbd49d9817a27dfd0bc0f842f38d54b1e924b4b8c57da1a9b3b8d587f8f52e79304e2433d6225658e14f SHA512 a3f8f87ba08dfd002c1a57fcc1cd1f1e271c96844cf270d0fc0dedad86d0859f4297391b27d33a27be69cc63f5fc82fed076ef5c785012b4e2f0da24d5d040e6
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.0.zip 53398 BLAKE2B b39bd3a968e7fd96fa4a47c122a462279d6d4a3ca8bcda3fa33de14e4d3479870c7ada449dee940bdd86a7dc4161de74d93b469ab1f7ec78ae091ee8a37bd9b3 SHA512 b28003b75482dd4e111639e4d9d463641916254db29d38036a983d0d5deb8896942c2a3677a74e189208512d3255b9847bbbcef7da2f2208ea50398dc454f5ed
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
@@ -146,10 +173,14 @@ DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod 79 BLAKE2B 00b450e2
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.2.1.mod 89 BLAKE2B cd3a4c19eec05b9850693e2eb9e30a679b3bc6122fdc3768aec4332bb0a4f1db1e4c3b47db7b608295537f318e53038358bd07b31fdbfa7ec9780996893422b4 SHA512 cbe7f39e867ec974701d25122c5efd655e19d3d1693c66cecbcb3d8416380441d94f9da31ac74e78bb6db7c872d13163b5989ae6df8803672dfdef13fb3f895a
 DIST github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.2.1.zip 20150 BLAKE2B a0655085d3a21395f0140daddb1e4b66ef9e29acbbc3700ddbf2c0fd9e72f07e4a06cc3c1d9a9022b4dd35779bf8d67ebe4772b4b99423487a597eebe0c657c7 SHA512 761e587ecfeb840c53e8a1c9cd2af638030a5541a6393183ece8ec8b1149517ce3e68f703707daeddf47b8d07a7b0e0057692eb5b9c5bd315f7cdd5c4e5a1597
+DIST github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.3.0.mod 89 BLAKE2B cd3a4c19eec05b9850693e2eb9e30a679b3bc6122fdc3768aec4332bb0a4f1db1e4c3b47db7b608295537f318e53038358bd07b31fdbfa7ec9780996893422b4 SHA512 cbe7f39e867ec974701d25122c5efd655e19d3d1693c66cecbcb3d8416380441d94f9da31ac74e78bb6db7c872d13163b5989ae6df8803672dfdef13fb3f895a
+DIST github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.3.0.zip 22417 BLAKE2B 3116cb1531c3f3376ccb328e2029756622994765f20f97a7aebf0bbef3eeeb75249b2a50dd889fa3eed7d24799ef455f6f5822eb84dd52ba13aec2fa39501cbf SHA512 e5354c0baf4cb8dc18c459d11b037381ef5e6bf9c4a86ed8715f62ceba755211f587c06099704d67e360a9104a145804393ca7f2de5f57fe29054f86691bab9b
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod 46 BLAKE2B a909a61754bdc458c27211bf62b57f4ead8065bcb84511f4fc8c6fa77f56d78ca714e7e311035c1544d92f596de2fca56bcc767f9aa360d8d2cc36b7301fde21 SHA512 b1c1ceafb509b0b3c2b1c5fa0a28281880084a63a071a32f6ea4a04dcd2b2c455c9824414da7f767b1e039a079b6a40c0505a2e71991b9e737c1ba01947ea434
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.mod 34 BLAKE2B 696d74ba109247fd088f7ff14db1ae77a4a755dacf04e355aacd8c11e8e2646c2247f3f3ac947289a36f293615d40ae25bd1c3cab656e884183c97e46fb44056 SHA512 be55172330f6088410e969af6a419b9d30e8dcaf6f1c240b55e97df38e1a8d85c8e84ca1ddeca2075f171806371fa524187a24945fa6cce0e8612acf97ff60b5
 DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.zip 7343 BLAKE2B 436bd84adabac44091873102b8c5161098a67f8799166cb6e11dd82a5e0781a8c138df286d73feee9998ff46853d0c37a6ed28ea14b88de0e42f57704a17cec3 SHA512 6b8fe83e5833685d0b274bd97212d05f936f4637eb3251b9d4babaaae4c60c420ebb8fb206b973e2a56eea470e1c4709439516e7e2afc23d2cadb1fcbc441030
 DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.mod 34 BLAKE2B 696d74ba109247fd088f7ff14db1ae77a4a755dacf04e355aacd8c11e8e2646c2247f3f3ac947289a36f293615d40ae25bd1c3cab656e884183c97e46fb44056 SHA512 be55172330f6088410e969af6a419b9d30e8dcaf6f1c240b55e97df38e1a8d85c8e84ca1ddeca2075f171806371fa524187a24945fa6cce0e8612acf97ff60b5
@@ -185,7 +216,18 @@ DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.6.mod 582 BLAKE2B f265b8
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.6.zip 679014 BLAKE2B 29812d675833a110b4bca2e90b66d5d148fff6cf7fe68b9ae12c0afd90f4d1f0eb3befd2839b8956bf8adb136e72be086659feca89aae16eb691e4f3f592a06a SHA512 cc1c5f55ae7183dd31686551bdf2223a410a32ea75866e17e57a227049371fde97f49bcfa0b6d934b71e4de8f3df340ff46ad462901cf825f1d33d5c776eef15
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.7.mod 582 BLAKE2B f265b83af720399c2c438281b7e98d15f5bb3164627ae580ac775b533576c429f3a5408fd8f4a92f7b403598df24b7c6732b22eb817f9fea495c0138884cd136 SHA512 29d12c6f2d42630c252d58bbd2b2f5ef9af6660d000109b4c0d9a4f4e048d3c92920dac309aa5b21962e45df57ca8ea412e9fb63abe7b51923ba9eeb36f7d9d7
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.7.zip 679034 BLAKE2B 2a7477ad03a902b15cc08359190162de71ffcbd36c24a33b10c00b9f1d8734c19686eb4d4b3fb8356ea9e68ab0e96cdb686f09442579e063c96215850934bcb8 SHA512 67fa041d5b3ffd66cc134bc9932e19089700374e2470e09092d4fef81536f750ca70125cc47494aa03da1cd672c31dea248d83e063649e8aa2fdc8c70608b8e6
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.16.0.mod 544 BLAKE2B 8cbd49aeebe4c8a3a9d67d9d3274c9589cc8df3ff9716484038cdf74a5fdd1fc93f91d5e275fffaeb080089fd51df41aba2139147802ecc86fbe985458edb4d0 SHA512 2d86d94949229a4c013e533603247c2d6c6bc1b83ff0e560034c30e95920286d4d1ef33f726965da9dcc92dcfb9b42d5fa09d8b8d03db53d06a29df65ec92d82
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.16.0.zip 690319 BLAKE2B 5704ec83016463b58b6011ec8b0a3e48c197c32c1cefad4fe89583ae8617728fe25d1d6dd18bf1b06d4c69aebc086fac979ca55f39cec8ffe9132c873ad432c9 SHA512 4ce4502097b531ec44f96cae0d4731b04b5a72d529aec45a9333022cea4397a4f63a15587ee3f1668c817a0244d010a1b6564fbde0fec4280133757e9dbf5799
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.16.1.mod 544 BLAKE2B 8cbd49aeebe4c8a3a9d67d9d3274c9589cc8df3ff9716484038cdf74a5fdd1fc93f91d5e275fffaeb080089fd51df41aba2139147802ecc86fbe985458edb4d0 SHA512 2d86d94949229a4c013e533603247c2d6c6bc1b83ff0e560034c30e95920286d4d1ef33f726965da9dcc92dcfb9b42d5fa09d8b8d03db53d06a29df65ec92d82
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.16.1.zip 693172 BLAKE2B 719f6f5fd8ebd5c3fca22c52a1588020b139f4811c73016148fefe9c4932fc6d3762344d27b9f6ceef6aad59b9453e7277f42afbc05294e630e919159dc7ccdf SHA512 12a571b1040e697d2e61f173ec946921c17c4f2aeeae9f42a3284bb8050e418dfafe9be4cb9a0316d1dce55cae974d3fb74e537a30e4b1dc17c002f5aaf32979
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.17.1.mod 544 BLAKE2B 8cbd49aeebe4c8a3a9d67d9d3274c9589cc8df3ff9716484038cdf74a5fdd1fc93f91d5e275fffaeb080089fd51df41aba2139147802ecc86fbe985458edb4d0 SHA512 2d86d94949229a4c013e533603247c2d6c6bc1b83ff0e560034c30e95920286d4d1ef33f726965da9dcc92dcfb9b42d5fa09d8b8d03db53d06a29df65ec92d82
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.17.1.zip 693464 BLAKE2B e8dae8aee36d2f0750af5adf269c5ea435dbc1c860ee41182dd0c96b2681cc8b0720fb5a7be9e8c4f9d3cea9777ca0e9b4d88ec8c0550a5a7d6bf41e9382f061 SHA512 212a2a6b2bc3aeaf7c7f06b29a4619d26d173cfce85561d0859911e657cc16f97675fa200352bea6104c908becc5f9f370e808d1ed81e2e47e8c432b2b416131
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.17.2.mod 544 BLAKE2B 8cbd49aeebe4c8a3a9d67d9d3274c9589cc8df3ff9716484038cdf74a5fdd1fc93f91d5e275fffaeb080089fd51df41aba2139147802ecc86fbe985458edb4d0 SHA512 2d86d94949229a4c013e533603247c2d6c6bc1b83ff0e560034c30e95920286d4d1ef33f726965da9dcc92dcfb9b42d5fa09d8b8d03db53d06a29df65ec92d82
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.17.2.zip 692938 BLAKE2B a029b14c2529f8208845c520ff62bee05b0bb9fb153f815a3d0ba6f1f21215cfdb0544bf8d8921dafc22a9b9251762e3a525817df37418405295f1b80bdd3aed SHA512 5fa9f76f8e30b2d8477de5083d9560b1ad240234ec5d338db20e94618979ff8363f3c355be5204049d85bf04bed7d6005ba1086e2ba66b12d5ff145af60ddec3
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.17.3.mod 544 BLAKE2B 8cbd49aeebe4c8a3a9d67d9d3274c9589cc8df3ff9716484038cdf74a5fdd1fc93f91d5e275fffaeb080089fd51df41aba2139147802ecc86fbe985458edb4d0 SHA512 2d86d94949229a4c013e533603247c2d6c6bc1b83ff0e560034c30e95920286d4d1ef33f726965da9dcc92dcfb9b42d5fa09d8b8d03db53d06a29df65ec92d82
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.17.3.zip 693673 BLAKE2B 6cd032a0d451051b19b1abfba4de241de9cbc2dc343c90e8816ba496dcb0827ff67b9bebd095b8abdbece1dda2446e1a71d86668eff4aab8148d24d8305746c9 SHA512 2e9ae0007042169921dbdd2801cdfb1b3e04a44f11577c1c864c30059905343c65ba7eedb90972c426222edc957ac315c7358328e523cc14b737376ad2494c02
 DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod 37 BLAKE2B 0d60c4f85be76a6a73bd4b6403a73e12378ceaebf9dd48bba245ab0e14e846bc1fb480671f959ff56d52c5e2b41db8de0804d4258fb4cb58d6b0c618c1401104 SHA512 6a0913935e88940258478e250207882eb1df8727e18e66419ba5d4a06a0b2c8691642ed379d4b4ef16df715893b35e59d1e967d5276e6b0ea75b1f481e852a65
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmarten-seemann%2Fchacha20%2F@v%2Fv0.2.0.mod 42 BLAKE2B 1b36ffdf3a83189aff49e1d1353cd73badae858280e83cedf293d167cb71d5edb0c61ed6eb0d823251a0428c64073f82a5532682e80dcbfc48399556ee646cbc SHA512 17325059f7cf8236e6412e41da4e9b3237bdcbaff896a005d7be0f1fb9e5393b2b05128c9eecd8eb0c84db956efed1a0c9cfa57f10187ae8cf11c39b4f6852da
 DIST github.com%2Fmarten-seemann%2Fchacha20%2F@v%2Fv0.2.0.zip 61284 BLAKE2B c37a2108c815bccc27731b3a606dd03c555a9a30f85deb5ba0e1af6ab01e6ae13191b6cc591f4d2ddfe7b5886c4762bded2c319f7c46c68dc6416d1c10a0026f SHA512 cb4d2647779f381a44000b4300866c64769e19a2f52c02c00aa44c634bcdb8c8f40f2f6d4eab9353376f56dc80ae77e368b484920a622d19aafb2b9b533db87e
@@ -212,6 +254,8 @@ DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip 744
 DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod 42 BLAKE2B 1d5bc998881315c3b4507519cf19774b640d614dd686c11fdd8a9ea8f75b7c361a5bfbf13e4d005e768f6d8646a774000e3eac16d817dd7ea2d04f617c7eeab3 SHA512 c3fd7d7dfbb06289594cd16f09122e73d8882153ff54e1fcdf6f7c009c244fbbd7eae3f30154207f99a06c3fdee761b74cbcc8423131f714c626556d75ecaa94
 DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15
 DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip 84306 BLAKE2B a22f077e8a63a951ca47f6d62a6de017245ae81ad57f788996c9efc722a5df7bf3ef9cda993ac8c524d75a95a2218732471d46d21e8bfc56f324ed8b126ba1ff SHA512 7732e181c4a620e81e77d261addf74c7d7edaa50fe41f13512124650a572ec258ebac8a4144bffa3107115f9c65968cc67a3aa5de8c8dbfffbcffceecfccbc63
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
@@ -237,6 +281,7 @@ DIST github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.mod 143 BLAKE2B 92090da
 DIST github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.zip 10535 BLAKE2B 5ee9836e4754c461f35147fad847639bf3ac3c29f8b860859d0253f57a3310e30f5d316e317ddf70b1369a4d767f21929eca0a1f50f106bcc1a0f9856ef56d0c SHA512 314235b8956590f688d2973479531c0188a0b30a6b9ecf5ffee1f5b5c4d7ff7d7763693ae404c0fa6a0f843b68c54009d1d16db932824146496d2933c59fdda8
 DIST github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.mod 154 BLAKE2B cd261f2a04c34e1d81fdf1c44ef2865caf6bc4a475821bd5206e8bde5cc47ca810571c5b64d2f5d2c81d6b2f24eb91bf6822f35897c8792a738f4dc568baaa73 SHA512 6bada4d2156f4e1b2cd4088e382830b0ae89786a1fd46dce5378134470485d7c589d16a6af2d3adca0d8f14d1eae4232620cf14a463b1ac7537854c53a95533f
 DIST github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.zip 28943 BLAKE2B 333fee8591068ef9c0a681dd8d028356b7251406fba2b1b56fc9cb65a1c08219da736def1e682e65ad557ac0e31402c996d4574e11553348c7be9b3a97e16ca6 SHA512 339fce0ee64a01b57c781af5670e3f42c9391cbe204ef2ea86da45b92425555810b2f5f41816da234c0a8e977822c432c4cf316687f01db9242a116f2254f3ff
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod 35 BLAKE2B 02b7783baf4e91e1d27eecd00775026d0871b01c7c8d447f74db2fbf8f1fecafe8d25aedc503762ce9a96f9299efc3305d8382a7e87336de8197d332e51ebf03 SHA512 884e2bf0081cbf0158921c92db1bab1af99d32a30494e632457e59cc31a692eb510f93e800dd606f8b8c4cda68be8df08d571b5957816e2cc98caa1ec19ff3f4
 DIST github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip 16924 BLAKE2B 6de4e697381061b4c409057d566cb8d53ae77a4e511bdabf9d65d8c07ab8d4dd1b8fcd20595c99b9fbbb4473cd0aa970a2c040011191511fa847aff46fd08ccc SHA512 3a6d9765d02b91787c599fc39e5f1dfb144ad4a9326716fca562c60f9a62e55e8d3efd5bb2e50077ef180731ea2b89d09aeed14f3999e9cd4cfa4da3ef9194d5
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
@@ -311,8 +356,15 @@ DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e232810
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
 DIST github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod 39 BLAKE2B 0bf074876e4db2c76b675966ce28a4a32e7ac8a50c44f1f3c7f1cc929c682fd00d1fbdc5dd72d9d6dee2405d59d6699f1a8da4ed69863260258dd2574b81e924 SHA512 a6e5d41a24eded17812fae0ac1815c4e41dd3d60ac3ee667475e1801c3c654416346077d2473193be24dbdccb5d4fe7ae44acddcd354420d6a312a03df9daaf9
 DIST github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod 46 BLAKE2B 44bc49585092c685651bf48824262b655c9bf38fcb810ab934c0318324cbe62af85137efc6066eb30e5c132c8a2c52851741dec0d76b28024548b122621e1ee8 SHA512 183674d9c991b53d241664459b81ef54f1c2bd4c1b841af62ddb7bd72aae76ee21514a178a0d7e17267d6a958d3eb231300969bbf3db2aa266fe2a72cb265eee
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
+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.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
 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
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
@@ -332,6 +384,7 @@ DIST github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.mod 33 BLAKE2B e49
 DIST github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.zip 22167 BLAKE2B ac220a5ea44260b9725c89748e054b03d2b3488dc8d2d21e6513a13d22270e4937780089b6b7ed925d15641906c6aa5727474f45e5432ae58aab86e60387b23c SHA512 5728843c29d833360dd4eb07837180c08f4ac9e0f65d7a1f3a3854ada0a3902da3c05ea1a2309e783b536257dd4f937b9cc3f556e8426401a10d2f1619f5cf87
 DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.3.mod 40 BLAKE2B 0d12dc1fd09b245563e86708118ecc00ddb9712b290b444c1239c190358ff523f24118c5f69c5ad1861d9056bbeafc5d04f038d6ab4df82d64019c489175716b SHA512 1cece428d8224cbbb52f74138f441ba00fdaa13105a523d6374c7674c6b40e1c784782f105ce6ef9dcf3fcbebd4c8342a81674cace5211d73e5d108d1e9f16a7
 DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.3.zip 18380 BLAKE2B 3d89274008ba057e502f9d2cfada1c08cc4cf89b807feb5f2b3ab43a942f1260589ca4e166784fd72ed693ac44a0a87f2aabd5369b3bb22efa4758cbb127500e SHA512 13d7083668aba9379b82fe37230a107a618a125ae16ed89481632546061d9e5f3919d94f4a03b29c1af925f12fb770a63a534102a5eb72018b52bc2f54af568e
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip 72765 BLAKE2B 61a5269577f397701a50299f9e32b195f56af70a439ecc94f3ccba5a04cf6d1d220b5ae34d26c1a019989b19996335d265abb665ac5aee876ba50b941665cf99 SHA512 5edcc7510abaf7a6326a27a43aa7debd43d333dd1c23462a5f0d8a8d526ef74c085db35a637536eb6883d531bce4bf35648b75dbb19e43e481382572cdd24b3f
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
@@ -344,11 +397,13 @@ DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.10.mod 31 BLAKE2B eb05706f9dc60f414
 DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.10.zip 24489 BLAKE2B a60d9421a54d92fc636b0d0da8421da7d99a8fd0d92fe4884f97ac3df86880708bde8c2d9e66184859d4f6292f4d7b0aa66adcca327bd801107327c0c96f888b SHA512 ec52ac45634b0262545a3d1803be995fad4bbc4836dba98cce8f1069dcd2ddcb021f8ace0cc0026a339747910abd501d5bd1239a82b0a1c4788135eeb18cc624
 DIST github.com%2Fwillf%2Fbloom%2F@v%2Fv2.0.3+incompatible.mod 30 BLAKE2B 68b9d3dcc1a7ad178f568bc16e8b24803d183f12aec9a0e911bec2ef649e50cea2f7d86bbe063e0e3a798ed29e6604f73e5c9c6e4ae0148f5715d50863e59bfc SHA512 fa494fd4869ee860aa0a5ede2caa1e185041c3088ad45e9bc899e0f2a1324fb56405153e63dee8474d7c111a79ed1a45557335de87948fc5338f189c65e532ab
 DIST github.com%2Fwillf%2Fbloom%2F@v%2Fv2.0.3+incompatible.zip 13222 BLAKE2B b8e493c316400f811d322e717c75ddc12dbb9f628d38cbfa141209d7654d22d0a024b9952aedd09f40298bc13bba6c6667f74d85b184a298c4b0d6c3238624f8 SHA512 a83d562b8ca9e85366d7fdeae8e7fd7fcc507e551b65602fa109522c9ebd38780ed69f665a4c498c5c0660c7c5bc374cb796114bff364e232c8594326b2d6c87
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
 DIST go.opencensus.io%2F@v%2Fv0.18.0.mod 1118 BLAKE2B 55892f4e07819a81da5ad96866ff71d2195b51051b5786e11d1e7badca1804f8e7dc3231dc17f99c9d4d00df45e7825ea389a30be8fd0f0670e9620b551efb97 SHA512 6992b5459b8f831b93b69588300374d1ee59e27056887687dd52baf61bb18c41e2ca75079cb17acc339a9d94da79bb697aa96e68af966abd73408a724ab70d2e
 DIST go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod 15 BLAKE2B 00f2fbcebe2e9f068ba7e7dc4da2bf2e66f09203415957a1dcf8d5ca6aee422579cbaf2efdb4383985742c6e71d41029a8c68c20a074819666d2db732cf1ed13 SHA512 5bccd8605a1e1d8381adc2f52e27c600732590e7dfe261521b149fb6519693e1124e471c61bb7e6bad8f683d684c7a652f5f11ecc766c84286a51e3837cea6af
 DIST golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod 4407 BLAKE2B 01f20c6ca234f03f65fb5bca568f3f86c4fe49308030dbd045434025ceebeb168508b7d104143fa38c8476c4a926cba29bdbdabcc7d8a1f8bbb1fa7d4bcadda3 SHA512 a207bc1fff631a38a2ce1e1c041548860885b201919aa2d729af31b9538f7616b61f695c3cbed18146ce5bb79c72823425914050b5b75115f9889fc94d29d1c6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
@@ -376,6 +431,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+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-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.zip 1422506 BLAKE2B 910ec4e504c94c944c49110e12845ce3a9fc766d66efa523e14937664b6220aadc65056eecf1053460f18a76a21a9a2f4309e16aedf342003d48522ea9c2c2ef SHA512 1ab2269fa1b7cb5266c7cbbf25b8465002f08ef300c13e832db1de8864ab041d85a46e37f83b64a2843c58d340815b1eaa31776c675aac0a83b92ab102f19293
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
@@ -395,6 +451,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180926160741-c2ed4eda69e7.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.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-20181205085412-a5c9d58dba9a.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-20190215142949-d0b11bdaac8a.zip 1584596 BLAKE2B 2d891f4ee749bbf528b0a44acc8cc71a56432961fc47864ec9dd47543a8a1a97d55399dbb95a0654b0588ca2dc95289ae31746ada83afd9a667662c371b6747d SHA512 8431fd78425186e55e07be9cfdb81d294b517d1695f99da3612477b8275d9a64038b60097658a02f399ed99d2f399197e572f3c307f70fa075b4995943caddb8
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -404,6 +461,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.zip 1590803
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.zip 1866142 BLAKE2B eecef3b6640818edf21f8bc62cd44ec7c3d6959165cb85e9bb1132450100de82c43c0337db78d100e0ff9b886f51427bed3f3987176cbf07ce38903bc96fefbc SHA512 fd3cdf5bd56617de83a09132656ca226c4334447f68494282fa7101ba2d85ee02a33d5fe870ad46e59e5fce4bf7bc031e0f1012315b6d017203e3915ac06a87b
@@ -419,6 +477,8 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec
 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%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
@@ -455,6 +515,8 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip 1456574 BLAKE2B 4957a5322065e982e12220a4eae758cca1626e9e158222acba41df0bf5fffaa8256e4efc832d90c4853d29b46fdbc8f4af9702f51cac93f92d25fa0f4d7cd603 SHA512 739d87735445d8c7bc877774ad0400570a3bbb67216100fd7edab615f11087225dda48fd16be53f7e6535c16f1cd686716c262567954e8ffc052b11125bcfb13
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip 1491602 BLAKE2B 7fcfd0d05fe509a3e30885304b7ec76a538fdc9cde84d44fb90a32aebbd14bdffd5f3f7e36f9ba24ef87decec89fa824963780b152faf43f3799c8e64e822f34 SHA512 91a070430e3a44edc4f66d6b2ecfcfeb4c633a07c252d1494ecbc9a37141483cb7bc9bfc641022a59e740ccfe9c4ed52e263d59eb85b5bc37a66088bafb6ca8a
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
 DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod 28 BLAKE2B 0fbbe5d1e239fce8fc245a0a54a09a57ba1a669a6ed93aabefe8fd333549b3309ad9e6eb15cff2f0a853d3830e6b5cd60961835b14e2dd13aad5812cca6ee04c SHA512 00151108bdaa29a2097ab78c99c93bf0ec27af203696a11bc7ba55e36d7115ad13279110c245bd3a2cc84b63bb2a8840964e3b2e1334a0d085ac1e8ec5239bad
@@ -462,6 +524,7 @@ DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip 29965
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
 DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
@@ -487,8 +550,12 @@ DIST syncthing-1.3.4.tar.gz 4785353 BLAKE2B 01ea21d207fd8d84d28b03125f6c3b2071a4
 DIST syncthing-1.4.2.tar.gz 4792506 BLAKE2B 32f5944b54f994e827226c4704e1c6a66e39124a7f72f5b3864b5a204d59b7c89c65df1fa1715096fa8af3a397fb4e7d695720faab639747018909c437c555aa SHA512 39631ce3da7e77edff92809cc0dc4224b7311da791b8a60aaaf06d60a476d2e9d6b914d4f4b9c13d33dad19cec98093c6cacc75abe431bb3809b5b5fdc883591
 DIST syncthing-1.5.0.tar.gz 4797347 BLAKE2B 60ccb06d491b2f7cb822207cf55f70fe79cac044900b3cc2947132a5e410b3be5b7a4379472c9bac77f10f7b3a599617644ee573648c7e84abbb456511f493f4 SHA512 a1f71701eb1f615b8783a75ae21dbe73b26c5371f7225064c5ac2cf71a227a1e679420ec68ad7f95e51e0962d810c9ecf8a977fef8517de8ac71a9d7b8f7022f
 DIST syncthing-1.6.1.tar.gz 4837435 BLAKE2B 6a2cb7328748f9866e25c3c986f6557411da390865d0d0816c3792634958546bd7ff74ab0ead98627d305a94f9b39b5c56e0f9e850c8c73ce23a8f7fa5c65293 SHA512 49ae4be6adeedeb76c346e2dec5a59e1c2787612595601af140462ff8df9035fe6b2366af78412e13d5070aa149d34904b5c0cf28fa40f1cab2dbf59c175c2db
+DIST syncthing-1.7.1.tar.gz 4856327 BLAKE2B 52c62d364dbef2d8472c774867e39302fd92195abe343b060fa3389e13b575d91b3df86cf9f5a728bb75912f6fd57198407daad0a667e1340663dbc127ad6318 SHA512 7607111f00bb2d6adc8e0262da4500a3f7234793775fe865c370ba196a7d69cb01eafabb7c227ccc6ce514be03db402675ae53d80d69272c56d0cf7cb4faffa1
+DIST syncthing-1.8.0.tar.gz 4839248 BLAKE2B fd9fff6220d5ca0794a6f053b13da0d75a40ab9cacb526aa633585f5c41baf41986f4d5cd8b3896c2615959983f00d4374121214e4b160384c42e23e3c5573de SHA512 239283ceec0a7c563d2181b157c0628469d7807c1f03d87bc4a9f0cdaa4823746a8d2fc06eb52af1c84c5efe83de3ab8b5b61638405b4a1ca70623b69bf85ba1
 EBUILD syncthing-1.3.4-r1.ebuild 16157 BLAKE2B 41eedeac4255ac0559a8ebd1545abce9c1f94547b742b6dd644377f9e2ba1e288cce6fc10faf8e8b5d2fb5f046461ee50d03d80eb66e805324f6fa5a80a13d21 SHA512 595ce2e21d5afaea290697c6757f24e8b18805914aae9221e4b55a05ab2e562bc49e747caa1af236c22cd71ee3bcc23afc6c445302d5e9194303f6d61d1c346b
 EBUILD syncthing-1.4.2.ebuild 16850 BLAKE2B 2172f321051205b1f8a5f9b2a5aa74f8cfc536e8d7ae1fc85be87e1e43c16628aafa50227a697cb7d0c0c4e4d3f49607c2bd8910cec2aa2cd596f11965bf0381 SHA512 f22c4511a07aaffb2a7002c4917cd9b28cb772350ae11772e8f8d80572a2df99ab12968e1562ab6293fe93a98546de7043d849e5effcb2ec8a23c27c35f4d328
 EBUILD syncthing-1.5.0.ebuild 16606 BLAKE2B 33e3eb982a4dd8b4c4e684751583bafffa696fb12932b296f6266b3914fcc39ba8289ab30de76c227668ff3e7d5092618b978f6e35f4213c8f4ee1065477f6ce SHA512 2fed1577d0de26d11e95c0e18579360ecf3074b15cbcf8b924079940589b3e0225341fe23bad8f918f518ce9329a4a3e1c01f90f450d5021df3f5192f5f58564
 EBUILD syncthing-1.6.1.ebuild 26087 BLAKE2B 27aeec34f329043d3ccadb1e1bdd35c82c21c4e0ed75bc0cf76cae38053cc63d7335c433eb6748056cc835814fe25076496a4d2d9e2909c164299afd6167f3d9 SHA512 020af42ba2bffd95eccef92564c058c033343b72e61f8490963ff71c1b55ac44efab351def0dc9c4a897339b02376d800cec6a987243bc325159f0ab2de1d5b8
+EBUILD syncthing-1.7.1.ebuild 28504 BLAKE2B 764fbf75cf032a907072d55b22e6390e7cfbba999557e442dfda418f91baca0eef07a7836576e6d71a10fdf15f5ccdbe952a161b4fea70d8e7934a8a0436ed0e SHA512 b48fb439db79b8150dc7d8b9dd5bef3f38a6ea48682249b82f005b5f7d42d07fc7f7d921df97ad4c912bcc5f6b355b41e09796560b0a45a287afe3d6d4523fc6
+EBUILD syncthing-1.8.0.ebuild 29432 BLAKE2B 9421b72e04b273cc2705fca25f941f460d5af323f01c3988810dfc47067826bec43c2162737478fc7d302967221f3e2998c4d3abb4e26fe00795abcdad1dbdea SHA512 6169ae6c0d03cebdc0319ec7acd371aab3b95e8f4698c979071b4a2070f9a471cc70e9b4a4a822ba841fb2a77432f87e3835a56c2456503de40690e717b62ca6
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.7.1.ebuild b/net-p2p/syncthing/syncthing-1.7.1.ebuild
new file mode 100644
index 000000000000..a85137dddd52
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.7.1.ebuild
@@ -0,0 +1,584 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop go-module systemd xdg-utils
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.31.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.37.0/go.mod"
+	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
+	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
+	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
+	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
+	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20190627213056-c55ef6137fc6"
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20190627213056-c55ef6137fc6/go.mod"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/AudriusButkevicius/recli v0.0.5/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/DataDog/zstd v1.4.1"
+	"github.com/DataDog/zstd v1.4.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75"
+	"github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/calmh/xdr v1.1.0/go.mod"
+	"github.com/ccding/go-stun v0.0.0-20180726100737-be486d185f3d"
+	"github.com/ccding/go-stun v0.0.0-20180726100737-be486d185f3d/go.mod"
+	"github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67"
+	"github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.0"
+	"github.com/cespare/xxhash/v2 v2.1.0/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/go.mod"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/d4l3k/messagediff v1.2.1/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/dgraph-io/badger v1.6.1"
+	"github.com/dgraph-io/badger/v2 v2.0.3"
+	"github.com/dgraph-io/badger/v2 v2.0.3/go.mod"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/francoispqt/gojay v1.2.13"
+	"github.com/francoispqt/gojay v1.2.13/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/getsentry/raven-go v0.2.0"
+	"github.com/getsentry/raven-go v0.2.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/go-asn1-ber/asn1-ber v1.3.1"
+	"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.1.7"
+	"github.com/go-ldap/ldap/v3 v3.1.7/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.1.10"
+	"github.com/go-ldap/ldap/v3 v3.1.10/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-ole/go-ole v1.2.1"
+	"github.com/go-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.4.0"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.2.0"
+	"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/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/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/googleapis/gax-go v2.0.0+incompatible/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/greatroar/blobloom v0.2.1"
+	"github.com/greatroar/blobloom v0.2.1/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jackpal/gateway v1.0.6"
+	"github.com/jackpal/gateway v1.0.6/go.mod"
+	"github.com/jackpal/go-nat-pmp v1.0.2"
+	"github.com/jackpal/go-nat-pmp v1.0.2/go.mod"
+	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/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.2.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/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.3/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lib/pq v1.2.0"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lucas-clemente/quic-go v0.15.6"
+	"github.com/lucas-clemente/quic-go v0.15.6/go.mod"
+	"github.com/lucas-clemente/quic-go v0.15.7"
+	"github.com/lucas-clemente/quic-go v0.15.7/go.mod"
+	"github.com/lucas-clemente/quic-go v0.16.0"
+	"github.com/lucas-clemente/quic-go v0.16.0/go.mod"
+	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/marten-seemann/qpack v0.1.0/go.mod"
+	"github.com/marten-seemann/qtls v0.9.1"
+	"github.com/marten-seemann/qtls v0.9.1/go.mod"
+	"github.com/maruel/panicparse v1.3.0"
+	"github.com/maruel/panicparse v1.3.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.1"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-isatty v0.0.7"
+	"github.com/mattn/go-isatty v0.0.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"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.1/go.mod"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
+	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v1.4.3"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.8.1"
+	"github.com/onsi/gomega v1.8.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+	"github.com/oschwald/geoip2-golang v1.4.0"
+	"github.com/oschwald/geoip2-golang v1.4.0/go.mod"
+	"github.com/oschwald/maxminddb-golang v1.6.0"
+	"github.com/oschwald/maxminddb-golang v1.6.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/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/pkg/errors v0.9.1"
+	"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/prometheus/client_golang v0.8.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.2.1"
+	"github.com/prometheus/client_golang v1.2.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20190714054239-47ef3260b6bf"
+	"github.com/shirou/gopsutil v0.0.0-20190714054239-47ef3260b6bf/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
+	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
+	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
+	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
+	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
+	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
+	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
+	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
+	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
+	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
+	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
+	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
+	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
+	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
+	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
+	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
+	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0/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.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/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.2"
+	"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/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/syncthing/notify v0.0.0-20190709140112-69c7a957d3e2"
+	"github.com/syncthing/notify v0.0.0-20190709140112-69c7a957d3e2/go.mod"
+	"github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d"
+	"github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d/go.mod"
+	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+	"github.com/thejerf/suture v3.0.2+incompatible"
+	"github.com/thejerf/suture v3.0.2+incompatible/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v1.20.0"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.2"
+	"github.com/urfave/cli v1.22.2/go.mod"
+	"github.com/viant/assertly v0.4.8/go.mod"
+	"github.com/viant/toolbox v0.24.0/go.mod"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"go.opencensus.io v0.18.0/go.mod"
+	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5"
+	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/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/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-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/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-20190228165749-92fc7df08ae7/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f"
+	"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-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod"
+	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76"
+	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/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.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/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-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/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-20190425150028-36563e24a262/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.0.0-20180910000450-7ca32eb868bf/go.mod"
+	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
+	"google.golang.org/api v0.1.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.3.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
+	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
+	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
+	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod"
+	"google.golang.org/grpc v1.14.0/go.mod"
+	"google.golang.org/grpc v1.16.0/go.mod"
+	"google.golang.org/grpc v1.17.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.23.0"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1"
+	"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"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="selinux tools"
+
+RDEPEND="acct-group/syncthing
+	acct-user/syncthing
+	tools? ( acct-group/stdiscosrv
+		acct-group/strelaysrv
+		acct-user/stdiscosrv
+		acct-user/strelaysrv )
+	selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
+)
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+
+	# We do not need this and it sometimes causes build failures
+	rm -rf cmd/stupgrades
+}
+
+src_compile() {
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	domenu etc/linux-desktop/*.desktop
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+
+	# openrc and systemd service files
+	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+
+		systemd_dounit "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-p2p/syncthing/syncthing-1.8.0.ebuild b/net-p2p/syncthing/syncthing-1.8.0.ebuild
new file mode 100644
index 000000000000..d44432b33ae2
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.8.0.ebuild
@@ -0,0 +1,604 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop go-module systemd xdg-utils
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.31.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.37.0/go.mod"
+	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
+	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
+	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
+	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
+	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20190627213056-c55ef6137fc6"
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20190627213056-c55ef6137fc6/go.mod"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/AudriusButkevicius/recli v0.0.5/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/DataDog/zstd v1.4.1"
+	"github.com/DataDog/zstd v1.4.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75"
+	"github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/calmh/xdr v1.1.0/go.mod"
+	"github.com/ccding/go-stun v0.0.0-20180726100737-be486d185f3d"
+	"github.com/ccding/go-stun v0.0.0-20180726100737-be486d185f3d/go.mod"
+	"github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67"
+	"github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.0"
+	"github.com/cespare/xxhash/v2 v2.1.0/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/go.mod"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/d4l3k/messagediff v1.2.1/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/dchest/siphash v1.2.1"
+	"github.com/dchest/siphash v1.2.1/go.mod"
+	"github.com/dgraph-io/badger v1.6.1"
+	"github.com/dgraph-io/badger/v2 v2.0.3"
+	"github.com/dgraph-io/badger/v2 v2.0.3/go.mod"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/francoispqt/gojay v1.2.13"
+	"github.com/francoispqt/gojay v1.2.13/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/getsentry/raven-go v0.2.0"
+	"github.com/getsentry/raven-go v0.2.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/go-asn1-ber/asn1-ber v1.3.1"
+	"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+	"github.com/go-asn1-ber/asn1-ber v1.5.0"
+	"github.com/go-asn1-ber/asn1-ber v1.5.0/go.mod"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.1.7"
+	"github.com/go-ldap/ldap/v3 v3.1.7/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.1.10"
+	"github.com/go-ldap/ldap/v3 v3.1.10/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.2.0"
+	"github.com/go-ldap/ldap/v3 v3.2.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-ole/go-ole v1.2.1"
+	"github.com/go-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.4.0"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.2.0"
+	"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/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/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/googleapis/gax-go v2.0.0+incompatible/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/greatroar/blobloom v0.2.1"
+	"github.com/greatroar/blobloom v0.2.1/go.mod"
+	"github.com/greatroar/blobloom v0.3.0"
+	"github.com/greatroar/blobloom v0.3.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jackpal/gateway v1.0.6"
+	"github.com/jackpal/gateway v1.0.6/go.mod"
+	"github.com/jackpal/go-nat-pmp v1.0.2"
+	"github.com/jackpal/go-nat-pmp v1.0.2/go.mod"
+	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/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.2.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/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.3/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lib/pq v1.2.0"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lucas-clemente/quic-go v0.15.6"
+	"github.com/lucas-clemente/quic-go v0.15.6/go.mod"
+	"github.com/lucas-clemente/quic-go v0.15.7"
+	"github.com/lucas-clemente/quic-go v0.15.7/go.mod"
+	"github.com/lucas-clemente/quic-go v0.16.0"
+	"github.com/lucas-clemente/quic-go v0.16.0/go.mod"
+	"github.com/lucas-clemente/quic-go v0.16.1"
+	"github.com/lucas-clemente/quic-go v0.16.1/go.mod"
+	"github.com/lucas-clemente/quic-go v0.17.1"
+	"github.com/lucas-clemente/quic-go v0.17.1/go.mod"
+	"github.com/lucas-clemente/quic-go v0.17.2"
+	"github.com/lucas-clemente/quic-go v0.17.2/go.mod"
+	"github.com/lucas-clemente/quic-go v0.17.3"
+	"github.com/lucas-clemente/quic-go v0.17.3/go.mod"
+	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/marten-seemann/qpack v0.1.0/go.mod"
+	"github.com/marten-seemann/qtls v0.9.1"
+	"github.com/marten-seemann/qtls v0.9.1/go.mod"
+	"github.com/maruel/panicparse v1.3.0"
+	"github.com/maruel/panicparse v1.3.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.1"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-isatty v0.0.7"
+	"github.com/mattn/go-isatty v0.0.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"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.1/go.mod"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
+	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v1.4.3"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.8.1"
+	"github.com/onsi/gomega v1.8.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+	"github.com/oschwald/geoip2-golang v1.4.0"
+	"github.com/oschwald/geoip2-golang v1.4.0/go.mod"
+	"github.com/oschwald/maxminddb-golang v1.6.0"
+	"github.com/oschwald/maxminddb-golang v1.6.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/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/pkg/errors v0.9.1"
+	"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/prometheus/client_golang v0.8.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.2.1"
+	"github.com/prometheus/client_golang v1.2.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20190714054239-47ef3260b6bf"
+	"github.com/shirou/gopsutil v0.0.0-20190714054239-47ef3260b6bf/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
+	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
+	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
+	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
+	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
+	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
+	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
+	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
+	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
+	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
+	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
+	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
+	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
+	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
+	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
+	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
+	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0/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.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/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.2"
+	"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/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/syncthing/notify v0.0.0-20190709140112-69c7a957d3e2"
+	"github.com/syncthing/notify v0.0.0-20190709140112-69c7a957d3e2/go.mod"
+	"github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d"
+	"github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d/go.mod"
+	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+	"github.com/thejerf/suture v3.0.2+incompatible"
+	"github.com/thejerf/suture v3.0.2+incompatible/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v1.20.0"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.2"
+	"github.com/urfave/cli v1.22.2/go.mod"
+	"github.com/viant/assertly v0.4.8/go.mod"
+	"github.com/viant/toolbox v0.24.0/go.mod"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"go.opencensus.io v0.18.0/go.mod"
+	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5"
+	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/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/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-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/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-20190228165749-92fc7df08ae7/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f"
+	"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-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod"
+	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76"
+	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/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.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/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-20190425150028-36563e24a262/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.0.0-20180910000450-7ca32eb868bf/go.mod"
+	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
+	"google.golang.org/api v0.1.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.3.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
+	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
+	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
+	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod"
+	"google.golang.org/grpc v1.14.0/go.mod"
+	"google.golang.org/grpc v1.16.0/go.mod"
+	"google.golang.org/grpc v1.17.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.23.0"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1"
+	"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"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="selinux tools"
+
+RDEPEND="acct-group/syncthing
+	acct-user/syncthing
+	tools? ( acct-group/stdiscosrv
+		acct-group/strelaysrv
+		acct-user/stdiscosrv
+		acct-user/strelaysrv )
+	selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
+)
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+
+	# We do not need this and it sometimes causes build failures
+	rm -rf cmd/stupgrades
+}
+
+src_compile() {
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	domenu etc/linux-desktop/*.desktop
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+
+	# openrc and systemd service files
+	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+
+		systemd_dounit "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 045fdad39179..4739b98a8e0a 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,12 +1,9 @@
 AUX 60-transmission.conf 56 BLAKE2B 4c2aadb19b4c85ce8ecec4f190f83da81a8b9e27f02cb20b785251122b5a495d1b3b7425378c4e17d3cda3c1c5b92c4297140dcfc3d4973dfbd1ac8e713245ca SHA512 9f79cfb00fa92e6d9054aad615f0ca7a1ad9d57b750e40b8942b7987a4a93d97b1f1ba9774a64f2b16e7c49fe7ae5fb4978d7aca3c481431ff333d508ed36410
 AUX cmake-unused-command-line.patch 875 BLAKE2B 3f86d8cd5977504e89d09948120a09a152be54a5f705c3a0e44b35bb26610750f526e5dcff2f781215a66be3b3a1fba0be797187972adcbfacf41c5835d00341 SHA512 58278a26998f560f52b76bbc76bf4c2981464e2f5c8e13672c288b9eedd0944228ee104abb99422154ba23646135baabb8400344122ad13b1333156af73fea8f
-AUX libsystemd.patch 630 BLAKE2B 1e7d9ac41ebc8971a86f051aaa5e7c4899004e4ae29b62d8b2963a16047cdd9ce7830156510d8e2f00967dcfb538991138f3b5c31bb2c841e5ddabfdb397ab47 SHA512 5babefd3ab0216dd1cf0b08b1ad10c79d034782ce744c9a4df402036ed1529655b9e05c641e876e9629a8366363ad0bf2d5e7581a621f2b0749ff02c6ed742eb
 AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
-DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
-EBUILD transmission-2.94-r1.ebuild 3821 BLAKE2B 3ef7bb62f838ee382b5a7d5fb755d15ae3de1a555cdf3b4e6b9cdc40506e9aa271982e046bc379170708e5d802f1b9490ee078f2ee49583157d968442fd8e7c9 SHA512 ca9d0fbe7d6169effdeddc2c16370e26a90207e40e63e675a55aa4e726f0395989cf0c0877bb82dad062988040177eb7d0459bac19cd15053a79cffdd199de01
 EBUILD transmission-3.00-r1.ebuild 3224 BLAKE2B 88442406484c45c7888adeeacecb53ec1ba811a0410fa2c607903831046dd3b1521641a0e2f5fdf4182f201be3a0c8a9c743ce0384b2428c952f14eda492b1a3 SHA512 34bf63e3076fca558d3e5fc52527a53244548db2034e8d3b13d0b1c3b5becfee1becb8019f8f1e969abb017783c39c65bd987d7f49bb2e8bf2b5ba612fa59eec
 EBUILD transmission-9999.ebuild 3196 BLAKE2B bd91eee69c5ba68e2bd9d168190eeeda69b1199844d217fd6eff1adfd71085c649b1b66823efe6b66dcd97bcdc32f95eb18686cb3bd986997246b4ea9815fbeb SHA512 f1d288b3406c460485535242af24064b194d43ab02f3b6c17764f3329e58202839202205c230a2b37f87f92788bab0c58398a7b03c5ba6494985db9f456286fe
-MISC metadata.xml 602 BLAKE2B 05300c81bd2c4df76aaaf8381a788016777e259075aa6a3bf9da239b4832dac1281f718f0fd79ece7d5c238440e07d1aabe15b7da40f34674ac30bbd356d0c6b SHA512 0047a936eda032a4521707ea50dcde06dce3837993e70d43a5b033183ba58633ae46e2d2e56de98a56f3480b30e596c7fbae82fd1e2ee9cbebc7983d9551617d
+MISC metadata.xml 468 BLAKE2B 1420e812b1518717cbb7c12bd5dd6f549c1f7327a099af937a71411d2a61980d58108e2566b4c44b7251e3c300f7ea87b95893eb581d9063fc9968988adbd9a4 SHA512 a584152669fbea79254cd7cbd3bec48d65054ebd51bf268887c17710290f428994afb143b65e906c172fadfb6c06bc6fde77ae87522a99729866fa421f209055
diff --git a/net-p2p/transmission/files/libsystemd.patch b/net-p2p/transmission/files/libsystemd.patch
deleted file mode 100644
index 5db47ef39bd9..000000000000
--- a/net-p2p/transmission/files/libsystemd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,7 +245,7 @@
-             [Add support for systemd startup notification (default is autodetected)]),
-             [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
- AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
--    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
-         [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
-         [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
-             [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index a5cf0e4c937c..f4f00780e768 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<flag name="lightweight">Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
 		<flag name="mbedtls">Use mbed TLS instead of OpenSSL</flag>
-		<flag name="xfs">Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-p2p/transmission/transmission-2.94-r1.ebuild b/net-p2p/transmission/transmission-2.94-r1.ebuild
deleted file mode 100644
index 432fe079c923..000000000000
--- a/net-p2p/transmission/transmission-2.94-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic gnome2-utils qmake-utils systemd xdg-utils
-
-DESCRIPTION="A Fast, Easy and Free BitTorrent client"
-HOMEPAGE="http://www.transmissionbt.com/"
-SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.tar.xz"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT=0
-IUSE="appindicator gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux"
-
-ACCT_DEPEND="
-	acct-group/transmission
-	acct-user/transmission
-"
-COMMON_DEPEND=">=dev-libs/libevent-2.0.10:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libnatpmp
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.16.3[ssl]
-	sys-libs/zlib:=
-	gtk? (
-		>=dev-libs/dbus-glib-0.100
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-3.4:3
-		appindicator? ( >=dev-libs/libappindicator-0.4.90:3 )
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		)
-	systemd? ( >=sys-apps/systemd-209:= )"
-DEPEND="${COMMON_DEPEND}
-	${ACCT_DEPEND}
-	>=dev-libs/glib-2.32
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	xfs? ( sys-fs/xfsprogs )"
-RDEPEND="${COMMON_DEPEND}
-	${ACCT_DEPEND}"
-
-REQUIRED_USE="appindicator? ( gtk )"
-
-DOCS=( AUTHORS NEWS qt/README.txt )
-
-PATCHES=(
-	"${FILESDIR}"/libsystemd.patch
-)
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
-
-	# Trick to avoid automagic dependency
-	if ! use appindicator ; then
-		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
-	fi
-
-	# http://trac.transmissionbt.com/ticket/4324
-	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
-
-	# Prevent m4_copy error when running aclocal
-	# m4_copy: won't overwrite defined macro: glib_DEFUN
-	rm m4/glib-gettext.m4 || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_xfs_xfs_h=$(usex xfs)
-
-	# https://bugs.gentoo.org/577528
-	append-lfs-flags
-
-	econf \
-		--enable-external-natpmp \
-		$(use_enable lightweight) \
-		$(use_with systemd systemd-daemon) \
-		$(use_with gtk)
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		eqmake5 qtr.pro
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt5; then
-		emake -C qt
-		$(qt5_get_bindir)/lrelease qt/translations/*.ts || die
-	fi
-}
-
-src_install() {
-	default
-
-	rm "${ED%/}"/usr/share/transmission/web/LICENSE || die
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-	systemd_dounit daemon/transmission-daemon.service
-	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-
-	insinto /usr/lib/sysctl.d
-	doins "${FILESDIR}"/60-transmission.conf
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		emake INSTALL_ROOT="${ED%/}"/usr install
-
-		domenu transmission-qt.desktop
-
-		local res
-		for res in 16 22 24 32 48 64 72 96 128 192 256; do
-			doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png
-		done
-		doicon -s scalable icons/hicolor/scalable/transmission-qt.svg
-
-		insinto /usr/share/qt5/translations
-		doins translations/*.qm
-		popd >/dev/null || die
-	fi
-
-	if [[ ${EUID} == 0 ]]; then
-		diropts -o transmission -g transmission
-	fi
-	keepdir /var/lib/transmission
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-p2p
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)