gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-p2p
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
71 files changed, 504 insertions, 984 deletions
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index cc4d9e7e1576..77d319a174d9 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 df114bcc5688..fc0fc7e238a2 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 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
-EBUILD airdcpp-webclient-2.6.1.ebuild 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
+EBUILD airdcpp-webclient-2.6.0.ebuild 1432 BLAKE2B 85b65ba33e707985aa89695e367a7aeb0e5281074a5c9513fb964ebd05d82dd6a5bcb24e08cfa3dfe2ef75b67ec2b79d64580855fc38f0c9d61b45cb4203d538 SHA512 699e273529acafb182e54133361b8277bf7b7aa38041083ecaa67151a38ca552656bb61551e6b8353a6b30d44a19a449e0e2c3cc09881439ed2e042451c63263
+EBUILD airdcpp-webclient-2.6.1.ebuild 1432 BLAKE2B 85b65ba33e707985aa89695e367a7aeb0e5281074a5c9513fb964ebd05d82dd6a5bcb24e08cfa3dfe2ef75b67ec2b79d64580855fc38f0c9d61b45cb4203d538 SHA512 699e273529acafb182e54133361b8277bf7b7aa38041083ecaa67151a38ca552656bb61551e6b8353a6b30d44a19a449e0e2c3cc09881439ed2e042451c63263
 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 647a9600c515..380aadd6adaf 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{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 647a9600c515..380aadd6adaf 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit cmake-utils python-any-r1 user
 
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index fdd9fb3765c8..c5f833a73566 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,3 +1,4 @@
+AUX bitcoin-qt-0.16.3-boost-1.72-missing-include.patch 700 BLAKE2B b115726fd0c658c7825ea7e3472df8e91d83944bfabcc5e87b5a9ce1d79ff78655197ef73c53f6ff276b71e64fe6a330465009eee93c894036d271ea5692d692 SHA512 f59044fcf7cb60646c473620ebdbb3318b10224cc4155686678203bd7bbc066b2c9ceb450837c3ddb03b388f5fe7c4b55ad646991096fc01244457e23c4893de
 AUX bitcoin-qt.protocol 150 BLAKE2B b18645f52a6884fc0e475a85809d5b79e207adc346307623c5f1edececcb4564ac17bdb9a0deeb5c12c41409a34f83c1f22ab89f32852c58d948affa1de57edb SHA512 6b71d9d3fc9e05e6c6595aaaa307be9b5007c25f4b11162c5d873e200576d35156c2c660f229799400a3fba6dc8a9663ff8824371d83242d52ee6472687118ab
 AUX org.bitcoin.bitcoin-qt.desktop 468 BLAKE2B e00d41612be14770d1f34b83f98a104aed197eb62707382a0189c5b9559f572336e8d236dcd290e1a4a43df041bfdef23209e1533401659228af8b004c9b3d76 SHA512 0cecb04d7813bcc0e5c9f1a5dfc32859708d3524548f6dcee33ba9fd600a7000f64b3d5f2dbdc1dcfce0a68fd82ea932b338da77ad495ebc03b097f462a75d88
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
@@ -6,7 +7,7 @@ DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a1
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 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 bitcoin-qt-0.16.3.ebuild 4899 BLAKE2B 4caf32f186e2d813e5722d3d649c03529c7b2991029d7fe690e8aeea912069d97ea450f7fa0439aa8510656182b516298b6481a805bca362c8f4fa4ff58cf787 SHA512 4fdfcd74e61850ff27aa18961d868823e2ababfdf50a61af2491582def60e0180be48f2e89d52618f249a36956b6a518fb133d5380327defe9a2f876b1cbb67f
-EBUILD bitcoin-qt-0.17.1.ebuild 5051 BLAKE2B b223c6d6eb551593aaa5b79be3dba21d520e5c1f1d9d28edc7b1decffa84463a0d9df3e98ce70b24e96651106c81f9152a88ea6cad6b5b8edcc062fa5f853174 SHA512 eab8b55218a03f319ee3e2fae20819abd579266c5edc3ffd40b077c04a166d4ed792fd383c1fcc89fafadb81e02e6b71c08b53d686cee52327f67b691e8d93aa
-EBUILD bitcoin-qt-0.18.0.ebuild 5187 BLAKE2B 91f92ab7dce54e10fc62fe5e1529d08585e7c60565c45ecbfd0e62508444db635ec8f4f9870dd543d8066dec664d653998ea86db70d871c731a9323ec9320a5d SHA512 885e7cdd2a97d09a1fb1456697a047450b9020a3a24200e95731bdb1e4708ba3a58e95aa88ad4aa767d9061b63cc37c24c53d2f6921157af9b60780fb1a02535
+EBUILD bitcoin-qt-0.16.3.ebuild 4967 BLAKE2B 9c17d4bfd817fa0bdc218d6feef51af69378d8e1f3475c2820f31238f0f4c250d2eee208315f0e194b0f3d662b49cfe000bd7c8305773dc53d5f50d39145e742 SHA512 970a8fed13a0fdf88c9c94b98f0984b4a0138ab45ec6f8e74f7600d4df0abee381e9b206c41188242f6556e99f4cf30f0322b4062a88b5b19f1e3a4b7e6a3e89
+EBUILD bitcoin-qt-0.17.1.ebuild 5119 BLAKE2B 14498aef2e20fbf2e375c0f1c01e7323742d12d4696da6eeed29caab2dc3432201c60fa920d0bc9320f532993eec548fc4ba0cd3f65db869b55ad8a6e3e3a6fb SHA512 b9c0a9fe6e1a139766d46f13afecd5c20a6b5266ddd3c25f60c4067ac64fd075cf7c5dcc74157792e32c12c96a13f37baa2af306a9ada7418ec79fc3984ddbb4
+EBUILD bitcoin-qt-0.18.0.ebuild 5255 BLAKE2B 8d3d0363985b822d6dc1d512c6e0ed228288288875c790c4f919f4db5e6083412ae46a876f4111fda0c3cb22cc20036a7ec14b1f7070c70b46b4f7bb2ddffc7f SHA512 5ef943897c3a8d0e1324c97bbe8dc88b1406a93995ea17b74016eb45bc5bf5fcf85049db983b703c43b3cfeb80028a9e4ad3674770e901973ad4660038fbab4e
 MISC metadata.xml 1390 BLAKE2B 2fc9611a5a3839183e28be1f49f3eebf3c01ba0097afbcbf2c587e53edbe9ec9973dc65b834d479e8870e9094cc3fb1cc3fda266818f7b6e209079f4c576b6c9 SHA512 a5d9727f4cc019d475f625d705c08f26958d5118d4433a9245e73ef4eb2ff7ffe840630de334c93df7107eecf3adf8c7782a85b7c35690c1c073ff489548ed70
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
index e6d5e30a9323..0ee413a509bd 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
@@ -87,6 +87,7 @@ src_prepare() {
 
 	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
 
+	eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
 	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
 
 	if use knots; then
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
index 28c1e57132f0..1ae0e2eadb77 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
@@ -85,6 +85,7 @@ src_prepare() {
 
 	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
 
+	eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
 	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
 
 	if use knots; then
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
index 0aa8b5e10796..5c4928418151 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
@@ -85,6 +85,7 @@ src_prepare() {
 
 	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
 
+	eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
 	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
 
 	if use knots; then
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.3-boost-1.72-missing-include.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.3-boost-1.72-missing-include.patch
new file mode 100644
index 000000000000..b553a245806a
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.3-boost-1.72-missing-include.patch
@@ -0,0 +1,24 @@
+From a5929130223973636f3fd25fbfaf2953f2ec96a9 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Fri, 25 Oct 2019 13:05:17 +0000
+Subject: [PATCH] http: add missing header bootlegged by boost < 1.72
+
+httpserver.cpp:74:10: error: no template named 'deque' in namespace 'std'
+    std::deque<std::unique_ptr<WorkItem>> queue;
+    ~~~~~^
+---
+ src/httpserver.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/httpserver.cpp b/src/httpserver.cpp
+index 81137771871f..d9c711332358 100644
+--- a/src/httpserver.cpp
++++ b/src/httpserver.cpp
+@@ -15,6 +15,7 @@
+ #include <sync.h>
+ #include <ui_interface.h>
+ 
++#include <deque>
+ #include <memory>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index b48187dc8b26..d7a6cfdcfcae 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,6 +1,7 @@
 AUX 0.18.0-daemon-fix.patch 470 BLAKE2B eb390dbe6a0093fa1e977e55efa7e562b67316c6c5b247359da1effc0ff0d7057abd67189a232ba0fdca79328e5d80dd1fa6b9a609c8d4bd820ac3da3b994bd6 SHA512 9f3f85d1f2b5e8dc2556a5a2bc246ef5eaa6305ab10aacc5ca5bfb2f52d9d21f2c52fc6bc0e5c34221b8bae4daead2e8edf13e69878eb59bfa1d3580df84b62b
 AUX bitcoin.conf 80 BLAKE2B be9f776453fce1081dfa95fd844089d51e8212731d7bb460256a3b258b5369fe14b0bd19af15d9c360fbc07232e8718056acd829e03138a326faba32ac42e4da SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f
 AUX bitcoin.conf.5 1438 BLAKE2B 8664545f78ee9e48a9c9ea2d11f54d7320d205182f6b81f705262826f470e0bf9c86fa3a93aab81ccb1dd139bd01cb399a7b2c6a37109cc21aba5606ca9bc593 SHA512 1dd9dfdfb530d1bfb20bc84590034ab6902f25714b3c5bfa2418ad27515bc895fa16968880ec326641f0e58f9364e666764972b5a8782acb2e7494207d629888
+AUX bitcoind-0.16.3-missing-include.patch 194 BLAKE2B 9e445cc1e6db76fbd6353eba59b15344b0df82581683ef5432b41faa5a31b847920d84c07de1af95f75d234f2394aec7feb8287354a32890d951a9375165b605 SHA512 236217e8f75974d57b7ea525f80f0840e1a5ecf5ee579422c01ab8eb195e2e62722a16426726ea66609de7b2c255827e2debe43aa13a2fd6c8eb69ce3d84d1dd
 AUX bitcoind-0.18.0-raii_event_tests-always.patch 2192 BLAKE2B 353d38c285eafb335094b7ca2102f8872f69f178bf408f41785d9685a5fc0eecfa27fc3fa69668a551b6dd1eb53fdcd3709a6362a177c53b911fd95152ca5b31 SHA512 8a99721fbe165419129a0b2632c6e8ea6535e1541083fe6ba4558193163567723301d15b16cb9657ce9b999bc2e9d04df4992d6d4a81f82cf94bedc52bc5de11
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
@@ -9,7 +10,7 @@ DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a1
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 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 4872 BLAKE2B ce55ed47b10e8e9ed864b84774afa9941fddceda43503c8307d3b5ca937756f296631dd60e7f95007d457105f011ef36438e68a904f00a72f35224b51cc5b96f SHA512 57c1edf677c9f944445c91e59998f548e00157ddf3648a20f7a4a46f30fea876f2e499e04ba1d604052c91007c84ddcb61c760b5a8df96b6e5b2cad0dd62da81
-EBUILD bitcoind-0.17.1.ebuild 4949 BLAKE2B ac286880adf9cfa813baf458177c331ab5207c974bd941891260c10b0bcf2e517e4bb285bd5f6af195bf315d37b5d4e42cb868d7731c4c964779eee40b29ac2b SHA512 87bd022955a7c2e4fce1a28e49f7e3f26936806537e0cefb63ae0879e92dbd39dd96943bbb60e645e60ee03c88926dd37168a1b875afb20a441fe684f10cd05d
-EBUILD bitcoind-0.18.0.ebuild 5190 BLAKE2B 1dc826611b26271ba81094be25828a026e9f9d201d5e23cd993f92b468f2a85d118f041949d3e3892849c3927eb1ae0a319f80b740a43bb340de926a449dc9e2 SHA512 b035c5a725ffb851051b8f022be3a259275525344b60a6d1c96f629c2a1505f4d1d8be93ee3297fdf5e40a8998b5a8065c8ec3425efd894029f65eb1ffc9b63e
+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
 MISC metadata.xml 1126 BLAKE2B c109473fe9b14ded30c783f08664ffdddca59b27905ec3ed2c7af3b367102f30017bf79599e984546f431d9665a33f9fb7a75501a1f37a5212073a3ff6c57ea6 SHA512 8e6357a5c3860a0b0d4440f0f2341a13582a24a1256443b352834aea491ec15f1d7980b7c9b2568aa1d4f5c44dd189934065c23df4bd63199acc6189aebbf03a
diff --git a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
index 9147db4d3e08..86589b99be5e 100644
--- a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
@@ -71,6 +71,7 @@ src_prepare() {
 
 	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
 
+	eapply "${FILESDIR}"/${PN}-0.16.3-missing-include.patch
 	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
 
 	if use knots; then
diff --git a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
index 2f1df22dec83..f8e1efe4331a 100644
--- a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
@@ -71,6 +71,7 @@ src_prepare() {
 
 	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
 
+	eapply "${FILESDIR}"/${PN}-0.16.3-missing-include.patch
 	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
 
 	if use knots; then
diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
index d758ec041969..6b144706f370 100644
--- a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
@@ -75,6 +75,7 @@ src_prepare() {
 
 	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
 
+	eapply "${FILESDIR}"/${PN}-0.16.3-missing-include.patch
 	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
 
 	if use knots; then
diff --git a/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch b/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch
new file mode 100644
index 000000000000..f413c323b92d
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/httpserver.cpp
++++ b/src/httpserver.cpp
+@@ -13,6 +13,7 @@
+ #include <sync.h>
+ #include <ui_interface.h>
+ 
++#include <deque>
+ #include <memory>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 7f33c76f64d4..a1a1cb4b7de3 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -4,5 +4,5 @@ AUX bttrack.rc 519 BLAKE2B 829b1a4cdb29bae41e25e832d7383ea4fda3ec2473d6d9bebc273
 DIST BitTornado-0.3.18.tar.gz 189227 BLAKE2B 96a273c6f1072a19a0853cb0f0c16165432670927588f3422e680580e7d31a76b1b06b8e8a806676eb2f0cdfe0d4c785c389f07cb7a4690feb57cbac9c45c28f SHA512 61a55726d93ddb245e18e47f41dea982b8faa7d3296c3a7221d00e0fe71db772613c3ee113bb7df18390807dda8c77859ed7159a03535446ca417a1344e3c0d6
 DIST BitTornado-0.4.1_p20160925.tar.gz 164352 BLAKE2B 34cebe27ab0cb18a960ef830311ffa47f2064c83768a9a011dcd9e45e9460b60438e159824eaf9cf844d7c5604a9de832e6a85cea3335d9e6223c31e7b349014 SHA512 09971cc5705c421c4440cd51b9aa37da9f8ce992a882d342c0547fe1771199fa61c4924f6d6cd321776f9dcefafd3e244b9cbfce047c4cdd4502dd0a1a1fdaaa
 EBUILD bittornado-0.3.18-r4.ebuild 1446 BLAKE2B 0108039e36d2eb8f7d98e70b25de4bda9ecb57f462eab0891367771b181ce7e2be29332f0241dd6af76668f730a3805c3074737a44cf8c89b92a736928dfd778 SHA512 8271f7e1506e2e2c8026120b2c192c6bce81d310d7c1e2af70d15e58480af7e11d81c9ba679540a59bec869c593edc30b6c4ec5c77f6eec2e25fac0dc0a2b606
-EBUILD bittornado-0.4.1_p20160925-r1.ebuild 1298 BLAKE2B 36fee7b18dbd54716e5cb5a9fbe6ee7d382bc4e75f4b96fb298ca3c8b69816a7d7d7befc67db61cc9d79453c1cc6149b52f630e02dec35a9308172ee408da84e SHA512 b38e0b4317579a2edff16600f4391deb9fd5e3f7a3dd4fd038fb5ac22a3cc859d1ac6304ccf067759e5ff0f3e512c25cca3b651be9bce378d80c31eb901e913e
+EBUILD bittornado-0.4.1_p20160925-r1.ebuild 1294 BLAKE2B fc0c48475b947787b374b20f7647ecb0c799cb2307075f4aa84963ae984885ba9bd3e8bb8f5f6ad980ce6aa0e289bd99f3d1397664aaa19b58d0e19326d20cd3 SHA512 f36052c84ea0b4a9315436ed03cc86b80827ea05af764946f256d2c77c44d197ed35ba264402f50f03227f95e648765f9b62f57cafe0088c20f64e27fbe3679d
 MISC metadata.xml 302 BLAKE2B dee7f2a91d0302a9476d974057446af53bcd7cc74269dde75af61e5d6f824c697b0feadd4014c262ac4350511f797a60db656f45981d037125f0926f6bac569e SHA512 a2ed81559aad97406f1099fba266a7a2fa9d97013f267cfc9df5139ebde26495f103f1118fc0b2af825e281b026c434d11300e545aef9eed07b65eb504b47e67
diff --git a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
index b364a4eed64d..b6c5b54f5fcd 100644
--- a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
+++ b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index b1558d31d434..1ae6eea51aa3 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,5 +1,9 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-3.10.3.tar.gz 1940128 BLAKE2B cf8b591cc10dc5507eef322de397c462a14c2164ec8806ff189a135abdc58314add18d46110d05f6ba365a475632df2bb33f97706454049a9275e08004c90d5a SHA512 cc1d4934fc17cc7ecd1402e9e32fc9caf9a493e3f3e573637036638e10679c19ba4a2e4f83376ddb462c7d404aecf747c0bd4d46e4e934013ad9d53a765a862f
-EBUILD cpuminer-opt-3.10.3.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
+DIST cpuminer-opt-3.11.1.tar.gz 1924178 BLAKE2B 1ed7f07f89c94e7e15ac370e7873e5b37ec45c5b0132c3a8f2772558eb37666f1db41fbf78311f539d69f2b0858ef91478a9b1b469220e09fe07e20bd0147db3 SHA512 af6a70e0e60d7c6ab904fe29f37ba3f18327d9eb7b9700b53c28ca5d4f6693d124b01a9f382f608f4449f5a412ca57216bac354bc40d1793a1f1d40f7191dd7b
+DIST cpuminer-opt-3.11.2.tar.gz 1923535 BLAKE2B 24ee1f4e64771ac1f007fd5934569e53959692f95dfd9fe4a7b38d4d32cbd4d5dd3731a285ad4e9e1e9bbbfd56a86bc9a69de9d5392d6d9a858a816ad031575f SHA512 bdbe99b358e37d8170259e5575f28d0b8c2e7faa6159b389f173e1a74299483ae6c5b2173f7565943f4c36e8e99d436ffbb485e3012f53337599d9dbd004b1b9
+DIST cpuminer-opt-3.11.3.tar.gz 1924724 BLAKE2B 1e0cd26b7400b1d09fcc74bcadedb7da478f8b0be9c4c8ad8ce097e0a4c438068214139e9eb4901f0fa80a3c997ff9bb802788198236aba418703bdfc5edd0f8 SHA512 fd061644b15b5d2e68bca949a67bc6d2eab53e5d309c4e0c6766ccea0e956f49229e385e582144ef2dadf805eeee30a16b7409df3aad3184d68eb03c32ef1258
+EBUILD cpuminer-opt-3.11.1.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+EBUILD cpuminer-opt-3.11.2.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+EBUILD cpuminer-opt-3.11.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.10.3.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.1.ebuild
index 666d27ee1c02..a5d436b3b8b8 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.10.3.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.1.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
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.11.2.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.2.ebuild
new file mode 100644
index 000000000000..a5d436b3b8b8
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.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/cpuminer-opt/cpuminer-opt-3.11.3.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.3.ebuild
new file mode 100644
index 000000000000..a5d436b3b8b8
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.3.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 ebb838367e37..ace3c4d2f318 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -17,6 +17,7 @@ EBUILD deluge-1.3.15-r2.ebuild 4929 BLAKE2B 78454c0525b20a0a521d15bd49c01e556c7c
 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-r1.ebuild 4415 BLAKE2B b1028710ba509fe4e3b89ecb973f5e788c8ac1ed4172954a2f92ab0e8ad43542819d083b82c18f2d58360d49ae1572bd75e7496454f44a665a18606a5bcb758e SHA512 07ac0dd3bfcc907088d682b5f9e699cf70d9dc12d4ffd6690dcd9a54e6b7a5daed81963aa0722f54aee6a3270068acf4913ae009462d9904186069e21971c631
-EBUILD deluge-9999.ebuild 4415 BLAKE2B b1028710ba509fe4e3b89ecb973f5e788c8ac1ed4172954a2f92ab0e8ad43542819d083b82c18f2d58360d49ae1572bd75e7496454f44a665a18606a5bcb758e SHA512 07ac0dd3bfcc907088d682b5f9e699cf70d9dc12d4ffd6690dcd9a54e6b7a5daed81963aa0722f54aee6a3270068acf4913ae009462d9904186069e21971c631
+EBUILD deluge-2.0.3-r1.ebuild 4413 BLAKE2B 86a93914d61d06ed9860ac9873d5e9eefaec800a1957445710b6bdf091cfbd90be4b8a987642c186e9a7058e54fc5371c2d15ffd952903bfaee6269fa755d01a SHA512 f51c986a322af353296ef72cb4465578816bf13aa40f43eb5ff6531269f2403768c2662f5b687484119daf84fa512afc6d4ccbacb5e593bb0e246ea63119ac19
+EBUILD deluge-2.0.3-r2.ebuild 4403 BLAKE2B dd1698b08bc2c722b33c29f05daeab2337016326c8e368126c52efce793cd9a6ec3389f7c721d8ac8fa54e7cc870f711e3cb727a41ca3ef843fc9d399e6b3816 SHA512 ebd99abc0ee319e373d2f697d036b0d68591155b73e99fefbb6e6a1c17c6b347586d6fa26b133d8bf34a3866591997dbde7269df92e4392d3925676b1fa40773
+EBUILD deluge-9999.ebuild 4403 BLAKE2B dd1698b08bc2c722b33c29f05daeab2337016326c8e368126c52efce793cd9a6ec3389f7c721d8ac8fa54e7cc870f711e3cb727a41ca3ef843fc9d399e6b3816 SHA512 ebd99abc0ee319e373d2f697d036b0d68591155b73e99fefbb6e6a1c17c6b347586d6fa26b133d8bf34a3866591997dbde7269df92e4392d3925676b1fa40773
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-2.0.3-r1.ebuild b/net-p2p/deluge/deluge-2.0.3-r1.ebuild
index 9d936b780a05..960cc354e427 100644
--- a/net-p2p/deluge/deluge-2.0.3-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 
diff --git a/net-p2p/deluge/deluge-2.0.3-r2.ebuild b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..fc0402eb7223
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+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 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( gtk )
+	sound? ( gtk )
+"
+
+DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_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}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
+	"${FILESDIR}/${PN}-2.0.3-UI-status.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 -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init" 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 -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/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
+}
+
+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/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 9d936b780a05..fc0402eb7223 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index 8ee96e54e751..b82d7e7a935d 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -1,8 +1,8 @@
 AUX fms 861 BLAKE2B f4ee5f508327c55bf2b5446d85ab51fe3f968c6592be0045a26f4a1a8f4df3e86505a5f9f5f57c62dafb4d11e75229ddd76b8839f6183ddfcf5adcd53016e15e SHA512 82a8202dd7191b8b0dbca7028cdadeb4d62faae3d60d77bc5e799bd0c83d6ad3e6a7bb0317531b746f7f5f4851df4439edb90b155587ad6631c1b1b91ac18a80
 AUX fms-use-system-libs3.patch 1380 BLAKE2B 3c2c5023b83099a5a90a5e6b8f583e7d1479e47080e543af525878b79b5c2d9101e2f69aa95f867a24959d1d404bb2d1dfa70c930db814f3bec2aba3ec03ad50 SHA512 5eaf4f455a1b6b65e2f71a2371382710d435a2fdc7379244019951622dcdd8ed6677c0fe3061aacff419cc186a8c8b0169f1949445c6af8bd2577f57051527bc
 AUX fms-use-system-libs4.patch 1343 BLAKE2B b45a272f24e0b738328e7d901699f4a5a9e4d9f8f2d564d28d85e817ed4fc8165cebdaa150ecece8c88197d2b5bb7d31a690f84198bad89e9cb7df63a5d57f65 SHA512 36aa556661db38813021e6e4ef2ebc6f3b4e06aa400f774281766579fa21da9583d87a27aef3c7b68c840bec7c69b99aebd237ba25c42fc5732a66b10d4ed20d
-DIST fms-src-0.3.79.zip 3847775 BLAKE2B e6087ef6e0e22f79e3d399f08ed531e839faf8199bdb3d0c0e148553dd6b7cab9dd35dbc74081a628d4456fadc4f9dd83a7a767f1dab8ac511f94eac1685d2ee SHA512 aa9f505c5ef55b1f462b16de6d870d02dc102fd184cc353c6c6b8a346978a9953b34e878f262f4190a3d15d76c5a37f065c4e5ebdbc0e43a4a5c22d61fa9fba7
 DIST fms-src-0.3.80.zip 4583891 BLAKE2B 363fe148c622d999398d2f435f49e312d3bea22ad6b69865a618593616b47b632c1a56bcc8fc75bd40590e3858aad7e3f1d70991a21936e38562e10f1813b49c SHA512 d3aa5eb7d417bb135d88a515702fac9c451054d071374bb7f475add9af7e1fda90f4d9c61569e3e9040b2a241efa7fcc7ecac32a7f652327d15ed8d1ea1418c4
-EBUILD fms-0.3.79.ebuild 1870 BLAKE2B 4a8096cd5900dcf32c4c7467718d57474bac83692ca74214fc291a0479c85cc6d7b755a5856680d72462ac22c67891c0b4a9f84f3d3ec5eb4364002bec3d23fd SHA512 82ffae8e51793be6a1353b75ad8cbb2427e9a5bfee25af163e9419035c680f4b82615f855aa9477dcdd55d9ba05b06a288805a01894d0bcd10c612c99b2cd61c
+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
 MISC metadata.xml 394 BLAKE2B a6924fe829c9abc8b3a04106d30b34af326d4596eb5bc9a96165db2ba1993a4157fdecfbeedc0f0a27b75c6327b501a67de3e46864ec4d7fe6211731fd2e121c SHA512 f4943a8b16ff6b031cf95eb5aaabe12fc18abc349f566fc7d4a4eab155ad917e9d49ebb5fcaafa0e36239d772d24391f1489ad71649ff33554f3a8fb6bdd69b7
diff --git a/net-p2p/fms/fms-0.3.79.ebuild b/net-p2p/fms/fms-0.3.81.ebuild
index 60669d4aaf80..125c6be8d35b 100644
--- a/net-p2p/fms/fms-0.3.79.ebuild
+++ b/net-p2p/fms/fms-0.3.81.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils cmake-utils user
 
 DESCRIPTION="A spam-resistant message board application for Freenet"
 HOMEPAGE="http://freenetproject.org/tools.html"
-SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
+SRC_URI="https://dev.gentoo.org/~tommy/distfiles/${PN}-src-${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="frost"
+IUSE="frost ssl"
 
 RDEPEND="virtual/libiconv
 	frost? ( net-libs/mbedtls )
+	ssl? ( net-libs/mbedtls )
 	>=dev-libs/poco-1.4.3_p1
 	>=dev-db/sqlite-3.6.15"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 S=${WORKDIR}
-PATCHES=( "${FILESDIR}"/${PN}-use-system-libs3.patch )
+PATCHES=( "${FILESDIR}"/${PN}-use-system-libs4.patch )
 
 pkg_setup() {
 	enewgroup freenet
@@ -32,27 +33,29 @@ pkg_setup() {
 src_prepare() {
 	rm -rv  libs
 	edos2unix src/http/pages/showfilepage.cpp
+	edos2unix CMakeLists.txt
 
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	local mycmakeargs="-DI_HAVE_READ_THE_README=ON \
+	local mycmakeargs=( -DI_HAVE_READ_THE_README=ON \
 		-DUSE_BUNDLED_SQLITE=OFF \
 		-DDO_CHARSET_CONVERSION=ON \
-		$(cmake-utils_use frost FROST_SUPPORT)"
+		-DFROST_SUPPORT=$(use frost && echo ON || echo OFF) \
+		-DFCP_SSL_SUPPORT=$(use ssl && echo ON || echo OFF) )
 	cmake-utils_src_configure
 }
 
 src_install() {
 	insinto /var/freenet/fms
-	dobin "${CMAKE_BUILD_DIR}"/fms
-	doins *.htm
-	doins -r fonts images styles translations
+	dobin "${CMAKE_BUILD_DIR}"/fms || die
+	doins *.htm || die "doinstall failed"
+	doins -r fonts images styles translations || die
 	fperms -R o-rwx /var/freenet/fms/ /usr/bin/fms
 	fowners -R freenet:freenet /var/freenet/fms/ /usr/bin/fms
-	doinitd "${FILESDIR}/fms"
-	dodoc readme.txt
+	doinitd "${FILESDIR}/fms" || die "installing init.d file failed"
+	dodoc readme.txt || die "installing doc failed"
 }
 
 pkg_postinst() {
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 858bdba56d48..72d72070ffc0 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,6 +1,4 @@
 AUX gtk-gnutella-1.1.14-statx.patch 967 BLAKE2B 73cc687043d2b932b8e36d69c935c84a6668a28902f9ce8b060679ef1e567958053d5e565d1087ada4a590547250bf6ef7b9daa5e8a6b66cdbc275bb1a3c2941 SHA512 fd2cc3d0486efe526b9764d0d6c5bdffa08c344fc91f14305d0b16b957353ca38a23ff873cc669a49f67fd416b79ba38c288cda080ebeac545ea64e40634596f
-DIST gtk-gnutella-1.1.14.tar.xz 19372716 BLAKE2B b9caf1eaa79ca9c9e4d6a036f438eabbbab59a2d94a5227aee17ef9e9551af8185c3049247ee2e53ed913cbb46fafc6841d84346928490b380e16ccf5d27cc4e SHA512 cf8d76a5d531ad26e6155aedc2099f86ff91f96c4587bd6910e844fb6d19d35b48e3d1c4df45b7c68b34f4afcf2ce507943d73a33d923a97f6c43dd9c9ce10c9
 DIST gtk-gnutella-1.1.15.tar.xz 19606508 BLAKE2B 3c699f2c5e8b6962265c9fc9bc6720d740c447afb33bef8968e8c8f1f7ec8b88ec3381419cdcee8e2ec8f4e10be2c6e5707d5f89365f347a33990fffd0f18395 SHA512 6b2bee08fba463b66890c8c5d7f7815a8cc4106824e598bed8cffe4601b1e591fc14903ce8d587815257f795c854d459b3a4fa7cc90de2fbc109daef025e5968
-EBUILD gtk-gnutella-1.1.14.ebuild 1925 BLAKE2B 6b61266bb7cf37a7c1ce8b28775a9d0f9955e5df71ce3688288d475032d3ae8f10d25562006412a10d7f08137098084cfe58bdf23c2bba4d94dc3b83a8f824f8 SHA512 fcb3011c1ad0140a116e019d0496b79a4e15a4942525cfb4ac452df4ebb7b86799a6095921e1a76112e463d0d396ee71419f2d12e2513e372b32fe92672d9460
 EBUILD gtk-gnutella-1.1.15.ebuild 1884 BLAKE2B 630d1b1137338d2594e8f2f01d5b76ab376a22e8c0e03f0d79f8a885521946ad93ba4b790cad68cdb040bba85f069172603c7a3f59695500d826a746bd623119 SHA512 afb48864c3d9a1855019b2829dffcb8d4d3a433f9a46e7390a1e98536c5362d31ceced35fd3c3462a1690c7e8b628d7ee58afc8b77d1f3f93d74bef8d49f463d
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
deleted file mode 100644
index 1996dcafb443..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 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="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	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() {
-	eapply "${FILESDIR}/${P}-statx.patch"
-
-	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 d737fd87eead..1c4d917a3689 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,11 +1,5 @@
-AUX ktorrent-5.1.1-kcrash.patch 616 BLAKE2B 3293f03911337f447b56ec7bfff36dbdfc4bfa1ed39b06f58522c3a1d31cb87d1df47fec689090eb77927cb14956df3e127d70a8b633013d75ddd6ac2db5ed96 SHA512 c4b2ce42fc2e9048ec1137d522b22d5be8a96e2e73e6b2506d1e9c640403f3fb7ef67c54881975d90907b8324cb04e8a8518a4de4840299ed54f81b415b2d4c8
-AUX ktorrent-5.1.1-kdehig.patch 1320 BLAKE2B b34d97f8e55358e97a898c6c4e0b88040a4965a11b3d0ca3904e51d529912265887cdfc4c57200f793fca41495d2ec31511ef1bce987c9ff3ac0579ea9ab7527 SHA512 fbfedc1fc9d17cc4705f66b03853e749b693d6a9477981d6564735a6cf3711b7ff237c0728a300ac8c63378c3085073318ae89da8cfb7f56c854910bdcc90fca
-AUX ktorrent-5.1.1-missing-header.patch 609 BLAKE2B 9d27522bb0309775dd330447993ba13d6b2730de74a241ebf091b9fe96a41fa157bf34ac4ec95820ce285c7305f8ebed9010a74af82fc8a26116bb68a95f60cb SHA512 571736ad190d2e75e5d6e1457d688e177388477e346e18f37c05bc74b9d97d3834897d0352b09c6469f3d5e996b093b827ebc0e5054005b8cfa5a5fc5b9fda16
-AUX ktorrent-5.1.1-scanfolder-memcorruption.patch 2244 BLAKE2B 53efe0320124f954adff60144981d740e5cdf45ed4712fa43f112bb6133fb24b4303e6f969d9a73598525dea4f6706c22e57d2e5c7378c69e494dd924360a307 SHA512 8d3868a6f75e2f53fa11762378a676736df09e14e6fbde04f0dcfb45eb56e8b739d17b3ea96af4be21edb22edad610982865b33508847f07ac2eba744f62ae5e
 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.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06
 DIST ktorrent-5.1.2.tar.xz 2048604 BLAKE2B 761df1e0aab5c4457311ae821a47ebf7b5b82b2839b4bf238491231caa213370cc649a1c0cafd332b42bbb84230f4a313e5172db722ff3c7af81c0daba450a98 SHA512 b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621
-EBUILD ktorrent-5.1.1-r1.ebuild 3192 BLAKE2B 5d0e9eb5e8a38f4f81c1928158f96973695f179fe7e423317e00959627ea2b66547d1ad043297898dd06ddb230735c1999180c3b43e7385d44689b4b74053ace SHA512 ee10006a6f529e1860f9499cf85df90e19ec8f2c39d03c714465e8a72104bfd82ee09b062f56307c9483f579d1df646549d2bd17df4a77f62e4b9ad3cec31899
-EBUILD ktorrent-5.1.2-r2.ebuild 3116 BLAKE2B 82308ad33f720e1227de906fd5d5d43040ca14010d49ef9699f80810619a825eb9e6f86d702ff9299b4bf96cc46c60f042c907dada286fe8d160c467e8c3c274 SHA512 42a9685512c197308bc791574cf2c6936d81ca4abbf0b9804aae513550059d9c1605852985972d5a6cc56643b95af17d9ec58dbd0e3148bbb5157396a3804fe4
+EBUILD ktorrent-5.1.2-r2.ebuild 3347 BLAKE2B 5bb90db40f6f451603cd3d0c4d56ce0db5965839ae708830494448aec38fc42fa21b10acc31fa4428af68baee41d3dcc6d7ffc385105b70552d67ec1f356834d SHA512 2d3e7220badc77282b556acaa31722e1a5beb227a610c55cfeabbc226744bc17137de8548a1c4af2327549b80041ae85718cc8eb2b2e1bc3fd2e8293d80469b6
 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch
deleted file mode 100644
index 8beffd97b4cc..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3ff87f67e984e514a968ddf388a4056f8aa2e723 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Tue, 11 Jun 2019 22:59:15 +0200
-Subject: Fix build. Needs KCrash
-
----
- ktorrent/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ktorrent/CMakeLists.txt b/ktorrent/CMakeLists.txt
-index e8c29af..326c59a 100644
---- a/ktorrent/CMakeLists.txt
-+++ b/ktorrent/CMakeLists.txt
-@@ -110,6 +110,7 @@ target_link_libraries(ktorrent_app
-     KF5::WidgetsAddons
-     KF5::WindowSystem
-     KF5::XmlGui
-+    KF5::Crash
- )
- 
- install(TARGETS ktorrent_app ${INSTALL_TARGETS_DEFAULT_ARGS})
--- 
-cgit v1.1
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch
deleted file mode 100644
index 971152298895..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c77b09fe37ac00c86e6ac43db5e43b325fa4d8a1 Mon Sep 17 00:00:00 2001
-From: Carl Schwan <schwancarl@protonmail.com>
-Date: Thu, 14 Mar 2019 23:24:27 +0100
-Subject: Follow KDE HIG by using ellipis
-
-Summary:
-See https://hig.kde.org/style/writing/placeholder.html#actions
-
-@stikonas I add you as reviewer because I saw that you are last contributor to KTorrent :D
-
-Test Plan: Build and run
-
-Reviewers: #vdg, stikonas, ngraham
-
-Reviewed By: #vdg, stikonas, ngraham
-
-Subscribers: stikonas
-
-Maniphest Tasks: T10258
-
-Differential Revision: https://phabricator.kde.org/D19772
----
- ktorrent/view/torrentsearchbar.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ktorrent/view/torrentsearchbar.cpp b/ktorrent/view/torrentsearchbar.cpp
-index 045d695..2e9c428 100644
---- a/ktorrent/view/torrentsearchbar.cpp
-+++ b/ktorrent/view/torrentsearchbar.cpp
-@@ -46,7 +46,7 @@ namespace kt
- 
-         search_bar = new QLineEdit(this);
-         search_bar->setClearButtonEnabled(true);
--        search_bar->setPlaceholderText(i18n("Torrent filter"));
-+        search_bar->setPlaceholderText(i18n("Filter..."));
-         connect(search_bar, SIGNAL(textChanged(QString)), view, SLOT(setFilterString(QString)));
-         connect(this, SIGNAL(filterBarShown(QString)), view, SLOT(setFilterString(QString)));
- 
--- 
-cgit v1.1
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch
deleted file mode 100644
index b574d3028249..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 909215cc912d89fbc8573f2f98e3b433472d8eae Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 9 Aug 2019 20:54:52 +0200
-Subject: [PATCH] Add missing QVector
-
----
- libktcore/plugin/pluginmanager.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libktcore/plugin/pluginmanager.h b/libktcore/plugin/pluginmanager.h
-index 50eaa768..3a04a729 100644
---- a/libktcore/plugin/pluginmanager.h
-+++ b/libktcore/plugin/pluginmanager.h
-@@ -23,6 +23,7 @@
- 
- #include <QList>
- #include <QStringList>
-+#include <QVector>
- 
- #include <KPluginInfo>
- #include <KPluginMetaData>
--- 
-2.22.0
-
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch
deleted file mode 100644
index 4c41a6af11db..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 2d73d5f25a1a364a2115fb1d3262377f7fdf99cd Mon Sep 17 00:00:00 2001
-From: Valeriy Malov <jazzvoid@gmail.com>
-Date: Wed, 5 Sep 2018 20:43:51 +0300
-Subject: Fix memory corruption in ScanFolder plugin
-
-Summary:
-Reasoning behind this patch is kinda dubious because I don't fully understand what happens, but it shouldn't make the matters worse either
-
-Seems like deletion of KDirWatch objects from scan_folder in ~ScanThread(), after said QThread has been stopped, causes memory corruption.
-
-Preemptively deleting scan_folder contents before we stop the thread resolves this.
-
-also mark booleans shared across main thread and KDirWatch callbacks as atomic
-
-Test Plan:
-Without this patch unloading ScanFolder plugin sometimes crashes ktorrent, including unloading on exit
-Doesn't happen anymore with this patch
-
-Reviewers: stikonas
-
-Reviewed By: stikonas
-
-Differential Revision: https://phabricator.kde.org/D15265
----
- plugins/scanfolder/scanthread.cpp | 5 +++++
- plugins/scanfolder/scanthread.h   | 5 +++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/scanfolder/scanthread.cpp b/plugins/scanfolder/scanthread.cpp
-index 0e62768..d7b13e0 100644
---- a/plugins/scanfolder/scanthread.cpp
-+++ b/plugins/scanfolder/scanthread.cpp
-@@ -156,6 +156,11 @@ namespace kt
-     void ScanThread::stop()
-     {
-         stop_requested = true;
-+
-+        // XXX seems like deleting KDirWatch object(s) created in scan_folders
-+        // in destructor of this QThread after it has been stopped
-+        // causes memory corruption, so we delete them early
-+        scan_folders.clear();
-         exit();
-         wait();
-     }
-diff --git a/plugins/scanfolder/scanthread.h b/plugins/scanfolder/scanthread.h
-index d13ca08..fb214a4 100644
---- a/plugins/scanfolder/scanthread.h
-+++ b/plugins/scanfolder/scanthread.h
-@@ -29,6 +29,7 @@
- #include <util/ptrmap.h>
- #include "scanfolder.h"
- 
-+#include <atomic>
- 
- class QDir;
- 
-@@ -88,8 +89,8 @@ namespace kt
-     private:
-         QMutex mutex;
-         QStringList folders;
--        bool stop_requested;
--        bool recursive;
-+        std::atomic<bool> stop_requested;
-+        std::atomic<bool> recursive;
-         bt::PtrMap<QString, ScanFolder> scan_folders;
-     };
- 
--- 
-cgit v0.11.2
diff --git a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild
deleted file mode 100644
index 443883b0dbca..000000000000
--- a/net-p2p/ktorrent/ktorrent-5.1.1-r1.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
-
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
-[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
-+mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=net-libs/libktorrent-2.1:5
-	infowidget? ( dev-libs/geoip )
-	kross? (
-		$(add_frameworks_dep karchive)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kross)
-	)
-	mediaplayer? (
-		media-libs/phonon[qt5(+)]
-		>=media-libs/taglib-1.5
-	)
-	rss? (
-		$(add_frameworks_dep kdewebkit)
-		$(add_frameworks_dep syndication)
-	)
-	search? (
-		$(add_frameworks_dep kdewebkit)
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	)
-	shutdown? ( $(add_plasma_dep plasma-workspace) )
-	stats? ( $(add_frameworks_dep kplotting) )
-	upnp? ( $(add_frameworks_dep kcompletion) )
-	zeroconf? ( $(add_frameworks_dep kdnssd) )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	ipfilter? (
-		app-arch/bzip2
-		app-arch/unzip
-		$(add_frameworks_dep ktextwidgets)
-		$(add_kdeapps_dep kio-extras)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-scanfolder-memcorruption.patch"
-	"${FILESDIR}/${P}-kdehig.patch"
-	"${FILESDIR}/${P}-singlefile-torrent.patch"
-	"${FILESDIR}/${P}-kcrash.patch"
-	"${FILESDIR}/${P}-missing-header.patch"
-)
-
-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-utils_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)
-	kde5_src_configure
-}
diff --git a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
index 95f9bf8408b4..cac1657e6a9e 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
@@ -3,66 +3,69 @@
 
 EAPI=7
 
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+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="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=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? (
-		$(add_frameworks_dep karchive)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep 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? (
-		$(add_frameworks_dep kdewebkit)
-		$(add_frameworks_dep syndication)
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
+		>=kde-frameworks/syndication-${KFMIN}:5
 	)
 	search? (
-		$(add_frameworks_dep kdewebkit)
 		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
 	)
-	shutdown? ( $(add_plasma_dep plasma-workspace) )
-	stats? ( $(add_frameworks_dep kplotting) )
-	upnp? ( $(add_frameworks_dep kcompletion) )
-	zeroconf? ( $(add_frameworks_dep kdnssd) )
+	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
@@ -71,8 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	ipfilter? (
 		app-arch/bzip2
 		app-arch/unzip
-		$(add_frameworks_dep ktextwidgets)
-		$(add_kdeapps_dep kio-extras)
+		>=kde-apps/kio-extras-19.04.3
+		>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	)
 "
 
@@ -92,7 +95,7 @@ src_configure() {
 		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
 		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
 		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
-		$(cmake-utils_use_find_package rss KF5Syndication)
+		$(cmake_use_find_package rss KF5Syndication)
 		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
 		-DENABLE_SEARCH_PLUGIN=$(usex search)
 		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
@@ -101,6 +104,6 @@ src_configure() {
 		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
 	)
 # add back when ported
-#		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
-	kde5_src_configure
+# 		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
+	ecm_src_configure
 }
diff --git a/net-p2p/mktorrent/Manifest b/net-p2p/mktorrent/Manifest
index 7971aab2b80e..45ef5c1a83ba 100644
--- a/net-p2p/mktorrent/Manifest
+++ b/net-p2p/mktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST mktorrent-1.0.tar.gz 23089 BLAKE2B debfdbf2691fd1baa9f1647ef1cd64a4e5d8cbcabd77fb7c8a4b7ec5c1abbf4fa56ae54ea51afc58b0807cde8d525c4ac7106d38576e52a71e2776ba0bfcacda SHA512 f103c8860c008796c2dc604fcabce7374264fd7814237fcad5f9dab0fe10e927b0e2d9b58e7462dd198265a7d83fe30fd68313c7dce4029d8c331a6f2d4622de
-DIST mktorrent-96090fb175f3cef17ae2499e98c2868363106927.tar.gz 24575 BLAKE2B 85f4c1088a5db91ba9bfa9391c82d81c87436a5ee920441c4e05a0e22d535aa1f3c60a0f2c6918a313f911ce9a586ab0ce725212926ad703f7daeaa4ee8b3e14 SHA512 2016cf9c81c6d35f3e482bb5cf8d0083664cee7131bc57f94ba5d0482df7d9b53e49a622035e1e93b6cebb50da9a29d8d00e2a65d3b84a872d98ed51e75a3a8a
-EBUILD mktorrent-1.0-r1.ebuild 773 BLAKE2B 2d2be9f07b8d12e50d14fb7855abd73c86ad881c213da8d53de7c216a9e93b4fb52cfa2d0f825ce147b83871cb3c638fddc556ff67ff24af7d996abd461b7fc2 SHA512 0d0bb8c9cd8c14d7c6ecbd7bc7b59576ad1a1ba2ee27afba9ad2e2231e8fd48d47f657097d27f266ebe5a708e4c1e1cac1f9ddcad00838ccba757b89771e3b84
-EBUILD mktorrent-1.1_p20180502.ebuild 984 BLAKE2B 12ac4b99a2ed57bd3bfd9bf937e8dbf2a8601a24311f60c7ea6a910dcd6748e20d40491ae16b7913df66ec6e77bd6e88d6a0fca35004749822190a33b45dfbaa SHA512 712658efe2504b105091c244e41cdeec65d3b4878d2b9c53765f8f87e38016b9196f0688944a3588996dcbe39319e67bb036c5eaee96d32582a1e03b1bc950f3
+DIST mktorrent-4c221a05d949a3767a2671de139c6014909daf6b.tar.gz 24574 BLAKE2B e7dcc17aca52c8d1f9d816ce3e89bea5c2b1d7759dba6a00578960b253652506b7e61855d769440056aaa6b0719e6856108ca5b80977152746a648862c71e97b SHA512 49ba2697373a1b40829d50d66faaaeb57fa3893e97283ec2844b447b8e4cf2713d7c0e76e49d3893475f5ce298c3215249751defe0f952d2c52df1bf68f7706c
+EBUILD mktorrent-1.0-r1.ebuild 771 BLAKE2B 57060402de8e6986f469b69efa29d7983c656acd06fe2dd689b355f80f99070d4fb81d8c736701bd258b673f15e42fe40466c5abbacc79142138216e2e7dbdb8 SHA512 cff3ed23f2c2e6495de9b92434d0cbaf9509fefa9ac0e258af44ee549824e3c4be9865148ca7d9c011a36fc0f2b9c7e2eae9930b4893f2e5dc678ac188998656
+EBUILD mktorrent-1.1_p20180912.ebuild 1050 BLAKE2B bea81e8d32320c9d7d53a2859012ab6bc80b57c3ae54108a2c08a0e173b11596cfe08c6b3d31a6092ad87170de0eba72457fffcc66af1550cb89eda513723530 SHA512 30efd4fe261ec6f5176993cb3772bb0663e45021238b9d07f2637b8d2a5d7588a9b45d71cb47ce631ae22ab6206b129a1076d59e1274ed1001b75cb207e7695e
 MISC metadata.xml 446 BLAKE2B f5298ced2a3c59bc990eebd8d183815e8449191b11e48e31aea3948944cf67e79ab649922c104a0a644d8f4de6bab044175a2bb64fe3124f4a317fb98be7deb9 SHA512 6dc7c65acabf5e556235a4c5e95d77301d8aa92acf2d82d6c50afe761095637c8f08616d40b6a34270894ba9baf9bfef33f060e3c8fe67e3ee92a9bfad1f68b7
diff --git a/net-p2p/mktorrent/mktorrent-1.0-r1.ebuild b/net-p2p/mktorrent/mktorrent-1.0-r1.ebuild
index fbf7e1b73e9b..d132d68b2e1d 100644
--- a/net-p2p/mktorrent/mktorrent-1.0-r1.ebuild
+++ b/net-p2p/mktorrent/mktorrent-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ DESCRIPTION="Simple command line utility to create BitTorrent metainfo files"
 HOMEPAGE="http://mktorrent.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="threads +ssl debug"
diff --git a/net-p2p/mktorrent/mktorrent-1.1_p20180502.ebuild b/net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild
index 6e9c5fe03dae..40a3a3270d56 100644
--- a/net-p2p/mktorrent/mktorrent-1.1_p20180502.ebuild
+++ b/net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Simple command line utility to create BitTorrent metainfo files"
@@ -11,18 +11,24 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Rudde/mktorrent.git"
 else
-	COMMIT_ID="96090fb175f3cef17ae2499e98c2868363106927"
+	COMMIT_ID="4c221a05d949a3767a2671de139c6014909daf6b"
 	SRC_URI="https://github.com/Rudde/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PN}-${COMMIT_ID}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 	S="${WORKDIR}/${PN}-${COMMIT_ID}"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="threads +ssl debug"
+IUSE="threads +ssl libressl debug"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
 
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}"
 
 src_compile() {
diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
deleted file mode 100644
index c61395ed7a80..000000000000
--- a/net-p2p/pybitmessage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pybitmessage-0.6.3.2_p20180521.tar.gz 1102349 BLAKE2B 346834ba6a6f7805ad79e95137b922b74963dd2c9da1b978e6e161be1e82b8465443ba1de255a6ab3c909c7ee1328509123eaf129dbafa13ec8c0d9f8291c93b SHA512 ef7e64e67cd6438fea1835db26c6ab71af004e1f6a7fb2cb8681674024a1addaeef1a31d959b1f0d3e502d8b96b3c07c6b6e0840e86dff12768ecd36e4fdf026
-EBUILD pybitmessage-0.6.3.2_p20180521.ebuild 1715 BLAKE2B ba16163cf4c602e4f2f03e3e491ba59fb02384f954e4a98c15252ff88f3a740bcd22dc81b9c560f3a674166491971b0ce5e2382bf8c76da1a5c6e1bf82fe87c4 SHA512 6697e5ff79a67bcb432fd7177ad94824fae03f40815d0477dbd2a48be672e488f1fb48ef224e9e7fb9e32fd7ea5ea17327de6da09c34f01de1832bd0c3e590cc
-MISC metadata.xml 1156 BLAKE2B 9b20373355740d63c1d8e9d2d0b1c569d2d8944a7a477b871a3bc9ec741321fb71670ab9dde1753348369c91e9c2ca17a05d6830ce8ffa9288599e595d06f654 SHA512 0a5d180118567c9d120584a03ed920f2f73931653f714ad7d68ea38cc427e8e443e7a518cc5039f61dcfea9d0c13f889c82124d2009f51bc13e96381bce77c0d
diff --git a/net-p2p/pybitmessage/metadata.xml b/net-p2p/pybitmessage/metadata.xml
deleted file mode 100644
index 2f7203b304e8..000000000000
--- a/net-p2p/pybitmessage/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Bitmessage is a P2P communications protocol used to send encrypted
-		messages to another person or to many subscribers. It is
-		decentralized and trustless, meaning that you need-not inherently
-		trust any entities like root certificate authorities. It uses
-		strong authentication which means that the sender of a message
-		cannot be spoofed, and it aims to hide "non-content" data, like
-		the sender and receiver of messages, from passive eavesdroppers
-		like those running warrantless wiretapping programs.
-	</longdescription>
-	<upstream>
-		<bugs-to>
-		https://github.com/Bitmessage/PyBitmessage/issues
-		</bugs-to>
-		<doc lang="en">
-		https://bitmessage.org/wiki/PyBitmessage_Help
-		</doc>
-		<remote-id type="github">Bitmessage/PyBitmessage</remote-id>
-	</upstream>
-	<use>
-		<flag name="opencl">Enable <pkg>dev-python/pyopencl</pkg> for GPU acceleration</flag>
-		<flag name="qrcode">Enable <pkg>dev-python/qrcode</pkg> for QR code support</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180521.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180521.ebuild
deleted file mode 100644
index 8c8aa169578b..000000000000
--- a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180521.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-COMMIT=30e211367003bafa67834ffff3f31e6b5a897f4b
-inherit distutils-r1 gnome2-utils
-
-MY_PN="PyBitmessage"
-
-DESCRIPTION="Reference client for Bitmessage: a P2P communications protocol"
-HOMEPAGE="https://bitmessage.org"
-SRC_URI="https://github.com/g1itch/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libnotify libressl ncurses opencl qrcode sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	|| (
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/u-msgpack[${PYTHON_USEDEP}]
-	)
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.3.1[gui,pyqt5(+),${PYTHON_USEDEP}]
-	debug? ( dev-python/python-prctl[${PYTHON_USEDEP}] )
-	libnotify? (
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		x11-themes/hicolor-icon-theme
-	)
-	!libressl? ( dev-libs/openssl:0[-bindist] )
-	libressl? ( dev-libs/libressl )
-	ncurses? ( dev-python/pythondialog[${PYTHON_USEDEP}] )
-	opencl? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyopencl[${PYTHON_USEDEP}]
-	)
-	qrcode? ( dev-python/qrcode[${PYTHON_USEDEP}] )
-	sound? ( || (
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		media-sound/gst123
-		media-libs/gst-plugins-base:1.0
-		media-sound/mpg123
-		media-sound/alsa-utils
-	) )
-"
-
-S="${WORKDIR}"/${MY_PN}-${COMMIT}
-
-src_install () {
-	distutils-r1_src_install
-	einstalldocs
-	# The man page is not installed because it's basically empty.
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 02fcf3018927..4f3637724f3c 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,10 +1,10 @@
 DIST qbittorrent-4.1.7.tar.gz 7803389 BLAKE2B 6a8cf01c2bd86b63b629877fd3446db4aedd1591058af24c14dd4b69f0abae7f3ca715190fa0496b1a3ec742d4ee12585dd27e27c1465a1d22a149c2d47608ca SHA512 59fc6dc9696fbcfb9325017dcb5514f866e7f9e9eda9b4487c29c94d445709f1f3fab35f9817b62da75757360239362d77024d708eae48e89dffdde4ed272be4
 DIST qbittorrent-4.1.8.tar.gz 7803739 BLAKE2B ee56e004945025f06b179b08e938c6a3182f252c3bed6990158634ea1fdfd525fd67d105fd7ecdf0217a4bd73d847c5007d1e95f492f4f4e41c32d22dd6b7523 SHA512 8920e98f8db5dd738caab8815cc4a10950c34ba2eaa19b50479bb2ab548f6f297534759d71791caa4c8bfbea92d4b71d223a27fae150e00cc0a262eb3370a1e3
 DIST qbittorrent-4.1.9.1.tar.gz 7804066 BLAKE2B b5fddfdef8773318991ee5a3a818101b46fd0f258c24eebe2a9dde3f9e806544159c373406f609a911b330e32257b3d58a7d81e830ed91cce205182cde16052a SHA512 2a132202762461293ee8e4248bf7d512b3c33ec73670bf4c5c22261be546a69a69775b6c4baacd97a3f9055145cdb4153de17704b6b574b33370f3b454b1def9
-DIST qbittorrent-4.2.0.tar.gz 7797615 BLAKE2B 55c891e9d255c295eb2dc53e3cccaa50ceeae6623ddc016bf5e30fb117b849f35def462bbee598e754a2672e771465b93fa751b047efeb6326e8bc2619a58cb4 SHA512 507e548ea7b5ee25e412bdca6751e3e1b65130f16bbb2c92bd8f80cb86d824bfdcdf40ec49af6a8e111a36d7970430e8b9a6e29a6af1165563c9cb16c4bc2741
+DIST qbittorrent-4.2.1.tar.gz 7824636 BLAKE2B 06aa493b4e59f8e064955c604846cd4e4d404988819aa4f0b7a555cd3d8c74f42d4b40b581bc5c2360e5b75f0ce33f77882051360453176a9540d03d4d5de82d SHA512 345c702a49d284fe28b45e52719a79195a784ba07339ea49c340d10d387482d3ba59335b2e41616de97e3813531e808c41239e597ef4b710fcebceb0c837483c
 EBUILD qbittorrent-4.1.7.ebuild 1471 BLAKE2B 4425b0c76189dc80766092cfcea3939951918051fe73c14c9b7bc270ce4cdd4cea1bf9d879ca0aa1791d197bd331e4426fdb195eae78d59e0764cbff948d45d5 SHA512 e3660d0920d56b236f0309eeb9af01b4fe83d091687a814970ea33d7c5ed7be242bb1f7996b0cbbbacfd3b3e998250b175c412d0abca05a42b53bf80fc35bada
 EBUILD qbittorrent-4.1.8.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db
 EBUILD qbittorrent-4.1.9.1.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db
-EBUILD qbittorrent-4.2.0.ebuild 1454 BLAKE2B 75fbb4665d379be568ace2bac666e1de1c7c7ce63e1b6b4666bf2bde3ec9af3121eca69e0b59ad8d776af4ff20f14a43c5cca955b329c1fd62c15267b1ea04a0 SHA512 890a73066f960497a8663758a32344bb33c90684780b5d873023262f23c7d680e4bab7917e6cbf182d76d5c215c12a482555072b12ffa26a42e9591adc81b0da
+EBUILD qbittorrent-4.2.1.ebuild 1454 BLAKE2B 75fbb4665d379be568ace2bac666e1de1c7c7ce63e1b6b4666bf2bde3ec9af3121eca69e0b59ad8d776af4ff20f14a43c5cca955b329c1fd62c15267b1ea04a0 SHA512 890a73066f960497a8663758a32344bb33c90684780b5d873023262f23c7d680e4bab7917e6cbf182d76d5c215c12a482555072b12ffa26a42e9591adc81b0da
 EBUILD qbittorrent-9999.ebuild 1454 BLAKE2B 75fbb4665d379be568ace2bac666e1de1c7c7ce63e1b6b4666bf2bde3ec9af3121eca69e0b59ad8d776af4ff20f14a43c5cca955b329c1fd62c15267b1ea04a0 SHA512 890a73066f960497a8663758a32344bb33c90684780b5d873023262f23c7d680e4bab7917e6cbf182d76d5c215c12a482555072b12ffa26a42e9591adc81b0da
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.2.0.ebuild b/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild
index 22b2a5ad4a47..22b2a5ad4a47 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.2.0.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index f19a667ae9ac..80419eb4b9f3 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -6,4 +6,4 @@ DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4e
 EBUILD retroshare-0.6.3-r1.ebuild 3946 BLAKE2B e4078aa47a2553aa113eacb37aac1772db81c5560423af5abcebd847925853fc6a69faba386711a38a96aaf9e9b728afffc453c2cdc9232c9289a426ea424096 SHA512 3c24cd55ddab91ead27966d354320460f7789cb91970d8d0e1628c7e232ee46420aeb1a86334625c6d3a2d4fe83e56cdfad47f1706141ae1d58531edf353697f
 EBUILD retroshare-0.6.4.ebuild 3783 BLAKE2B a764907fa347a3362a7fa60ba8664a4211d09fbfb641768175e7f72ff572400e77dd274c435a5a0b22d1beefb727e6fc3dfef43218a82c0b93c98005ba34eb34 SHA512 5ef95f47d3186f4031c294e153da6001d978530bb376fcc393048abeaf717b2303c4467de27307e5ce7ca5b2d19da39d12cc3c60223cc68b9b7ec4be6847c09b
 EBUILD retroshare-0.6.5.ebuild 3921 BLAKE2B c35a753c86ad3ba4a6778e8d8375b01dda13b5dc87703144ef37cc1b467ba7e3b1130e3c8855608ad272196d7e993a21fe58659cc20bae29973bea112c23d1cf SHA512 6b0ff8a74ca4f998d99342e5403e4edd11aeeb25a47c834974cc4b11a3f0f7df0b929d7d380853d443390ad44a1083098bfcdb96083e22854be2389a93135dbd
-MISC metadata.xml 1758 BLAKE2B 7c3cea20af17ad1ba4c5a9923929ada21f986706bc2cc7b43512e272d01e10cb8cbbfa8556159402c9b6aa8165e0b8ff0befea34fa0186115b9af254a35be88f SHA512 b4f152eca444ff069446dbf78b40cf128ff36f6a01689d160b6399c631439489847585dcef3d7ee9afd8e72b5fd88ee8daaf0fd49df45efbc102ae85554efdae
+MISC metadata.xml 1694 BLAKE2B 7266177c5abea3b795043576795318e44a98961f7e673dc32f530232add78e56cea5a9db3e56cb2d1a504c6d13c6c531200dfd6d1e2d48b3f9170730eb3fda28 SHA512 3f856caf5306b1f84308c27a44112bb131312aabc1aa6389deb51c0c3d816ffd4a9ab29b92221cc2baf31e10a17cea2e5f5f46c622f3ac30edd9b05b54d6f9b5
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 6f3c32a1f56b..8c048e6d36af 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -22,7 +22,6 @@
 		<flag name="control-socket">Enables API via Unix socket support</flag>
 		<flag name="feedreader">Enables the Feedreader plugin</flag>
 		<flag name="gnome-keyring">Enables potentially insecure autologin capability via Gnome Keyring</flag>
-		<flag name="gui">Enables the GUI version of RetroShare</flag>
 		<flag name="jsonapi">Enables the new RetroShare JSON API</flag>
 		<flag name="service">Enables the new RetroShare service controllable only through JSON API</flag>
 		<flag name="sqlcipher">Enables GXS database encryption via SQLCipher</flag>
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 3c541af31c8e..3df59c400caa 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -12,14 +12,13 @@ DIST github.com-AudriusButkevicius-go-nat-pmp-452c97607362b2ab5a7839b8d1704f0396
 DIST github.com-AudriusButkevicius-pfilter-0.0.5.tar.gz 3241 BLAKE2B 43d4c85e7dd71c75217338a1ad6d2ee1446f4e0ba91b6922b9efcff8fc451e07f8e6c2c12f2635551c015968c0177ea433e59400a82df93e78315b5975f4fc70 SHA512 6e820e5f8b498897ec6453fc24aeef672ded0c4cada59a174ad8b8533bcfe20caf3dbed44ce6770c76e9a03d645d40d9bec971183c008d0fe74799442cd13c90
 DIST github.com-AudriusButkevicius-recli-v0.0.5.tar.gz 12368 BLAKE2B 7a84c0bcb604b555164b3452436b258ecc28495e1849c2f791d79f0fb10132ef9c7ef23e47946345c22095d3f6de203fca9398417f5d6d38c8489ba838994bcb SHA512 f3716820f3e61d792998b1c391d2ef06b75f34d93cbd9f62f77202bf0393e85829a549800fae1aba916f0e1619100f163658ab214e3cc6f195883157d5ac667d
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-beorn7-perks-v1.0.0.tar.gz 10866 BLAKE2B bebb0b77adef45fd5c89302ba637e3b5e8e918276ff798dbeb11fbf9d490f3efa760cf4685b21c8a736469fbe7ebce3f20bbcc66092766e418a654d149caa401 SHA512 23a6660dd9e806efc841fe3acf702dc3471808770c86cbfa3353adfa9d9534eb6d20591bb60be2c798ebf8823907b2d5188339869f4b0f61bb2e9ecf74b4ea77
 DIST github.com-beorn7-perks-v1.0.1.tar.gz 10867 BLAKE2B 373c4dc08cc964430f187a05a8165df751ea7398b2dd271b85fd13dfe5c9a33c2f8df32ca6f6229b332358e60e90de6d4670d54eb1b9808d1eada0ec7a83e0f6 SHA512 686eefcc824c5bde49385d63916299e2797be205523bda66500404c5ad64ed4d1ebe8ee50958237b41a4c481579f5040288b99c9d2ff1082abbf172893f389f1
 DIST github.com-bkaradzic-go-lz4-7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz 233008 BLAKE2B 3d8ce6b5d27dc692fc583ad0955dc531b658a806bd13aa3da68a6b15133fc6f610dcbba7252aa25b5b974f375f434a3057aaa98db92cb5444e7b9bc784e0fed9 SHA512 8d37e7068d39f24ee8f3266ae4508f064e857dd741db4e5a5eec7f215e3a922fe50c58443e3cd79c474a44e16156cf480203aad3a2a0f98dbf910c82abc844da
 DIST github.com-calmh-du-v1.0.1.tar.gz 2344 BLAKE2B 03207d407bbc1ffcf5d2fe100fa3c1d267ee2fc7429653063deeffc78777eecb2b299809963f812907d9861bb3e1366830cf5a650a7e40bfaa85548255e76b70 SHA512 05a5c3d5be4d06442368ad19c4743e32a6869f341a625230d0f6cfeb39b3bfe37318277a8dd2ff1573a6a7ef273a34be6082ae31348962ae1088ea719fe5d3c5
 DIST github.com-calmh-xdr-v1.1.0.tar.gz 10530 BLAKE2B 758d92071934bf1636b8d3e9a61a88d83d1f3c7db67682c536dc3b00764fb8e2086b6c1f236a9d4638c2039ebaa37ceac04157ca4e7cc9939886ef86877d35ae SHA512 3d439746cd1e6d0f503d58d901efddde31af12264c724dd7d1226d110a5641f799f70e3fdf97a64c274c78545756550b53b0fdb0cf2ed3a839e43ae44152f8e4
 DIST github.com-ccding-go-stun-be486d185f3d.tar.gz 14126 BLAKE2B 75202fa40d2ac806a79494da945b09ead265a2e880abb4c84a99bc36d355cbe1677e42465932075907325e4b2cfece45a27bb40898dc953069b840d26a9d8cc7 SHA512 935edec5205da5637da1fb89c0233f0def5d265b33b5ed7a1d3c7ff7bb0f19163dfab681600ed5955345555018bfd0029725e703cd98824449458671fa2a2e60
 DIST github.com-certifi-gocertifi-a5e0173ced67.tar.gz 155606 BLAKE2B 844299f2865a6f763fb76cfd028f94e68b27ed4bd4470e07c111b6f19a9e4fba3b32d7c839f3e650f5d658220c9993134d1e69e263eee847f6068cc2a38543dc SHA512 2402afe82ceb2f95ecfab04efc12936a2f73d61f07d7cf1bd56d614d7930502c94323894c6907e9b2b0c4535f26169ff47319d9927b894335925a0bd8ab2322e
-DIST github.com-certifi-gocertifi-d2eda7129713.tar.gz 155615 BLAKE2B 71896fdf49a2e87a7009ff51978472733b182d078cd482b680f167a6f40b715b9a9dc96764dd7439606b4d94ad73854bac95a252289536b8a92a9a620ae58b48 SHA512 3cc5d734c4bf8f4a5350f2f12050a6f5ce7a310eda19913a467a0b190469f948b4bd3bd3f799f7d8f77ce86756eb483a3d3da6ba647fb9824555a829c414aef0
+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-d4l3k-messagediff-v1.2.1.tar.gz 8059 BLAKE2B 989a0b7bc6ba0f98e4725de209b081728fb5613b17b0706a18f448cc7444445a9a5b31f14ee0d454b66ef249a773d1b9631ef22eaf9cad60c44d796b7cb18d9b SHA512 5015339aa7a3730e1dbf8c6fe2e488f181db165480fb9ec12e9f0fcd449ec8df7dbe4e0b672845cfa5fc73036fdc6ff80c1044b2b96810eeb5a1e6192f224ff0
@@ -35,22 +34,20 @@ DIST github.com-gobwas-glob-51eb1ee00b6d931c66d229ceeb7c31b985563420.tar.gz 2503
 DIST github.com-gobwas-glob-v0.2.3.tar.gz 25962 BLAKE2B edc7e7ea8db6312690989d007d2a292f197a22c6efa7b5737cd925c2608e4a0ee38571082bb0dca57088d4531bb5b1dfad6341b09cd7fd4bbb57943640d9b441 SHA512 b91b27389e1f172d7c2c181f19ebc27d566e6bd6397cc6ad924ecf5f2ace98ecca639e020e05c9e281fb8549f9065610f7eb6070c63e3f9e7c6fd190c457e42b
 DIST github.com-gogo-protobuf-v1.2.1.tar.gz 2017393 BLAKE2B d55fc545759add352512c2ef81d948c598f71131fdb1649ee526b59989457a324b03144e989a3c651b5614a2eee9e7b1652d3d259733cd3752c97fc2f6720705 SHA512 7cb48dc85e76cf6b116015441e29e86a25514667b409c0a1d335ce1c844a080fc9b37f48911959531aac8ece009b6d8401b1fb7bc463fc8e6fb5e133c9846e64
 DIST github.com-gogo-protobuf-v1.3.0.tar.gz 2031976 BLAKE2B e237bb7436ed74344cd9618cc158675a1d3bf89a8f0bb81aeadd3cdd8df819b52d1ae18bec7b7444c3de754440eee209254302113d0f3b9f704cfdc55d6fe882 SHA512 c88e27245519f13f9091a8f9bdbf1a56f710f098dfb500ea3d0e5949ee8b3b4945d6fa1d1c0c94fcd2c3e1f57f45643b8a806001537ab160b35e33d591898a0f
+DIST github.com-gogo-protobuf-v1.3.1.tar.gz 2038188 BLAKE2B aee5f1910018ada96b4e52070bc487f6703c6cce4366cf5e1f167234702a7a318dc8dc74c19fc6612579d7d59b7e8220cea0edb6e70ee37c141093d857872607 SHA512 a901a849d5161fb9806ded3b4e57afc53a355875625ef285a74895deff32d799bf96feace6fe55aff40be5f16347a491ec16529c8d1ca4cbf087174960f013a1
 DIST github.com-golang-crypto-0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8.tar.gz 1444273 BLAKE2B f304c3984fc3239077dd2ad41972f37ecd4dff7d8dbaf5299811cdd15e2d74d1e98eba4fe7542daeb7961c362d9a4310c48379a3da748d8dde713c689a966765 SHA512 09ed21929d26480f6b9f760c655b8c3445daecd65acf71d084a7807253ee73dd0fec46ed058ecd2e3761b431761df6dff2a4e12586631b6ecf9dc1e12f66c584
-DIST github.com-golang-crypto-5c40567a22f8.tar.gz 1690995 BLAKE2B ce33e064cf8ed8d1939dd39b5176293f5de1db975e5325d6eb4a481960451e8ad77cb48bc2bc36fead10a6a1811bfe95b44a191ca7272508d7776168033d9f52 SHA512 003608c7b791212dbec4c9d22dd695245a6b570e93dff06593e7baf9aed2e2cd02355a0fa8c12b69bb451b9ff27b85a82099a751872c5a0d02163a034f72d829
 DIST github.com-golang-crypto-9756ffdc2472.tar.gz 1693333 BLAKE2B aa50207831927736c73eb2a33612baea37aae506734079094ef811fa03ecffc3a4a17027a9c6b0d35497d59d077681890d0ca9c72f556e4503f185ad63a8e49b SHA512 918d2959219f0af630fc198c72f8d4fc2f5218dff6ab31626f4d9cd1b1012223ec05a0c53f9725963f7296d4ae97f35864dff036bec1a18743b13c7c3c2d4227
 DIST github.com-golang-groupcache-84a468cf14b4376def5d68c722b139b881c450a4.tar.gz 25841 BLAKE2B 38026e1d9783d366af5996ed0c25f6fcd366a56e976c2665d7b815ac8aff371aa6b7c322176f1cd4c79e0dd1a29de2ec4f563a05ef8473876f74a0816cf628c7 SHA512 e56e2e7c604f485a188bc7be3c3e58cd129359d346ccfd30f55c0c768b7128390d7d0264f093387d75484aa687b9c2c811ce7b2a272942bf14854775270a0648
 DIST github.com-golang-groupcache-869f871628b6.tar.gz 26038 BLAKE2B 154828b6d5f8be97ee9b462a766834e36f8012e7e15a8d7d30f0a5a8a3d1773aeb9b103b3dd1470f7553fb5a5ddff52860565dc6d47f0c49af608309d1be67b2 SHA512 0245e645d9cdca84f8413d58f507a9bdcd8b047784aed2a9175cf31ecdd9de19a088afdd28a1079200fd13ad1ba6f647d29ba54bbeff10811af8cccdd0bc2837
 DIST github.com-golang-net-351d144fa1fc0bd934e2408202be0c29f25e35a0.tar.gz 967715 BLAKE2B b18360cf29bc50b936ed6a0c48fc3a8a283e4610bad302ab732a345e51a9fc2922904a824e173047cba15c189e169160af14d717ffe3877a44a1c74d90723440 SHA512 6778a4d08064c8cbfc9d7ea0dc30a4bd6af7c68f9101c1dc4cda4b037348acde3fcd8c72fd25a61e94a64c659851380137e0d60c54edace03af3bc7f05554053
 DIST github.com-golang-net-ba9fcec4b297.tar.gz 1100219 BLAKE2B 763e2e4b38adf4f7abed20974aaeadbd22356f7224957b6f8d99146d07355ba6924727e93ef71f0e3b0416a7f5269539321223c56c9b3b4667160ff947a544b5 SHA512 8ad57611de7fcc6766da4ff1c29adf2e9d21eb888dcf0c1160b31b310f1f94d4c3bd45a1a3627d9f2ab9fcc8f4c0960beceae3771083b8a2cddc2568f5c4f1a2
-DIST github.com-golang-net-d28f0bde5980.tar.gz 1097929 BLAKE2B 91c413c045cd08756ef900df0617d4f3d070047ab05177e21c199607afb71383188eb412afa0221ae6189ed302b25b6824179206f1d0c3722910a3f0e08bf0a1 SHA512 022763ab0d57aa789d645665b761d8ca8374f95c7079f50b66ad959b5af6cfd3a3cc3f23fb459d980cf46ec93b40394773b1fcd6c3ef2d08e1073892f02f8ae2
 DIST github.com-golang-protobuf-v1.2.0.tar.gz 332565 BLAKE2B 6916341aaa30f593c9a27363d4d73c548d0f7a629adffeab927078bb3ebc64f59a5c568b7bb7999c7505d526ce0ead0c9163908080f24ecd6c7b94ed2db28335 SHA512 a0f596ee96f7501ee47da75ea234c1e29c0abb2c3fda731acd601a55880502ae90d70f6d3da9c9a35e493fd1bcb69971c062e16b1e49a0996137950dac2effac
-DIST github.com-golang-protobuf-v1.3.1.tar.gz 310884 BLAKE2B 704efef653d39b4954798537e7451d15dd1d913c67d1332ffc016b396b028a0dd03487765a89b0bc5f920b75cf4f51be79a8da9d3291e0f02873c47601360080 SHA512 7dfc6d7851c7181e1a73effe9e8a97752bb428bf207a44b065412a8e87e0e3e200b5eef3d8c68af33a0721d12a8b98bfa88b22add074b19b6e1759e9268abf25
 DIST github.com-golang-protobuf-v1.3.2.tar.gz 312285 BLAKE2B 381ae3c4bad3d3b3d489a3b66752e9e2405d17d9ed2c55aa1ec06ce6c18171b1c7625f6cc6e28490551a6410835f6e774a408de39f6e9ea9b3cddaf46e3b859a SHA512 ef9190f7773b18005760eb755a1dee25eff38c188687033362635e2431cf2c7372a59a3fec91acd6e4f63aa31d08391f7521a8dafef7895268b6a1a78735dd8a
 DIST github.com-golang-snappy-553a641470496b2327abcac10b36396bd98e45c9.tar.gz 62076 BLAKE2B 0c44cd5633864eb1aef91e83706c8d2e0469722603eea1969c4f38ad013dac411ce80ace29a89478f9027951a4e469fc442c60988a729f4efbf4caff2361c423 SHA512 a324c8a7687e820f6b322930a054d1e7fc4c37bb66a95d473ef2a67fed703de90e8cc3072273ad2f9c681b1cf7ec1acc0ee9dc735ab593e23eea5cde96eea8a6
 DIST github.com-golang-snappy-v0.0.1.tar.gz 62605 BLAKE2B 0af2dc71967b38aa4677e5286c8f0fe4167deedb32f065d9612e318bf1e09dd220014e5b05d30418a625dda138dd33ced8b9e73781f2c6e8f7f301246c8103d1 SHA512 87a934b1b5af6a19341b99170d6dfa078ca33753a4c1b2ec120cb54c55a51bb4e808d38d77d498115c9c53678adddf897b4bd81b7a9480564c57a209e2745f42
-DIST github.com-golang-sys-04f50cda93cb.tar.gz 1450689 BLAKE2B b1b33bb265344ef4d3473bbd267276dccaa344d2a1c8f9bb9d16f9892640aba6a1e97fa18b7e3ef634c3eec3a298109d8b310d158834586847d10f54b796f8be SHA512 dcb88fc4cd02d92cefb2913513567076c8a9e163f6f7afb1d0df6cb4d39fe058a2979a89803605d0f64b470a6f5b24174ba674b0add9b5dd16054a0b781b3c9d
 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-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
@@ -62,21 +59,19 @@ DIST github.com-kballard-go-shellquote-cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.
 DIST github.com-kr-pretty-v0.1.0.tar.gz 8550 BLAKE2B 210bbedee436b225b678ccbc363a2feb09b6903bf459e34d0d6950333dc273db5713a828b003ad0b52da0718de38aa3665ff7be6c99b865a7766998e37e55fb9 SHA512 7a367c317043d40cfbf7fac631a286c0bbb8b45a716fe7388d6271431e354b3913505398b8ccf7ffbb01abf71f04216738936a4282c3c9645e26c51b7692e820
 DIST github.com-lib-pq-v1.1.1.tar.gz 95305 BLAKE2B 2e7cdc435305effb1c4dd65919a6c2c1fbf6bf1c8ce621b6484f20dca8b767b1004bb85bff17eb2b2a7692b904b58fcaeeda81ddee389d01453c4044be7c622c SHA512 62e991b80458841a1aff7996a91bb085eb33ed8f4e36de7f6fb0acd8d4c974df1358431740a85628ac0a020b0a31777c4448ab8d5659f20d7e1cbfe262c91b19
 DIST github.com-lib-pq-v1.2.0.tar.gz 96083 BLAKE2B 391a24495e3d7c9bbea8f1fc99a7e0a8a3fb17b5afbfccf1a039f66cb7d96fa4befce59b55238d05d73afe77e9fd39e7224ced5036c8d6d7fbc7aab866d24d41 SHA512 f0a1252d575d92dcdddb9e5286f1beed77d3d4b3d499ff9d828c160f36a3188546a71799255c311a66c13c7cd0f41bd231d5abb1d674e761195ca2b7fbe7195a
-DIST github.com-lucas-clemente-quic-go-v0.11.2.tar.gz 321908 BLAKE2B 327bcb2e180f62c858dedc3f8d0e26f9f4efce42995a14fff086815b9800f8fb504ef2fd35dca2046890d80ce3920d6fc80173f58541708418c020bd2a21d7e2 SHA512 bf5fc1b40a98a70036b9d932b7d3cdde4b39e3e8332e6f53d7804bf034ee910fc89d8ad050796ecb4af3c8823780d1f7157005f9c0745b5e4066f1e3515796dd
 DIST github.com-lucas-clemente-quic-go-v0.12.0.tar.gz 351958 BLAKE2B eee00ef6c7a5601956700835cabd4eb62bdaca37126f2a24aa4c510c3379fa1045ed9594ffb5e5675c80271eee06324cd1014ab1bf969a78dfc32ecb3f872ade SHA512 b06cd4bcaed2f0a3c44a4832d802ff2abf0142dd83b81cf7ca7e5ecf33d07aff1059e81e694b3ebdcd5a037cd3ab6e62d8ba8cd81fdd841025f54d998c5253a2
-DIST github.com-marten-seemann-qtls-v0.2.3.tar.gz 389521 BLAKE2B ed9b07ffbc06274fa6942eb43bebdd2889971931e03e749db4f13929cbdb8120e3375f31114754d88e512592b8c4d9bb2a734bd3fcc2a4872ba613c5f635a3c1 SHA512 3f8bbe93ca8e36d98efcfc41f38505423fc159091ed0394fd7c7837cb8ff4aa879bd54253a8976ff5a8f84b06d050ba418e5295a38e31a6faea7405980bde28f
+DIST github.com-lucas-clemente-quic-go-v0.12.1.tar.gz 351956 BLAKE2B 72a30439c7177baca5d3dfbe7ab94e90c04b0d5f0720713c760f40b53a230a0b4afbce27034b6a2e1aa0dd95395327379cb18ed6cd2319b53abc7a927388c5ec SHA512 70842607fc93da2e95ce710b4572ebb32df897db9e20f19f12e728bd704d455213e9c46cc53eea5f6605967dc854cdf42416119325be27bfebf49f74755bbd1f
 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.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-onsi-ginkgo-6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz 127951 BLAKE2B b8b981f2c98bfaecd4e65db1a97f00190c8935da866f5b7cb77a0c437063dab8cb94fb19eb77ec6bff9b361d91aa772945cc51dbafabc7870268326b0e458da0 SHA512 f6e99db70c540a08e064358c0034e8978f2cb7d2c27be439f3a90d0fd0c741ade9a15a30c837da71ee1c8df6b80b124799f4820ca25b71994d7e8de207ba4eb2
-DIST github.com-onsi-ginkgo-v1.8.0.tar.gz 133392 BLAKE2B 42105f337a583d1d07554e07a13ac141edbe6bfa7c04a2a83c9ee49eff3f7b5b9b9acb35d824d33045cd991876f03457f8271a6eb3d493fd9288b23a1f07e704 SHA512 ed8a21d07c63dff1291a3ea0413dd5168f54738630bc0ebe1938765f3e0cd5d41e01f3836e401d3c2c96770281506440bbaf83d745a6c5b3be4cb5cde84f3d9f
 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.5.0.tar.gz 88642 BLAKE2B de8a842d9cd48d11f5f0df905bdeabf37d6467ffb3d8e4f30f160061e00452d5e5fb63384fcd64b83de69106859a89cb9de3667624a5db2853b9bd95f31bbd0f SHA512 96420cc6fca24ad8144bdf207a702c67f9787be6fee041875e22fc8762b257649b54be5f4e926a2b0b2e52bc0ffa1f3297d0db39c8668dea5ccb1c0d9240df41
 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-maxminddb-golang-26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz 17818 BLAKE2B ce68d48e238a674f492b2cbe63d9c74f2a839d3cbb744df8442f4bdd7d5705f0a5d4f2114bd4faa431c76c05331d67edd090db658ccb5546a266e40386d9ccbb SHA512 41c37ab97728b1d1a3e30dac22f29846cad487dff7e8211d2225f1d1b70a05849680dbce79134d5f9685a46f5db51c23a2b11744fea237a79ccefd90bc840c92
@@ -86,16 +81,16 @@ DIST github.com-petermattis-goid-b0b1615b78e5.tar.gz 6816 BLAKE2B 11ac50a4a9c618
 DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
 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-v0.9.4.tar.gz 142795 BLAKE2B dcf60337b5afe26825c58b88db415cefeeda1127d529eca1708a8b79594cb7cf677c32bd644408a1864258a47b28268d7b650416db2ca67c6298831ceb1e91a2 SHA512 45c07c0673c2db1c5a7a6bb47d26d0a33c71efac52ed38d6540bb81cfdc37f4160d112614a7d771ff70dbdf59b6837854c4c44674d63fd2df62e8d26606f1d4e
 DIST github.com-prometheus-client_golang-v1.1.0.tar.gz 140006 BLAKE2B 39c57a3e8e0dc41ab84b9c6e0fd53ed169da6126c2f39bd6298d80aef9043e39a785e26f075becdeefd337521d0376efbe89eee39a9e2fb8775804e9136fa822 SHA512 21f0ab86dafce3f02cadb7cdfcd7fdf50a67c5a8c0eccb24392a0ee64bac0288988ea491525c80628891b98a67715624a84033a754fe783c0966c579efac190f
+DIST github.com-prometheus-client_golang-v1.2.1.tar.gz 142465 BLAKE2B 5570e7fff11db4372a6e3dfc465359e32ed51921372f0012768e23f0b49d84e8a10dc60ec09b50c50b51e2e566779ca7e0d034de7b3b62850d57b7890a88de10 SHA512 3ac98e101fb27cdaab5d282ed01eac2d4b8addd902fb40f67a3307f82f0a1c9f6ce15b706bf530d1bb55524bc1f2cc34359eda48676f76d68b26ef48e7c413c4
 DIST github.com-prometheus-client_model-14fe0d1b01d4.tar.gz 57541 BLAKE2B acc5701969d724df3d0c85a3b456b1e397b6c72ba33fb2ff98a04702423e8873c2c3ce2aa68ef7f62ab2a6b4ab881dcfec740217f88f29bd35a7d99df298ec19 SHA512 d9cf5775446d349767573831df1020aec72fb340e6fd3d181ff7e6cad9e972a2b26f1aeb1382d70431470933e1452d718782c8f0a0c4159a81069e9ee5623198
 DIST github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz 57195 BLAKE2B 08fa9bf28957a15e543e2d86e5a19fc302f7ef5284796d6dec24c182ce7a3889a5bbe53d58fc018cabbd0bc717b36533043c3ccb3e3355d8434fa7e3dd399b50 SHA512 e44828e3790282e088bedd5c8786948192beb5061e8dedd4f0b2508e31f641569c2c2a7e3899c2eebf4aac0c0fb3a22fc9172e0460fa2372fa876e23807d23b8
 DIST github.com-prometheus-common-v0.1.0.tar.gz 87363 BLAKE2B 5b9c46c8169fccab40c8d6f0213754495691d5324508018095983111b67912e668b8c9ccac7dcaadddc603b59a93ee5a86375d728cd5e3e524f32b305e58d3a2 SHA512 a5966bd0c66d3d6c5aa98c15918c8b1fd4d9f68bef54d180984f4e71a3f209feab25ca01e6f9338e462aa7ac9452938e2da14ae94847249771947a1664796e08
-DIST github.com-prometheus-common-v0.4.1.tar.gz 98631 BLAKE2B 1f2d4780c6e0bac957320ebdfb83c6ab9de28abe8b5ea6f75d76d8af76ecef37231da82a070da28c5e05886241c7db0f9538cf85e0b26d20aad610639310e9a4 SHA512 36860b02c9ed11fa02aea619e2e7bcb58f2ade54dae2210194d6b83200ea76e743b07e62d8ac8c20f31806bb0ec680c579da359d41d4400ce50ed6c902e9b534
 DIST github.com-prometheus-common-v0.6.0.tar.gz 99696 BLAKE2B 4d49d93ec732c963ce3784aa7a074e91f87ae58acea46a1e6b8b58b012332b6954f90df83041d097d86ed7bca992fb4214c1a05c11746d8f74f0001d4a822abb SHA512 9ed108c0e13d879921c9f9892713f1de1da5fccd03cd11bee2b4728fb09aa3eb8adfa98f2701a6d68fb35b8458c4d59027e48ec0e94e90a441cedb1d25c08945
+DIST github.com-prometheus-common-v0.7.0.tar.gz 100520 BLAKE2B b03ae3e46a9cd038b1123df7b230995c65f8002430f341cc94fc39ff59a3050c37cf1caac036c7c13798c1303ed13c67f3628a2f9e5c7a90b92f465b98f6acfd SHA512 47a1fec9bffb720a8fd20287c7628167e649c9fad436c3d6eb290863b30580dc9c9ca417dfae01d8d76c278bb021cb2288ff1d3fa9b598370be6534637fa8337
 DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
-DIST github.com-prometheus-procfs-v0.0.2.tar.gz 78550 BLAKE2B cded530ef80939cda11dde97d02289ffc1033cd90e7c7eb758468ccbad9f9bde7a259324c067c84b9d16c45be0c2971bc2652b507118045acb23b2a7b36a8f9b SHA512 93635aa795027e71cb79bbd35cf5141617634b09e2d56cad578abfb69edeb54fbda4971b9c81fccd51eb7837fc23f6773fd723b250dd6b16a25acb41aa37bcf4
 DIST github.com-prometheus-procfs-v0.0.4.tar.gz 108252 BLAKE2B 5ea5fa4b57595584afce1953d9de7366d5bac30a85cc3069d256362f6ec87686c65b4cef99e486a8e3b95bd39aff96d8ca9f6f76c9d4e79e5ec1cf743e856fc8 SHA512 030bf68684f61eb3cf2b5e5a6d33b7dbdc3b3bc1a3d50a282c20f1ca339984d2e9cb4fa3460719753626b8d9542bff2cbc0922b7b42ec3e1a03a95f552f2b989
+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-sasha-s-go-deadlock-v0.2.0.tar.gz 9957 BLAKE2B 764bcf1ac0f018253b91b475e03ebca0edfcde4eb526c473df3a245a5397a742db678a70a767a452d6ecac25961059d9f304e21bc623807f6f6c9f6d9f504b69 SHA512 114461313768b79966669817b3a12502fa787e7dad288deda1440825605c962959da89c9106fd179cbe4f603a5c4f7f87c491f29def80936d7fa6eba7a1a1cc3
@@ -111,11 +106,9 @@ DIST github.com-urfave-cli-v1.20.0.tar.gz 58397 BLAKE2B 0f623bff26139e57f29a2939
 DIST github.com-urfave-cli-v1.21.0.tar.gz 68419 BLAKE2B 4fe7091cfe3dd58d1c73d7ade84c70efbfeda354f8dfeb1cf7572b8792ed15c14432b4815107aae900a7d45e08a81dd261c97edac1a94a2e9557c3e595824e20 SHA512 8bd1dc64220eb5388da99a9d98971097b7e64dc054cdaff54c86fd427667962aa8add7edaeb045d17515bb15df885c369f939a5d374e8bcc010c7f0fdd554763
 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.2.1.tar.gz 4740427 BLAKE2B 2f102100030f646f069a51c5af7c5ab448ea59fa0629d78b14432e32cbfbe90f1b95c49cc3d5812b8cd228ef0454ba5d95f9ddf5910492370018234bc1c66438 SHA512 226386af38c3e99434496f24aa571bd1edd3d1e0528dac06c08b4148b2c63b898b67261728cc6c92dbd0496c24b32f0b1189571d03f6ab5dd592e78f2a5beb3b
-DIST syncthing-1.3.0.tar.gz 4753744 BLAKE2B 1fb731ca41fa2c703af7cc6cccdf7fabbee3972a6146f8f92cc8f5a2635083956134c46396f9b64e3b67d8377e4e74b59cfdde98cc4f92741f638f5b48e431c0 SHA512 aea1f979f3441e81c10dfbf0a5c22080814486a16999eabf7179928c6ea960c0f49d6684ea8626ffb2e2431777231e30c5de326fc500f17ee9c51e74cb1b3d5a
 DIST syncthing-1.3.1.tar.gz 4753853 BLAKE2B b0e4a3b435ba08718203b7009586f5c360dbeac110fc2a9755ac5202bc689c634fb0e31c861e16f401326ec7e99aa2fecb671943e5da27202173f6d70616bafa SHA512 a5f5de85d719379c6d312fa1051d6a0761e3ed73014c8e5b95b26bb0ab264a48f114d210a46f0e990b0535494873a5997284a6acaa0337d1f082bbcd847ab664
+DIST syncthing-1.3.2.tar.gz 4760240 BLAKE2B d24dbf55c404bf14a90df2e250f58dbbf9724abf0f661642513b2b22402fe8202e63465d9cf48cfe55c55de0eb914a10006149692dd9230a969c399e4c0ae714 SHA512 e718cba9a727d086894270fe0e91b1a03d2fde14c0c0b19d8fe6e82b6c9d9f493adf5371d5e38e00eda131a77d4392f8dc3f4d32761eba24102373e7a8f51b5d
 EBUILD syncthing-1.1.4.ebuild 5974 BLAKE2B 2115e3d26f93044b48cc361b0b65be68ba9624a24fc14e6c7272ecd675d02ce99bbf6cf978a9e7d806bb5b504edeae5ed1f8843e7cb21ceab03a65a4b66aa2f9 SHA512 d5feaccbca635da35adf513f98dcc2a12cdb94279c9befd1d98acfa81372e7f9ddada2acf93050e4e6c1eab1fda087c10502c7cefd4eda25fd12273e99f5e59e
-EBUILD syncthing-1.2.1.ebuild 5574 BLAKE2B 7c4d6538463495a4953ac832eadb75912c5d52898956e3bea05d189f2238e212583a777b2c4f51d59236f80264af294b9dff3a71149daadf22dcb0f9845a08cd SHA512 90214fc183320a8037868b4d461239d62e1d87299f597c485551e89e5181ad06d83b148de4496af15851bae88f884c6b9601cdaa39d6bc14151476a0e4ade5a1
-EBUILD syncthing-1.3.0.ebuild 5605 BLAKE2B ccbe4c2e84102da99b1a91a367b5377bbcbcd4c752b6edba257a420485da2d54cf6b0e867e40668384793d6840d3d9f6948981b634ce1224ca529ca98a140d40 SHA512 b6931ecb5fb6abd6710774773d9d46963bb15ca1baaa9a2406429b7edb6ef8c29181c42dcaad6795c6f284f700afc827819bf73b42d5b35ff1a2c8b94b7854e7
 EBUILD syncthing-1.3.1.ebuild 5627 BLAKE2B f36fb0b8d92ec5bc448ed96123b414ff27820e2a5f2b11dd3d6476b31ade267918be27896aee576115bff52941e6794e639e18172eaecfca530f1d1ba61f1693 SHA512 049ce757f54a1786fac4758ea108471ba49218d45f9d7900c460d4c6041a2f7abd15c0a66c29ca9ef2a180e9397a5f970a5bfda9a8af427315e3f5b765c34ee8
+EBUILD syncthing-1.3.2.ebuild 5325 BLAKE2B 066e0ca1956f3325f73b7ef041d0bc3d6dc246819e5b206f92cd9202f5934bac14c958cd1bb5605466880213224df4f9b7b9e28b59c659d2666ebf4f23afdd7d SHA512 5cb31bdaca335412986ec89ee6bdc04bd4754c0af6ed9f6dfc02f13a63b7e7c9ddf186201d684191eb7f1b4bdd229ce97c72b0f7e16e5127656531e0a29f1f12
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.2.1.ebuild b/net-p2p/syncthing/syncthing-1.2.1.ebuild
deleted file mode 100644
index 6f0d17ef5458..000000000000
--- a/net-p2p/syncthing/syncthing-1.2.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/${PN}/${PN}"
-
-EGO_VENDOR=(
-	"github.com/AudriusButkevicius/go-nat-pmp 452c97607362b2ab5a7839b8d1704f0396b640ca"
-	"github.com/AudriusButkevicius/pfilter 0.0.5"
-	"github.com/AudriusButkevicius/recli v0.0.5"
-	"github.com/bkaradzic/go-lz4 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"
-	"github.com/calmh/du v1.0.1"
-	"github.com/calmh/xdr v1.1.0"
-	"github.com/ccding/go-stun be486d185f3d"
-	"github.com/certifi/gocertifi d2eda7129713"
-	"github.com/cheekybits/genny v1.0.0"
-	"github.com/chmduquesne/rollinghash a60f8e7142b536ea61bb5d84014171189eeaaa81"
-	"github.com/d4l3k/messagediff v1.2.1"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff"
-	"github.com/getsentry/raven-go v0.2.0"
-	"github.com/gobwas/glob 51eb1ee00b6d931c66d229ceeb7c31b985563420"
-	"github.com/gogo/protobuf v1.2.1"
-	"github.com/golang/groupcache 84a468cf14b4376def5d68c722b139b881c450a4"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/jackpal/gateway 5795ac81146e01d3fab7bcf21c043c3d6a32b006"
-	"github.com/kballard/go-shellquote cd60e84ee657ff3dc51de0b4f55dd299a3e136f2"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/lib/pq v1.2.0"
-	"github.com/lucas-clemente/quic-go v0.11.2"
-	"github.com/marten-seemann/qtls v0.2.3"
-	"github.com/maruel/panicparse v1.3.0"
-	"github.com/mattn/go-isatty v0.0.7"
-	"github.com/minio/sha256-simd cc1980cb03383b1d46f518232672584432d7532d"
-	"github.com/onsi/ginkgo v1.8.0"
-	"github.com/onsi/gomega v1.5.0"
-	"github.com/oschwald/geoip2-golang v1.3.0"
-	"github.com/oschwald/maxminddb-golang 26fe5ace1c706491c2936119e1dc69c1a9c04d7f"
-	"github.com/petermattis/goid 3db12ebb2a599ba4a96bea1c17b61c2f78a40e02"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/prometheus/client_golang v0.9.4"
-	"github.com/rcrowley/go-metrics e181e095bae94582363434144c61a9653aff6e50"
-	"github.com/sasha-s/go-deadlock v0.2.0"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/syncthing/notify 69c7a957d3e2"
-	"github.com/syndtr/goleveldb c3a204f8e965"
-	"github.com/thejerf/suture v3.0.2"
-	"github.com/urfave/cli v1.20.0"
-	"github.com/vitrun/qart bf64b92db6b05651d6c25a3dabf2d543b360c0aa"
-	"golang.org/x/crypto 5c40567a22f8 github.com/golang/crypto"
-	"golang.org/x/net d28f0bde5980 github.com/golang/net"
-	"golang.org/x/sys 04f50cda93cb github.com/golang/sys"
-	"golang.org/x/text v0.3.2 github.com/golang/text"
-	"golang.org/x/time 6dc17368e09b0e8634d71cac8168d853e869a0c7 github.com/golang/time"
-	"gopkg.in/asn1-ber.v1 v1.2 github.com/go-asn1-ber/asn1-ber"
-	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
-	"gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap"
-	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
-	# These are only used by the test suite but conditional vendoring is messy
-	"github.com/beorn7/perks v1.0.0"
-	"github.com/golang/protobuf v1.3.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
-	"github.com/prometheus/common v0.4.1"
-	"github.com/prometheus/procfs v0.0.2"
-)
-
-inherit golang-vcs-snapshot systemd xdg-utils
-
-DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="selinux tools"
-
-BDEPEND="<dev-lang/go-1.13"
-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|' \
-		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
-		|| die
-}
-
-src_compile() {
-	export GOPATH="${S}:$(get_golibdir_gopath)"
-	cd src/${EGO_PN} || die
-	go run build.go -version "v${PV}" -no-upgrade install \
-		$(usex tools "all" "") || die "build failed"
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	go run build.go test || die "test failed"
-}
-
-src_install() {
-	pushd src/${EGO_PN} >& /dev/null || die
-	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
-	popd >& /dev/null || die
-
-	# openrc and systemd service files
-	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit src/${EGO_PN}/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 src/${EGO_PN}/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
-}
diff --git a/net-p2p/syncthing/syncthing-1.3.0.ebuild b/net-p2p/syncthing/syncthing-1.3.2.ebuild
index 97b8359ac791..da5fa26736c6 100644
--- a/net-p2p/syncthing/syncthing-1.3.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.3.2.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-EGO_PN="github.com/${PN}/${PN}"
-
 EGO_VENDOR=(
 	"github.com/AudriusButkevicius/go-nat-pmp 452c97607362b2ab5a7839b8d1704f0396b640ca"
 	"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"
@@ -20,17 +20,19 @@ EGO_VENDOR=(
 	"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.0"
+	"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/kballard/go-shellquote 95032a82bc51"
 	"github.com/kr/pretty v0.1.0"
 	"github.com/lib/pq v1.2.0"
-	"github.com/lucas-clemente/quic-go v0.12.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.9"
+	"github.com/mattn/go-isatty v0.0.10"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
 	"github.com/minio/sha256-simd v0.1.0"
 	"github.com/onsi/ginkgo v1.9.0"
 	"github.com/onsi/gomega v1.6.0"
@@ -39,7 +41,10 @@ EGO_VENDOR=(
 	"github.com/petermattis/goid b0b1615b78e5"
 	"github.com/pkg/errors v0.8.1"
 	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/prometheus/client_golang v1.1.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/shirou/gopsutil 47ef3260b6bf"
 	"github.com/sasha-s/go-deadlock v0.2.0"
@@ -51,35 +56,27 @@ EGO_VENDOR=(
 	"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 749cb33beabd github.com/golang/sys"
+	"golang.org/x/sys b09406accb47 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/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
 	"gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap"
 	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
-	# These are only used by the test suite but conditional vendoring is messy
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/prometheus/client_model 14fe0d1b01d4"
-	"github.com/prometheus/common v0.6.0"
-	"github.com/prometheus/procfs v0.0.4"
 )
 
-inherit golang-vcs-snapshot systemd xdg-utils
+inherit go-module systemd xdg-utils
 
 DESCRIPTION="Open Source Continuous File Synchronization"
 HOMEPAGE="https://syncthing.net"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
+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 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="selinux tools"
 
-BDEPEND="<dev-lang/go-1.13"
 RDEPEND="acct-group/syncthing
 	acct-user/syncthing
 	tools? ( acct-group/stdiscosrv
@@ -97,30 +94,26 @@ src_prepare() {
 	default
 	sed -i \
 		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
-		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
 		|| die
 
-	# As of 1.3.0, stupgrades fails to compile. This command was not present
+	# 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 src/${EGO_PN}/cmd/stupgrades
+	rm -rf cmd/stupgrades
 }
 
 src_compile() {
-	export GOPATH="${S}:$(get_golibdir_gopath)"
-	cd src/${EGO_PN} || die
 	go run build.go -version "v${PV}" -no-upgrade install \
 		$(usex tools "all" "") || die "build failed"
 }
 
 src_test() {
-	cd src/${EGO_PN} || die
 	go run build.go test || die "test failed"
 }
 
 src_install() {
-	pushd src/${EGO_PN} >& /dev/null || die
 	doman man/*.[157]
 	einstalldocs
 
@@ -132,11 +125,10 @@ src_install() {
 			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
 		done
 	fi
-	popd >& /dev/null || die
 
 	# openrc and systemd service files
-	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
+	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}
 
@@ -152,7 +144,7 @@ src_install() {
 		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
 		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
 
-		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
 		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
 		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
 
diff --git a/net-p2p/torrentinfo/Manifest b/net-p2p/torrentinfo/Manifest
index 3e48cd98a8a7..5231c5d32faf 100644
--- a/net-p2p/torrentinfo/Manifest
+++ b/net-p2p/torrentinfo/Manifest
@@ -1,5 +1,5 @@
 AUX torrentinfo-1.8.6-fix-tests.patch 934 BLAKE2B 6204fd3d04f7c8ddd4f4e9b9c64683003a4eb19f06fe5d7b7f76d3cdcb356b279ca4ac2d226080422f7bf98711d591b6b054d25539f3aa4096ad25ba970d6ef8 SHA512 d878048fe01bea0260f6b3045e77f88a6fb94ed11e15996fa3389119d8315657f77d2434d2c67b3ab58c83d4741f11c22723f0e9abbd06f4ab0df82cffc1b064
 DIST torrentinfo-1.8.6.tar.gz 22232 BLAKE2B 04159e4e54fbe979a1a73e1dee39c9b7f9def389c44e3886fd28707646a2bc4c6a4dfadd5494ef9283427959da1c36260828693a0008e09993786d8639813bcf SHA512 7f36f6c80876cbd70ea9e1331195c8a30a6546406f345402d4bec5c58afb9b03a3b60189b8d177a63a7047c3ede7fc18d8fc47ecb1bcbb726dd01b7cb2a6efb2
-EBUILD torrentinfo-1.8.6-r1.ebuild 671 BLAKE2B c6c84b7d4e934f9495bd320009127cf1c558fe13b351454df7f36185468ca9d4be3a95d6f4aa5d7e641c8ca3d441776da8e46f881177de812578a25b09c58228 SHA512 38b80cccf5c078c290f4a03dbfc2748c9499ae3926243a08c2f35807f0403de5da5f1bdc08d3b1a404169131060f5679be16ed4faa4813acc16a2e35ac7441c4
-EBUILD torrentinfo-1.8.6-r2.ebuild 676 BLAKE2B aa5401ebba591ae2900af81426aaf6feec1764c7fe6315f16e5ef252e9ba24e91285f2bf3e59d5ac288840d831b127c7ea014bc9736259a7b42472d1f21f3c66 SHA512 833aa285828447485bf8eb5c03d656920302b53f6491546ad0d14e0987ba37ea8205d18f9365647238e192006d99997a0a79625ac8325ec673eeb676d85e2cb5
+EBUILD torrentinfo-1.8.6-r1.ebuild 664 BLAKE2B 3116968ae4e28e58a0e007f312c1ee01e741bbaae98db108391295a3c6d2db5052952bf3d38a5f0033edc00229cd54923c85d3ba067fc36fae4c536d7c9d075b SHA512 1ed77ab17d06f69fb14dfe19422fcc03062cbac03683973d09d19b98401d30d70952868c53b8b2a2cdab4dcfdf61d4c82e606a62060db3954af20e6df8aeccbd
+EBUILD torrentinfo-1.8.6-r2.ebuild 671 BLAKE2B 03c96fc92426157d0759340aeace42a947e3e6f5390c2f4517397337d5ddb311a9739e921af66745bb7b2ef73b9dd0194cb5dd4cb118319bc17712e85d878725 SHA512 509e5fb0a3b24a5ef9aec8f1a3d0719d08a4cb1cee3f465be90dc81bd8076a0337106b659994883cb2fd20def3a7991d9611bbb619dfac1c3b4ecbd7267e3a31
 MISC metadata.xml 514 BLAKE2B 5369e1bd1e98a7f74671ee33fb82473ec8154c75352d6d3c605d847ba605e22da4946e72ecd4799012f098ba6d82d46eadd599122c6820c1fa854bd6b58ae24a SHA512 8f37c7e38771055becfa77f5f2bde1dbf2bbd16c9b469f0b4174f9db97c8ace9836bed9708f8e375538140e4d3e194caeb5829dd8219c176a3745dbb55f38dd5
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
index 4b8f21ae7e10..0e50b76255ee 100644
--- a/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
index a556d16e24e2..b7a80d84c665 100644
--- a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/net-p2p/xmr-stak-rx/Manifest b/net-p2p/xmr-stak-rx/Manifest
index bb33df74f5ff..13bf54ec987a 100644
--- a/net-p2p/xmr-stak-rx/Manifest
+++ b/net-p2p/xmr-stak-rx/Manifest
@@ -1,10 +1,6 @@
 AUX xmr-stak-rx 952 BLAKE2B ac1a2aa6c5c16f5f851929845566215bb7ff0b6359012631f5125a9251afd5d8ea50af805834fef64be0ca3a91eed96d95831c51af723e10214e2642a8dec9ed SHA512 3644dcf114cf5e49cc8c72380a0ff66149be836c1f79c81b5d076aec7ecf315ec632812cb5561e01217dc40a0cd5919db09d3a0aef133d7a8fbc24b6b202da2d
 AUX xmr-stak-rx.service 955 BLAKE2B a9b9cebacb566b5ea9c36380817833513f8352bdd7cd7d0471469215a079512e8ae1b267afe7a7317c982fc33935323b410ae6ca4b01812af703912a31af093f SHA512 b59dd8dc0fd0ab24900f48bead8b5d238dd0157b470399fd423c4831d07cd2769e965a740082071957da1edc5b157c4d45e37aef07deb800d7fa5ccb0a0594f7
-DIST xmr-stak-rx-1.0.1.tar.gz 500735 BLAKE2B 112b75122f35358c8558dec116a5f37bbbd13e9f57a767e03e85da37ab4a408831aa50bf5f2415451f776492b42c5a4a36de730fefc7d99bb13f437c9007d549 SHA512 488884948ad66445c37725397152201883feef8aff5afecaa93297a5bb45e65173b095e2e796d729bd8e9c778e94ee6fb65146250be54c39b10635a2569b6866
-DIST xmr-stak-rx-1.0.2.tar.gz 2590320 BLAKE2B e4bd4770ebd491182633a544a89e9ece25e471dfded7592680e0685883a805b26a0266982c0474f8a0db2c0ecf40412e4976c3ca7a4dc9f5f91f59bab947d277 SHA512 5a31ae5ae6e27c6bd2300c5e5056de733037d149fa7656b91da37f4e9dfb4f1cd1986503c30b84c4a5ee2539c12992dd5e5e883fb808d435d50484290cdb7e87
-DIST xmr-stak-rx-1.0.3.tar.gz 2590745 BLAKE2B 4b7d452728f9a18239a91de08fe3bda8e515fd96d47e3411b83d77ec254fac70d1ac9f334fffb6eb09bd57a4f7c533b214ad017a207190e5800ff27cdcccc6a4 SHA512 0836cde0766f781462957c196683b343ea48c10afee184db324ca6b62c4c7b53e381e8e4f4e41690148ae903b074d0cf0d51fed6a411b6bdaccb6f383e802935
-EBUILD xmr-stak-rx-1.0.1.ebuild 1824 BLAKE2B 4f7aa3e1158fdb42d0a10c6ad889e25e4062808b5e6b9ebe83565f8cc7e96fb76f5c08d634a9d9612f56deaa9063813cfa2b1c2bc8b0347071a13d241e7ccd0f SHA512 519270844b2739fed2f2587c6d66546fd0b2fdbff40c339254cbaa08597527421ed163fae625345bca5607a821443cbb5ccdd60474d2375542720c481776ca1e
-EBUILD xmr-stak-rx-1.0.2.ebuild 1824 BLAKE2B 4f7aa3e1158fdb42d0a10c6ad889e25e4062808b5e6b9ebe83565f8cc7e96fb76f5c08d634a9d9612f56deaa9063813cfa2b1c2bc8b0347071a13d241e7ccd0f SHA512 519270844b2739fed2f2587c6d66546fd0b2fdbff40c339254cbaa08597527421ed163fae625345bca5607a821443cbb5ccdd60474d2375542720c481776ca1e
-EBUILD xmr-stak-rx-1.0.3.ebuild 1824 BLAKE2B 4f7aa3e1158fdb42d0a10c6ad889e25e4062808b5e6b9ebe83565f8cc7e96fb76f5c08d634a9d9612f56deaa9063813cfa2b1c2bc8b0347071a13d241e7ccd0f SHA512 519270844b2739fed2f2587c6d66546fd0b2fdbff40c339254cbaa08597527421ed163fae625345bca5607a821443cbb5ccdd60474d2375542720c481776ca1e
-EBUILD xmr-stak-rx-9999.ebuild 1824 BLAKE2B 4f7aa3e1158fdb42d0a10c6ad889e25e4062808b5e6b9ebe83565f8cc7e96fb76f5c08d634a9d9612f56deaa9063813cfa2b1c2bc8b0347071a13d241e7ccd0f SHA512 519270844b2739fed2f2587c6d66546fd0b2fdbff40c339254cbaa08597527421ed163fae625345bca5607a821443cbb5ccdd60474d2375542720c481776ca1e
+DIST xmr-stak-rx-1.0.4.tar.gz 2595481 BLAKE2B acd0667301255ba145d42ea6a3f6acf731ca9946beccacd6db973a25a03c0e9f53dacb0e716f739f17f38e42b3ccb25e5af9052b7884ccfa0d5e89b6a3ab3c85 SHA512 ce2fb84e88cd3fe2d75d73c6027eea0823d3ac77463229ae838b97ba0e91d43d5f30365363049f7de7a7c1e8e85b5511850da86ecb07ae3db86d276241a7cce3
+EBUILD xmr-stak-rx-1.0.4.ebuild 1800 BLAKE2B a386f8a925d3682362953c5431dcbf84e94c1377a0a78435af9fd1cf579dfec28b6c343e69784268f00370bf8a1f74d617962452f7a36df923acdc70dc128ef2 SHA512 7037d978ab1a0ef42c2d47515df5847d4efc7a5cf5ab5f879f58830029bea251ba4cc2b7d551a755a7ef9c39eef5a8b7be838e4bbd575716fb3181bdb533f3f7
+EBUILD xmr-stak-rx-9999.ebuild 1800 BLAKE2B a386f8a925d3682362953c5431dcbf84e94c1377a0a78435af9fd1cf579dfec28b6c343e69784268f00370bf8a1f74d617962452f7a36df923acdc70dc128ef2 SHA512 7037d978ab1a0ef42c2d47515df5847d4efc7a5cf5ab5f879f58830029bea251ba4cc2b7d551a755a7ef9c39eef5a8b7be838e4bbd575716fb3181bdb533f3f7
 MISC metadata.xml 584 BLAKE2B 6c20a725c035fdfedb7a50e043943f56d7fe2a4d25823b543899873eb1136f804af6b3ea4cc39399f46b7400ee72e49cecadc4d9a8d9d2a4599da0bb29f8ab38 SHA512 4b3ab5ba293447a9fd518e628e3bfc0f6a40b1d182bd70eb3e7a5165e3b4a85e9ad1a8b5f2c282c6ff44895548fe7e1f94917560d1ee0fd32ceb5f3a57680c88
diff --git a/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.2.ebuild b/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.2.ebuild
deleted file mode 100644
index 5bd13426b524..000000000000
--- a/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
-	EGIT_BRANCH="xmr-stak-rx-dev"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}-rx.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/xmr-stak-${PV}-rx"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Monero RandomX Miner"
-HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda hwloc opencl ssl webserver"
-
-DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
-	hwloc? ( sys-apps/hwloc )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:0= )
-	webserver? ( net-libs/libmicrohttpd )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCUDA_ENABLE=$(usex cuda)
-		-DHWLOC_ENABLE=$(usex hwloc)
-		-DMICROHTTPD_ENABLE=$(usex webserver)
-		-DOpenCL_ENABLE=$(usex opencl)
-		-DOpenSSL_ENABLE=$(usex ssl)
-		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	doinitd "${FILESDIR}"/${PN}
-	dodir /etc/xmr-stak-rx
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}/etc/xmr-stak-rx/main.config" ]; then
-		ewarn "To use xmr-stack-rx:"
-		if use cuda || use opencl; then
-			ewarn "As root or as a user that is a member of the 'video' group,"
-		fi
-		ewarn "run:"
-		ewarn "/usr/bin/xmr-stak-rx --cpu /etc/xmr-stak-rx/cpu.config --amd /etc/xmr-stak-rx/amd.config --nvidia /etc/xmr-stak-rx/nvidia.config -c /etc/xmr-stak-rx/main.config -C /etc/xmr-stak-rx/pools.txt"
-		ewarn "xmr-stak-rx can now be terminated and 'systemctl start xmr-stak-rx' or '/etc/init.d/xmr-stak-rx start' can be used."
-	fi
-}
diff --git a/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.3.ebuild b/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.3.ebuild
deleted file mode 100644
index 5bd13426b524..000000000000
--- a/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
-	EGIT_BRANCH="xmr-stak-rx-dev"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}-rx.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/xmr-stak-${PV}-rx"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Monero RandomX Miner"
-HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda hwloc opencl ssl webserver"
-
-DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
-	hwloc? ( sys-apps/hwloc )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:0= )
-	webserver? ( net-libs/libmicrohttpd )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCUDA_ENABLE=$(usex cuda)
-		-DHWLOC_ENABLE=$(usex hwloc)
-		-DMICROHTTPD_ENABLE=$(usex webserver)
-		-DOpenCL_ENABLE=$(usex opencl)
-		-DOpenSSL_ENABLE=$(usex ssl)
-		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	doinitd "${FILESDIR}"/${PN}
-	dodir /etc/xmr-stak-rx
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}/etc/xmr-stak-rx/main.config" ]; then
-		ewarn "To use xmr-stack-rx:"
-		if use cuda || use opencl; then
-			ewarn "As root or as a user that is a member of the 'video' group,"
-		fi
-		ewarn "run:"
-		ewarn "/usr/bin/xmr-stak-rx --cpu /etc/xmr-stak-rx/cpu.config --amd /etc/xmr-stak-rx/amd.config --nvidia /etc/xmr-stak-rx/nvidia.config -c /etc/xmr-stak-rx/main.config -C /etc/xmr-stak-rx/pools.txt"
-		ewarn "xmr-stak-rx can now be terminated and 'systemctl start xmr-stak-rx' or '/etc/init.d/xmr-stak-rx start' can be used."
-	fi
-}
diff --git a/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.1.ebuild b/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.4.ebuild
index 5bd13426b524..11f242f611ce 100644
--- a/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.1.ebuild
+++ b/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -30,7 +30,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -42,11 +42,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak-rx
diff --git a/net-p2p/xmr-stak-rx/xmr-stak-rx-9999.ebuild b/net-p2p/xmr-stak-rx/xmr-stak-rx-9999.ebuild
index 5bd13426b524..11f242f611ce 100644
--- a/net-p2p/xmr-stak-rx/xmr-stak-rx-9999.ebuild
+++ b/net-p2p/xmr-stak-rx/xmr-stak-rx-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -30,7 +30,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -42,11 +42,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak-rx
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index 77b0e9ae82ba..33245a40d5c1 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -15,20 +15,20 @@ DIST xmr-stak-2.8.0.tar.gz 388733 BLAKE2B cc75b2d80d7d9761b192f8d0752dde29d49c56
 DIST xmr-stak-2.8.2.tar.gz 388342 BLAKE2B bcdfbebb2f8b8aba9be97a1591921e267852cf7a1c3685b3cc3858a3ca0e06498eaf969bd09c27f294ecac6a8fbc969b600ec0bbf33331d555e1f13cfbaa0402 SHA512 eb29ebc6c0a31bd274ff094558e93da0191ab219adc8b7fd47efec02ebe49feb441bb0224b4f3e0ce012588002c450f7a12c0ce3792b7f309bdb9045b06e1906
 DIST xmr-stak-2.8.3.tar.gz 389352 BLAKE2B db4a52b99a950d81f6ae67b6a96f2cc7cbb5f86553c5a17b429ee7e7e84e486c81f62d9e45c9317d11160e86a89715102bf73281fff3e8a75cc93f68c52ee9c4 SHA512 ed930a93c59acfd086ad24403f58f4b545602f35c9641655b423657da24ed66ddff80c555d6bc364a09ba5a1015f66b20fa7f3d4bcfd75a0316f3ce30b9b9dd7
 DIST xmr-stak-2.9.0.tar.gz 411514 BLAKE2B 8016bb70bf5d6d3c5ec70534e1711b0d7607fc46f9c33d9f6c4a9129aae599496f7af4453eab88b5260d50f5718583ee24e9def766308987d60662aaffba3ce0 SHA512 226ab0580aaf5e6c40734fb7448ccb6ab46631ad151765c3bd4829b2151027d748c593fd97ac5cba63c631c4fc8f7de632b1e8c633d80e20e53fea2a0744f8dc
-EBUILD xmr-stak-2.10.0.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.10.1.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.10.2.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.10.3.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.10.4.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.10.5.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.10.6.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.10.7.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.10.8.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
+EBUILD xmr-stak-2.10.0.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.10.1.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.10.2.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.10.3.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.10.4.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.10.5.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.10.6.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.10.7.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.10.8.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
 EBUILD xmr-stak-2.7.0.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-2.7.1.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
-EBUILD xmr-stak-2.8.0.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.8.2.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.8.3.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-2.9.0.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
-EBUILD xmr-stak-9999.ebuild 1888 BLAKE2B ea64b3f1a710696bb6818f03e8a6c0abbe4f67a742d7f6962fbda4dd916906f2593baf48f3016d7b19e8736ec95b3f820672629daea2c68ec920bd23af7bc89b SHA512 4c3b9abc3233d20fc1f1f2b6aa6aee128d6abd27a67558defaa5d6f4efeeed8cfd8684be7b5df7c7b67a953dde6e104e8281cece2b4a18e9d3171c669d3fa232
+EBUILD xmr-stak-2.8.0.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.8.2.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.8.3.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-2.9.0.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
+EBUILD xmr-stak-9999.ebuild 1864 BLAKE2B 460aeff8daa9784dea1306b02e6f0712403403445e6c9821d73ab0734a11905b669265ae1ad4318c64c2e1875ad675cc0e50188d2460f6792645c7b62a4161e0 SHA512 fb6dcd4f82871cdcb0612929e713148af5b4f278e95ece1ed4ef043312fc2cf8d7dcc1c2e685b38e55b7f83444499fc62c9bd5e120a1c321bdc745922e32359f
 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.3.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.3.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.10.3.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.4.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.4.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.10.4.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.5.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.5.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.10.5.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.6.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.6.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.10.6.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.7.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.7.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.10.7.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.8.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.8.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.10.8.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.10.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.8.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.8.0.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.8.0.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.8.2.ebuild b/net-p2p/xmr-stak/xmr-stak-2.8.2.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.8.2.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild b/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
diff --git a/net-p2p/xmr-stak/xmr-stak-9999.ebuild b/net-p2p/xmr-stak/xmr-stak-9999.ebuild
index 07ffbf9c1036..8876dd4fc1d9 100644
--- a/net-p2p/xmr-stak/xmr-stak-9999.ebuild
+++ b/net-p2p/xmr-stak/xmr-stak-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
@@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if ! use devfee; then
 		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
 	fi
@@ -44,11 +44,11 @@ src_configure() {
 		-DOpenSSL_ENABLE=$(usex ssl)
 		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
 	doinitd "${FILESDIR}"/${PN}
 	dodir /etc/xmr-stak
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-p2p
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)