From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 3 Nov 2019 16:06:58 +0000
Subject: gentoo resync : 03.11.2019

---
 net-p2p/Manifest.gz                                | Bin 8276 -> 8262 bytes
 net-p2p/cpuminer-opt/Manifest                      |   2 +
 net-p2p/cpuminer-opt/cpuminer-opt-3.9.9.1.ebuild   |  50 +++++++
 net-p2p/deluge/Manifest                            |   6 +-
 net-p2p/deluge/deluge-2.0.3-r1.ebuild              | 133 +++++++++++++++++++
 net-p2p/deluge/deluge-2.0.3.ebuild                 | 133 -------------------
 net-p2p/deluge/deluge-9999.ebuild                  |   6 +-
 .../files/deluge-1.3.12-fix_scheduler_plugin.patch |  22 ----
 net-p2p/deluge/files/deluge-web.service-3          |  10 ++
 net-p2p/ktorrent/Manifest                          |   2 +-
 net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild          |   2 +-
 net-p2p/qbittorrent/Manifest                       |   2 +
 net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild     |  70 ++++++++++
 net-p2p/vuze-coreplugins/Manifest                  |   2 +
 .../vuze-coreplugins-5.7.6.0.ebuild                |  51 ++++++++
 net-p2p/vuze/Manifest                              |   4 +-
 .../vuze/files/vuze-5.7.6.0-unbundle-commons.patch | 114 ++++++++++++++++
 net-p2p/vuze/vuze-5.7.2.0.ebuild                   | 136 -------------------
 net-p2p/vuze/vuze-5.7.6.0.ebuild                   | 145 +++++++++++++++++++++
 19 files changed, 590 insertions(+), 300 deletions(-)
 create mode 100644 net-p2p/cpuminer-opt/cpuminer-opt-3.9.9.1.ebuild
 create mode 100644 net-p2p/deluge/deluge-2.0.3-r1.ebuild
 delete mode 100644 net-p2p/deluge/deluge-2.0.3.ebuild
 delete mode 100644 net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch
 create mode 100644 net-p2p/deluge/files/deluge-web.service-3
 create mode 100644 net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild
 create mode 100644 net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild
 create mode 100644 net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch
 delete mode 100644 net-p2p/vuze/vuze-5.7.2.0.ebuild
 create mode 100644 net-p2p/vuze/vuze-5.7.6.0.ebuild

(limited to 'net-p2p')

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 529af29a4d44..8ea3c7ae033d 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index c22198aca034..c68ceb9dd008 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -3,11 +3,13 @@ DIST cpuminer-opt-3.9.6.2.tar.gz 1796238 BLAKE2B 5c9ef9e04897ac8e62196bb54606b40
 DIST cpuminer-opt-3.9.7.tar.gz 1797055 BLAKE2B 33f978139a04e5bedd76bf37f20d55e1a910e38bb877adf611b9a3b5a9c83193bde6adf5a93562a57e5b12c5e05b59824709714143b9df9abffb751f20e9543d SHA512 a696847b9c7283e1a05cfae2785311e82a1b84496ca1da2b30bb960d3fcc37991f9ab866b8e32125f66718d89b2b8ac3e680b53da2ec68deff910745603ce6d7
 DIST cpuminer-opt-3.9.8.1.tar.gz 1792320 BLAKE2B 2e53e40bebeff44e8197f9a2d8e95e75020739ac8797b7826f7e056d94dc85d4f43994a520abeec5fad8be0c4ef20c2667e1860873810a33026a33dc328fe094 SHA512 42ae191c29c53cc837b8532a1aa00dab19392f48c5e69dced09392d83bb3f949c156db9172fbd765c0ebca6b8fdc48346f4b0b5504ca1c5dd69718ee9c832997
 DIST cpuminer-opt-3.9.8.tar.gz 1792693 BLAKE2B e08866a17e29491430ef2896b79336a78b8fd74696812c406be9454c59ec07c5d65237714375888a06d15cceaaf8465658004f73d0371f0e95f7954fae2c22fe SHA512 af50d7cbc4890697cc006887053d7fe7ec516dc13709bdb61c77ba1322fa7c6ce0c942ea9fc1881ce9ae43524b20f7182d574e546ef4e0fc479a0827658329af
+DIST cpuminer-opt-3.9.9.1.tar.gz 1817197 BLAKE2B b32f95a31a85deb9ebac344a11d0fb5e1b2c99912ae0acfe29c811236f4a84722f3a973b8d7527ca27206a47efb641ad422eeaf80346a5c5b3a0ad4765b86083 SHA512 8146293ff9da20a5fd1df90712a53118d2fd5319ce49e5ae7b37d741ed3056f422b6ab4ef4ca48ed398f45f78ae11150a1ee9a75679e7e0ce87ded72006e129e
 DIST cpuminer-opt-3.9.9.tar.gz 1819335 BLAKE2B 1fccbcb1615eb9a11b242c462e4b6a1c2bdd9340311a53f8b5a1827aeb008da07b695e0c8d2af42621fed895268fd6324a2a73bbc6ec311b4900fc911a658e06 SHA512 d53b721f3e961f8a61b28bb164c2a470ed2c230c00263dcc67182e8b20b54d7905c65b96e01ad3e639888d3f3aa2e978cfa712ea4a3f34826d314fcd08485417
 EBUILD cpuminer-opt-3.9.6.2.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 EBUILD cpuminer-opt-3.9.7.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 EBUILD cpuminer-opt-3.9.8.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 EBUILD cpuminer-opt-3.9.8.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
+EBUILD cpuminer-opt-3.9.9.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 EBUILD cpuminer-opt-3.9.9.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 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.9.9.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.9.1.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.9.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 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 d8bced93ad91..ebb838367e37 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,4 +1,3 @@
-AUX deluge-1.3.12-fix_scheduler_plugin.patch 1050 BLAKE2B 574e0a32d856247108418978bd8a4cab7db960ec929175a4a5845f07ab726e0714070c3bd853dc2537ec52a770daea11d54c43568da1e12cc5bba3f394b2a42c SHA512 0613de93b5f61e523dfd8b8d5ec145a64b69ae96fde8236d9da9c7e4a54af681490879157f0a8a5537c27e93feb5b1db6651d61a9655e58763c1676e1843e087
 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
@@ -6,6 +5,7 @@ AUX deluge-2.0.3-setup.py.patch 428 BLAKE2B f9469cac78d66cf71b510d846bceb1e59e6c
 AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999
 AUX deluge-web.init 1484 BLAKE2B f58b9a929345ee705088cc7efbf83bd1537a8e0c8332e3c4d50f08f47b1a41c5b5005cb19c94e555fcbe92bcc1c5f2e274057cd9624789ee107d22717ffa0d03 SHA512 8afb1318e4cf267013a3704f71c83942c4c862eeb6d91ea15f4a2a8bb5f1bed7461453bf2877fe0afc4c3f560dad3629ade538324a75a9b6ce4982f5121a74ef
 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
@@ -17,6 +17,6 @@ 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.ebuild 4431 BLAKE2B 83af31524f55d3be3a3dddc9090030734b42eea4155fe257d8288be886c7de430127c3ec3927ad13be50368005c8d8d8c0ef0cabca70ae12587a3e55f9ea4e7a SHA512 f01b50cfbe640e43756ee4aed3d56d633c5ffec2bd6c2ea2a3483c6f72df613156386b89fdd74948eb07eeefe2ee3a161cddd3dc73617a85a3dcbb200e7f4f70
-EBUILD deluge-9999.ebuild 4431 BLAKE2B 83af31524f55d3be3a3dddc9090030734b42eea4155fe257d8288be886c7de430127c3ec3927ad13be50368005c8d8d8c0ef0cabca70ae12587a3e55f9ea4e7a SHA512 f01b50cfbe640e43756ee4aed3d56d633c5ffec2bd6c2ea2a3483c6f72df613156386b89fdd74948eb07eeefe2ee3a161cddd3dc73617a85a3dcbb200e7f4f70
+EBUILD deluge-2.0.3-r1.ebuild 4415 BLAKE2B b1028710ba509fe4e3b89ecb973f5e788c8ac1ed4172954a2f92ab0e8ad43542819d083b82c18f2d58360d49ae1572bd75e7496454f44a665a18606a5bcb758e SHA512 07ac0dd3bfcc907088d682b5f9e699cf70d9dc12d4ffd6690dcd9a54e6b7a5daed81963aa0722f54aee6a3270068acf4913ae009462d9904186069e21971c631
+EBUILD deluge-9999.ebuild 4415 BLAKE2B b1028710ba509fe4e3b89ecb973f5e788c8ac1ed4172954a2f92ab0e8ad43542819d083b82c18f2d58360d49ae1572bd75e7496454f44a665a18606a5bcb758e SHA512 07ac0dd3bfcc907088d682b5f9e699cf70d9dc12d4ffd6690dcd9a54e6b7a5daed81963aa0722f54aee6a3270068acf4913ae009462d9904186069e21971c631
 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
new file mode 100644
index 000000000000..9d936b780a05
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_{5,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-2.0.3.ebuild b/net-p2p/deluge/deluge-2.0.3.ebuild
deleted file mode 100644
index f347e4c3ee39..000000000000
--- a/net-p2p/deluge/deluge-2.0.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-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}]
-	webinterface? ( 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-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-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index f347e4c3ee39..9d936b780a05 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 
@@ -51,7 +51,7 @@ RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
 		libnotify? ( x11-libs/libnotify )
 	)
 	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+	dev-python/mako[${PYTHON_USEDEP}]"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
@@ -99,7 +99,7 @@ python_install_all() {
 	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_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
diff --git a/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch b/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch
deleted file mode 100644
index fda64aa2b393..000000000000
--- a/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From cdf301601fe71bd697f3796cf0a5656d437d140e Mon Sep 17 00:00:00 2001
-From: Calum Lind <calumlind+deluge@gmail.com>
-Date: Wed, 16 Sep 2015 15:11:56 +0100
-Subject: [Scheduler] Revert erroneous fix backported from develop branch
-
- * The issue this was intended to fix only occurs on develop branch
----
- deluge/plugins/scheduler/scheduler/core.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/plugins/scheduler/scheduler/core.py b/deluge/plugins/scheduler/scheduler/core.py
-index 9fb81df..f0e2392 100644
---- a/deluge/plugins/scheduler/scheduler/core.py
-+++ b/deluge/plugins/scheduler/scheduler/core.py
-@@ -127,7 +127,7 @@ class Core(CorePluginBase):
-         """
-         core_config = deluge.configmanager.ConfigManager("core.conf")
-         for setting in CONTROLLED_SETTINGS:
--            component.get("PreferencesManager").do_config_set_func(setting, core_config[setting])
-+            core_config.apply_set_functions(setting)
-         # Resume the session if necessary
-         component.get("Core").session.resume()
diff --git a/net-p2p/deluge/files/deluge-web.service-3 b/net-p2p/deluge/files/deluge-web.service-3
new file mode 100644
index 000000000000..5e0049e7ac23
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.service-3
@@ -0,0 +1,10 @@
+[Unit]
+Description=Deluge WebUI
+Documentation=man:deluge-web
+After=deluged.service
+
+[Service]
+ExecStart=/usr/bin/deluge-web -d -c ${DELUGED_HOME} ${DELUGED_OPTS}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 1f7ffe4b5eb6..a295d11d2903 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -7,5 +7,5 @@ AUX ktorrent-5.1.2-crash-on-exit.patch 13261 BLAKE2B 735100f666ad7b6d0dccfcf3b5c
 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 3118 BLAKE2B a4d3853d387bf201e40df11167bbca60693b5140c6d8ea4d3dd8224f138afbef6445479552ed9731f88e9dc75c971890b5a59685b200a542dfd64dcb1a267ad9 SHA512 7585567f8ee55a9e50b447c02c9a01ccc340c977a9c339b87f0777ed4e9dab562867dc76a594370d915d9a56f608b5cb66e9503e5a090ee573fd3028bde37de1
+EBUILD ktorrent-5.1.2-r2.ebuild 3117 BLAKE2B 6def5bacd79003cfb07ee10db374c4a2074ed2715a8ec46819b9f7530ba7b0b161ddab4fe5a56a9111eeac3b4441820b78f7b2097b185303123cb7e8d9bca549 SHA512 b437859dabd46d654f28d571ed911b20ab6d262bdcc5c468b8169f9d74bfe2337b502c7e8474a808fb198d9f0332357d5042b961a5220448f09e693a31189f7d
 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
index a23633e653d4..e87eb859a2a6 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
@@ -13,7 +13,7 @@ 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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 4c5eb92b0cf0..f947088fee08 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,6 +1,8 @@
 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
 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-9999.ebuild 1476 BLAKE2B 17de90559b1830bd74b745589e7fdd9f3b6eb9de191ab0e6083bbafe66143549117ab94bc5dd0fd587c17a3e34f7b7775121c622ec4333e9ec648a41d6cd37fd SHA512 bffb41425575c458fd7db4eba7ec071dbad620cb65c84aab7a18b4b9670587eee33139b12e9a370875857b6f806531ad24ee32b740538e6e94b055ccfc185acd
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild
new file mode 100644
index 000000000000..e4e1c16a3150
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S="${WORKDIR}/qBittorrent-release-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug webui +X"
+REQUIRED_USE="dbus? ( X )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/boost-1.62.0-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
+	dev-qt/qtxml:5
+	=net-libs/libtorrent-rasterbar-1.1*:0=
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	X? (
+		dev-libs/geoip
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+src_configure() {
+	econf --with-qtsingleapplication=system \
+		$(use_enable dbus qt-dbus) \
+		$(use_enable debug) \
+		$(use_enable webui) \
+		$(use_enable X gui)
+}
+
+src_install() {
+	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-p2p/vuze-coreplugins/Manifest b/net-p2p/vuze-coreplugins/Manifest
index af025e0d1a49..c4b24eb15244 100644
--- a/net-p2p/vuze-coreplugins/Manifest
+++ b/net-p2p/vuze-coreplugins/Manifest
@@ -6,6 +6,8 @@ DIST azupdater_1.8.17.zip 26023 BLAKE2B 2db0d88bc5aef807d4116bb8a0aacb89aa1ba594
 DIST azupdater_1.9.2.zip 26390 BLAKE2B 9c146beee646cd4a31a1014286d4a2bdbe791b5841c0bc2dca1d0740546f224d34294efcc0ae7a36ae21b8a9e93a442369af8e896255bb11518a5a80b27fff11 SHA512 8a1b37d69e6c955f0e507c5455ae198c162f9de2f1713abd6d47bc9f32e65b6afba15152956f98eca101fbf4dbbecaa5b0f84813dcf11e9b7bf33171ce7432cd
 DIST azupnpav_0.4.6.zip 247837 BLAKE2B 1c4060515b963bc1edab9a8f5195232aec268eabc67830c94ace69868726e89ff697647c1f00056cb551c53b517c672990dcb7693f025f8f4a6c6cf77dde0b4c SHA512 eee392cf82aae37b2689ce086fb00727728064552ca31bbf228d3d76407c15f92d30527b979dfc555dbf3a1ead65d991c55d8c517c0f5c93d5a3890b88bfa6b1
 DIST azupnpav_0.5.6.zip 264588 BLAKE2B dafaaa89dc9978e06e40bb56e4a76523c2c5e66f0e01beaa0af1b216f2f23348850c93d2f4e85ee2c9458b3d932dc44598a1d72f9c0149964e0533b30395dc59 SHA512 f780e708db51eb4e02ee1dedd445aa72f8a52dc6711d473b93339a2db9492654f93d44cde8456bb7db457b3bca88e15132ce0bc5221247ccb34672ae58bca172
+DIST azupnpav_0.5.7.zip 264998 BLAKE2B 70a8864c61a9b9c3520ae04b0576678c768c619de1f822cfa7968617d7d37597077126b7b562d7a6ebd7458fa8a4e1fecd733be2db41ebe2aec7b8825d00f669 SHA512 f58fa8a3e26d204080a8567240bcbac2868233137ddb073c2ca0c91c17ace5f7a07cebfb1eef04e7fb18eb9287418329b5ca742681806fce78a975e0053ddf1c
 EBUILD vuze-coreplugins-4.8.1.2.ebuild 1978 BLAKE2B dc7a4e6e4032b9bdc95a25e57b5013dc71c8f2c6bd3f13d8e111d096821cba74d4ebccc5a9f3e9a6cc60ecd974732168a8df033ea84047b56c0287ff58582ada SHA512 e3190df7d088dc28a7c935249596798f3a519920f3adea77827bffab9755d6b71569a93d27356faaf8abdf7190c646f7b5983d5c23b57abaea589204e86f552d
 EBUILD vuze-coreplugins-5.7.2.0.ebuild 1467 BLAKE2B c583f2ab339ad8048ac3684bb42c3671a103733d776fb58ecfc4e583538bc9a37b61610b248605df7a8d467f112a021a351f557f75b2b535804e814df8ebfc51 SHA512 c2db8fb998f28b14365eb7fead8033f56a309e8135378de67ecd1fd8b0f348f9215f005cf917e5923a97271f1990289f2ce812c765169333ebf32be8cb96370f
+EBUILD vuze-coreplugins-5.7.6.0.ebuild 1468 BLAKE2B 7edd44b53612574b487b0061dc665be290f33831d339a1fad23388ce83927e2fc6b53f416391dc42824e1c136544a89feed94d871aac7e55a3f12ab385a2522c SHA512 a7a46abcc4bbc17887730566a0d72dd440993afc0cc4b6f96f63bab3691d37ccd9f63b87487448f9ccafe9c6046c98254d75200efdd4c40948f3956d40034e83
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild
new file mode 100644
index 000000000000..81ad877b00ab
--- /dev/null
+++ b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# update these when bumping the version
+PLUGINS_V=2.1.10  # http://www.vuze.com/plugins/details/azplugins
+RATING_V=1.5.19   # http://www.vuze.com/plugins/details/azrating
+UPDATER_V=1.9.2   # http://www.vuze.com/plugins/details/azupdater
+UPNPAV_V=0.5.7    # http://www.vuze.com/plugins/details/azupnpav
+
+PLUGINS_DIST=azplugins_${PLUGINS_V}.jar
+RATING_DIST=azrating_${RATING_V}.jar
+UPDATER_DIST=azupdater_${UPDATER_V}.zip
+UPNPAV_DIST=azupnpav_${UPNPAV_V}.zip
+
+ALLPLUGINS_URL="http://azureus.sourceforge.net/plugins"
+
+DESCRIPTION="Core plugins for Vuze that are included in upstream distribution"
+HOMEPAGE="http://www.vuze.com/"
+SRC_URI="
+	${ALLPLUGINS_URL}/${PLUGINS_DIST}
+	${ALLPLUGINS_URL}/${RATING_DIST}
+	${ALLPLUGINS_URL}/${UPDATER_DIST}
+	${ALLPLUGINS_URL}/${UPNPAV_DIST}"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="~net-p2p/vuze-${PV}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	mkdir -p plugins/{azplugins,azrating,azupdater,azupnpav} || die
+	cp "${DISTDIR}"/${PLUGINS_DIST} plugins/azplugins || die
+	cp "${DISTDIR}"/${RATING_DIST} plugins/azrating || die
+	cd "${WORKDIR}"/plugins/azupdater && unpack ${UPDATER_DIST} || die
+	cd "${WORKDIR}"/plugins/azupnpav && unpack ${UPNPAV_DIST} || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/vuze/
+	doins -r "${WORKDIR}/plugins"
+}
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index ef0a16e0d92f..553624cc7838 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -9,11 +9,13 @@ AUX vuze-5.3.0.0-unbundle-json.patch 1322 BLAKE2B fc387740073933b9f99474dd2ac5e7
 AUX vuze-5.6.0.0-commons-lang-entities.patch 2085 BLAKE2B 547ab6aa8e964280f72bc161775c4eaec5371c06d8e98629013068d3d69b160f8cac36377a14811ad714cc011f3293d7c82dd873d2bbed536110ab4b4d6fd016 SHA512 a08d23a1947ad668048f49c8137d4494da662d65f5cf98acd5e44656f7d6a2bf691eebba4fd8033996594d1c4edc1a2eec3ce3f92d23b1818c03b405fc081899
 AUX vuze-5.6.0.0-invalid-characters.patch 1121 BLAKE2B 4a4dc12ee00fc60198a1533e4b3b0e293dd6b98f7cdafdaafbc4819bf2bf0ffdaa90065fae8770769f42ae39b6e2a437e0f191dae66b1f24e40b4195fb0b9300 SHA512 718c64a892aa860455db4c23f97d403c77bbba0fd1ecf957761f7c7dfcb9c8b42ed75b1f3e706f3d67335ed38599fbc6f9e2731941bdf819d956e830a8227344
 AUX vuze-5.7.2.0-disable-osx.patch 2278 BLAKE2B 760b82f75b310d01b94891a3c1528fe48200e7c8fdc04baecb18965316e3ffb347c9b131540f7a30061751fd1b449d924536f9d8f77bde7743c88579b33e9be5 SHA512 39797193297d61c1e91bfdcbf6e4fa6acb523c067ac96a0de99d5f79fab69b327688f87f8c8f24c0d7967c4c1017bde478ecc10aa117f96f0b891dc10a21420a
+AUX vuze-5.7.6.0-unbundle-commons.patch 5156 BLAKE2B 641a0264521e97d808046a9d76cb362302dd25679a6e8df6878646d59f04b1a6cc0ab1fd7e83d8f76cb7250b9b2fbd64cf1efbbbc4eb14a0432f2eceea3c22c7 SHA512 f4c5082b618a2feb9c19bb1ddc53e7a61f1511d804488ce279e3c3174fc185d93d31316de58d185e3f6a6f19af11d587c9b11c4361c3f07622c11843eff6b51c
 AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
 DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a7305587d36ef863257b7b86e911f7012e73f532b3b4648000cfff5fa2fd2cd1848f0742791232ceee54f158a9c219 SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf
 DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
+DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
 EBUILD vuze-4.8.1.2-r1.ebuild 4000 BLAKE2B 5ce11619ce22b732bd1f7c0f38c5d48f72cce4bce2092ccc93bc261b6888b40d24cf0bd1e2a120549c2adddd9576226faa9049105a0b81df188eb49f3d094593 SHA512 bffeac4eaab07b89d9e80cdfa3483cd0d3027f4fc53d5e70177c6e07cecc06f64a606fc8daf06fa2dfbeba84e96fc4ecbd82666203bc939347e021e0931da706
 EBUILD vuze-5.7.2.0-r1.ebuild 4253 BLAKE2B c857b5ff4dc750b3d2790c919f24b38d49ca7272dad17c80b789f6aa2fb8978dbe2e525131cedbb829525c51843efcf74ae04067258c6891687af5c8a844bfc9 SHA512 2b5299478c69ac75e28d47c35d0e3ca7a3064fd168a53a78e11545baa674940e62ae11b62bc46883b1561184da5b3e81002bb4a9309e38579d2a5ed1c63bc6dd
-EBUILD vuze-5.7.2.0.ebuild 4193 BLAKE2B c1845f9c926717ea470ab39122771498a1d49d0cd9bc5fe406f8c9aa20f99a1b02489c4ef490855743646c184b819c4a767e4fc2b0912caac99cb337f18d5054 SHA512 57542781decd415deaf345fc00977d9502def7faac9685273b2d9df8e55a3233f15efc861183ac85af2bf9d9febad5c99bcac3137d6cf15f96c1083b0cd5044c
+EBUILD vuze-5.7.6.0.ebuild 4110 BLAKE2B 0c21f1a4937237ab93865419d74015b0241bba14ebfbfa8fba7599562c58fa212e3fcc230a345eaf915ded63f3e790dfdacc995eb640a21922695c9d8d9b16df SHA512 46f739eb0bf9675fce078e6eb9ebf0b7a8ad3483b3fef188891235122fdeda7f4ee17677bea387c5e16b8002ae830c87e0f4033fb5dc903441a6e86eb444bace
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch b/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch
new file mode 100644
index 000000000000..d8643dbe680f
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch
@@ -0,0 +1,114 @@
+diff --git a/com/aelitis/azureus/core/metasearch/Result.java b/com/aelitis/azureus/core/metasearch/Result.java
+index bec05e1..9481f86 100644
+--- a/com/aelitis/azureus/core/metasearch/Result.java
++++ b/com/aelitis/azureus/core/metasearch/Result.java
+@@ -28,7 +28,7 @@ import java.util.Locale;
+ import java.util.Map;
+ import java.util.Random;
+ 
+-import org.apache.commons.lang.Entities;
++import org.apache.commons.lang.StringEscapeUtils;
+ import org.gudy.azureus2.core3.util.AENetworkClassifier;
+ import org.gudy.azureus2.core3.util.DisplayFormatters;
+ import org.gudy.azureus2.core3.util.HostNameToIPResolver;
+@@ -464,6 +464,6 @@ public abstract class Result {
+ 		if ( input == null ){
+ 			return( null );
+ 		}
+-		return( Entities.HTML40.unescape( input ));
++		return( StringEscapeUtils.unescapeHtml( input ));
+ 	}
+ }
+diff --git a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
+index 2d353b8..8ebf9ff 100644
+--- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
++++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
+@@ -87,14 +87,14 @@ public class WebResult extends Result {
+ 	public void setNameFromHTML(String name) {
+ 		if(name != null) {
+ 			name = removeHTMLTags(name);
+-			this.name = Entities.HTML40.unescape(name);
++			this.name = StringEscapeUtils.unescapeHtml(name);
+ 		}
+ 	}
+ 	
+ 	public void setCommentsFromHTML(String comments) {
+ 		if(comments != null) {
+ 			comments = removeHTMLTags(comments);
+-			comments = Entities.HTML40.unescape(comments);
++			comments = StringEscapeUtils.unescapeHtml(comments);
+ 			comments = comments.replaceAll(",", "");
+ 			comments = comments.replaceAll(" ", "");
+ 			try{
+@@ -107,7 +107,7 @@ public class WebResult extends Result {
+ 	public void setCategoryFromHTML(String category) {
+ 		if(category != null) {
+ 			category = removeHTMLTags(category);
+-			this.category = Entities.HTML40.unescape(category).trim();
++			this.category = StringEscapeUtils.unescapeHtml(category).trim();
+ 			/*int separator = this.category.indexOf(">");
+ 			
+ 			if(separator != -1) {
+@@ -136,7 +136,7 @@ public class WebResult extends Result {
+ 	public void setNbPeersFromHTML(String nbPeers) {
+ 		if(nbPeers != null) {
+ 			nbPeers = removeHTMLTags(nbPeers);
+-			String nbPeersS = Entities.HTML40.unescape(nbPeers);
++			String nbPeersS = StringEscapeUtils.unescapeHtml(nbPeers);
+ 			nbPeersS = nbPeersS.replaceAll(",", "");
+ 			nbPeersS = nbPeersS.replaceAll(" ", "");
+ 			try {
+@@ -151,7 +151,7 @@ public class WebResult extends Result {
+ 	public void setNbSeedsFromHTML(String nbSeeds) {
+ 		if(nbSeeds != null) {
+ 			nbSeeds = removeHTMLTags(nbSeeds);
+-			String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
++			String nbSeedsS = StringEscapeUtils.unescapeHtml(nbSeeds);
+ 			nbSeedsS = nbSeedsS.replaceAll(",", "");
+ 			nbSeedsS = nbSeedsS.replaceAll(" ", "");
+ 			try {
+@@ -166,7 +166,7 @@ public class WebResult extends Result {
+ 	public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
+ 		if(nbSuperSeeds != null) {
+ 			nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
+-			String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
++			String nbSuperSeedsS = StringEscapeUtils.unescapeHtml(nbSuperSeeds);
+ 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
+ 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
+ 			try {
+@@ -248,7 +248,7 @@ public class WebResult extends Result {
+ 	public void setPublishedDateFromHTML(String publishedDate) {
+ 		if(publishedDate != null && publishedDate.length() > 0) {
+ 			publishedDate = removeHTMLTags(publishedDate);
+-			String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
++			String publishedDateS = StringEscapeUtils.unescapeHtml(publishedDate).replace((char)160,(char)32);
+ 			this.publishedDate = dateParser.parseDate(publishedDateS);
+ 		}
+ 	}
+@@ -257,7 +257,7 @@ public class WebResult extends Result {
+ 	public void setSizeFromHTML(String size) {
+ 		if(size != null) {
+ 			size = removeHTMLTags(size);
+-			String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
++			String sizeS = StringEscapeUtils.unescapeHtml(size).replace((char)160,(char)32);
+ 			sizeS = sizeS.replaceAll("<[^>]+>", " ");
+ 			//Add a space between the digits and unit if there is none
+ 			sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
+@@ -303,7 +303,7 @@ public class WebResult extends Result {
+ 	public void setVotesFromHTML(String votes_str) {
+ 		if(votes_str != null) {
+ 			votes_str = removeHTMLTags(votes_str);
+-			votes_str = Entities.HTML40.unescape(votes_str);
++			votes_str = StringEscapeUtils.unescapeHtml(votes_str);
+ 			votes_str = votes_str.replaceAll(",", "");
+ 			votes_str = votes_str.replaceAll(" ", "");
+ 			try {
+@@ -317,7 +317,7 @@ public class WebResult extends Result {
+ 	public void setVotesDownFromHTML(String votes_str) {
+ 		if(votes_str != null) {
+ 			votes_str = removeHTMLTags(votes_str);
+-			votes_str = Entities.HTML40.unescape(votes_str);
++			votes_str = StringEscapeUtils.unescapeHtml(votes_str);
+ 			votes_str = votes_str.replaceAll(",", "");
+ 			votes_str = votes_str.replaceAll(" ", "");
+ 			try {
diff --git a/net-p2p/vuze/vuze-5.7.2.0.ebuild b/net-p2p/vuze/vuze-5.7.2.0.ebuild
deleted file mode 100644
index 41195930d091..000000000000
--- a/net-p2p/vuze/vuze-5.7.2.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2 versionator xdg-utils
-
-MY_PV=$(replace_all_version_separators "")
-MY_SRC="Vuze_${MY_PV}"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-# bundles parts of http://www.programmers-friend.org/
-# bundles bcprov - 1.37 required but not in the tree
-RDEPEND="
-	dev-java/commons-cli:1
-	dev-java/commons-lang:2.1
-	dev-java/json-simple:0
-	dev-java/log4j:0
-	dev-java/swt:3.8[cairo]
-	>=virtual/jre-1.6:*"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.6:*"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-src_unpack() {
-	mkdir -p "${S}" && cd "${S}"
-	unpack ${A}
-
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
-}
-
-java_prepare() {
-	# upstream likes randomly changing a subset of files to CRLF every release
-	edos2unix $(find "${S}" -type f -name "*.java")
-
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-java5.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
-	epatch "${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-commons.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0.0-invalid-characters.patch
-#	epatch "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
-
-	# OSX / Windows
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java
-	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
-
-	# Tree2 file does not compile on linux
-	rm -rf "${S}"/org/eclipse || die
-	# Bundled apache
-	rm -rf "${S}"/org/apache || die
-	# Bundled json
-	rm -rf "${S}"/org/json || die
-	# Bundled bcprov
-	# currently disabled - requires bcprov 1.37
-	#rm -rf "${S}"/org/bouncycastle || die
-
-	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-	mkdir -p "${S}"/build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	use sparc && mem="320"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates"
-	echo
-	elog "Vuze was formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration options will be"
-	elog "placed in '~/.azureus/gentoo.config'."
-	elog
-	elog "If you need to change some startup options, you should modify this file"
-	elog "rather than the startup script.  You can enable the console UI by"
-	elog "editing this config file."
-	echo
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-5.7.6.0.ebuild b/net-p2p/vuze/vuze-5.7.6.0.ebuild
new file mode 100644
index 000000000000..893c96776623
--- /dev/null
+++ b/net-p2p/vuze/vuze-5.7.6.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2 xdg-utils desktop
+
+MY_PV=$(ver_rs 1- "")
+MY_SRC="Vuze_${MY_PV}"
+
+DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
+HOMEPAGE="http://www.vuze.com/"
+SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# bundles parts of http://www.programmers-friend.org/
+# bundles bcprov - 1.37 required but not in the tree
+CDEPEND="
+	dev-java/log4j:0
+	dev-java/swt:3.8[cairo]
+	dev-java/commons-cli:1
+	dev-java/json-simple:0
+	dev-java/commons-lang:2.1"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	dev-util/desktop-file-utils
+	>=virtual/jdk-1.8"
+
+PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3.0.0-java5.patch
+	"${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
+	"${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
+	"${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch
+	"${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
+	"${FILESDIR}"/${P}-unbundle-commons.patch
+	"${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
+	"${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch
+#	"${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
+)
+
+src_unpack() {
+	mkdir -p "${S}" || die
+	cd "${S}" || die
+	unpack ${A}
+
+	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
+	if [[ -f build.xml ]]; then
+		die "upstream has build.xml again, don't overwrite"
+	fi
+	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
+}
+
+src_prepare() {
+	# upstream likes randomly changing a subset of files to CRLF every release
+	edos2unix $(find "${S}" -type f -name "*.java")
+
+	default
+
+	# OSX / Windows
+	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java || die
+	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java || die
+	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
+
+	# Tree2 file does not compile on linux
+	rm -rf "${S}"/org/eclipse || die
+	# Bundled apache
+	rm -rf "${S}"/org/apache || die
+	# Bundled json
+	rm -rf "${S}"/org/json || die
+	# Bundled bcprov
+	# currently disabled - requires bcprov 1.37
+	#rm -rf "${S}"/org/bouncycastle || die
+
+	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
+	mkdir -p "${S}"/build/libs || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
+
+src_compile() {
+	local mem
+	use amd64 && mem="320"
+	use x86   && mem="256"
+	use ppc   && mem="192"
+	use ppc64 && mem="256"
+	use sparc && mem="320"
+	export ANT_OPTS="-Xmx${mem}m"
+	java-pkg-2_src_compile
+
+	# bug #302058 - build.xml excludes .txt but upstream jar has it...
+	jar uf dist/Azureus2.jar ChangeLog.txt || die
+}
+
+src_install() {
+	java-pkg_dojar dist/Azureus2.jar
+	dodoc ChangeLog.txt
+
+	java-pkg_dolauncher "${PN}" \
+		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
+		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
+		--pkg_args '--ui=${UI}'
+	dosym vuze /usr/bin/azureus
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=204132
+	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
+
+	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
+	domenu "${FILESDIR}"/${PN}.desktop
+
+	use source && java-pkg_dosrc "${S}"/{com,edu,org}
+}
+
+pkg_postinst() {
+	ewarn "Running Vuze as root is not supported and may result in untracked"
+	ewarn "updates to shared components and then collisions on updates"
+	echo
+	elog "Vuze was formerly called Azureus and many references to the old name remain."
+	elog
+	elog "After running Vuze for the first time, configuration options will be"
+	elog "placed in '~/.azureus/gentoo.config'."
+	elog
+	elog "If you need to change some startup options, you should modify this file"
+	elog "rather than the startup script.  You can enable the console UI by"
+	elog "editing this config file."
+	echo
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
-- 
cgit v1.2.3