gentoo resync : 10.02.2020

26 files changed, 436 insertions, 184 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 8b4df21cef5d..7a277ea2c125 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 fc0fc7e238a2..a6d859bd00d9 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -2,6 +2,6 @@ AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
 DIST airdcpp-webclient-2.6.0.tar.gz 903873 BLAKE2B 7a82891efef14e8d3c2da9a15165698084daf9c044d420c271dd1401710f030fc3c6fd83d7f58cee746767624b1292e7fcb7a48387e03b0eca2cf779753686d8 SHA512 d6d029638e69d19743d2e49185b08a808d95d725c3f40bd98ab42c384d3eae6d07e4528ac28ac9db50011f8a68592ae60f49cedbbccb45a78e82a5e424bb731c
 DIST airdcpp-webclient-2.6.1.tar.gz 908393 BLAKE2B 8734cdfc1b0e380d231cf6e571d215b7cec196fe012bf842fd2257496f252dd803eee0a308e97033f959652dbd4d21bd2b96559c4a4262a8f7ddd2c491c7d263 SHA512 bad35d09475ef9a95f358bce99d1143586e3eedb58b3c5c74570c707f099ed1b1214714c093f74c6e2bbfa733077dcaf3e590ae3d821330938f9ec32c75a7152
-EBUILD airdcpp-webclient-2.6.0.ebuild 1432 BLAKE2B 85b65ba33e707985aa89695e367a7aeb0e5281074a5c9513fb964ebd05d82dd6a5bcb24e08cfa3dfe2ef75b67ec2b79d64580855fc38f0c9d61b45cb4203d538 SHA512 699e273529acafb182e54133361b8277bf7b7aa38041083ecaa67151a38ca552656bb61551e6b8353a6b30d44a19a449e0e2c3cc09881439ed2e042451c63263
-EBUILD airdcpp-webclient-2.6.1.ebuild 1432 BLAKE2B 85b65ba33e707985aa89695e367a7aeb0e5281074a5c9513fb964ebd05d82dd6a5bcb24e08cfa3dfe2ef75b67ec2b79d64580855fc38f0c9d61b45cb4203d538 SHA512 699e273529acafb182e54133361b8277bf7b7aa38041083ecaa67151a38ca552656bb61551e6b8353a6b30d44a19a449e0e2c3cc09881439ed2e042451c63263
+EBUILD airdcpp-webclient-2.6.0.ebuild 1426 BLAKE2B d94c8917282b654323af2d0fe782f4903b450a24bb8f7a27d8209bbf402cdf3456110aa24107aa7a4499a0196a330d84613b483d26da7419878e45a3aefff784 SHA512 21a0c3545af4979ebf9d178c99b30ee1dd3d5b1aba147287162c804c43d307bc8f8fee92079a61335f534980917c48dc49e5fdbe2416623fb0e0d286224a1419
+EBUILD airdcpp-webclient-2.6.1.ebuild 1426 BLAKE2B d94c8917282b654323af2d0fe782f4903b450a24bb8f7a27d8209bbf402cdf3456110aa24107aa7a4499a0196a330d84613b483d26da7419878e45a3aefff784 SHA512 21a0c3545af4979ebf9d178c99b30ee1dd3d5b1aba147287162c804c43d307bc8f8fee92079a61335f534980917c48dc49e5fdbe2416623fb0e0d286224a1419
 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.6.0.ebuild
index 380aadd6adaf..8f278445821a 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit cmake-utils python-any-r1 user
 
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
index 380aadd6adaf..8f278445821a 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit cmake-utils python-any-r1 user
 
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index d7a6cfdcfcae..7215a237e258 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -11,6 +11,6 @@ DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de
 DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
 DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
 EBUILD bitcoind-0.16.3.ebuild 4929 BLAKE2B 0659fbc5d29350ad948f4108762fca414c6f5893342a6a7463bfe1b7d4b3744ce5969949954d6aa040b4ae333df368661ffd9344a0e7c2fbec28befb0710d0f7 SHA512 1f6d0648aea9d864d22bbc55236e0b9ffd6ad0744051b165f40447eafcafa6179a28538dcac2e784ac07e58355969a6ec39a8b3fa9631067e0a4ade012101079
-EBUILD bitcoind-0.17.1.ebuild 5006 BLAKE2B aad9e7021ab9e4241eafcfca3b6734a9259351e6600ef47078eb27ef6de33bd7352a9ac516fcea73e58da5689aaa6ee9c6e9b386a22aa72a793da1032d6d9296 SHA512 a808f9733f201b7f5a850fa65d91d31b3899624b7482c1f9e4bd7b5f793c440ee37c1806ff52516dbd6d1e01cbe12ef0e36d35e5ed91c8630d275b68a198fef3
-EBUILD bitcoind-0.18.0.ebuild 5247 BLAKE2B 24ee462f7b825086cff084e2c99bfece19ba3291e0bfc1255883aaf842a2d721f1b7414dd448ae00039ed34889ed3c487d4f1742f26eb98374aef9165feb158a SHA512 22f55c178d1891ababeecc6cac6ce8e92926691517c201fa4eeafdf97b02724850c6a0f40cd275d1981153fc5b6e725229c42560f07fe2227c5a1f88f25dbac6
+EBUILD bitcoind-0.17.1.ebuild 5004 BLAKE2B f8bda0eacbf9f4488c5afad71113ded83b146575c9ce17856592ccd964bd6bf91001323901f8421c618d549b3d7800b82a9b9d9199b8a84084bfdfac68c94c16 SHA512 dfbf3d9a5138d999edfbe6c63d5d1e61c1add27df4b4dbb6031920af476401d8f11abfd6e2b49ee1e9ff7071c5c691d67bf529ed94692740cf3ca584a02519e6
+EBUILD bitcoind-0.18.0.ebuild 5245 BLAKE2B d50049d9cec9a70744e4ebb2417d4389ad8577d4b150acb746ecec77d1b3cd9efc18931cc1743bbaa9868da16f642299aee5c51298c3c39bb3336518579325a9 SHA512 d8e2a2b955bf89e464575a38239ccf307f88ce0b211ceaf1ecb5709c5cd1df7e8400c2957739642c6b04d2c195be7dacac9bf9811a3a94a4265c7ee94fb348f8
 MISC metadata.xml 1126 BLAKE2B c109473fe9b14ded30c783f08664ffdddca59b27905ec3ed2c7af3b367102f30017bf79599e984546f431d9665a33f9fb7a75501a1f37a5212073a3ff6c57ea6 SHA512 8e6357a5c3860a0b0d4440f0f2341a13582a24a1256443b352834aea491ec15f1d7980b7c9b2568aa1d4f5c44dd189934065c23df4bd63199acc6189aebbf03a
diff --git a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
index f8e1efe4331a..5e04c93da374 100644
--- a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
@@ -124,7 +124,7 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+	rm -f "${ED}/usr/bin/test_bitcoin" || die
 
 	insinto /etc/bitcoin
 	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
index 6b144706f370..9948395c7967 100644
--- a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
@@ -133,7 +133,7 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+	rm -f "${ED}/usr/bin/test_bitcoin" || die
 
 	insinto /etc/bitcoin
 	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 99a36d8ebe39..c3e38b0bd13c 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,5 +1,7 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-3.11.9.tar.gz 1871215 BLAKE2B 3cd19225d4e2b4ab26721069d83f6d568c48ca12fa94ced35024420429000099f8db0e8c69e46617738238d9ab969ef39e3ef555731c4618a7b7b6c88d438c58 SHA512 d1a8f18769970a05df8da454f1755fda593dc0dfb2484855fb447dca25484254cefdbd31e19917b13195519c0e5cbf91fbe644f2d27300ad2db6c1ae52d5125b
-EBUILD cpuminer-opt-3.11.9.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+DIST cpuminer-opt-3.12.1.tar.gz 1809074 BLAKE2B 2c19cba4dc070286d7fe39b53b61177b64c3d873bbcefa359c62f4cdaa8b685fa40f2ef61a1fce9fba57902ba3399cd3b45816e932362f2633ce3ca174ad2b41 SHA512 98c84e8057a9c31cfa65daba32f43c7a7d9225878dcce07c740fac563225494c901f15bdf0450e50d857918dbc01861ddfd39ead9d44f8038fe866bfa3ef69e1
+DIST cpuminer-opt-3.12.2.tar.gz 1809424 BLAKE2B fedec681166de95e18d41e4c61ec75a9e1ea1fc1cdb656cebcb303a637a01eb3aba9e0c5cbb5cc710be6a2191dcbef0b1a2c00f0ce349064b25471eac5035c26 SHA512 f8a9c71d673f68418164cc1f0bd7c80b4e5d246b21a8f54432ad9fc87c1962a0ab0a96372018e2d1da55d084b6ce9dcae58dd3f7a0b0e62e595a805fefdb5a10
+EBUILD cpuminer-opt-3.12.1.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+EBUILD cpuminer-opt-3.12.2.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.11.9.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.1.ebuild
index a5d436b3b8b8..a5d436b3b8b8 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.11.9.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.1.ebuild
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.2.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.2.ebuild
new file mode 100644
index 000000000000..a5d436b3b8b8
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.2.ebuild
@@ -0,0 +1,50 @@
+# 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/deluge/Manifest b/net-p2p/deluge/Manifest
index 56f2e5df40e1..dcea91f620e0 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -14,11 +14,11 @@ AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-1.3.15.tar.bz2 1775913 BLAKE2B 9d5224766051d52b6e075dcafab5716793081c78ba69da616fc98f2c463ddc7676b2c2ce8f54b81e1480cf4344582245733033cf5927a9692bc43ec0a23f0001 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda
 DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
-EBUILD deluge-1.3.15-r2.ebuild 4929 BLAKE2B 78454c0525b20a0a521d15bd49c01e556c7c437c4363cbccc0a17b86e48afa8f9fb226388e55d397c9069d8bb1ab0ec265964fa3d529ef64a8f83973b706a925 SHA512 3d1e9636458040434fa54ec1d2f782f193739188bad0b03ff1fe3d9fc20ee2450d2cc2e2185d050ae34e0be271ca692cd88adc22dc69591eca110b88be54cf39
-EBUILD deluge-1.3.15-r3.ebuild 4495 BLAKE2B 82ffe9b866a7761cfce5cea806ba57cce365172fe092470481c0ca6af14801b91d2d3c58da3c9b5d41764273b35223f4d18daa44682f45901038d4fc64b773e6 SHA512 dd366542d8ad15db9ff42ded2e2a45c421457f8cddc2640438decccbc82e25e4b3a8c3c4959eb265c3a27c655b86af7902ebba989301066f97176d5d07fb0120
-EBUILD deluge-1.3.15-r4.ebuild 4433 BLAKE2B 3568da55fb548fd2bff397e7475eb35566b32215c704e0bea54088c3bf99a2819a866111ff579f3a64cd3160bb1dc1f7a5273f1a9be5aa1fbe40ba5ece07230b SHA512 21a791b18064beabc6213ebe9414af89151e47bc80747691045b4931c67f72b158a6ca444ecb94efc428db250c4dc94dc9425b46d6791b26329a6ee6621e17c7
-EBUILD deluge-1.3.9999.ebuild 4443 BLAKE2B bc2778509d617096c242d0d0d0295bb9c257cbc0befbfaff376d530106b278260970eaf162ead9d83c841f33cce180be84d8d0f81686f3394bb52edbe596e94d SHA512 70391b5670f0b3fe38e477a952fa563bc7441d65f7b0e141eebd073166392a5aaa9f98f3e2414c240333007eb4fb714517c190b8b6287812e96bb5b244f41469
-EBUILD deluge-2.0.3-r2.ebuild 4407 BLAKE2B 2f60b8ad1f446a360e8922423ffcf20142092850136b8a15b0201ac3a9b9cd3b6bd3cc4955aaaf8f54bd348b82ed7e7ebe3a477729a7773a0b00eba7fc6bcd99 SHA512 dbb785608b01558519e87c1828e795e9bc218a49a8128ea39666810678434921579e71c2d5c3069d158a4d002c6fe95a5cf928dae39ba77b94282844c89e480d
-EBUILD deluge-2.0.3-r3.ebuild 4342 BLAKE2B ee1298c4af7786c5b74249035398aa350a28d870bd273f06b2d4219d9fc4403b300b83f1203d916b66b2e61146ccf29c77bb7d55980a8facf86a43a5bf13c7b8 SHA512 e9d5f6eafe64af91f95499fe921a895ced9de14658a3c76fff3cdb433dac17cf7fbccedcb0552b0cbf8a5fc1f832c0c7f041494759f4f6f7c345423f64983413
-EBUILD deluge-9999.ebuild 4337 BLAKE2B 5ad161fd29af8008040404699b232a5b9176aec3a80cfc2f6829e4277bd81e499f3fd5c1704452614e3ba177f3a392185be722f497c25045a4e33488dd7888b4 SHA512 0f6d50dcffce2a2d91debe260bc2cfba9f140be14bfe0f63a6896896e9e48958a509a4905c611477c4e6187cfc9eaa3250263ed55caae5889b4812c536bfdb3e
+EBUILD deluge-1.3.15-r5.ebuild 5049 BLAKE2B e835b233c714144f9b430b48ccc0e9705814464e0d80997fd144b4cb6121c114467858326a6d311bcf3ecd2fcc8e0071eee2d3b94470dba16462e03121ff0767 SHA512 c9418ebce754628d524a6e94ed12937707b20267889d0c21f90287d38758d0e0be3932e9a4e07aa071f021513d72e1856cf2ecb1a2a9c083223a332e72c47c10
+EBUILD deluge-1.3.15-r6.ebuild 4627 BLAKE2B da5905161023ba40a0dd16a1f22186c30e3e2243e6795b3c239fd00857fbc9ddd10aefe30f7d36c37662fa7cefd503f06086d42bc96713da7508c67206ff1a63 SHA512 06673cd6882e68118aab461274b6f2666ce2c0ea68d898edc99fdc67b9830e78b6f9fddbc2cfde2e4413bc166e4bf854ac39aba57ac7f1cd52a55a6ec041eb8c
+EBUILD deluge-1.3.15-r7.ebuild 4565 BLAKE2B 0f3493cfebfd9caeb797110903bf73218286f54eaf0423fe32ddc9522e3cd946d0f302e7e6cb0c8da439a67f5a68bdcd05ae5643dedc6f86b5dbca8a58fe0384 SHA512 677d172e057274885e90e2326cf7ce866b9ac0aecb6a817fef0c42ae16e6d061d9b073b335c450924baa2f8ba3058aa53b26ee771edf13a0fdeebdea238f3ae8
+EBUILD deluge-1.3.9999.ebuild 4575 BLAKE2B eda51520f4bed4549b82a76065b3c9df05e68890b04d0d52ad7998a8e666ff5aefc87da75ca3469dfeef66f17ee86486d78eba631cd7b00a837fc292fe174909 SHA512 189365647ed13eca444ef4a5172b48708e851c3f75cc9e44209e176f9118573d2ce53107253762610088f220cc451fe2c52bd0583226e885c6bab51efacecb31
+EBUILD deluge-2.0.3-r4.ebuild 4551 BLAKE2B ca627923fdbb7144d4e4891916e5ef9f6e85f9ccdb24adc7ce28ab9295148ef3ec56c4f9fe3a53a6cc3c3b172dabb8c3ea23f7989db9e0d0d2c212313d8bbef8 SHA512 5b44412ab8537de7399608ff20afb7c8b06dc7ccc450dba4536df1c20c707bf59d3fa42bac27e91176e0d751da2a1848705fdcd0b7752df8fb3d13e676be4c37
+EBUILD deluge-2.0.3-r5.ebuild 4486 BLAKE2B 2b64e1b7305bf7fb2617151e5593247c61243f462867bbbd8ed9b03922d9c59e85899f1cda439fc66208f8323471c8c61b68abdf1edd89c652facc487c022e6e SHA512 3b724e1750f06be9a00dca6ee73e10715ef964bf28c14de9c29d4a214aff3201c6ebfd69a66356cf8d5b686da3904cbeb947d8557f477a805465528b49fd7369
+EBUILD deluge-9999.ebuild 4481 BLAKE2B 157aeb683c381e0e421ffb15029c64c73dd1281dc2c2708128108fd0df088e9e727b444ab648340e04292232ccc011f614104fb753b63151d4c01b60b33982d1 SHA512 807d72757aa4343cf99de89ff6f4b404219951fd0872295d95ae5482510821b1425b2136d2418caecd1d4e80d25e135aee5a27d05c8e773953e271df203df9f9
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-1.3.15-r2.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
index f49c58d5c41a..61514eb8e1d1 100644
--- a/net-p2p/deluge/deluge-1.3.15-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -34,30 +34,34 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
+CDEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-util/intltool"
 RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		(
-		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 python_prepare_all() {
 	local args=(
diff --git a/net-p2p/deluge/deluge-1.3.15-r3.ebuild b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
index d3ef7813a7a0..f044210962ad 100644
--- a/net-p2p/deluge/deluge-1.3.15-r3.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,29 +33,34 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		(
-		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 python_prepare_all() {
 	local args=(
diff --git a/net-p2p/deluge/deluge-1.3.15-r4.ebuild b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
index d938267bcd80..13817ba74ca2 100644
--- a/net-p2p/deluge/deluge-1.3.15-r4.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -32,31 +32,36 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		(
-		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 python_prepare_all() {
 	local args=(
diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 1be3b5719884..af10c260e9f3 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,31 +33,36 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		(
-		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 python_prepare_all() {
 	local args=(
diff --git a/net-p2p/deluge/deluge-2.0.3-r2.ebuild b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
index f3c58d701a9e..cf9714d16182 100644
--- a/net-p2p/deluge/deluge-2.0.3-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]"
+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"
diff --git a/net-p2p/deluge/deluge-2.0.3-r3.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
index 8b3cbf5b4f97..3cdc92e94de4 100644
--- a/net-p2p/deluge/deluge-2.0.3-r3.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]"
+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"
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index d1806e7558e9..9bf5ba2d72ba 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]"
+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"
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index b82d7e7a935d..0864a0836e9d 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -4,5 +4,5 @@ AUX fms-use-system-libs4.patch 1343 BLAKE2B b45a272f24e0b738328e7d901699f4a5a9e4
 DIST fms-src-0.3.80.zip 4583891 BLAKE2B 363fe148c622d999398d2f435f49e312d3bea22ad6b69865a618593616b47b632c1a56bcc8fc75bd40590e3858aad7e3f1d70991a21936e38562e10f1813b49c SHA512 d3aa5eb7d417bb135d88a515702fac9c451054d071374bb7f475add9af7e1fda90f4d9c61569e3e9040b2a241efa7fcc7ecac32a7f652327d15ed8d1ea1418c4
 DIST fms-src-0.3.81.zip 4732577 BLAKE2B a873fe4458a4abf4d19c7849d2045e49f556e001315d9112f50fd5c544481c64e00d0db5672ca20f1974e8d8b46e88b98e6a339536659a8a4c06b1a3c4439d21 SHA512 7e5efc2bf22fd3ba24d61fb4a7afbd3b6181a6ea4d038bc06bc2135dd9254835647cbb62be68982ee553212be9f2e038f50623916db3131b2fd19a77c3180af2
 EBUILD fms-0.3.80.ebuild 1995 BLAKE2B ed05c263b40015c8a07603f1d2ed8f8b2e44308d1981ec85c2513a9904d0fa5063830eb990109a82dbcbac2da97a5d12a909fc31f3c509c5d848910a00d5675e SHA512 9349fd07349c8d9db9282ece0c18e22ccc5dde9933c1a30892281e0dc3caae599dab5a2305674f1435aaa80140cdc5d9f2ca141f91857fbc2062e4a60256bd00
-EBUILD fms-0.3.81.ebuild 2129 BLAKE2B 15ff7a8cf7c948231e540e02917336c87ce55e21b9141955fdd6bd154c076fd0dd8aa841a387cf2f428afbbb7185d34f891f82245faa3bed979ec4590d4b4e39 SHA512 5194e250b3527987875f4d0d088dc0947fb91857e787664e7fe10349f845ab57c4017097203adbfc1ef031d4af52f326c194ed936205b1a1dba9422f42519d14
+EBUILD fms-0.3.81.ebuild 2222 BLAKE2B d118b9112aec64afa7216220cb0109bf1cd80d4cbb7ce4aac0f71b38ff55d8d49c8aa0284be4b442d65e331605b8453b880c94b9b58913fc63d76f8fcdbccd95 SHA512 5a34df6919c2f6e0573cb240d06f90a2422fe79012a79705170fbde0dfae57b39fae48f33ab26ecf88f27a247b5ddcb1a26e22fe6e7ee73f18426bc2adbbaecd
 MISC metadata.xml 394 BLAKE2B a6924fe829c9abc8b3a04106d30b34af326d4596eb5bc9a96165db2ba1993a4157fdecfbeedc0f0a27b75c6327b501a67de3e46864ec4d7fe6211731fd2e121c SHA512 f4943a8b16ff6b031cf95eb5aaabe12fc18abc349f566fc7d4a4eab155ad917e9d49ebb5fcaafa0e36239d772d24391f1489ad71649ff33554f3a8fb6bdd69b7
diff --git a/net-p2p/fms/fms-0.3.81.ebuild b/net-p2p/fms/fms-0.3.81.ebuild
index 125c6be8d35b..bed92b6fea61 100644
--- a/net-p2p/fms/fms-0.3.81.ebuild
+++ b/net-p2p/fms/fms-0.3.81.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,8 @@ EAPI="6"
 inherit eutils cmake-utils user
 
 DESCRIPTION="A spam-resistant message board application for Freenet"
-HOMEPAGE="http://freenetproject.org/tools.html"
+#FMS oly has a homepage within freenet, so the closest is a wiki linking to it
+HOMEPAGE="https://github.com/freenet/wiki/wiki/FMS"
 SRC_URI="https://dev.gentoo.org/~tommy/distfiles/${PN}-src-${PV}.zip"
 
 LICENSE="GPL-2"
@@ -15,8 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="frost ssl"
 
 RDEPEND="virtual/libiconv
-	frost? ( net-libs/mbedtls )
-	ssl? ( net-libs/mbedtls )
+	frost? ( net-libs/mbedtls:0/12 )
+	ssl? ( net-libs/mbedtls:0/12 )
 	>=dev-libs/poco-1.4.3_p1
 	>=dev-db/sqlite-3.6.15"
 DEPEND="${RDEPEND}
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 380bbef858f7..2c3943782eae 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-r1.ebuild 736 BLAKE2B af33d384f9db8d1d9aa48a6b4814ae595f511dd8ad5c986046c781fa8f36990956cd011cd08455cc1beb39caf47121f1276109f59f5dec37814744a68d8fd72c SHA512 a3c5e676bbdd23f15c9c9b9b48fca1063404e5452ab08808efd61024df8a1205d916c53cc75f9a953708118e255a7ef6d4887ef672ac9fcc25bfd7d0646a6054
+EBUILD nicotine+-1.4.1-r2.ebuild 779 BLAKE2B b84742e79cf7d919a2b4cd47ba13021e591676a1671067655ca6cbe7a78f121bbd2cf84ed1120fc188d9f7c53c8ca35fac1933f9e4d8d82b76a61434fbedb2a9 SHA512 b9063b9ae3560908b975636f21d46ab2b8ccecb47cac9e63711d87afeefcdb8b09b5437688fbb98151410a6da9e023c8b527a70564c197ebf0f44a13bf1cea8b
 MISC metadata.xml 257 BLAKE2B eefbd95091b941aef3073689259e7bed1a9cd7db0a4d46ca77608a0d6bab835122b56ce9047e7fb21d7ca706b331f3b6b50f2dfff68561da40b3b8d6e63de62c SHA512 a7df7842124c688e7ed9fc4ca49372517e3570f1c461e78f32364902fafe04255a6db8fde42a72cbe2ed61426a5d49e89baa792aa3c9900cb4a83cc647c56cd5
diff --git a/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild b/net-p2p/nicotine+/nicotine+-1.4.1-r2.ebuild
index 6244745090a0..bc288ddd9ab0 100644
--- a/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,10 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/pygtk-2.24[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.24[${PYTHON_MULTI_USEDEP}]
+		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 DEPEND="${RDEPEND}"
diff --git a/net-p2p/soulseek-qt/Manifest b/net-p2p/soulseek-qt/Manifest
index 5429f3cfef74..692a9a7967bd 100644
--- a/net-p2p/soulseek-qt/Manifest
+++ b/net-p2p/soulseek-qt/Manifest
@@ -1,4 +1,4 @@
 DIST SoulseekQt-2016-1-17-32bit.tgz 11481944 BLAKE2B 6710f74e5c2f0869c1b2813c56e2eed1b54a74021abbc14c10acaf6f463551ed1b8d31c48179746b160f498fb31b7ba50fdf20ce193222005e28a95769af2d24 SHA512 12b5ffc1ee470e6065d696e1d634e98f6654e0cd3575e8600ef10474cf2e2fd304302b8114a6fafb0ce06f1cc3912511c84efd44ba17c76b095e5fb1f40ed285
 DIST SoulseekQt-2016-1-17-64bit.tgz 11329818 BLAKE2B 8288b1f1c88a36f0d3c2ad86bf61036f26d919122080c176bbc77299275e5c91cf567bb5fd7048307e1130f8c3b899bc51edd00477cb1c3dd54b40029f7fa43b SHA512 73139e323f758245f5763e60cb74f6e195c1c8d9b6066ddc9cb63b7e755e412cbd479a47ced5bc33b3c8b85047705195ee424c41be5f4952c5d02c1769ac2240
-EBUILD soulseek-qt-20160117.ebuild 876 BLAKE2B c2c2d4767918e97d495b6d8f882e892106687e84d3c8c971b28402065d7a41915e3b5387eb0f6f9f58d0e8ca4f642cb603a71eb7fd36c32e3d398619bd90ee61 SHA512 f08366ca1df027e0d09d268398e95ad178a5047d3c7df58fced604c3c47008a21a3c61d38a6b8f5b224ec8d87a1eb6d7724aa21db7cef344a26eed6d74a2222a
+EBUILD soulseek-qt-20160117.ebuild 887 BLAKE2B 49bacad1f17cebcbf3504b5fe61366b212bbd626acf3e5988f045e3df45090f34d87dbe14c96efdad335666f7a851750c1637d357407f355566076148aba0564 SHA512 46f79fd6978e352fe5faf8c92c41f12e92a0dbcdf07f92711fecc196c63394ee86ed96483ed1b4943db73e9c5629851d7f8ddc53f33b3fcba07ad7917c033953
 MISC metadata.xml 256 BLAKE2B 61e2fe3a4fa0a8ccbe9fd34a995927cbe741c6d6f2f32b6be1b944caeff8b029772b4f7b8d236d595e345e2538b178743095f27d25aeb4e678e857a57dea3205 SHA512 9a1deae3cae6933cbd5aa5e403ece1ed0f34cfc8a7f18560bb1d66ec8b276d7af8c3060fc68e7928ae3fb74ec231889718665f7edd75f8cec3af167de08773a3
diff --git a/net-p2p/soulseek-qt/soulseek-qt-20160117.ebuild b/net-p2p/soulseek-qt/soulseek-qt-20160117.ebuild
index a3a1b37fc7f2..5c05f3ed42db 100644
--- a/net-p2p/soulseek-qt/soulseek-qt-20160117.ebuild
+++ b/net-p2p/soulseek-qt/soulseek-qt-20160117.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,18 +11,17 @@ SRC_URI="
 	amd64? ( https://www.dropbox.com/s/7qh902qv2sxyp6p/${BINARY_NAME}-64bit.tgz )
 "
 
-LICENSE="free-noncomm"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror bindist"
 
 DEPEND=""
 RDEPEND="media-libs/libpng x11-libs/libX11 x11-libs/libxcb media-libs/freetype x11-libs/libXau x11-libs/libXdmcp dev-libs/libbsd dev-libs/expat"
 
 S="${WORKDIR}"
 
-RESTRICT="mirror"
-
 QA_PREBUILT="opt/bin/.*"
 
 src_install() {
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 3df59c400caa..7891f0253c40 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -21,6 +21,7 @@ DIST github.com-certifi-gocertifi-a5e0173ced67.tar.gz 155606 BLAKE2B 844299f2865
 DIST github.com-cespare-xxhash-v2.1.0.tar.gz 9198 BLAKE2B 15dca7edb75751fac840795e5735c5e284e212180c0bf40b6bbb3023685b611b3835b8e70e865bef07ed915a5a81def967caa8cfc2a46bcd6edf81eac42d119b SHA512 6a44b29efe90fda8cdb267d1419673a577e231398480add90e7afb7eab92ecb375c947ce68c2221ed94b1fc7032a497703ec8026bff62386f52d22cac89ae2ab
 DIST github.com-cheekybits-genny-v1.0.0.tar.gz 15585 BLAKE2B 0b5d4e398b75ba2e413cd41d455bce346aadf8b31b9233b6287608b88264e0f698863bb151d44d75488caae011ce4e68fb574b301fcca77be53b32865b7db4ea SHA512 a045ce3dbe5c54e1e04705b87d2e3a18bebd71382a68156f975e28c6426aa82861e68e6ff162d3765704d5538a0493693cb973781e35b9d1b9ef8c4541ec1e19
 DIST github.com-chmduquesne-rollinghash-a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz 22391 BLAKE2B fc58e00f0df0f24d87a907926f0a0a0f2a1317fb78d0919d6f925522c00514f393be8c434efc3e65d9b38334c56ee51aa134d486f559913ad18052a500498a5d SHA512 a1fef7d7d9123cba6cfe688120be9931d0ea71597c271db30c96d068ab0658436f96391fb7ccb61e4872633a3f9a473baf2e722d91a5de0db7fdd3725d41e2f5
+DIST github.com-cpuguy83-go-md2man-v2.0.0.tar.gz 52021 BLAKE2B d3df2300a28d972b6b7269172a734dda7a60df5c25d8b4a4d9a45a2c636f08286eea4873c32d22a9533ba4e333660e4ec2deabe8fbdb9af3db96c07884278d04 SHA512 22a6c950ca7e386246fadb15f05d0a60437a249df48a7c5f905bc4bd05034cede6318e1158bd2113e97b4fd2d1e838776680a00c6141ac2b3c8795aeee15a39d
 DIST github.com-d4l3k-messagediff-v1.2.1.tar.gz 8059 BLAKE2B 989a0b7bc6ba0f98e4725de209b081728fb5613b17b0706a18f448cc7444445a9a5b31f14ee0d454b66ef249a773d1b9631ef22eaf9cad60c44d796b7cb18d9b SHA512 5015339aa7a3730e1dbf8c6fe2e488f181db165480fb9ec12e9f0fcd449ec8df7dbe4e0b672845cfa5fc73036fdc6ff80c1044b2b96810eeb5a1e6192f224ff0
 DIST github.com-davecgh-go-spew-v1.1.1.tar.gz 42152 BLAKE2B 3c6689b3d2861fbc4a70b8ab25b790d132865e4ec34062fd80005fc7d62c1b4cd77df534c27a2d8b1c42c63f8a551fc7d98e3649bf902d176fd965e933faf6be SHA512 b00621d2f11c4cc858e69fda3e6975f910deb375c4f2305a45b230e2d9be73f183db5d2ce4f5e30a14b27e11e79380233ee68fceeef0d855c64fca966e68111e
 DIST github.com-flynn-archive-go-shlex-3f9db97f856818214da2e1057f8ad84803971cff.tar.gz 7682 BLAKE2B e62cf23c7a1abe3228df1589d65f1e4f9b39a26f37f2b01255ee73073461b9d78b96775843437ce6748eb4606b751569034321af8a71af07e502076a4f2aa86b SHA512 7e167dc71a001e85ac72b03921b0749045fe457d181127f6b4b46a3e1e0d4d968bd1535572518d79e0b5119b796e25c3bbce00217419c890f71452a0e80125a6
@@ -48,12 +49,14 @@ DIST github.com-golang-snappy-v0.0.1.tar.gz 62605 BLAKE2B 0af2dc71967b38aa4677e5
 DIST github.com-golang-sys-4d1cda033e0619309c606fc686de3adcf599539e.tar.gz 1121248 BLAKE2B b1c9ca1b9f2c60e8915c944afb5058cbc2acca7acea1f7a1a093499c371c2bdcaa82e60c1715b59a375060ccdf0140641bc06291569d4f5e6486a9bb90993b7a SHA512 5e4c95cde60807191f2d980505b2fd5745966b8f3049180422c129408bdb37fefd8403127597af38e3b13cedee8892af1ea4ca26ce150b61bf02bf2b98a040c9
 DIST github.com-golang-sys-749cb33beabd.tar.gz 1470192 BLAKE2B ea87d94d0e1dcd9bbfba56ed8281f39cb1d3dd36c674900e002e16ff57f36b0c9c14483ccc4025ee8661e239f82c1c057985d35c86166f2d3b60ab15c38d0ad4 SHA512 482467a0547281cc3348ee1ce1cf9377c223e12dba4c9dd94b53189dda0b7ce0e36c88367346e24635522080c5bbfc94dad18d2137e0c9ed599789f7986bc0d3
 DIST github.com-golang-sys-b09406accb47.tar.gz 1499131 BLAKE2B 86058e9899923af031ede2eee74915b74b496ea6b4937828264ec5371b4b0b01957c3d7af69de57c8b3bf78eaf08ceca4564872f40f49a55c0a4e228096bf700 SHA512 02b2aee839e605274999bc1839bdb8f2b6fdb643f7fa4dda1f8d047c54409dfb23819c938041ce964aa360b15954ca787f10002d2fea2b4ae4973f7638bf1268
+DIST github.com-golang-sys-c709ea063b76.tar.gz 1537836 BLAKE2B a7628adf0de85657546ce93a46bee74e3dc80a36e47550a75ed11644d0405def28400997ae762bb4f0a21344e0be6defc14de453e6848cdf3570992ac58b7058 SHA512 dd2104ab43fb9fd79345041860ab592c1c4f6e37bfefaeff4835445ca2ccbe659ceda7aee49c8b7b102b0b4f9ca31752e232790fe7be8118952b2306ab263f63
 DIST github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz 6112971 BLAKE2B 46e4358a177a6253797177a31d0509e63c2986645c61fb833c479498fcf3a8cb2304a81c47c562340087dc7eba5273690cfc86bdb978e72b1183715c8e9cc662 SHA512 555dfd99a41705b0e1aa7ee5a6465fbe53d1dedeeccc226a26edafb1f41d5f7a137cd4ed6ad02146d112055ca324569ccbe2863933dd363e5ed002cdbda6fa90
 DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
 DIST github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz 9548 BLAKE2B 8e29ac7d44106d5d36e580aba5677d5688ef3e850f6efaa83c01c4e4e6bda253adca564a01e2720f9b8216bd12abe99c2a519adb3e26085af8363d0c2b88e819 SHA512 12c4c592391f5e7f7334f28dc76193eeb8fb66df2294d91931daaf19912aa20a3ed27c8ece1bc02139b93d8767d22ec7dadbf800f91ae1f94aa635b490245feb
 DIST github.com-golang-time-9d24e82272b4.tar.gz 9318 BLAKE2B f2d50340655d21b1bcded6cb76ae16026c1d43a40a45a45dcfdda8171722c64bde3fcdddde9eca4e1f9ceb994a58750687ebd439464f962652cfb004329b6310 SHA512 d4f6336675a491f5de855c33a506baa99c33c02f59fa9c5284e29ab4638eb55ff5f7d24dd5a1c480211f41cbd3bffa6366594828c333f5f039a7f3009515beb6
 DIST github.com-jackpal-gateway-5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz 4009 BLAKE2B 6825c0ca6ba94354f6d30d496ef5dc31cc1a1dd6e192f22bfb57d375b6ba2755f973ddc8cfc121ffbf46534e3c8d444002e95b0e6df307184b0bd1f22b8a49eb SHA512 6e5929fe2000461abe2c2d26f7e092134c2de5ced57ffd8ebd42af68cb3d7a0d2e476044c6eebefd8f6e0ba263524c78db71a004c5408ec14e6ff675458004e8
 DIST github.com-jackpal-gateway-v1.0.5.tar.gz 4284 BLAKE2B d463b080fe05c1e2b3064a8f63a638d6d23d4c2782fc76be9cb376a9bd2ab8c3e5047224b790fe33fa328c5b1714fc8c1275ad0d86292ae7424722681f4a4585 SHA512 ae490a8d5a7480d3548fdcb444b6c3e8741ff2254a037b3a3bb4e0dfeae8ff969e5e3a0df1ef454165cec152c4cbfec864eb2f2d2188f95bbfe0a0b3ffc5e24d
+DIST github.com-jackpal-go-nat-pmp-v1.0.2.tar.gz 4774 BLAKE2B 27fde3e9eea2bd3030ad8650b680f2f123388932293c2ea9b1c4e8039cc4aeeaa3ab50446d250f1ccaeb312093ed7c1c5eb5b55d298f5e568fd5f0abfa478e9e SHA512 97761a1fb7abc94e40ed4e3d40e7424bb5617497e3856f8538f9a35985f41ff60dc6d207bf6c01ea5b405493e64f37f31e81a0a8db1aa8272d6ac885d3e6d444
 DIST github.com-kballard-go-shellquote-95032a82bc51.tar.gz 4327 BLAKE2B ca31068aeb60ebea4568901fe91de1aedb6842533c98a9b2cfe2a989d6f0a3dc76cb113989c84acae934150f599173af186b7886661ba94a549dedd3508b3cf5 SHA512 6fc381005c055aff7e451145bd2dd5a20591481b416d2d94c1c05ddcfac84c76e3915046d86073f3ace97ddb38eeb6e8a925825ca4629f1687b7f274809d9c83
 DIST github.com-kballard-go-shellquote-cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz 4205 BLAKE2B c9df02705dff0d28cfdb4bd8cd4e5e74b490bd15c5b9d28138f7f4f4abc085f7dc59b34227adbe7d25874c8928a96b0f19cfebffbc79068d314eaf90d87cd4fa SHA512 d738d2bce5abac7c3246f20f52ff069f43cd6b4e43e3e03c245688342d178f8bb2ae6923f9dca2d191458fd46356d17c3e065d09c1918541d27544ac2f046f8f
 DIST github.com-kr-pretty-v0.1.0.tar.gz 8550 BLAKE2B 210bbedee436b225b678ccbc363a2feb09b6903bf459e34d0d6950333dc273db5713a828b003ad0b52da0718de38aa3665ff7be6c99b865a7766998e37e55fb9 SHA512 7a367c317043d40cfbf7fac631a286c0bbb8b45a716fe7388d6271431e354b3913505398b8ccf7ffbb01abf71f04216738936a4282c3c9645e26c51b7692e820
@@ -64,21 +67,26 @@ DIST github.com-lucas-clemente-quic-go-v0.12.1.tar.gz 351956 BLAKE2B 72a30439c71
 DIST github.com-marten-seemann-qtls-v0.3.2.tar.gz 392129 BLAKE2B 98f3f08bc2730df42dea5a91567ea284d6f37fb962eac62217c805aa478c0bfce083c8b3690fef392183cb33d9fb47940f12256d423a0bc8337682a647afe704 SHA512 f28e0be6a91e08d7cc325181fc0dc862204d2852a5c8cf269a28f6ae6115a92686cd0e1796d935a346bdffe46b604fa8ec4910f4f170a9f4bd39251b9d963004
 DIST github.com-maruel-panicparse-v1.3.0.tar.gz 1174190 BLAKE2B 5b2926ff65e32914409f3b6d8c39b2ecfb84636ea8aa5d1533e58f1091b16ad7d7e7ae546792ec8704f596911ce8c63de55622d885ad553a6b803183c8c404be SHA512 74e7b5cdc6dde46cfefc55097728864cc3fd1c76ded1c660eea87efca30167b2ac88dc573061142f32236f4df3a42d39c82ac9d24c02824f1f0655b6d681b037
 DIST github.com-mattn-go-isatty-v0.0.10.tar.gz 4465 BLAKE2B 7da424fd365096386e752780fcda8403a93754bb030c564f5d6df705b931d8385b00d8226155370ed5ebff86c700e9aa2b2bab33fe72a1fd3f6a91c36124dc1a SHA512 76545b77aaa04effd15d2ffb450c19b9a4091f65833323fb7138d6a2dbcc37197a66a8782aeafdd54ed9171e07a0e5c0160d39cdeb2d067182fb4d7e339c8c95
+DIST github.com-mattn-go-isatty-v0.0.11.tar.gz 4396 BLAKE2B 302970e6579f3ba108c6366c5b2fa024f565416cee4ef08fd6c0e0699dd69dd328b5e393c7e5d726aa832609beb8328360970e940cf653848a5a9eac6cf5ccd1 SHA512 09d4098f6770aba747b977c0406fb0fe8424b3d10da716d16013a3088e25d86726430cab2957b411507a60400c38cfc3d8b0161db0a7245c14368edca12fe1a8
 DIST github.com-mattn-go-isatty-v0.0.7.tar.gz 3559 BLAKE2B 1f65f3d33cf25459b63fb70912810dd094e3fc6f3f94db293539d4c95e22e495bc93e7d676d161e15f5a8ca6afe082d17dd5173a931382e66ce2cefcc44a59ef SHA512 f067811fd5483c8f49770132f42156e78256843672891448d725c9dbdd25ecaa941802e5e9d08ca9c20ae23a553e51a4653e8205f48f7cc979e5be0b4646f13e
 DIST github.com-mattn-go-isatty-v0.0.9.tar.gz 3904 BLAKE2B 20178fb090805cf70ab6f98af75d4df4a049ba7a44f9023378e947e717952b985e64d640594edf8ddd63b9217f847a02f81a29e8b138159ceb2f2e3801e71d08 SHA512 3044e4fcd5cb76014b905f2c50838ee8cda6b1c865955a8504566b164cd851317e9ad69404d0125d6317be2a269584d7f72de551e4363c9c05a1b8068fa2dac3
 DIST github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz 37184 BLAKE2B 9ad023f9b70938f45e6dd44624a7008c1895e488e63124bcd8f8492292ef98479e966ed627a62de32e0fe84a57e60710227e02e4a276aabece81f021af9408a5 SHA512 63d9963502e967e47253f638a19dfbeaa2b63efab74ed790539ceaa9b4a0b695aa107f9e0c920c0da547ac1abe81af22d47f6de547c500deeb005fd8a5e22660
 DIST github.com-minio-sha256-simd-cc1980cb03383b1d46f518232672584432d7532d.tar.gz 64704 BLAKE2B 6838142d5f7b3496e9a28cb829ae54a08fafcb022f46b6eeab462d851428d2040a1941b2b8532340f35597afd311e6904bf2b0e126441e48d8db48ee6c6b6ae9 SHA512 2d8307280540919af2154d551b2b76b0ea929770d18af0266440e05e39d0f16469b6b98db739f022eb579d8f40bccd67dd5f66bed9575f304e863bd07a5e6e97
 DIST github.com-minio-sha256-simd-v0.1.0.tar.gz 65406 BLAKE2B 7d3306d90e7017cce8f1af0aeefae8fdb63f03029db2098470290a44057c5f090d27b614c3797e54c2c891d56f6e1f96b383c519eda62d6be63054def13bcfb8 SHA512 6196a2e271169fab8c38934f535c4c77eb8526fd60d52bf99021eea3bfa79e739d8be11f20de6ea2ff4db2851b377c568a39ca9cd9d77f97f127876570ffb95c
+DIST github.com-minio-sha256-simd-v0.1.1.tar.gz 65024 BLAKE2B 850d147f9f5716a1d46817cf06930efa65e87f50e9ad26651f1e7d245460a610a24a3787aa11abd005da10b4ae34c147f94cde558ce9d73b6d0898dd67868b83 SHA512 aac672fae1605a7c3bc3661949e406a3b47b0f3f4b01ca7b4feac42e91df28740d64ad1d13c8eb22444ec743217966f86247866d1bfe886bdaf47e16b64dce18
 DIST github.com-onsi-ginkgo-6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz 127951 BLAKE2B b8b981f2c98bfaecd4e65db1a97f00190c8935da866f5b7cb77a0c437063dab8cb94fb19eb77ec6bff9b361d91aa772945cc51dbafabc7870268326b0e458da0 SHA512 f6e99db70c540a08e064358c0034e8978f2cb7d2c27be439f3a90d0fd0c741ade9a15a30c837da71ee1c8df6b80b124799f4820ca25b71994d7e8de207ba4eb2
 DIST github.com-onsi-ginkgo-v1.9.0.tar.gz 134036 BLAKE2B 9343e0affd2529f9063c5c8a7d75e5077865f1f0d12f1e1d10be47a13732e13d1412b5a021dfb78e32e18e14fad8496c52f4e543ead173d4570056358b9c5c06 SHA512 9a46809cbec75a6f6353866370af19ac65df9dd5224ed35df0711e59842c45cc7d62124ceeaf8a1afe7ba85812c5d85cfa186036c58cea0c5e207ea219567ae9
 DIST github.com-onsi-gomega-ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz 81608 BLAKE2B 78522352a6774340d5de89545ec8189102bfdf002e6e2d637c3e4aa6a6b270f4cac7d999bebc5c0741ecf6d2580bf34f5983dab173ec5d8ba04a722475c1fda1 SHA512 7f8ec51545f322537b50173338a3ecc04eb4214d1536395ae08ef41e3353b9455ffcfa7c0c69717e8e4bf316bec4d17e37ee1d1f604da38abec46afe5c7d76e6
 DIST github.com-onsi-gomega-v1.6.0.tar.gz 90096 BLAKE2B 303bfded9fa9fc631e1a048c1a27c6cc019944fdb6478e307ed976d7acee17f00d6b562c85097fc6656bd5a4c68b7a10f2bc3f8e8a314fbc97d0ceb6d3d3e74c SHA512 7f1f8c8cf684eb3c62dc05341bdd722b594019d275fcf5a06e00c335ed2832240915880a99ee981693e278ace98fd224d60c5d45d6bd99ec546603358b46dbec
 DIST github.com-oschwald-geoip2-golang-v1.3.0.tar.gz 6595 BLAKE2B 4d6eb86ef10e97284de0ac9326ffa348e421f034fdbb85565f93ddb774546197a196270bc65a1ec32bd8c99684cd39a31a5f4e806886bc79860f2c9c07b66bdc SHA512 841a716429fb01775e72d1398c3780294257be606b568524631a076ad22cd1330a11aa70b4f7c8b4bedccd22432613919b9cadf3bd4c4b34c097e1b123834209
+DIST github.com-oschwald-geoip2-golang-v1.4.0.tar.gz 7742 BLAKE2B 17eb2041a39759f19d2da9050618fa8a4fac9264b927e75a2201f452935e46de0d65e2e7b98d0adb25aca1ca523e7f8cb143c3dfaaf6cbb377b71b1b0614d924 SHA512 2bd998c4cacfe64c83851a8db053188ff6f0fe2d583946173e02eef237f483379b864a1fcda59f8cf7d74befafc796fbe9e4b2c1879299302eaab077b659dc8d
 DIST github.com-oschwald-maxminddb-golang-26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz 17818 BLAKE2B ce68d48e238a674f492b2cbe63d9c74f2a839d3cbb744df8442f4bdd7d5705f0a5d4f2114bd4faa431c76c05331d67edd090db658ccb5546a266e40386d9ccbb SHA512 41c37ab97728b1d1a3e30dac22f29846cad487dff7e8211d2225f1d1b70a05849680dbce79134d5f9685a46f5db51c23a2b11744fea237a79ccefd90bc840c92
 DIST github.com-oschwald-maxminddb-golang-v1.4.0.tar.gz 19912 BLAKE2B 8271c066b8c2e889d9a427d193c410bcec97c90db8feb571d292f6c1ef0b1723b24fb2ca8dfa2fe509614b98accce0e1d599538757c6ed2d9b39c809ff2c831a SHA512 354abf2cacb4ec67300cc000c4ba01c9ee36e2c2070963b9cee298dfc45bb4cda1f634524027c3df61349357b9d438723e0815c521eec2e055f18bc9e75af612
+DIST github.com-oschwald-maxminddb-golang-v1.6.0.tar.gz 21367 BLAKE2B a1437c7cc998695ee0643ccba2f3badf4a4e1a6e9d998ce66121e6901e4052190a08fc3299c95ca3143d7f718152756772d92550cebde076a17181f38c87d764 SHA512 7134d5feed35e3f73e44eee8bf844750539bf3b80c1d403a1f6e692af0c09e14f042bb7b3aad2b807be6e74a636c3f183de1a2d566eaf9ed0bba6c3e5f8f8dbc
 DIST github.com-petermattis-goid-3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz 6598 BLAKE2B 39b08b8bbf3525bb16279beec310dbcb9756960d3475f75866a483aa30e5ce4189dbf1d7324b02e284c4abf40543a15d3272630f8bfc55bb8c36d07e03e1806c SHA512 60c161fa5c1e1f21c8ed1568aeadf9bcc3744bf52b4ff51124095d436b1c5b665b18d9b151bcb1fef98cccf48b420d8135a8df1c40cee88a4bdbd37980c44b54
 DIST github.com-petermattis-goid-b0b1615b78e5.tar.gz 6816 BLAKE2B 11ac50a4a9c618d136c918a1041651355b6374e78f3269711c40c35d33ec6d388a8eaaf3700e964487bc738b9141f777f7102eda1cbae5bdd735071d03954d15 SHA512 52068f22edbc627623002a09979c0762aaf6d96c2a0cb248d47945a364e117df40a35d9937e3e98b8d47f109df5edcac470f963eec0117bc1c515419d72e393d
 DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
+DIST github.com-pkg-errors-v0.9.0.tar.gz 13947 BLAKE2B 56b2ce55c9b05e3614112f2b8fe5f9b463dca7ea045c475f63c12e70f2a81f66c2d3117027fa6fb9781d99aa037856dffd78d15f876a76c564df82185897f842 SHA512 79a7513faf957e43aa36b32d9b881c3ef4815e9f88f2108a019ad0388fe24e7f71872af781f4dd6d34104554815188b5c38b0244dc3077168a0a683a597a2ac2
 DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
 DIST github.com-prometheus-client_golang-v0.9.2.tar.gz 130109 BLAKE2B 01368039e66033ef4a7266672f648724138710748b5e0472a615bc7e7a66a244ee6ed2a51ff1524de6f5865cdbdc03e603f8b1a9b2f9c27a4fe7fc595794c7bb SHA512 b42c3fbbdde9de732f8ea999e571be862dc022c5f87a2802b65141c745fc2182a4ab5edadf58ea75cd40f03fcd1f2ad46bd2c1bd65fe56cdcb2950a6455ee355
 DIST github.com-prometheus-client_golang-v1.1.0.tar.gz 140006 BLAKE2B 39c57a3e8e0dc41ab84b9c6e0fd53ed169da6126c2f39bd6298d80aef9043e39a785e26f075becdeefd337521d0376efbe89eee39a9e2fb8775804e9136fa822 SHA512 21f0ab86dafce3f02cadb7cdfcd7fdf50a67c5a8c0eccb24392a0ee64bac0288988ea491525c80628891b98a67715624a84033a754fe783c0966c579efac190f
@@ -93,22 +101,28 @@ DIST github.com-prometheus-procfs-v0.0.4.tar.gz 108252 BLAKE2B 5ea5fa4b57595584a
 DIST github.com-prometheus-procfs-v0.0.5.tar.gz 112152 BLAKE2B d989dc38ab9e4b056884eedc61411d34ecbaa109d270820ce2bcac1abd40dc1c730071a0cc5bd1fd93191134a26f8475d682a17d517bac69e4ee37a93bf07a28 SHA512 35f29e69c4782f882d8f68ac448c6c7e2aceb93319d44a07c5ffbbcd61051e3ab1355e5191ccbd217146403492d33f8f35eb61e44c73dcbf1700b5cd72aa635b
 DIST github.com-rcrowley-go-metrics-cac0b30c2563.tar.gz 37566 BLAKE2B 210728e887a9c45a6ee278f444a93aafbb28653f8551fe96e51c38da01c533a2ea56a7c71d731008fd879014f15b4828ad37b89ac6f2340e9e11499e33687a78 SHA512 c042058531ef3283fde66c0d49e0dfeba414ae8f1db61d20c8c72c8de0c021d52417f8c252fdd25019df5f267d7dce400fd81546de204d99b2e556bbeabbc6df
 DIST github.com-rcrowley-go-metrics-e181e095bae94582363434144c61a9653aff6e50.tar.gz 35594 BLAKE2B a41d55f6d88310214bd1764a51900f6beb277b44ef0da900231c45113777db6af1a5f1055a5909cd0247c02b453be01ccac47858e7751eb676199077c5840aad SHA512 efd184873803e50379dc27f85a8aee6fa185d070501a4f4d80745ffa6df5c02d6023753a3affc56569d85ac328031bf4c2e0dfe7d9302e5249aeac59754d1fbb
+DIST github.com-russross-blackfriday-v2.0.1.tar.gz 79613 BLAKE2B fb48381501283f535bfd5e04d4db3fd81ab2780f91451f1188c40a5737145489ed1446dfd2dc1f4e6cc4bc690facf4d8237fb8cea6d958361dcd245e5aecb7af SHA512 b5c889480bd6a5e8a805bb5685ee91a07b5d1831fce65c27518fab5a2aeee2ed3e356b536b65021c092b588ae105f169cbd57fba8d16374173b04b9e9476c9aa
 DIST github.com-sasha-s-go-deadlock-v0.2.0.tar.gz 9957 BLAKE2B 764bcf1ac0f018253b91b475e03ebca0edfcde4eb526c473df3a245a5397a742db678a70a767a452d6ecac25961059d9f304e21bc623807f6f6c9f6d9f504b69 SHA512 114461313768b79966669817b3a12502fa787e7dad288deda1440825605c962959da89c9106fd179cbe4f603a5c4f7f87c491f29def80936d7fa6eba7a1a1cc3
 DIST github.com-shirou-gopsutil-47ef3260b6bf.tar.gz 129842 BLAKE2B c36ce4de493a866b035038fe604c1f878a5c16ac435fc88484edde4dc36c02a9e3ff2b96046e381829938c3590b5f5a27231c42c0c7a4bfceb214e9d30d4c066 SHA512 a752ad06f7ace7780e2c98465493324b7e9d24fb70b09f9d1a4398c07acce7c8db39366745ec2776037e8aecae9b951bbe6e6f860de4f1b9f8b67a03faf51685
+DIST github.com-shurcooL-sanitized_anchor_name-v1.0.0.tar.gz 2143 BLAKE2B 5f833b40808210b1b487985c9598dca0bf22b531c7a9d863cbdbd3d0483ccf8b35fc4d65b48b3de8b8d548e515a306a84af0c8dbb140677b191c839f751d68b4 SHA512 2b83e4f537a9290c0ba92bc1b8f7f5bddba8eb973e41db1eb5c13df35f7d75746f705fa0e1fd1794cf2442799e94609479e4a2b2c7c4cbcedba67259a0068db9
 DIST github.com-stretchr-testify-v1.2.2.tar.gz 101698 BLAKE2B 8280ff92a5005f9862ebfb80c6904b61105315189b6f56f087ba891dba47eaa5789a055e63c602b355c6c0c6ad68eefe3c26de9f1fac7a6dc44f9715bbbd86f8 SHA512 d925fe6c118f212868967cf1985aa70ca460bf4e3486d58be689e05ff6368485b42cc9a4ae1d5ce40eed38be45678b11d399a26000ce35d6e5ad218fc7d022ed
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
 DIST github.com-syncthing-notify-4e389ea6c0d84e6195eb585ffaf62c8c143306ae.tar.gz 57108 BLAKE2B a0bdc8393e17823b0b1df0c5e0b2e39b499486e6f00472cd273409b361d9bac4c3cbcdf4e0c95c8933d5a9e313aca6121486d747b785002cd504ddcc36847abe SHA512 55988ceecb308c896c8a5126bafa5651e4ac2b3b265dc7a2dba0820a59bb6505260d1fe422480785943ca877a589e52a16320e6c52991d50b5c2c522a88562b8
 DIST github.com-syncthing-notify-69c7a957d3e2.tar.gz 57113 BLAKE2B 42a861aa4b4faf69bd3840d0ac6d92281d9fb184a0f91f1ba6a3621f714965b3c4707164a04bbaf1c89f8ca6b9e66b0fed3b2c55c86d8825ed93781a49252103 SHA512 2607daae1df1b9f5d1f1fac4d84180444c6c1a590bbf9e768a71af76114263ba7365c0d8f7a43e7e4f0ab872f09094685f872b3e0d5ff4ba54cd97ad9d4ea3a1
 DIST github.com-syndtr-goleveldb-34011bf325bce385408353a30b101fe5e923eb6e.tar.gz 137733 BLAKE2B 42f9979a3f062b6cb86512ab8ddb88c3a1c9922203eccf9631c6387b8caa4c9ab88de4b9e34f24b053e68d9a85bacdbeecdd01aa7857a0ce4c92335de160c471 SHA512 e15f055d967534432569a8b1a265c09ec82f49b284706c063c708cdc4321abd1a5af7c5f7f2d34bbe8b77a08f14103361869ae2ab74abcebe7157988d9a7e1fa
+DIST github.com-syndtr-goleveldb-758128399b1d.tar.gz 148624 BLAKE2B dc19df2b66de5f03e5ddc8f9e07cc7a3a83e69df21c4f072f481db8873cf5524607cf1f1f95bc5121cd94892c078227a8caee61b35fb1955f8ddc818cf310406 SHA512 204706f31955eda14214a87910eb5cefa2408b6a63338c439bbd7d3eef7e768380f1b51df4ba8392cdc7b2d13bc34942f7e5410ea760dc4f42dc039b91a62080
 DIST github.com-syndtr-goleveldb-c3a204f8e965.tar.gz 147696 BLAKE2B 22156bca1e2056f512defe2ec5d52a3e2c0e834c5e347bfc3ae64af3e97153d25aef02db7ac72c3d7db8d5d5bee7716a2c1e4f22b70b3a7ad52ce6c99999578a SHA512 8a0639bee268989fa8b5d76b3795849b4f104c05e11baff441b3b213016e622586a673a6484c2a463fecea78c2e7306510d51e08d1726cd1bf6bf929f25c8530
 DIST github.com-thejerf-suture-v3.0.2.tar.gz 18047 BLAKE2B 6b6915ca6db2a8b8e8ae5f34150b862d16b2b82227c25022e7b5f258849c340d57d345a1b8cb87fc14ea7eb36b72025a55b2844270c01830e68bb2177b5dd82f SHA512 08780cdcd8d2a86fe1c42f80a0b7c05ab1aee2a1aef4caef462111bad65a28dbfac2c05f7339de80b698f7b22609f19b52588ecf4d4ea0e971e0d57c55da78e4
 DIST github.com-urfave-cli-v1.20.0.tar.gz 58397 BLAKE2B 0f623bff26139e57f29a2939c70ad8ba0c8daaf3721cc6f4d061fc88209102b1ece790dc0772f5fad66649f1129836482feee20def3dc0d63e728020664016ec SHA512 0a47a47121e25bceb6ebdf10a55ab3bc7531214284b1669fe20237c3ac938c7cd154ebc408759202d936688350e27e47d14f6a6b0793271c10534f2e90bd1fb5
 DIST github.com-urfave-cli-v1.21.0.tar.gz 68419 BLAKE2B 4fe7091cfe3dd58d1c73d7ade84c70efbfeda354f8dfeb1cf7572b8792ed15c14432b4815107aae900a7d45e08a81dd261c97edac1a94a2e9557c3e595824e20 SHA512 8bd1dc64220eb5388da99a9d98971097b7e64dc054cdaff54c86fd427667962aa8add7edaeb045d17515bb15df885c369f939a5d374e8bcc010c7f0fdd554763
+DIST github.com-urfave-cli-v1.22.2.tar.gz 76132 BLAKE2B 983e24389f664405f5d457ca41f025a422c951a99a22b45ce222ea233acc976035d3fbd6757d7bf8ae7b4fd579d9540de83500ce8916247c5884b1f435a48efc SHA512 68008c7187f95747d3fa931613174536fb5e0b72a84e5561820fc8f9f44c1fb867d471ac9972648973d801046b14a7dde0e24c5bc9cb87cca8785f9eb0edfef7
 DIST github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz 23973 BLAKE2B e272dc6a3f433d0b1479438a251561071e32a25f83784350f25cbbc0022ee1b23da4cac21e2eba76326ffd2838e93edbba816e593ab2bb3b703fd2c1ae65f15d SHA512 cc7ae47017191bd71136796334dd77b9f90e2564d348fa2c03086b593fb73f07cbd5ffe48f3d43ea2f7f32b64ed10f3a095013b27ee6afc25d08eb60f99d72a1
 DIST syncthing-1.1.4.tar.gz 4700261 BLAKE2B bf766d7d3701ac66d0d4ac266d9b4a9f02b2f97a6fa320b192f3e46fbe9055091ea5ae71bf405ccce4a9665efdf41477098af3b98562ea06bf0c4f828653bd51 SHA512 cb57cdf6bbab0147a700f72e800cddff0855835280a176883089e5e1dc06352e0dacf615569a35b16f98a857651f534c915f369c46bb592d416d7a01efe5b5ba
 DIST syncthing-1.3.1.tar.gz 4753853 BLAKE2B b0e4a3b435ba08718203b7009586f5c360dbeac110fc2a9755ac5202bc689c634fb0e31c861e16f401326ec7e99aa2fecb671943e5da27202173f6d70616bafa SHA512 a5f5de85d719379c6d312fa1051d6a0761e3ed73014c8e5b95b26bb0ab264a48f114d210a46f0e990b0535494873a5997284a6acaa0337d1f082bbcd847ab664
 DIST syncthing-1.3.2.tar.gz 4760240 BLAKE2B d24dbf55c404bf14a90df2e250f58dbbf9724abf0f661642513b2b22402fe8202e63465d9cf48cfe55c55de0eb914a10006149692dd9230a969c399e4c0ae714 SHA512 e718cba9a727d086894270fe0e91b1a03d2fde14c0c0b19d8fe6e82b6c9d9f493adf5371d5e38e00eda131a77d4392f8dc3f4d32761eba24102373e7a8f51b5d
+DIST syncthing-1.3.4.tar.gz 4785353 BLAKE2B 01ea21d207fd8d84d28b03125f6c3b2071a458b7e2fd611d31ae3b24e0eb38e9b28afed7b2b15272a362394e3b6d77e3385e74b97afe021915211cc394422b5b SHA512 1584e0856a7c559d4e809b171c6c7aa0cd01ca94a513607bc3ce6543a82ecb454647c990dfed221cf9d3d566b6c5b522f3fc3549aefbb0487111ecf54366f8b8
 EBUILD syncthing-1.1.4.ebuild 5974 BLAKE2B 2115e3d26f93044b48cc361b0b65be68ba9624a24fc14e6c7272ecd675d02ce99bbf6cf978a9e7d806bb5b504edeae5ed1f8843e7cb21ceab03a65a4b66aa2f9 SHA512 d5feaccbca635da35adf513f98dcc2a12cdb94279c9befd1d98acfa81372e7f9ddada2acf93050e4e6c1eab1fda087c10502c7cefd4eda25fd12273e99f5e59e
 EBUILD syncthing-1.3.1.ebuild 5627 BLAKE2B f36fb0b8d92ec5bc448ed96123b414ff27820e2a5f2b11dd3d6476b31ade267918be27896aee576115bff52941e6794e639e18172eaecfca530f1d1ba61f1693 SHA512 049ce757f54a1786fac4758ea108471ba49218d45f9d7900c460d4c6041a2f7abd15c0a66c29ca9ef2a180e9397a5f970a5bfda9a8af427315e3f5b765c34ee8
 EBUILD syncthing-1.3.2.ebuild 5325 BLAKE2B 066e0ca1956f3325f73b7ef041d0bc3d6dc246819e5b206f92cd9202f5934bac14c958cd1bb5605466880213224df4f9b7b9e28b59c659d2666ebf4f23afdd7d SHA512 5cb31bdaca335412986ec89ee6bdc04bd4754c0af6ed9f6dfc02f13a63b7e7c9ddf186201d684191eb7f1b4bdd229ce97c72b0f7e16e5127656531e0a29f1f12
+EBUILD syncthing-1.3.4.ebuild 5131 BLAKE2B 0407a94891fdabac6ff906990d2de3ab1e03ebe494aa80b8cc1afcb03cd53bd4eeb15329eb17610c647a8ddbbcc603bf294890a29ec8a6e4463753f01e3d2086 SHA512 9f413d465a307e850fdb50ac5031278596dcd1b4f395916292810f330da6e2f14aafe470f8f5129c438b43b356b4a79d4c4cb6932e300a8956b83024c6a108f4
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.3.4.ebuild b/net-p2p/syncthing/syncthing-1.3.4.ebuild
new file mode 100644
index 000000000000..fa26ff21ccfa
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.3.4.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"github.com/AudriusButkevicius/pfilter 0.0.5"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/bkaradzic/go-lz4 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/ccding/go-stun be486d185f3d"
+	"github.com/cespare/xxhash/v2 v2.1.0 github.com/cespare/xxhash"
+	"github.com/certifi/gocertifi a5e0173ced67"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/chmduquesne/rollinghash a60f8e7142b536ea61bb5d84014171189eeaaa81"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0 github.com/cpuguy83/go-md2man"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff"
+	"github.com/getsentry/raven-go v0.2.0"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/golang/groupcache 869f871628b6"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/jackpal/gateway v1.0.5"
+	"github.com/jackpal/go-nat-pmp v1.0.2"
+	"github.com/kballard/go-shellquote 95032a82bc51"
+	"github.com/lib/pq v1.2.0"
+	"github.com/lucas-clemente/quic-go v0.12.1"
+	"github.com/marten-seemann/qtls v0.3.2"
+	"github.com/maruel/panicparse v1.3.0"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/oschwald/geoip2-golang v1.4.0"
+	"github.com/oschwald/maxminddb-golang v1.6.0"
+	"github.com/petermattis/goid b0b1615b78e5"
+	"github.com/pkg/errors v0.9.0"
+	"github.com/prometheus/client_golang v1.2.1"
+	"github.com/prometheus/client_model 14fe0d1b01d4"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/rcrowley/go-metrics cac0b30c2563"
+	"github.com/russross/blackfriday/v2 v2.0.1 github.com/russross/blackfriday"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/shirou/gopsutil 47ef3260b6bf"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/syncthing/notify 69c7a957d3e2"
+	"github.com/syndtr/goleveldb 758128399b1d"
+	"github.com/thejerf/suture v3.0.2"
+	"github.com/urfave/cli v1.22.2"
+	"github.com/vitrun/qart bf64b92db6b05651d6c25a3dabf2d543b360c0aa"
+	"golang.org/x/crypto 9756ffdc2472 github.com/golang/crypto"
+	"golang.org/x/net ba9fcec4b297 github.com/golang/net"
+	"golang.org/x/sys c709ea063b76 github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time 9d24e82272b4 github.com/golang/time"
+	"gopkg.in/asn1-ber.v1 v1.2 github.com/go-asn1-ber/asn1-ber"
+	"gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap"
+)
+
+inherit go-module systemd xdg-utils
+
+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
+	$(go-module_vendor_uris)"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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 )
+
+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
+
+	# As of 1.3.2, stupgrades still fails to compile. This command was not present
+	# in releases older than 1.3.0, is not compiled in by default (USE=tools
+	# must be set) an in any case we do not really need this, therefore just
+	# get rid of the offending code until upstream has fixed it.
+	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
+	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
+}