gentoo resync : 05.02.2020

13 files changed, 94 insertions, 88 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index a2ab73614081..8b4df21cef5d 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index fdc13bbe9ec3..f9d5fa5a137b 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -13,6 +13,6 @@ AUX amuleweb.confd 720 BLAKE2B 1bcb4349f34c8deef069d156da29ff3dcb642f9b5c15fbef7
 AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d8548700cab8517bba5274fbad35ebb940ea11f96527553807b1365b7f7c27a6e7d8b656b51f60072cabe5ab8 SHA512 d9fcfc96f4c1bcd7bdae8ed4da19b4edec05e1b55149c664589c267539d183500a732f70670f0cde935c5f509f9dfbc97fd0e92b7047e1690f1342fa6504994d
 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 2339 BLAKE2B 16698d20edb786d3a1be426c65a89c53d3127dca0b6b0ce38adff0d37bf03ac2cb428f30935f75fd99ef62ba1f900a30c8e7eec3ae79a088885b74c26638dce7 SHA512 490dec5064d9e560626931616e4c9d9188f68815cc477df4ea39a4ff4a82af25f5ceea12a223c7b5188c8e661990a960534bffeca35ce97afb402713b5e1029c
+EBUILD amule-2.3.2-r2.ebuild 2340 BLAKE2B c99854ca744b5b15ec32e12b657bc5f6036a50002c0e99b85b0ef6c4ca1784910f36fa5d37d5050ed38b9d6d89c8876a3470e9a3254201fa1a7f19dfdf5d4349 SHA512 a8204f4c079d5606e58a5a2acda4745e61c8b3034cd8694274c19b76565e3e04c72b6e96a0eda28c653b6d7f5ffed87dc96fd5123769b8a4ef04c571973d2c54
 EBUILD amule-2.3.2-r4.ebuild 3018 BLAKE2B 9425d4949bd4bb98c369ec13407f2c299c269c6a38ac660d8d8fc23d42d145fc3274c9c0e81af41fdf97074107a82b0d4722897705d749195f074c9792bd0b56 SHA512 1ef3b5c99bc50a3ab2caac5bcb00ed6ae904a85820a0ca1a5f2d9b710bcca4bc9f9f6f382abc351a4723e3e13196fe9d12a63d9c859b6790da60bf23b49e9a14
 MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f
diff --git a/net-p2p/amule/amule-2.3.2-r2.ebuild b/net-p2p/amule/amule-2.3.2-r2.ebuild
index 3fc08e6fc94c..7f99faed8976 100644
--- a/net-p2p/amule/amule-2.3.2-r2.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
 IUSE="daemon debug geoip nls remote stats upnp +X"
 
 COMMON_DEPEND="
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index a1a1cb4b7de3..01970024751f 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -3,6 +3,6 @@ AUX bttrack.conf 613 BLAKE2B ad791caf43fc5cf0e22f8fd01acab3d2f93feb827d64e07a1d6
 AUX bttrack.rc 519 BLAKE2B 829b1a4cdb29bae41e25e832d7383ea4fda3ec2473d6d9bebc2738f126c9c95a937cbce0473bf5cf3a049b75e00a0301c3d8b1179c8c46db5f327e467977d9bc SHA512 74255a6dae0d5b1b5809dd6b7b792bb1f681d9c002dd64c0b633e4c903af8748922abe4521d0e52f23ad2d1f12066bf6a2eec1ad8112251e081f07002609eae0
 DIST BitTornado-0.3.18.tar.gz 189227 BLAKE2B 96a273c6f1072a19a0853cb0f0c16165432670927588f3422e680580e7d31a76b1b06b8e8a806676eb2f0cdfe0d4c785c389f07cb7a4690feb57cbac9c45c28f SHA512 61a55726d93ddb245e18e47f41dea982b8faa7d3296c3a7221d00e0fe71db772613c3ee113bb7df18390807dda8c77859ed7159a03535446ca417a1344e3c0d6
 DIST BitTornado-0.4.1_p20160925.tar.gz 164352 BLAKE2B 34cebe27ab0cb18a960ef830311ffa47f2064c83768a9a011dcd9e45e9460b60438e159824eaf9cf844d7c5604a9de832e6a85cea3335d9e6223c31e7b349014 SHA512 09971cc5705c421c4440cd51b9aa37da9f8ce992a882d342c0547fe1771199fa61c4924f6d6cd321776f9dcefafd3e244b9cbfce047c4cdd4502dd0a1a1fdaaa
-EBUILD bittornado-0.3.18-r4.ebuild 1446 BLAKE2B 0108039e36d2eb8f7d98e70b25de4bda9ecb57f462eab0891367771b181ce7e2be29332f0241dd6af76668f730a3805c3074737a44cf8c89b92a736928dfd778 SHA512 8271f7e1506e2e2c8026120b2c192c6bce81d310d7c1e2af70d15e58480af7e11d81c9ba679540a59bec869c593edc30b6c4ec5c77f6eec2e25fac0dc0a2b606
+EBUILD bittornado-0.3.18-r4.ebuild 1447 BLAKE2B 5360dbfbe00c8f8c8f5f748740a2846a0d88eddd2e766560c468e8d496942e6ecc643635ac74d11fc7ea4324d9e13709ebec3519d71f699436d5853dde7f8fbf SHA512 9e20a7fd7cef2cf221a2c456ca906ce7a5090493cd5a8dc92d5ae1a27df02d1767215ad6a9b07584826350b5581b226bb7ef0922c82e1c89fcf360723d650b67
 EBUILD bittornado-0.4.1_p20160925-r1.ebuild 1294 BLAKE2B fc0c48475b947787b374b20f7647ecb0c799cb2307075f4aa84963ae984885ba9bd3e8bb8f5f6ad980ce6aa0e289bd99f3d1397664aaa19b58d0e19326d20cd3 SHA512 f36052c84ea0b4a9315436ed03cc86b80827ea05af764946f256d2c77c44d197ed35ba264402f50f03227f95e648765f9b62f57cafe0088c20f64e27fbe3679d
 MISC metadata.xml 302 BLAKE2B dee7f2a91d0302a9476d974057446af53bcd7cc74269dde75af61e5d6f824c697b0feadd4014c262ac4350511f797a60db656f45981d037125f0926f6bac569e SHA512 a2ed81559aad97406f1099fba266a7a2fa9d97013f267cfc9df5139ebde26495f103f1118fc0b2af825e281b026c434d11300e545aef9eed07b65eb504b47e67
diff --git a/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild b/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild
index b08cf00354d7..8b95e17ba47a 100644
--- a/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://download2.bittornado.com/download/${MY_P}.tar.gz"
 LICENSE="MIT GPL-2"
 SLOT="0"
 
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index a7000e01bdea..99a36d8ebe39 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,7 +1,5 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-3.11.5.tar.gz 1927342 BLAKE2B 92f5bc74e6ef31ff320e502807d884dd0106ae3c28722b0b453b7a9c1d9568596e9beab1ee9d2a5a5ab1f1ad184f04d4cf012503393407a8133d3c806764fafa SHA512 7b31286a4d8a3613ace70be85cd80f7645d148a19b1707ea9c4b0c0b023b656a7bac37587e21a9db5477074e04ce1b87fdac794be999c284c51b0b7680be12e8
-DIST cpuminer-opt-3.11.6.tar.gz 1927145 BLAKE2B 8cb90a3a419011b98c5105e80aafcf0918934f9648fc2719d876430e6d706e7010a78c01c2b281f7c371a06be9df514dad0bad0c6b8eff456fe14ba9d74ac3f0 SHA512 bfe2df3ba577195781f92b4d96c34a5ea991217b59a5de4f1931458a8475ff630bd9779965110484b2540def1aea5c84de6136203a82c664e968c195a0e494ee
-EBUILD cpuminer-opt-3.11.5.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
-EBUILD cpuminer-opt-3.11.6.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+DIST cpuminer-opt-3.11.9.tar.gz 1871215 BLAKE2B 3cd19225d4e2b4ab26721069d83f6d568c48ca12fa94ced35024420429000099f8db0e8c69e46617738238d9ab969ef39e3ef555731c4618a7b7b6c88d438c58 SHA512 d1a8f18769970a05df8da454f1755fda593dc0dfb2484855fb447dca25484254cefdbd31e19917b13195519c0e5cbf91fbe644f2d27300ad2db6c1ae52d5125b
+EBUILD cpuminer-opt-3.11.9.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
 EBUILD cpuminer-opt-9999.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.11.6.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.6.ebuild
deleted file mode 100644
index a5d436b3b8b8..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.11.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.11.5.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.9.ebuild
index a5d436b3b8b8..a5d436b3b8b8 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.11.5.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.9.ebuild
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 5cddf004f5d9..56f2e5df40e1 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -4,6 +4,7 @@ AUX deluge-2.0.3-UI-status.patch 1406 BLAKE2B 7da865fa6d87fbfc0443572d34cbf7324c
 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
@@ -17,7 +18,7 @@ EBUILD deluge-1.3.15-r2.ebuild 4929 BLAKE2B 78454c0525b20a0a521d15bd49c01e556c7c
 EBUILD deluge-1.3.15-r3.ebuild 4495 BLAKE2B 82ffe9b866a7761cfce5cea806ba57cce365172fe092470481c0ca6af14801b91d2d3c58da3c9b5d41764273b35223f4d18daa44682f45901038d4fc64b773e6 SHA512 dd366542d8ad15db9ff42ded2e2a45c421457f8cddc2640438decccbc82e25e4b3a8c3c4959eb265c3a27c655b86af7902ebba989301066f97176d5d07fb0120
 EBUILD deluge-1.3.15-r4.ebuild 4433 BLAKE2B 3568da55fb548fd2bff397e7475eb35566b32215c704e0bea54088c3bf99a2819a866111ff579f3a64cd3160bb1dc1f7a5273f1a9be5aa1fbe40ba5ece07230b SHA512 21a791b18064beabc6213ebe9414af89151e47bc80747691045b4931c67f72b158a6ca444ecb94efc428db250c4dc94dc9425b46d6791b26329a6ee6621e17c7
 EBUILD deluge-1.3.9999.ebuild 4443 BLAKE2B bc2778509d617096c242d0d0d0295bb9c257cbc0befbfaff376d530106b278260970eaf162ead9d83c841f33cce180be84d8d0f81686f3394bb52edbe596e94d SHA512 70391b5670f0b3fe38e477a952fa563bc7441d65f7b0e141eebd073166392a5aaa9f98f3e2414c240333007eb4fb714517c190b8b6287812e96bb5b244f41469
-EBUILD deluge-2.0.3-r1.ebuild 4413 BLAKE2B 86a93914d61d06ed9860ac9873d5e9eefaec800a1957445710b6bdf091cfbd90be4b8a987642c186e9a7058e54fc5371c2d15ffd952903bfaee6269fa755d01a SHA512 f51c986a322af353296ef72cb4465578816bf13aa40f43eb5ff6531269f2403768c2662f5b687484119daf84fa512afc6d4ccbacb5e593bb0e246ea63119ac19
-EBUILD deluge-2.0.3-r2.ebuild 4402 BLAKE2B a0afeab84a35e0122e5133428d67808a75d64bcb2f102d76785a314cf234df645ed95a0a783d01fa83f658526973ddfa789ff840218ed076e78f5df1f0e3a716 SHA512 9031e35a1fcb07f3bf7419b7bb5b41f55b75b583fd5cab309a4ed23e39f7e12c3e9d149796dad913436b7e68685d60f036d854b381bdb6df93054f9b36ee902c
-EBUILD deluge-9999.ebuild 4403 BLAKE2B dd1698b08bc2c722b33c29f05daeab2337016326c8e368126c52efce793cd9a6ec3389f7c721d8ac8fa54e7cc870f711e3cb727a41ca3ef843fc9d399e6b3816 SHA512 ebd99abc0ee319e373d2f697d036b0d68591155b73e99fefbb6e6a1c17c6b347586d6fa26b133d8bf34a3866591997dbde7269df92e4392d3925676b1fa40773
+EBUILD deluge-2.0.3-r2.ebuild 4407 BLAKE2B 2f60b8ad1f446a360e8922423ffcf20142092850136b8a15b0201ac3a9b9cd3b6bd3cc4955aaaf8f54bd348b82ed7e7ebe3a477729a7773a0b00eba7fc6bcd99 SHA512 dbb785608b01558519e87c1828e795e9bc218a49a8128ea39666810678434921579e71c2d5c3069d158a4d002c6fe95a5cf928dae39ba77b94282844c89e480d
+EBUILD deluge-2.0.3-r3.ebuild 4342 BLAKE2B ee1298c4af7786c5b74249035398aa350a28d870bd273f06b2d4219d9fc4403b300b83f1203d916b66b2e61146ccf29c77bb7d55980a8facf86a43a5bf13c7b8 SHA512 e9d5f6eafe64af91f95499fe921a895ced9de14658a3c76fff3cdb433dac17cf7fbccedcb0552b0cbf8a5fc1f832c0c7f041494759f4f6f7c345423f64983413
+EBUILD deluge-9999.ebuild 4337 BLAKE2B 5ad161fd29af8008040404699b232a5b9176aec3a80cfc2f6829e4277bd81e499f3fd5c1704452614e3ba177f3a392185be722f497c25045a4e33488dd7888b4 SHA512 0f6d50dcffce2a2d91debe260bc2cfba9f140be14bfe0f63a6896896e9e48958a509a4905c611477c4e6187cfc9eaa3250263ed55caae5889b4812c536bfdb3e
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-2.0.3-r2.ebuild b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
index dd90402c4e22..f3c58d701a9e 100644
--- a/net-p2p/deluge/deluge-2.0.3-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r2.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 ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-p2p/deluge/deluge-2.0.3-r1.ebuild b/net-p2p/deluge/deluge-2.0.3-r3.ebuild
index 960cc354e427..8b3cbf5b4f97 100644
--- a/net-p2p/deluge/deluge-2.0.3-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 
@@ -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 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -85,31 +85,33 @@ esetup.py() {
 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
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${D}/usr/bin/deluge-console" || die
+		rm "${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
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${D}/usr/share/icons/" || die
+		rm "${D}/usr/bin/deluge-gtk" || die
+		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${D}/usr/share/applications/deluge.desktop" || die
 	fi
 	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
 		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
 		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
 		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
 	else
-		rm -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
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${D}/usr/bin/deluge-web" || die
+		rm "${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
+
+	python_optimize
 }
 
 pkg_postinst() {
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index fc0402eb7223..d1806e7558e9 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -85,31 +85,33 @@ esetup.py() {
 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
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${D}/usr/bin/deluge-console" || die
+		rm "${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
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${D}/usr/share/icons/" || die
+		rm "${D}/usr/bin/deluge-gtk" || die
+		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${D}/usr/share/applications/deluge.desktop" || die
 	fi
 	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
 		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
 		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
 		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
 	else
-		rm -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
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${D}/usr/bin/deluge-web" || die
+		rm "${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
+
+	python_optimize
 }
 
 pkg_postinst() {
diff --git a/net-p2p/deluge/files/deluge-web.init-2 b/net-p2p/deluge/files/deluge-web.init-2
new file mode 100644
index 000000000000..72ce74e7a8a5
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.init-2
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ "${DELUGE_WEB_USER}" = "" ] ; then
+		eerror "Please edit /etc/conf.d/deluge-web"
+		eerror "You have to specify a user to run deluge-web as, as we will not run it as root!"
+		eerror "Modify DELUGE_WEB_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${DELUGE_WEB_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/deluge-web"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${DELUGE_WEB_USER%:*}" = "${DELUGE_WEB_USER}" ] ; then
+		return 0
+	else
+		if ! getent group "${DELUGE_WEB_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/deluge-web"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi	
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	if [ "${DELUGE_WEB_HOME}" = "" ] ; then
+		DELUGE_WEB_USER_HOME=$(getent passwd "${DELUGE_WEB_USER%:*}" | cut -d ':' -f 6)
+	else
+		DELUGE_WEB_USER_HOME=${DELUGE_WEB_HOME}
+	fi
+	ebegin "Starting Deluge-Web"
+	start-stop-daemon --start --background --pidfile \
+	/run/deluge-web.pid  --make-pidfile \
+	--exec /usr/bin/deluge-web --user "${DELUGE_WEB_USER%:*}" \
+	-e HOME="${DELUGE_WEB_USER_HOME}" -- --do-not-daemonize ${DELUGE_WEB_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Deluge-Web"
+	start-stop-daemon --stop --user "${DELUGE_WEB_USER%:*}" \
+	--pidfile /run/deluge-web.pid
+	eend $?
+}