gentoo resync : 14.05.2020

30 files changed, 166 insertions, 758 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 2ce3f2aa6ee5..888e690f85d1 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 9a391dab3459..8e16feaa5dbd 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,5 +1,6 @@
 AUX amule-2.3.2-Fixed-compilation-with-newer-bfd.patch 931 BLAKE2B 5506a79dfaa15578cee4da734ad27549a0c9c300acd7dc4c9dcf72148f464901a1939e013aa2acc347499ec4dbdb1aaada0730115498534b0a399d09c607d991 SHA512 7bcf505f9e5cdd0a7e282b7d35afa2277df6d5e359d8836cfbf41d10165ab859ca9ba896df171b50195d3a7acfe882bc4547254bc4ffb4774ea787e40e24a3dc
 AUX amule-2.3.2-cryptopp-6.patch 927 BLAKE2B 3be08b8219cebdaf252f21dd4a7e469d0371aa62a5ed9856c13d8772163c8f85cb7f19d9cf383e226276852c7acbb73ffdcc4f46a3e23118491154ddd47ca1da SHA512 fe07cdddf447d327ac517366449ec329d81f49ef327183eac36aca522db244732713837ac8c4d4ca0d92d648bd96dad670597b466e375324204427a381bc2b26
+AUX amule-2.3.2-desktop-mimetype.patch 760 BLAKE2B 6865cd597ba061ae3d10b07d96e20754edf020155b293d73a6d694f68f45986d6dba7c7276292a18f1469b37d09c233cf65ce7639608eadbca91e3ebc5dea9a9 SHA512 010a9daeefadbe6c864c5db683faece1cfb5ac1eb263062ee865bca1fec047b0389d346d4ce536883bc4137a4b19199bdf649c20eddc398cffd613c58f5bd140
 AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876fe05c2b85a70e2d704ecb3dd14ec6fc47550d4a677fcdd071906b93c56652c133462d5065b5907564e91c092430e310e2dd8c2523 SHA512 6d98c1a78b16778ad94ef9d70e87fe7ded2228b101bdb961565c3f2a0f2687e55c97bd824e331b53cbd45fbafbfa5803ce4c2f1fa8e245a3ebc97cdd7f282b65
 AUX amule-2.3.2-fix-crash-closing-last-search-tab-1.patch 3620 BLAKE2B f6dbba7491472d1c15f2253ea94cb83681c4f745f6cbe8662d95daaa54f69ff3eee94e02a1d5d5d69cf303c55db5cfef630096750b6bfcc431d48e120cfca91f SHA512 752f2dc7590001d830da2aa211349a2e04601c76ab01620f741e57f8c7a05851e1a4a4cba2ec88167b8c8047b8c3bca1a120003ec85c1155d6b8e71bff05f42c
 AUX amule-2.3.2-fix-crash-closing-last-search-tab-2.patch 5073 BLAKE2B a90260842bbadae7ea2f068a2c4fb94d3024e61ff0eecf340257fbbdb7657a7946aed36b8bdfe3f5a5c06852be55d144909f74cdb01761fb0e167c67ea4c0fc6 SHA512 8227cbb72af28a076e03dec466fb53660985de33fd84ef8856b6d098035015bc4e9c4d5a3da5a320053525d0356f3a73f2fe0b9f1c1eb7991b29bc4e1e93751f
@@ -15,6 +16,6 @@ AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d854870
 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0
 DIST aMule-2.3.2.tar.xz 3895300 BLAKE2B cf1bce3a0fcd0c108e369b7aed257f067a4ce3ce2fd4e8509b577ac58f8bc52fbc9aabc5c703bc9111dd06ac011ee1f3756279b093b69bcaada106226493237a SHA512 3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016
 EBUILD amule-2.3.2-r2.ebuild 2340 BLAKE2B 9e1a34ed32160a724264302f954280dd014899efe2b767fe2b6850738e93960bea8ee84573365d0616554cb10444face37428b057e7f98efb2c69393d80efe27 SHA512 00d8da48dabec279688a50ad92c71fd74cefe44f66386fa170cc006f94373fd23fe627271ae598447063897371f37510e8ba7c38eb85e1ff761f6d43670fb224
-EBUILD amule-2.3.2-r4.ebuild 3084 BLAKE2B ff61a3177d3b47787a667b6309cf00a6b5d3aa8c3b31f8bf5c3c9941f1fa7d50ca6fcf17fd09c1c8751920702bfd9c26289784be612f8824848f553684b3a0a3 SHA512 a2668da7c097a98c07f1ee457fb02e006d2bb24d17ec70afb481a973a5b9b04c6a07866faa71eca76178a021af20c25526c093dd74a309c76c8c0f2c0e47a2b7
-EBUILD amule-9999.ebuild 2971 BLAKE2B b45aab5acc78862fb4a16959b9b5c80d7fdc685117460a1804243ec18fe11a8b765626a1aaf37184a32bef46c472c5440e43803270361c0119aa4bd12588309b SHA512 735f436b7164b701e01feeca582e579b6481ab6b8eca5bc491579388a04fefa30f45a697d9636fc169b246c7dc8599320468271aa2f7cb97bc2f2e2f2e069ae0
+EBUILD amule-2.3.2-r5.ebuild 3564 BLAKE2B 1299bcb759a16b4208803526ddae6439cd5948f0c7446c4cef1b0d9cf208c381a459e5c62552dd38a39e3a00049f76466ce41a72832c8b39d1192bd6ff49d1bd SHA512 5492d73bce793abd860bd2ce1695688aa911319ce7ac2fdb37cbf2f78f5f0b236e5d3b5d72b612ab3594d86c07efc0f0ef59214a1d6afa5fe8435f353b92d3f5
+EBUILD amule-9999.ebuild 2993 BLAKE2B 092bff5f6c925f5a4b76d5d1152cec75e450737200393a4103c6f6c618acf9369f7c8421eb80fb97a505261f17083a86edb6a0fb0b736728b9fadc4723f6a822 SHA512 f54c20bdfe58fab7e2f231f1ebbc4b1a6a55bbe3264b3d3409e9d6881a3bf94ad48b016458d5c7367ed7bc1c4d0fbc2f385b4a23f94c921adc78e90893d69b22
 MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f
diff --git a/net-p2p/amule/amule-2.3.2-r4.ebuild b/net-p2p/amule/amule-2.3.2-r5.ebuild
index eee88909130a..50397fafc6db 100644
--- a/net-p2p/amule/amule-2.3.2-r4.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r5.ebuild
@@ -4,28 +4,35 @@
 EAPI=7
 WX_GTK_VER="3.0-gtk3"
 
-inherit wxwidgets
-
-MY_P="${PN/m/M}-${PV}"
+inherit wxwidgets xdg-utils
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/amule-project/amule"
+	inherit autotools git-r3
+else
+	MY_P="${PN/m/M}-${PV}"
+	SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+fi
 
 DESCRIPTION="aMule, the all-platform eMule p2p client"
 HOMEPAGE="http://www.amule.org/"
-SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="daemon debug geoip nls remote stats upnp +X"
 
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/crypto++:=
 	sys-libs/binutils-libs:0=
+	sys-libs/readline:0=
 	sys-libs/zlib
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
 	daemon? ( acct-user/amule )
 	geoip? ( dev-libs/geoip )
+	nls? ( virtual/libintl )
 	remote? (
 		acct-user/amule
 		media-libs/libpng:0=
@@ -33,8 +40,13 @@ RDEPEND="
 	stats? ( media-libs/gd:=[jpeg,png] )
 	upnp? ( net-libs/libupnp:0 )
 "
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}
+	X? ( dev-util/desktop-file-utils )
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch"
@@ -46,12 +58,21 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-libupnp-1.8.patch"
 	"${FILESDIR}/${PN}-2.3.2-libupnp-1.6.patch"
 	"${FILESDIR}/${PN}-2.3.2-Fixed-compilation-with-newer-bfd.patch"
+	"${FILESDIR}/${PN}-2.3.2-desktop-mimetype.patch"
 )
 
 pkg_setup() {
 	setup-wxwidgets
 }
 
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		./autogen.sh || die
+	fi
+}
+
 src_configure() {
 	local myconf=(
 		--with-denoise-level=0
@@ -124,4 +145,10 @@ pkg_postinst() {
 			fi
 		done
 	fi
+
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
 }
diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild
index f14cc28e5c40..a108c9752909 100644
--- a/net-p2p/amule/amule-9999.ebuild
+++ b/net-p2p/amule/amule-9999.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/crypto++:=
 	sys-libs/binutils-libs:0=
+	sys-libs/readline:0=
 	sys-libs/zlib
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
 	daemon? ( acct-user/amule )
@@ -42,8 +43,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( dev-util/desktop-file-utils )
 "
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
 
 PATCHES=(
 )
@@ -55,7 +58,7 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	if [[ "${PV}" == *9999 ]]; then
+	if [[ ${PV} == 9999 ]]; then
 		./autogen.sh || die
 	fi
 }
diff --git a/net-p2p/amule/files/amule-2.3.2-desktop-mimetype.patch b/net-p2p/amule/files/amule-2.3.2-desktop-mimetype.patch
new file mode 100644
index 000000000000..cd8ba4c2fc50
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-desktop-mimetype.patch
@@ -0,0 +1,30 @@
+From 048e86d44e09ef9dc1897c432660a712109b263a Mon Sep 17 00:00:00 2001
+From: Werner Mahr <werner@vollstreckernet.de>
+Date: Mon, 29 Apr 2019 18:37:35 +0200
+Subject: [PATCH] Added imetype-handler for amule ed2k-links. Patch taken from
+ debian.
+
+---
+ amule.desktop | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/amule.desktop b/amule.desktop
+index 70be367af..1cfb38010 100644
+--- a/amule.desktop
++++ b/amule.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Name=aMule
+-Exec=amule
++Exec=amule %u
+ Icon=amule
+ Terminal=false
+ Type=Application
+@@ -8,3 +8,4 @@ Categories=Network;P2P;
+ Comment=A client for the eD2k network
+ Comment[fr]=Un client pour le réseau eD2k
+ Comment[tr]=eD2k ağı için istemci
++MimeType=x-scheme-handler/ed2k;
+-- 
+2.26.2
+
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 4696192c9529..68d5865b1693 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,8 +1,6 @@
-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
 DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
diff --git a/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch b/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
deleted file mode 100644
index 8a6737f88471..000000000000
--- a/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/support/lockedpool.cpp
-+++ b/src/support/lockedpool.cpp
-@@ -250,9 +250,6 @@ void *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
-     addr = mmap(nullptr, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-     if (addr) {
-         *lockingSuccess = mlock(addr, len) == 0;
--#ifdef MADV_DONTFORK
--        madvise(addr, len, MADV_DONTFORK);
--#endif
- #ifdef MADV_DONTDUMP
-         madvise(addr, len, MADV_DONTDUMP);
- #endif
diff --git a/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch b/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
deleted file mode 100644
index 8148d565967e..000000000000
--- a/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://github.com/bitcoin/bitcoin/pull/16564
-
-From 272855746b18de76f51e84945d675904e9b907af Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 7 Aug 2019 11:38:11 -0400
-Subject: [PATCH] Always define the raii_event_tests test suite
-
-The test suite must always be defined (even when EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED is not defined) so that the test harness doesn't fail due to not being able to find the raii_event_tests test.
-
-This improves upon 95f97f4 actually fixing https://github.com/bitcoin/bitcoin/issues/9493
----
- src/test/raii_event_tests.cpp | 24 +++++++++++++++---------
- 1 file changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp
-index bdb411d53f57..6691de882930 100644
---- a/src/test/raii_event_tests.cpp
-+++ b/src/test/raii_event_tests.cpp
-@@ -4,20 +4,28 @@
- 
- #include <event2/event.h>
- 
-+#include <test/test_bitcoin.h>
-+
-+#include <boost/test/unit_test.hpp>
-+
-+BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
-+
-+#ifndef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-+BOOST_AUTO_TEST_CASE(raii_event_creation)
-+{
-+    // dummy; do nothing
-+}
-+#endif  // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-+
- #ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
--// It would probably be ideal to define dummy test(s) that report skipped, but boost::test doesn't seem to make that practical (at least not in versions available with common distros)
- 
- #include <map>
- #include <stdlib.h>
- 
- #include <support/events.h>
- 
--#include <test/test_bitcoin.h>
--
- #include <vector>
- 
--#include <boost/test/unit_test.hpp>
--
- static std::map<void*, short> tags;
- static std::map<void*, uint16_t> orders;
- static uint16_t tagSequence = 0;
-@@ -36,8 +44,6 @@ static void tag_free(void* mem) {
-     free(mem);
- }
- 
--BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
--
- BOOST_AUTO_TEST_CASE(raii_event_creation)
- {
-     event_set_mem_functions(tag_malloc, realloc, tag_free);
-@@ -89,6 +95,6 @@ BOOST_AUTO_TEST_CASE(raii_event_order)
-     event_set_mem_functions(malloc, realloc, free);
- }
- 
--BOOST_AUTO_TEST_SUITE_END()
--
- #endif  // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-+
-+BOOST_AUTO_TEST_SUITE_END()
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 9309015a7c28..a0522da675aa 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,26 +1,18 @@
-AUX deluge-1.3.15-r1-fix-preferences-ui.patch 1209 BLAKE2B 570dba58991221c2c2d329c0a367f68ebadf15d7b0fef8633c9c22d1c3dc992328d69f329f9700d2c46ab812ff4d99de420a37daecbb6623338e005f8fa9538d SHA512 9d32dad457ce5fe5752fa3f4dd42492443ffbeb0508347d21197b4ee950674dbf209d4faf6a730c37eecfa8a5233606fbef9ede5c4a2da5ee60d047ec7569b98
-AUX deluge-1.3.5-disable_libtorrent_internal_copy.patch 1165 BLAKE2B 68d0e98ca8648adb3f5afdeda84c4d36fa5bcea2239e37087404573faa4b8084a8c54362d237bbfda702d4b12213818259ddc0cd61013dc7261186899ded4b96 SHA512 8f08d5b9cfcff3fda8153d4bdfc8435a3b63fefc51b6cd3c648a82134377dc561e68df3c9aba4a37cffeff7b789d352a438b75ec6bdaf58f87ab5326f641b316
 AUX deluge-2.0.3-UI-status.patch 1406 BLAKE2B 7da865fa6d87fbfc0443572d34cbf7324cc76037c603b7d2199081533fab04362d78e15dcaf37ceeb606f04017e8b1b5ad9ceb2028a9bd4d11bb859f02d3d898 SHA512 4860c7147ff4ec6da072a4245be7a80e6512f6cf2eecfd4db8260a206e76d1cb44b9f063e82e5a57ef70ab3d7dd020d9ba5ddb1c96b2bbb72ed9d3b2f20d85c8
 AUX deluge-2.0.3-gettext.patch 483 BLAKE2B 5c0c4462a27c9e8339979593c7868cca6a3f56549cba094d7f3932b76fe65c5f6d50390db7bbfc39268de05ebaa92bf1a22caffe6ae858e6adf222f17cec15d4 SHA512 122127744960786d7c3b247feb69fa4397ceb70bb1a4f2d30be4a683f163096f120cc5a0f72602cab39374eae5351bd5b3cf8bfd527bf036cc8e5e7f0700cf32
 AUX deluge-2.0.3-setup.py.patch 428 BLAKE2B f9469cac78d66cf71b510d846bceb1e59e6c887d89b239d39f67aa3757434dd2f3e384531733ceb332b8b57d62b56f34244caa592a279aa812269cde6106b1cc SHA512 d2f23dd8a27aa5537610c34b6197962b986f4811a89dffbfc82fade0dc8c0942a8f58480e0235d11d049f89dd38c48da43bbf1dc8a66f26cbc16db764b672af5
 AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999
 AUX deluge-web.init 1484 BLAKE2B f58b9a929345ee705088cc7efbf83bd1537a8e0c8332e3c4d50f08f47b1a41c5b5005cb19c94e555fcbe92bcc1c5f2e274057cd9624789ee107d22717ffa0d03 SHA512 8afb1318e4cf267013a3704f71c83942c4c862eeb6d91ea15f4a2a8bb5f1bed7461453bf2877fe0afc4c3f560dad3629ade538324a75a9b6ce4982f5121a74ef
 AUX deluge-web.init-2 1503 BLAKE2B 418f9091294b87ff6ef7780a3df3ff72e2c30baf8b2f1d0af5c90c5ff122e56fa3e0e2328f02734b8e4bc65976be92bd21740c03202fedee5afe09b3789ce449 SHA512 04135ecc250140ad836b8531e60adc18c39e87901f8be9578948d09027877f6a6523de5be9a33c5db6f93416355f08a8a53dfdc75fa3188e1bf9c10f3dc556a6
-AUX deluge-web.service-2 198 BLAKE2B 00195276c90653b406fcd9d7d75cb6a69fff6929644372905de42e5a62ad1129e954adbe54415a3be612f705cb773f40570d49c7720b40b6caffacc7fce4518f SHA512 51d761c76d213285bef2cd4cc80c7135838f0fb955a7584ca15194080d50aa63e81642d566b901af8970ed01ae9952482226a41627f1e198fd6587c197737889
 AUX deluge-web.service-3 200 BLAKE2B cddc255dda99d26d603c20d2d5e6ab15b46a81fd1865734e9b77df82580788938fd2f343c1f3bc5e57062c5089c3244b7e1950451912bdc460c2bba28dd6da89 SHA512 50791884fe84c39784b6350cc38dbca116ae5e4505a6cae6a3833167014861d51fdce7902ad1ca74bbe0b580438d850cc7a8f4f2d065f495c6e7864e360577fa
 AUX deluge-web.service.conf 100 BLAKE2B 2ed6ce80fb88d19f50911940ca5092617b55670228354cb5c7c38b7fb23801e3880ecea4d2326bb2ce1b496ba484242ed109ef6149b712f3fe6cd4b356eccdf5 SHA512 aaf493b3f614558c762ffea3219eda7045e739eeeb826a19df456ef9a94a0894302695bd96490eb4fb44e16039126170ec31ba6e0a0a2f6ae69669e2b9f4cda9
 AUX deluged.conf-2 228 BLAKE2B e498f2d8b232ce40fee847079608750a58e15bb88e5918cf9325a44258a1ae73d114db8d6ff80bcf093a956ed33d592bf76748015a14803c3a380c415a805a0e SHA512 3005478b48c6c4c67f0eb8d9ee44ea1310ccd209fe6364f7bbc37ec296111e50462296d678cd4098bb63472ade190fdaf38ded39c3e8a73cbb4cede4860978c1
 AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aae1f61677f0f2fd763c3d7686d4fcb5a583884f560906bf75917fddd4ebbe379cdb2d839dfba80e9e SHA512 a2514306b14712c7b31e64baccb65080101314e5f81e01702caf0f030afa40d98c1d3898c90fb66f55092bb27c48f0a6bd5a4db215ac68e352602000b700164a
 AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7385d8c7350ea3a23aa16d4761c598ff2208a2eeb997c3ded11f79637aefb4268fdfc74e7eaedd5fb5f SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
-DIST deluge-1.3.15.tar.bz2 1775913 BLAKE2B 9d5224766051d52b6e075dcafab5716793081c78ba69da616fc98f2c463ddc7676b2c2ce8f54b81e1480cf4344582245733033cf5927a9692bc43ec0a23f0001 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda
 DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
-EBUILD deluge-1.3.15-r5.ebuild 4915 BLAKE2B 76981eabdac0c9bc5ff02f15731473027f8fd327526a0bf3e4b9bdbd1487896cf8fea4b39c3751d6f739f9e87ccd8887a6ae63db0ba4332062328803ec2153b1 SHA512 0fee78aa555b499d52f8f28088784ca9c8dc2d195c480a4434ba8927ce860571287c89e54b17727dc0f575584460bcc46e9a1bca3edb52451e6cfd4d228ecb44
-EBUILD deluge-1.3.15-r6.ebuild 4493 BLAKE2B e097dcbba9eb411cb71421ac8d45ba6f9d6389e22f1b8642356de2fcdd27500f82806d4150b6656dc43fc3c703ba7334392ef3328f67619b772b9b69cd2a276e SHA512 6eec9c42e806608006f5187998aa95fddf0f0ef39d8eb1a7645ca76fd73c045a7f49b0750040d9215645acdba8fbe7e1fd78545d108f32f112bd093b8c1fe4ec
-EBUILD deluge-1.3.15-r7.ebuild 4431 BLAKE2B f6e97528f9c78fbc5a1fb1827284410dfbb02cf9a45c66f98d58ddea69bfa26b28d8791f7d25280f030fe3216f96b75406e603c2fe9d30fe20140c03dc497937 SHA512 5bc29d225085c4a4fe2aaf7edcf1ef6827e72787914661b37389be18af2e0316ba015c7e74111090ee699c29e792e50695b70782f30beab8d8c2336ec4e49a47
-EBUILD deluge-1.3.9999.ebuild 4441 BLAKE2B eaeca4ed31cc750ec9de42b6ad53777832717e6224639de6b2ffa0c59b7abb22a3264f08fbc10db9f79cc289cee6ba03f0fdb284d94d3760866b7cf584b53fa3 SHA512 24e5c4641c573a822dd2ef002d851cf0d935b28f3c65b75215e4e824b975ffb32e1f9a5d094580f006a74155277ab3b2af384917cfb1c92dfa9737bb8c9e7e46
 EBUILD deluge-2.0.3-r4.ebuild 4551 BLAKE2B ca627923fdbb7144d4e4891916e5ef9f6e85f9ccdb24adc7ce28ab9295148ef3ec56c4f9fe3a53a6cc3c3b172dabb8c3ea23f7989db9e0d0d2c212313d8bbef8 SHA512 5b44412ab8537de7399608ff20afb7c8b06dc7ccc450dba4536df1c20c707bf59d3fa42bac27e91176e0d751da2a1848705fdcd0b7752df8fb3d13e676be4c37
-EBUILD deluge-2.0.3-r5.ebuild 4494 BLAKE2B c044f5d698919c6930999a0ccda4f475c470a4ed07b7fbfa2e4eed7b744b1853317724857048ca0a26556afa75e7a711c97eca8a84ba37c66ad3b50c96e9ffb7 SHA512 853df5c79bb8cd07b9a9afa5ad4ae262f893f00f9e3b3e4feb5e473d7fa176f5d651e3b23aed9304e95ae3990a1b10770a4788f581ba6f2a0b883f57a4ac05e0
+EBUILD deluge-2.0.3-r5.ebuild 4498 BLAKE2B 36a76f2ac7e3729c02fbe55778a4e03f180bc9a786a2e588f9824a2da3f30a01bd414b114fcf00e41f4be7dc35190f204fba5558718894f5ebc7c49aaa0b7e99 SHA512 eb2175efa677e713c9f4f43f8eee4dffbd152b3b15e9344ee402d056504c62a87851bebdc6e5c9b899f58bf24ddf1dfaeed58a402d6bc5ec43558a8de9e57ad5
 EBUILD deluge-2.0.3-r6.ebuild 4536 BLAKE2B 2e364f8ab18cd863e062883a44347e25d1013423fab81731b8ed5ed12f16d46d7bf1dd3c334092ad8d2d4f6a8a827036a3432dca0a287c430e021b3d27d192c3 SHA512 907108811c97d88e8ccdee666623f8a130503e45ca4c148ce9266d802654075136940fbcc5563a6ce7de82bf602c6339e277d3e14fd66e3569895ec98dbfb97c
 EBUILD deluge-9999.ebuild 4483 BLAKE2B 68bc5d2fcb7a73aa084d5bb9f10a783503be261634a9162cbacfeb4454bbdca7c2aa858de5295e0cbfe934037eb97442721fee83b474b5076a6c920cecf34150 SHA512 00587ba71ee066314024586ec5420ed6419053f0ecde16a8745e021ea7dcc328d941927c011e14fd72b31a4ffc8c8eee72046c921f2612786794b6b2a968b35c
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-1.3.15-r5.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
deleted file mode 100644
index bb90b8848275..000000000000
--- a/net-p2p/deluge/deluge-1.3.15-r5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-CDEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="${CDEPEND}
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
-		)
-		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-python_prepare_all() {
-	local args=(
-		-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
-
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	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-2" 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() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	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-1.3.15-r6.ebuild b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
deleted file mode 100644
index 58e3297a8a9a..000000000000
--- a/net-p2p/deluge/deluge-1.3.15-r6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd user
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-DEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool"
-RDEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
-		)
-		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-python_prepare_all() {
-	local args=(
-		-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-2" 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() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	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-1.3.15-r7.ebuild b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
deleted file mode 100644
index 018c45c4ff65..000000000000
--- a/net-p2p/deluge/deluge-1.3.15-r7.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_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}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-DEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
-		)
-		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-python_prepare_all() {
-	local args=(
-		-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-2" 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-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
deleted file mode 100644
index 33dd3918e4ea..000000000000
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 1.3.9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	EGIT_BRANCH="1.3-stable"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-)
-
-DEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
-		)
-		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-python_prepare_all() {
-	local args=(
-		-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-2" 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-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
index 1afeb0acefde..6faac8588ac6 100644
--- a/net-p2p/deluge/deluge-2.0.3-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch b/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch
deleted file mode 100644
index a63e5de10de1..000000000000
--- a/net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 38d7b7cdfde3c50d6263602ffb03af92fcbfa52e Mon Sep 17 00:00:00 2001
-From: Calum Lind <calumlind+deluge@gmail.com>
-Date: Sat, 13 May 2017 00:05:48 +0100
-Subject: [GTKUI] Fix keyerror showing prefs
-
- * Fix the single_proxy ui to True as unlikely any users using <=0.15
-   and need to have different proxy type settings.
----
- deluge/ui/gtkui/preferences.py | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
-index 645ad26..efcd93d 100644
---- a/deluge/ui/gtkui/preferences.py
-+++ b/deluge/ui/gtkui/preferences.py
-@@ -318,11 +318,8 @@ class Preferences(component.Component):
-             }
-             # Add proxy stuff
- 
--            # Display workaround for single proxy in libtorrent >v0.16
--            try:
--                lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY
--            except AttributeError:
--                lt_single_proxy = False
-+            # Display workaround for single proxy in libtorrent >= v0.16
-+            lt_single_proxy = True
- 
-             for t in ("peer", "web_seed", "tracker", "dht"):
-                 if lt_single_proxy and not t == "peer":
--- 
-cgit v1.1
-
diff --git a/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
deleted file mode 100644
index 349261426de8..000000000000
--- a/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -205,38 +205,7 @@
- 
- _ext_modules = []
- 
--# Check for a system libtorrent and if found, then do not build the libtorrent extension
--build_libtorrent = True
--try:
--    from deluge._libtorrent import lt
--except ImportError:
--    build_libtorrent = True
--else:
--    build_libtorrent = False
--
--if build_libtorrent:
--    got_libtorrent = False
--    if not os.path.exists("libtorrent"):
--        import subprocess
--        if subprocess.call(['./get_libtorrent.sh']) > 0:
--            got_libtorrent = False
--        else:
--            got_libtorrent = True
--    else:
--        got_libtorrent = True
--
--    if got_libtorrent:
--        # There isn't a system libtorrent library, so let's build the one included with deluge
--        libtorrent = Extension(
--            'libtorrent',
--            extra_compile_args = _extra_compile_args,
--            include_dirs = _include_dirs,
--            libraries = _libraries,
--            library_dirs = _library_dirs,
--            sources = _sources
--        )
--
--        _ext_modules = [libtorrent]
-+import deluge._libtorrent
- 
- desktop_data = 'deluge/data/share/applications/deluge.desktop'
- 
diff --git a/net-p2p/deluge/files/deluge-web.service-2 b/net-p2p/deluge/files/deluge-web.service-2
deleted file mode 100644
index adb38300a30e..000000000000
--- a/net-p2p/deluge/files/deluge-web.service-2
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Deluge WebUI
-Documentation=man:deluge-web
-After=deluged.service
-
-[Service]
-ExecStart=/usr/bin/deluge-web -c ${DELUGED_HOME} ${DELUGED_OPTS}
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index b0b18b35823e..aac40c8003d4 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -3,7 +3,7 @@ AUX retroshare-0.6.4-qt-5.11.patch 2365 BLAKE2B 34745015cae77990a71005a07be39522
 DIST retroshare-0.6.3.tar.gz 19699359 BLAKE2B 5a7a77b5ab43d44928e08fd1edc3bd6baa8b42f5c1e68fb079d3c60786c1068914a4f7a4b32fe4b683e7b990fac1bd09e5af66a09a3e9b7013e5b51b3c69ae8c SHA512 ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757
 DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B 63a32ee3a22f4df8b9f6cff149be2c9a9cf18ac895456c808885d510b261f683bf57141b8beb4a0206f7e61eb5c88ce505440956ccdf963ad6ad7f7a73679fb3 SHA512 7fcca6479b73cb4d70532fe46bb4cf24332d523b14a198a0e81689d0e00b62ca300d167be5ac282200e97f5fd9dc6b6c3a2c992ab1daa25846db1a404bf616f8
 DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
-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 3989 BLAKE2B c289c5f64dc78817f268be66ca8d0a930e59ec0b6bb50b37648bdd67843727d6a6f1c2dc72660da37e700e04b95a9546abe775f3d5025472ff55dec2239ae2bd SHA512 693d7e46d763017204babc8c326bdf3f8bb182135ab63fa94dbc1f26913c3dacd08cf0b5ce7c928eec4501e92087e94f1f6b7caec70066df534f869f82d6465b
+EBUILD retroshare-0.6.3-r2.ebuild 3947 BLAKE2B 414494c6da909cc92d33a42446b3b7506498ccd8a717ad23d261ca33fe0d154fcef080c96cd2b0102f95b938ec5af565056e0360eb829386a93f3d0197692225 SHA512 c02e41b40b8d165b8e6573b28025bbbeeab22ba9394bde6e095177340f37496bbae5669bfb54b40ec36b9952bead014140f186d4de28305405b9300cdecac6b6
+EBUILD retroshare-0.6.4-r1.ebuild 3784 BLAKE2B 49de37d083826e72d628b302772fd0dc76843597a3ecf897c3c9346246ca618550d5c2bd2c1ceedbbfea3b9504ec205b274340c1a45128e034b446cbb8a2372d SHA512 ed78ef2d141c6d5098d3008c9722c356454f04d0b6a36a1b4df4e3b647d0ae54861ce0e979f23c6527d399690bb3afb2678e80bf1ef508b31074c61afcbd4d2d
+EBUILD retroshare-0.6.5.ebuild 3979 BLAKE2B 35db0f242692977c06de9243a4ee76862a74f38560989cca51d40fbbe1c9ba551559604d9c2bd3a1e88a111c50aceea58ee6dd3c5afb51633d625c9fa1802d34 SHA512 19edf671bd9b754d031848b8f20c068e0b41e51b95c2a6ea3f2ba85b55ccb77fd98e9c634fb4592b44cf5ae62d5be27b0115d76cbaef542aa30eb4814c0ae26a
 MISC metadata.xml 1694 BLAKE2B 7266177c5abea3b795043576795318e44a98961f7e673dc32f530232add78e56cea5a9db3e56cb2d1a504c6d13c6c531200dfd6d1e2d48b3f9170730eb3fda28 SHA512 3f856caf5306b1f84308c27a44112bb131312aabc1aa6389deb51c0c3d816ffd4a9ab29b92221cc2baf31e10a17cea2e5f5f46c622f3ac30edd9b05b54d6f9b5
diff --git a/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.3-r2.ebuild
index faf5d585b2cd..6d046cba38a5 100644
--- a/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,7 +51,7 @@ RDEPEND="
 		media-libs/opencv[-qt4(-)]
 		media-libs/speex
 		media-libs/speexdsp
-		virtual/ffmpeg[encode]
+		media-video/ffmpeg[encode]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4-r1.ebuild
index 3f8d484b6367..1e9543ef3ad0 100644
--- a/net-p2p/retroshare/retroshare-0.6.4.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,7 +51,7 @@ RDEPEND="
 		media-libs/opencv[-qt4(-)]
 		media-libs/speex
 		media-libs/speexdsp
-		virtual/ffmpeg[encode]
+		media-video/ffmpeg[encode]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index 5a6874454603..ab3d11026c9f 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/Retro
 # pegmarkdown can also be used with MIT
 LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
 
@@ -27,7 +27,7 @@ RDEPEND="
 	<net-libs/libupnp-1.8.0
 	sys-libs/zlib
 	control-socket? ( dev-qt/qtnetwork:5 )
-	gnome-keyring? ( gnome-base/libgnome-keyring )
+	gnome-keyring? ( app-crypt/libsecret )
 	gui? (
 		dev-qt/qtcore:5
 		dev-qt/qtmultimedia:5
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index b865e55b968c..11c3fd16ac2a 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -288,5 +288,5 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321ea
 DIST syncthing-1.3.4.tar.gz 4785353 BLAKE2B 01ea21d207fd8d84d28b03125f6c3b2071a458b7e2fd611d31ae3b24e0eb38e9b28afed7b2b15272a362394e3b6d77e3385e74b97afe021915211cc394422b5b SHA512 1584e0856a7c559d4e809b171c6c7aa0cd01ca94a513607bc3ce6543a82ecb454647c990dfed221cf9d3d566b6c5b522f3fc3549aefbb0487111ecf54366f8b8
 DIST syncthing-1.4.2.tar.gz 4792506 BLAKE2B 32f5944b54f994e827226c4704e1c6a66e39124a7f72f5b3864b5a204d59b7c89c65df1fa1715096fa8af3a397fb4e7d695720faab639747018909c437c555aa SHA512 39631ce3da7e77edff92809cc0dc4224b7311da791b8a60aaaf06d60a476d2e9d6b914d4f4b9c13d33dad19cec98093c6cacc75abe431bb3809b5b5fdc883591
 EBUILD syncthing-1.3.4-r1.ebuild 16157 BLAKE2B 41eedeac4255ac0559a8ebd1545abce9c1f94547b742b6dd644377f9e2ba1e288cce6fc10faf8e8b5d2fb5f046461ee50d03d80eb66e805324f6fa5a80a13d21 SHA512 595ce2e21d5afaea290697c6757f24e8b18805914aae9221e4b55a05ab2e562bc49e747caa1af236c22cd71ee3bcc23afc6c445302d5e9194303f6d61d1c346b
-EBUILD syncthing-1.4.2.ebuild 16843 BLAKE2B c44f5db5bcb364e39158ff65f2e4edfe3d912e19d3ef4f57a508292732a34c16da3fbdb1abd50775fcd42496fa28c2071d59782db6a2e8a971f678d869b57cf2 SHA512 316b0887f5220dec20e3e7ca1b2c222a13639f1cb5449d698f37d7d76bc5f6eb26c49d0abcaf4393fd4534a31868c5b2eab822c9ff5593d86942e2b9b7934cd4
+EBUILD syncthing-1.4.2.ebuild 16850 BLAKE2B 2172f321051205b1f8a5f9b2a5aa74f8cfc536e8d7ae1fc85be87e1e43c16628aafa50227a697cb7d0c0c4e4d3f49607c2bd8910cec2aa2cd596f11965bf0381 SHA512 f22c4511a07aaffb2a7002c4917cd9b28cb772350ae11772e8f8d80572a2df99ab12968e1562ab6293fe93a98546de7043d849e5effcb2ec8a23c27c35f4d328
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.4.2.ebuild b/net-p2p/syncthing/syncthing-1.4.2.ebuild
index 5047b42159ab..53f3a59b4b98 100644
--- a/net-p2p/syncthing/syncthing-1.4.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.4.2.ebuild
@@ -293,7 +293,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing
diff --git a/net-p2p/torrentinfo/Manifest b/net-p2p/torrentinfo/Manifest
index d778fa8633ae..8f7d0de23e1d 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 658 BLAKE2B edc1003a5e95c63db7adbbd18c3348792057ad3425d65959e7edccc7ae097d84eb9ba7a67f510d101b1b3408fc83cfd3e5e7dffa7f44fbf1fe5276872e06ca58 SHA512 df54436f230e85e99370be87b9087f1ee8083825ef445bf3ebf1033eab12f70425a18de740955d24b191f1b1a2116f28e9b95e4b7a6312091748a35fd1720636
-EBUILD torrentinfo-1.8.6-r2.ebuild 683 BLAKE2B 2d3c001a51a51a4b4cbf655de621c0f6ad7debdf81fffe44e0801ba0e2625e62a558377f31ac3baa6cad652e65e3198e8c8ea86ae39927e673ed6f013cc0c43c SHA512 19b0fbcdb674e45985b3639ecbf46b92fcb1ca91a9db7c63df093125e9d1b69a2ab6ce781368614c8c09ec12fa0ea4da39a5c9516566bbaf41c664ceb9b2be8f
+EBUILD torrentinfo-1.8.6-r2.ebuild 681 BLAKE2B d75174a576086dc4a2613deacb2a061c3a39ac4653ac99b9a2b93989263feb4c58bc5d8585340c80d7b9e9290b94ffe241af874d5ae43187fc94abcbc26a7baa SHA512 0805247c3281b8f4d9ac6316575eec421436a331b087162c5001636a19ef5aa8567cf8e827f7e48ddcd4aa1e4eaea6cff54bc9246e85b220802408c199dbcc81
 MISC metadata.xml 514 BLAKE2B 5369e1bd1e98a7f74671ee33fb82473ec8154c75352d6d3c605d847ba605e22da4946e72ecd4799012f098ba6d82d46eadd599122c6820c1fa854bd6b58ae24a SHA512 8f37c7e38771055becfa77f5f2bde1dbf2bbd16c9b469f0b4174f9db97c8ace9836bed9708f8e375538140e4d3e194caeb5829dd8219c176a3745dbb55f38dd5
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
index 47fe1ceaf026..56e97bef6ea9 100644
--- a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Fuuzetsu/torrentinfo/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index a9c1ff2c6865..93aa3cff44f1 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -4,6 +4,6 @@ AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
 DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7
-EBUILD transmission-2.94-r1.ebuild 3801 BLAKE2B 46b610e161134d8307a7ba4660be15ed472d95010a863c016ea617916e8e1cb45e47ba1e35e51f5b671f9a2db64cb3496b15ec0749b3d4f72bd98a9ca071d4f8 SHA512 4d1d297acde4184a0c597409cfb6158b0545b4896376b0eb80f064edd34943cccca5fb2a7c5cdf7c7058a388fa9674f2d41ee822b9601d626e482af9c8642b5a
-EBUILD transmission-9999.ebuild 3299 BLAKE2B 430187f576775fef4d7bab5156530875805d4379022a70c2732c3d8af1c412de4cb1711e08d87db232d9e5287ddcba30394fd85df3ea83f9c4b9018e0076209e SHA512 1b98853f5bf8a178a8c4c72f432b81e4b81e2c4442580e55b03eb62450ee88dd43e9757d9c03de29c94a9ca762c998b964f5de58cb825e4b154c43f92a4fb421
+EBUILD transmission-2.94-r1.ebuild 3821 BLAKE2B 3ef7bb62f838ee382b5a7d5fb755d15ae3de1a555cdf3b4e6b9cdc40506e9aa271982e046bc379170708e5d802f1b9490ee078f2ee49583157d968442fd8e7c9 SHA512 ca9d0fbe7d6169effdeddc2c16370e26a90207e40e63e675a55aa4e726f0395989cf0c0877bb82dad062988040177eb7d0459bac19cd15053a79cffdd199de01
+EBUILD transmission-9999.ebuild 3314 BLAKE2B 6d83ca174cac776ba91c0ada261f28162c5f8fdcbdaa1fc4a3165dc9b87a964d293453f5ebf6e27a04234e309e0f480d777c7bcdb7b53c83bba99e78ffc5b2d4 SHA512 4a5686d52735847671ece9de72c2afc6998b790c83ae9f492d73c53b6b99e876a10302b0eb19823aebc0dacec80e9f4ac5ed6a3c9ca61760f4d58c72e65ef211
 MISC metadata.xml 602 BLAKE2B 05300c81bd2c4df76aaaf8381a788016777e259075aa6a3bf9da239b4832dac1281f718f0fd79ece7d5c238440e07d1aabe15b7da40f34674ac30bbd356d0c6b SHA512 0047a936eda032a4521707ea50dcde06dce3837993e70d43a5b033183ba58633ae46e2d2e56de98a56f3480b30e596c7fbae82fd1e2ee9cbebc7983d9551617d
diff --git a/net-p2p/transmission/transmission-2.94-r1.ebuild b/net-p2p/transmission/transmission-2.94-r1.ebuild
index 86c72f12f62b..432fe079c923 100644
--- a/net-p2p/transmission/transmission-2.94-r1.ebuild
+++ b/net-p2p/transmission/transmission-2.94-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.t
 # MIT is in several libtransmission/ headers
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT=0
-IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
+IUSE="appindicator gtk libressl lightweight systemd qt5 xfs"
 KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux"
 
 ACCT_DEPEND="
@@ -31,7 +31,7 @@ COMMON_DEPEND=">=dev-libs/libevent-2.0.10:=
 		>=dev-libs/dbus-glib-0.100
 		>=dev-libs/glib-2.32:2
 		>=x11-libs/gtk+-3.4:3
-		ayatana? ( >=dev-libs/libappindicator-0.4.90:3 )
+		appindicator? ( >=dev-libs/libappindicator-0.4.90:3 )
 		)
 	qt5? (
 		dev-qt/qtcore:5
@@ -53,7 +53,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	${ACCT_DEPEND}"
 
-REQUIRED_USE="ayatana? ( gtk )"
+REQUIRED_USE="appindicator? ( gtk )"
 
 DOCS=( AUTHORS NEWS qt/README.txt )
 
@@ -65,7 +65,7 @@ src_prepare() {
 	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
 
 	# Trick to avoid automagic dependency
-	if ! use ayatana ; then
+	if ! use appindicator ; then
 		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
 	fi
 
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index f7f2735ac3c6..36907b345d40 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://transmissionbt.com/"
 # MIT is in several libtransmission/ headers
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT="0"
-IUSE="ayatana gtk libressl lightweight nls mbedtls qt5 systemd test"
+IUSE="appindicator gtk libressl lightweight nls mbedtls qt5 systemd test"
 RESTRICT="!test? ( test )"
 
 ACCT_DEPEND="
@@ -57,7 +57,7 @@ COMMON_DEPEND="
 		>=dev-libs/dbus-glib-0.100
 		>=dev-libs/glib-2.32:2
 		>=x11-libs/gtk+-3.4:3
-		ayatana? ( >=dev-libs/libappindicator-0.4.30:3 )
+		appindicator? ( >=dev-libs/libappindicator-0.4.30:3 )
 	)
 	qt5? (
 		dev-qt/qtcore:5
@@ -111,7 +111,7 @@ src_configure() {
 
 		-DWITH_CRYPTO=$(usex mbedtls polarssl openssl)
 		-DWITH_INOTIFY=ON
-		-DWITH_LIBAPPINDICATOR=$(usex ayatana ON OFF)
+		-DWITH_LIBAPPINDICATOR=$(usex appindicator ON OFF)
 		-DWITH_SYSTEMD=$(usex systemd ON OFF)
 	)
 
diff --git a/net-p2p/xmr-stak-rx/Manifest b/net-p2p/xmr-stak-rx/Manifest
index 25c764a89e65..ca5e4984599f 100644
--- a/net-p2p/xmr-stak-rx/Manifest
+++ b/net-p2p/xmr-stak-rx/Manifest
@@ -1,6 +1,8 @@
 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.4.tar.gz 2595481 BLAKE2B acd0667301255ba145d42ea6a3f6acf731ca9946beccacd6db973a25a03c0e9f53dacb0e716f739f17f38e42b3ccb25e5af9052b7884ccfa0d5e89b6a3ab3c85 SHA512 ce2fb84e88cd3fe2d75d73c6027eea0823d3ac77463229ae838b97ba0e91d43d5f30365363049f7de7a7c1e8e85b5511850da86ecb07ae3db86d276241a7cce3
+DIST xmr-stak-rx-1.0.5.tar.gz 2596272 BLAKE2B 6d0923d7f0c5ed7751f2e38f9142dc3d4a216d4c5c9485ae41f9710fffffc8d7c20626f6d047366b879f9b40a2479613b0f403c078837f9a17564cacb5eb3590 SHA512 79e2a42f31f71cdbe27b89a31d302afc1a1897acd4440482d3cb0cee2c70e90018d64e941e392ebd536e552f46f0002d9dbc4a3efde7f562880ad4236677da56
 EBUILD xmr-stak-rx-1.0.4.ebuild 1800 BLAKE2B 2e8e4624de78b29264a763bee486560ad3c560e46966c9fcdbc8d46d535e66baa465349cbfd12e4d81d9f2c0f0db02182d9d359b8d97711c8a33c0777e41e493 SHA512 ed8644adfe669db8d3c1c4fb39ab5817f15918118da5e7c3e0d5919df9f6d7dc7f3107452e4592f2184e9b37cabf8bb01edd0c74600b64b61fb43d87d0cef4ee
+EBUILD xmr-stak-rx-1.0.5.ebuild 1800 BLAKE2B 2e8e4624de78b29264a763bee486560ad3c560e46966c9fcdbc8d46d535e66baa465349cbfd12e4d81d9f2c0f0db02182d9d359b8d97711c8a33c0777e41e493 SHA512 ed8644adfe669db8d3c1c4fb39ab5817f15918118da5e7c3e0d5919df9f6d7dc7f3107452e4592f2184e9b37cabf8bb01edd0c74600b64b61fb43d87d0cef4ee
 EBUILD xmr-stak-rx-9999.ebuild 1800 BLAKE2B 2e8e4624de78b29264a763bee486560ad3c560e46966c9fcdbc8d46d535e66baa465349cbfd12e4d81d9f2c0f0db02182d9d359b8d97711c8a33c0777e41e493 SHA512 ed8644adfe669db8d3c1c4fb39ab5817f15918118da5e7c3e0d5919df9f6d7dc7f3107452e4592f2184e9b37cabf8bb01edd0c74600b64b61fb43d87d0cef4ee
 MISC metadata.xml 584 BLAKE2B 6c20a725c035fdfedb7a50e043943f56d7fe2a4d25823b543899873eb1136f804af6b3ea4cc39399f46b7400ee72e49cecadc4d9a8d9d2a4599da0bb29f8ab38 SHA512 4b3ab5ba293447a9fd518e628e3bfc0f6a40b1d182bd70eb3e7a5165e3b4a85e9ad1a8b5f2c282c6ff44895548fe7e1f94917560d1ee0fd32ceb5f3a57680c88
diff --git a/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.5.ebuild b/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.5.ebuild
new file mode 100644
index 000000000000..b82f8550d869
--- /dev/null
+++ b/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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_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_src_configure
+}
+
+src_install() {
+	cmake_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
+}