gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /net-p2p
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
70 files changed, 1133 insertions, 411 deletions
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 5d23fe783d10..529af29a4d44 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 4c63221d45a0..1529fb396d20 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 1456 BLAKE2B 64e0ec4a29695c5c5eb80683fa9fd8bc8cec9d99e6e0116d9881ca37c1165c938b28fac7280194c42fc52eadc46a65c3be50bacdcfaa6ad8e1ff1fdb22013ff6 SHA512 d8ef600646f83a98ab31b230c4658a22bf093532e3b4b2a8d5ba617ffa102c39695b7868035c429face2e8f1545dac4de402472ac742f5f92f150269e0ba904e
-EBUILD bittornado-0.4.1_p20160925-r1.ebuild 1281 BLAKE2B 8d94b3037f63028c02573ced25f10cfdb858a8bcaf35f082c5e4bb33d77099632b92eb0ccfdec77fb674e0a80b34125220ab4993649d718f2a057229357cfdb8 SHA512 32b17c700e9e8535da36dfdcbb401a80fc3866d7878b7ea7e66a8f82ad525c8b376ab3a9b4d84c04ada9ea7c4fe3d80533fa771df63935ca96a8f6d455ed7660
+EBUILD bittornado-0.3.18-r4.ebuild 1446 BLAKE2B 0108039e36d2eb8f7d98e70b25de4bda9ecb57f462eab0891367771b181ce7e2be29332f0241dd6af76668f730a3805c3074737a44cf8c89b92a736928dfd778 SHA512 8271f7e1506e2e2c8026120b2c192c6bce81d310d7c1e2af70d15e58480af7e11d81c9ba679540a59bec869c593edc30b6c4ec5c77f6eec2e25fac0dc0a2b606
+EBUILD bittornado-0.4.1_p20160925-r1.ebuild 1271 BLAKE2B bd66707c3ff0d3705d8b62f4c7e3395508a5b8fab0860b17b070dd1c1fac0543e219cc019bf654c21fd04c0b44ab622d67e75fd9bba79b1d763b37550a111412 SHA512 a142ff1521643673f61f10d9338f9cbb445ea6e565d91be14da68785895b0fc3ea53d3144fff622304bd9fc7ec9fe0cb8d69ccf7dd217599deeb4ccdbdecc01e
 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 65522c0ef29f..b08cf00354d7 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 ~x86-fbsd ~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/bittornado/bittornado-0.4.1_p20160925-r1.ebuild b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
index f745bef28bbf..9b2dcca61fdc 100644
--- a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
+++ b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/effigies/BitTornado/archive/${EGIT_COMMIT}.tar.gz ->
 LICENSE="MIT GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 89a25ea12ea0..c22198aca034 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,9 +1,13 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
 DIST cpuminer-opt-3.9.6.2.tar.gz 1796238 BLAKE2B 5c9ef9e04897ac8e62196bb54606b407ae5df7f48074f91c202a7323f9ebfa5c44361df99ed83f9c67e69080580c9bf1e29607b491c872a2f1385c8c42444940 SHA512 92e96724fc40d974cd80d61c19c7d46b6581ec0e63328bf940cade12231240fa17f26639a6c344cf19c20ea6e6f7dc4178dea7db51a4c7ec85a66ab5e4a5e59d
 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.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.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.8.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.8.1.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.8.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/cpuminer-opt/cpuminer-opt-3.9.9.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.9.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.9.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/ctorrent/Manifest b/net-p2p/ctorrent/Manifest
index 235949db336c..d06605d66bee 100644
--- a/net-p2p/ctorrent/Manifest
+++ b/net-p2p/ctorrent/Manifest
@@ -2,5 +2,5 @@ AUX ctorrent-3.3.2-empty-path-components.patch 838 BLAKE2B 429629e3a774738f49251
 AUX ctorrent-3.3.2-negative-ints.patch 442 BLAKE2B 5580122a22c750e253f6a229f83b4db37d2222a0cdf4c0b3cce217164ac558b622e426c064d211aa13a83e372754240e57753a401ff5d6b3aa071a5679ced8a2 SHA512 edc950552e3497d91a98ba320d4fbc49284f07f9a130230a765427b91e1dcde099610d5be16c4b9c9969a446d8908c18dd3884eb207901ae46e4b696d1215150
 AUX ctorrent-CVE-2009-1759.patch 10951 BLAKE2B 852f88d508f7b8d00f3e09d8076985adb16bc3e741adc3df8a152cfb79e5c4bf66759a4eec01405dbd706e0eb357f8dcef5004cbc99ed4fc55fe00330df67de2 SHA512 9ab3080fc58564e48f5404bb29affe621d4d5c52ded858378354084a350e9f7932d579433cdc25b684627116c728b70affe8a352a316eb028cab1f326c13ee20
 DIST ctorrent-dnh3.3.2.tar.gz 219053 BLAKE2B a05958e85721b8a119a9ee9fdf80071456420b023767bda1c19d9021646236745ee6515bea1213ea3a513fad47ae0f7ecb843504e8015b5ed23b964e16b08f4c SHA512 e59b2b899b8603e42a5754d5ce65f661b135b8e107140e0472af379b2b06ee2985239ed0ebf19dcaef788e617b99eac35ad32ad2d10352e2fcf5a6dc084d27dd
-EBUILD ctorrent-3.3.2-r4.ebuild 694 BLAKE2B be756d2644593efa2f072372680cb640b416bbcc6cb26f99fd11b8a355ee69c00aff6e7003a39a28a9f5083319e345efb7f0bb026f7b391dde49030b26f2be75 SHA512 cab13a3afeefebc5a166603926ee448dbed9053e7821acce81003c7150d8539fa4243131a38f56999dfaa8accb734cd744c84e4910a17d5d3fe291891e79aaa7
+EBUILD ctorrent-3.3.2-r4.ebuild 684 BLAKE2B f8c4a71e64bb7c4e64d55142c86e4c4d3e50e755cb23d25fe695355826e374f9d88223031399f5f027e8be5f8bd5fb07ac0e279b93034d7331dbe102d1ecfc4a SHA512 712ba4a4c78ba5e579dae85d7c29ac306ce54991691130c7ea40628398a0ae35a1733c2b08cdcb44e33cbda15056de5eb28a1aed41d2bdb1b8b51ef0cfd57c6a
 MISC metadata.xml 245 BLAKE2B 135efc8148ddf902795388aef90e078b6e9793d8913798723b71abd479a0468bd68be0f21ab36508835ab5e4e5618a0e16d601aabc3755022df6b52075e51036 SHA512 2614273ab49d7d71d4a7c39fde414a2337c4f62fa92f9b803d900dcae5c79299c894a1161ff14269d20f436376c5388b3e3f0cd3ad9d2b6ae766366c7029d6bb
diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
index d921f9ff3729..000a6838b530 100644
--- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
+++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ~s390 ~sh ~sparc x86"
 IUSE="libressl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index f321f9616297..d8bced93ad91 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,6 +1,8 @@
 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
+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.service-2 198 BLAKE2B 00195276c90653b406fcd9d7d75cb6a69fff6929644372905de42e5a62ad1129e954adbe54415a3be612f705cb773f40570d49c7720b40b6caffacc7fce4518f SHA512 51d761c76d213285bef2cd4cc80c7135838f0fb955a7584ca15194080d50aa63e81642d566b901af8970ed01ae9952482226a41627f1e198fd6587c197737889
@@ -10,8 +12,11 @@ AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aa
 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-r2.ebuild 4929 BLAKE2B 78454c0525b20a0a521d15bd49c01e556c7c437c4363cbccc0a17b86e48afa8f9fb226388e55d397c9069d8bb1ab0ec265964fa3d529ef64a8f83973b706a925 SHA512 3d1e9636458040434fa54ec1d2f782f193739188bad0b03ff1fe3d9fc20ee2450d2cc2e2185d050ae34e0be271ca692cd88adc22dc69591eca110b88be54cf39
 EBUILD deluge-1.3.15-r3.ebuild 4495 BLAKE2B 82ffe9b866a7761cfce5cea806ba57cce365172fe092470481c0ca6af14801b91d2d3c58da3c9b5d41764273b35223f4d18daa44682f45901038d4fc64b773e6 SHA512 dd366542d8ad15db9ff42ded2e2a45c421457f8cddc2640438decccbc82e25e4b3a8c3c4959eb265c3a27c655b86af7902ebba989301066f97176d5d07fb0120
-EBUILD deluge-1.3.9999.ebuild 4471 BLAKE2B a996b5c941ce4e5d1dc72c902e727d6c75805feb2bb7627009b39e52a6e3c3be0b251879ebffb755376d94b400a62170de3cef6a8fad5cbc7fe2f2d6e10cd816 SHA512 511ccc9ee312a70a86981d5abfe3319a0e3438563294346565aadb181ee237f6f13aa1a68d76b82755d40a2cc3b02a9307704b888ade460f37b64a203abfda50
-EBUILD deluge-9999.ebuild 4787 BLAKE2B 1d731c0c8790fa85090e28738ccbb608eedcdfe1703737b36018a7dff33242499ee29720e1abb6e94ef61672f13144280e17ffa9bf61a96832e2fcf39af8284a SHA512 84c7d81d0a6060c050e43dbd9d74a0584224983a170d297941d632d7e1347c07852e4e474540e73908f9c912f2fe6c6bdc25fdedbc93c21c33506bec461ef2c0
-MISC metadata.xml 647 BLAKE2B 1d02be5cf9e82cf9105241eec91537f7f174ccaed33de9a2cbb26d184051cc96706a7fdc3f771f78a9057413af7501279f01a125722a25e3feea89a95df8cff3 SHA512 758bd56860522d98aec78c4517f797c4369566ca9cace827f44011c8141498259aa1b503556e47308dc2e95a1c5ab5b5fec3da2a536a4ebc25f516e19305495c
+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
+MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-1.3.15-r4.ebuild b/net-p2p/deluge/deluge-1.3.15-r4.ebuild
new file mode 100644
index 000000000000..d938267bcd80
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15-r4.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 )
+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="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
+RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		(
+		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+		)
+	)
+	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
+	gtk? (
+		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	)
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+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
index 5abf8ffb3d04..1be3b5719884 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd user
+inherit distutils-r1 systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -35,7 +35,9 @@ PATCHES=(
 
 DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
 RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -112,8 +114,6 @@ python_install_all() {
 }
 
 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"
diff --git a/net-p2p/deluge/deluge-2.0.3.ebuild b/net-p2p/deluge/deluge-2.0.3.ebuild
new file mode 100644
index 000000000000..f347e4c3ee39
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3.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} )
+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 7d98de7bce8b..f347e4c3ee39 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 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
+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="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -26,35 +23,41 @@ SLOT="0"
 IUSE="console geoip gtk libnotify sound webinterface"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
 	libnotify? ( gtk )
+	sound? ( gtk )
 "
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.12-fix_scheduler_plugin.patch"
-)
 
-CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
+DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${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/twisted-16.0.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
-	)
-	geoip? ( dev-libs/geoip )
+	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:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+		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"
@@ -67,13 +70,6 @@ python_prepare_all() {
 	)
 	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
 }
 
@@ -117,8 +113,6 @@ python_install_all() {
 }
 
 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"
diff --git a/net-p2p/deluge/files/deluge-2.0.3-UI-status.patch b/net-p2p/deluge/files/deluge-2.0.3-UI-status.patch
new file mode 100644
index 000000000000..bef102062a04
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.0.3-UI-status.patch
@@ -0,0 +1,31 @@
+From 53391b513f96ce3b8e9cc55f63e5db0c57b6e839 Mon Sep 17 00:00:00 2001
+From: Andrew Stone <a@stoney.io>
+Date: Wed, 3 Jul 2019 16:55:40 -0700
+Subject: [PATCH] [GTK] Fix ordering in status tab
+
+---
+ deluge/ui/gtk3/glade/main_window.tabs.ui | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/deluge/ui/gtk3/glade/main_window.tabs.ui b/deluge/ui/gtk3/glade/main_window.tabs.ui
+index 30bd395bd..e9a4b60a1 100644
+--- a/deluge/ui/gtk3/glade/main_window.tabs.ui
++++ b/deluge/ui/gtk3/glade/main_window.tabs.ui
+@@ -112,7 +112,7 @@
+                               </object>
+                               <packing>
+                                 <property name="left_attach">1</property>
+-                                <property name="top_attach">0</property>
++                                <property name="top_attach">3</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -312,7 +312,7 @@
+                               </object>
+                               <packing>
+                                 <property name="left_attach">1</property>
+-                                <property name="top_attach">3</property>
++                                <property name="top_attach">0</property>
+                               </packing>
+                             </child>
+                             <child>
diff --git a/net-p2p/deluge/files/deluge-2.0.3-setup.py.patch b/net-p2p/deluge/files/deluge-2.0.3-setup.py.patch
new file mode 100644
index 000000000000..dba520f61c01
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.0.3-setup.py.patch
@@ -0,0 +1,11 @@
+diff -ur deluge-2.0.3.orig/setup.py deluge-2.0.3/setup.py
+--- deluge-2.0.3.orig/setup.py	2019-07-25 18:19:04.624650797 +0200
++++ deluge-2.0.3/setup.py	2019-07-25 18:19:42.984276752 +0200
+@@ -221,7 +221,6 @@
+                 )
+ 
+         print('Compiling po files from %s...' % po_dir)
+-	uptoDate = False
+         for path, names, filenames in os.walk(po_dir):
+             for f in filenames:
+                 upto_date = False
diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index 5a74432b6fe5..d528c24819ad 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -9,6 +9,10 @@
 		<email>k_f@gentoo.org</email>
 		<name>Kristian Fiskerstrand</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index c7c0827cf108..f3374c2f76f9 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -1,19 +1,20 @@
+AUX ipfs-at.service 354 BLAKE2B 77bf7a265a0b29945e6661d03f9deec5884076f24afffc9e5bedd7049be26d4340508d5c9f215d1dd8365c4e15142a8a2c3549ff4be798c45e4ad725bfe5bc51 SHA512 0cefe732cb8a0dacdef5ae395d0d0126a96017c66401b0bd2d4838c376e44e138b74e65f90866e5d2b8478b535008da0427c2c6842e3a3c426df07c06e089f89
 AUX ipfs.confd 30 BLAKE2B 7ecaa40f2a4097690f9d8091da5891e0bbfb0f298bed4a59769c8d0ef978a2471865a01177950da5869b61f3b8c124f43eab97daf297c06efecdc25785a5846d SHA512 c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1
 AUX ipfs.init 464 BLAKE2B f5927ab792427a87c330772fca4adc177ae84899be5c6b856f763d6e71d1cbdf1d151bf6eea46ff13ba5ce5996a55468a4749d37c1e8306c4d07f897f17430a1 SHA512 6616a0114039a7c178ee9788c748e4abf143a875df2a9d6d823249d7adef2024cd3f537cf45a624e76751792e8c24b1d42b0dd536686b14d6f53f59ca53ca1f4
-AUX ipfs.service 245 BLAKE2B b2d528a82a79d1e7fd5cfedac1a4db2412e7e02c87c3e5e902b0bd1a9259fd4156328b8c289df42a898a64a396d83ef93f24743d042b4fe24a2d97f8f0c5235e SHA512 58e21b8c7a7c0af0b05ee936fcd7e8e61903755f1c124a4d59758bb094d520d3dafb9b5b8b92d2a4b414367fbdaf2ec0025c05cbc796d0ee26f2916d12dde472
-DIST go-ipfs-bin-0.4.18.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
+AUX ipfs.service 364 BLAKE2B c3d87df9588d6faed1710c592a5f3b2b1baad5442ee9fd63435d8ffff0f4e441afdded35f703c3bc56b505f99b61ac7c1ff3859e0251b87195cf4ed24abc1502 SHA512 dd0943c2b76cf73b686af3d69aac7321036f548b19c662c107ce51a34f8786fd80075e1369f4ed8d2b67280db93bf9772a3ca85e41f126d88e45604473e0d5c9
 DIST go-ipfs-bin-0.4.19.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
 DIST go-ipfs-bin-0.4.20.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
-DIST go-ipfs_v0.4.18_linux-386.tar.gz 11128726 BLAKE2B 2f1289bb0aa93d0d03585bb90f577f91c8db922ba7905aab90c6e6b7804b7fab5c52b861aa0cdd927de8ea0b6e20f22f1c42c390628cd2e660fbaecd55b04d24 SHA512 7fff0da87827dcef7c84f959f4cfdc0b5e43e82c636b77fd600d4f62d7b78b8f1660ea346caa5eaf2d791ab275f41c0f83d606e4b36f29f3284a1851a82fbce5
-DIST go-ipfs_v0.4.18_linux-amd64.tar.gz 13791729 BLAKE2B 777d20792d089216010574798245e0eac0a5ec46549aef3ec4162c289d1d4fec1b381d8fba39ad2a57d88fcbeee5cdd1bd8509fa8883dd946fb452c4266f95de SHA512 ef5b44a0aaed604890c83322ca02228061204085b87b20dd173edfe6b6631fc7a54724d2e00202488c86886992a0d409f43e09f022cdf8b1138f8419cf7614b0
-DIST go-ipfs_v0.4.18_linux-arm.tar.gz 10933477 BLAKE2B b846926b33c78a6d089717689993c6a9c9b6ae03b32f184c2a74ecc1a9c290e7b29a9e35f2e7691e504e86c6f6229d86bbf956d90d939decb91a22fe04f74504 SHA512 c60cf427109c9c08a73a8270fe9d2792932894cfd68c1a90ec159733d121c5c12647e4b8ab2ed24865c9a4b7f8cb94db9dbe47667e48b5525b39f0c3a0acf085
+DIST go-ipfs-bin-0.4.22.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
 DIST go-ipfs_v0.4.19_linux-386.tar.gz 11313754 BLAKE2B ac45961d7af003b28668c208be8e5d4457f28284a9b2ce21d9958a52204212fa08c4a8077382913027b0e79cfd8a230227494ca7897d25ee4900f9747039d6af SHA512 9fc7b467098613786788d41c04257b119d124a03279439c16c6a541d5057ce769b295eae16a42b10561f42f5eb982221dc2beacec42d56e517566115e72124da
 DIST go-ipfs_v0.4.19_linux-amd64.tar.gz 14068171 BLAKE2B e108fcbeeca0823a90df049c870501406ec68d5750d300d5e50fb8f8b2e8c3a1cbdceecc76687cfa9ca0185e7661ad5fb91bf0f33cdef1e1e7c4fc5e0c25dd6c SHA512 66d930bef0196c70f25cb207c00da6e36f6c2c17ff0e785f45d360e710502c233aeeeaaa5ee0bfc984919d42225c74c6474e5e5ce5c8cd6993580903fa8ec0c4
 DIST go-ipfs_v0.4.19_linux-arm.tar.gz 11118746 BLAKE2B 08ea24e8367d22577798636faec3ecdacb2dad9dd635f727a129b875ab02d1b37712b20ce6a387046a7be753032b437aa1feb8fab79aff99140c543652f3d7c6 SHA512 00084c0ecdf2d78e792519dbfcc7f62897283d5d81e7df90745ac41091dabaf44674a62c0ebc6a63bfea9bed97f98ed1dde260d8eb05f4bef2f4d35d3ebe9f5b
 DIST go-ipfs_v0.4.20_linux-386.tar.gz 18312554 BLAKE2B 0da4c23635f4451f4a4156f492fb380a538108b1dd834bbfb35ae1d77543e3d2fb9823431228c5cf6fe6aa6318062dcc4c22e4e3c8775c16ac2b5e876ecfafe3 SHA512 675ab88affa3871ea6ca9cf14150f6ad262ca1c7120ab2dbf15259693754f5372de3958ae9265ac800b21e53f495356dc45f1a67fb01548468dabb6e5d8befd4
 DIST go-ipfs_v0.4.20_linux-amd64.tar.gz 20120151 BLAKE2B 3e363fbf244d4d848dbf5e0e13a78804401ea1b3b205683e8ea6d8b2409557b0575bb23149013ebac231523bb7f6278220715f8e20032d0bbb7a420f94e664b5 SHA512 a8a2ec9c04a7aec576f8b86997d5310b77eca2b78df9c269ac9ef478d786277550f09e410e392ede333eb652e8ed136bb58a22f2b3198c94a61649c7a5525b68
 DIST go-ipfs_v0.4.20_linux-arm.tar.gz 17668228 BLAKE2B f900ecdbc580e86a476d1d5d64fa54be7856429a33b9fc98d8d8141431be0df2776726c64d81218903c51f648f1ab5256d23daf82e260f4e714c7e4bb169380f SHA512 feb608db7fc9750ca155d008992a93bb5e9e1f53504d224aeb474465c5811ada182770c4a5465331f9d6b2c3472201bb53a1243c0de844f94db4751569db3021
-EBUILD go-ipfs-bin-0.4.18.ebuild 1284 BLAKE2B 03fee910022a804913d3adb50beaa93cae9d14d12a73157c125561bd0b42b6ecd8c40391b517e9bb2233513ead6903781cb8733c4d2b524f82399dd159afbc2d SHA512 14291ab9b9bacb9b9ce40e943ac3be80a69bdfa8d59bfcd2bd5ee2902c07acc28351f582105b358aea7134b4edb61c346225c771906110394509fc111cb45956
+DIST go-ipfs_v0.4.22_linux-386.tar.gz 18865892 BLAKE2B 4ff67301ce6eec8cb38015f6dba16e10ee1fa3efffb47b2c3a9fe76fba875907ccd53ec011abe5b496de4dd2dff0a30f4e526e232f47c174b83004efdcc30764 SHA512 a6d16217412d1be0cdc0a2df604740054758b767994bbcb7ffc745abd90c64c28031b543bcb5589c715fa7115effc9a3b898ada8ad96c604507b428ed2538378
+DIST go-ipfs_v0.4.22_linux-amd64.tar.gz 20900056 BLAKE2B f068c367fb454a62c76f9828927aae0870f54853d0aeddfe6ca774490107c26df88ce41efa016732dffaf269d3dc2d16e1744f9cc35d4f86e355744eb3172a10 SHA512 49b99fec741d67f7bad8fb6fbbd984967f06dfc3de846d10dca34b166f621a182d12f13cf5ccf4e4f33747b67cede6f4205b4cd9b57ce5244128d1385ec82c85
+DIST go-ipfs_v0.4.22_linux-arm.tar.gz 18199193 BLAKE2B 25316649add6256c4f12efb9bb43848e2049cc7bcbe89dbe77309e1cf793e2ebd28559a05d0974af53488c414a26c28499d80f2f13f80454d4217019c58edc65 SHA512 c803964828ccbac40797e58dc82d10bdf899db26ef71ddd2443882bd4f84ff4a5aee4995a04135cb31b8f991381ce8004c51b06501aaef4d58dbcac239519822
 EBUILD go-ipfs-bin-0.4.19.ebuild 1284 BLAKE2B b352def2375a823e31a688afcf169ba7ce81c7b00af076c24e811364db45ee23d10f0aa31df129492ee9938fb39f1b39c7ee0ed6c1c99f310758122796d99e7e SHA512 d35216cd49fbca3e778d39748012b0a7d27783a888707ebe53355debaebe36a1d42adf0631f3599dc5dcc76a51910c82c9b0e89daa0ec3cfbdb1c6001622c778
 EBUILD go-ipfs-bin-0.4.20.ebuild 1284 BLAKE2B b352def2375a823e31a688afcf169ba7ce81c7b00af076c24e811364db45ee23d10f0aa31df129492ee9938fb39f1b39c7ee0ed6c1c99f310758122796d99e7e SHA512 d35216cd49fbca3e778d39748012b0a7d27783a888707ebe53355debaebe36a1d42adf0631f3599dc5dcc76a51910c82c9b0e89daa0ec3cfbdb1c6001622c778
-MISC metadata.xml 514 BLAKE2B fb8cdd1bd3a7e9f4ee567d126e9a2e78c1a7e3237a13f831f0edd775d1ff5ebaab94d2bdfbd764fb32bc52d4fdd65a21e37af369efd6e2a9f932bbe2fa113256 SHA512 46e23df18c12c87434db22e3a22ebc9a9df8650b6a8235f655ee6e4657e706fd86dc468462a485483eb9ea440f38d40e262a3537cceb41eb1e68110651ba5d00
+EBUILD go-ipfs-bin-0.4.22.ebuild 1325 BLAKE2B 347eff8b98a137099b9b4d36ba64ce773da594dda87073099c36c3a337912f61ab67da7c8a179ee229fefb5d600bed892f24dd470b872c5982d94675ab3da4d9 SHA512 bf0eb3b77f96471fb63a13caf1e87dc19dbd2748882a0b3c9c72ac67fd3f6c350f07ffb22d0f80146f88b30bb3b5d152cff442e499c0bff41fb0cca2fbd64c94
+MISC metadata.xml 627 BLAKE2B 2865ae255e9526337bbe2aed42afded9beb581347d1dcd2fac8920bc8e494992dbf8e64f4dd2d053ffbec69f643b1dc76442381fbd31fb98e30c0294f55d778a SHA512 5a241dce8c43268ef0b8e80c641fe20afe05475965ce13855c36f64c09930dd97795d25fe5c7923c71f4e5536d0b278dbfd18b3351e00502801f44494bf64d4f
diff --git a/net-p2p/go-ipfs-bin/files/ipfs-at.service b/net-p2p/go-ipfs-bin/files/ipfs-at.service
new file mode 100644
index 000000000000..1ad99bd61bcb
--- /dev/null
+++ b/net-p2p/go-ipfs-bin/files/ipfs-at.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=InterPlanetary File System
+After=network.target
+
+[Service]
+CPUSchedulingPolicy=batch
+EnvironmentFile=-/etc/conf.d/ipfs.%i
+ExecStart=/usr/bin/ipfs daemon --enable-gc --migrate
+ExecStop=/usr/bin/ipfs shutdown
+LimitNOFILE=8192
+PrivateTmp=yes
+ProtectSystem=full
+Restart=on-failure
+Type=simple
+User=%i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/go-ipfs-bin/files/ipfs.service b/net-p2p/go-ipfs-bin/files/ipfs.service
index 189ace2fd762..d942d5697b61 100644
--- a/net-p2p/go-ipfs-bin/files/ipfs.service
+++ b/net-p2p/go-ipfs-bin/files/ipfs.service
@@ -3,12 +3,17 @@ Description=InterPlanetary File System
 After=network.target
 
 [Service]
+CPUSchedulingPolicy=batch
+EnvironmentFile=-/etc/conf.d/ipfs
 ExecStart=/usr/bin/ipfs daemon --enable-gc --migrate
 ExecStop=/usr/bin/ipfs shutdown
-Group=%i
-Restart=always
+Group=ipfs
+LimitNOFILE=8192
+PrivateTmp=yes
+ProtectSystem=full
+Restart=on-failure
 Type=simple
-User=%i
+User=ipfs
 
 [Install]
 WantedBy=multi-user.target
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.18.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild
index f2e16b7beee3..c4af0136eb9e 100644
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.18.ebuild
+++ b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit bash-completion-r1 systemd user
+inherit bash-completion-r1 systemd
 
 DESCRIPTION="Main implementation of IPFS"
 HOMEPAGE="https://ipfs.io/"
@@ -17,7 +17,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~x86"
 
-RDEPEND="sys-fs/fuse"
+RDEPEND="
+	acct-group/ipfs
+	acct-user/ipfs
+	sys-fs/fuse:0
+"
+
 S="${WORKDIR}/go-ipfs"
 
 QA_PREBUILT="/usr/bin/ipfs"
@@ -26,6 +31,8 @@ src_install() {
 	dobin ipfs
 
 	systemd_dounit "${FILESDIR}/ipfs.service"
+	systemd_newunit "${FILESDIR}/ipfs-at.service" "ipfs@.service"
+
 	newinitd "${FILESDIR}/ipfs.init" ipfs
 	newconfd "${FILESDIR}/ipfs.confd" ipfs
 
@@ -34,9 +41,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	enewgroup ipfs
-	enewuser ipfs "" "" /var/lib/ipfs ipfs
-
 	fowners -R ipfs:ipfs /var/log/ipfs
 }
 
diff --git a/net-p2p/go-ipfs-bin/metadata.xml b/net-p2p/go-ipfs-bin/metadata.xml
index 463ccefc2c0d..ee40761b5e13 100644
--- a/net-p2p/go-ipfs-bin/metadata.xml
+++ b/net-p2p/go-ipfs-bin/metadata.xml
@@ -5,12 +5,16 @@
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>hurikhan77+bgo@gmail.com</email>
+		<name>Kai Krakow</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
-	IPFS is a decentralized torrent-like networking system with transparent
-	file adding/downloading.
+		IPFS is a decentralized torrent-like networking system with transparent
+		file adding/downloading.
 	</longdescription>
 </pkgmetadata>
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index e3f258fe25fe..ba07b398b1e2 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,6 +1,6 @@
 AUX gtk-gnutella-1.1.14-statx.patch 967 BLAKE2B 73cc687043d2b932b8e36d69c935c84a6668a28902f9ce8b060679ef1e567958053d5e565d1087ada4a590547250bf6ef7b9daa5e8a6b66cdbc275bb1a3c2941 SHA512 fd2cc3d0486efe526b9764d0d6c5bdffa08c344fc91f14305d0b16b957353ca38a23ff873cc669a49f67fd416b79ba38c288cda080ebeac545ea64e40634596f
 DIST gtk-gnutella-1.1.14.tar.xz 19372716 BLAKE2B b9caf1eaa79ca9c9e4d6a036f438eabbbab59a2d94a5227aee17ef9e9551af8185c3049247ee2e53ed913cbb46fafc6841d84346928490b380e16ccf5d27cc4e SHA512 cf8d76a5d531ad26e6155aedc2099f86ff91f96c4587bd6910e844fb6d19d35b48e3d1c4df45b7c68b34f4afcf2ce507943d73a33d923a97f6c43dd9c9ce10c9
 DIST gtk-gnutella-1.1.15.tar.xz 19606508 BLAKE2B 3c699f2c5e8b6962265c9fc9bc6720d740c447afb33bef8968e8c8f1f7ec8b88ec3381419cdcee8e2ec8f4e10be2c6e5707d5f89365f347a33990fffd0f18395 SHA512 6b2bee08fba463b66890c8c5d7f7815a8cc4106824e598bed8cffe4601b1e591fc14903ce8d587815257f795c854d459b3a4fa7cc90de2fbc109daef025e5968
-EBUILD gtk-gnutella-1.1.14.ebuild 1959 BLAKE2B 39df6cee0d80ec20d69ce782b47496490d3339998fa754557bb8ff749dec96f9ed4e9fcccfd36bbfc58993c93cea72b7149cda2084bbed0dc31d126e20737349 SHA512 9e44fcc69a2f05a40cba5a7650b96ec98a3451b78149ebb13a6382575710b18d32a3210ed5b198855c53b032118cda08a3b5414fa68eac61a7c8f2f9f1d7d6b7
-EBUILD gtk-gnutella-1.1.15.ebuild 1918 BLAKE2B 444f5242ef782ff99964a971a8747ee4b8fda2d0f8a77f748f9200147f45d89c9e2f01957f7cd443a20d379ec7f103736f61064d1b366190a34b996281b1252c SHA512 7ba87429998165d5f1c6a72583f9da6c2146816b884ecb70a2d767568045aeac5ad7fa6e3436d3f8d326030dfecb606dcea4900ba808cf76dd18f2393c5a11ba
+EBUILD gtk-gnutella-1.1.14.ebuild 1949 BLAKE2B 181f08e69be141816a5ca4fd4b9dc5fdf3f8f66e900dddb13ef2983a23b5cfd147ffd826ebeb949eb787a43871538c7319af09a26e4a89dab3c08b3c438235c3 SHA512 5f2d9d5a849fe45281ba5e1f49f3949272ff11bc4c60365ba7c4feb8337a59bbfc144126fd9b8cfa696e6d69ea692532bef1e94cd836e83d6860e8a42441362c
+EBUILD gtk-gnutella-1.1.15.ebuild 1908 BLAKE2B 79b612525bcd9153c8c15b294a40d74f9b81fc35b5b7cce056f0f9126031d80e23d089910d5a76d8b9a214e80f5c2d2d91e4ee49f4adc1f96cb1d3b997abcc1a SHA512 228ddc61f133b6835b060242264e109a57da2d14ff5c544f74735a425807365abd4562e8a1cd39e2092e9e8edba11f4428ceeacdd23a220b79825690f4428db2
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
index f47119c78d91..0dec1bcfd052 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	sys-libs/binutils-libs:=
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
index 9bbefd21a8c7..b7e9bc27bfcd 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 RDEPEND="
 	sys-libs/binutils-libs:=
diff --git a/net-p2p/gtorrentviewer/Manifest b/net-p2p/gtorrentviewer/Manifest
index c0d334cd1b80..03018a13e896 100644
--- a/net-p2p/gtorrentviewer/Manifest
+++ b/net-p2p/gtorrentviewer/Manifest
@@ -2,5 +2,5 @@ AUX gtorrentviewer-0.2b-curl-headers.patch 239 BLAKE2B 0ac725af45030e1b873f1ae29
 AUX gtorrentviewer-0.2b-desktop.patch 483 BLAKE2B 30f107035db2d7ed8526c3d0db5aeff8254b44d8221d3dc112cf72391371d8fd4ffef97eff4ba4919c77f289d0f603625a5dc23da976ea003626db121a1afb85 SHA512 fbe5154caf39212489f04b398becf92b37b41fc481bef9a2e0644fcbd2971d3939c2c6f05e009e58b05b79ad9f581239daeda98f79095c9c8c35cdfc0cb7af0e
 AUX gtorrentviewer-0.2b-underlinking.patch 342 BLAKE2B ae82741ed35aaa141fdcc8cdac983248de0866925710f9ecdb5b88708467d4a4e227eeb8d1ad6a220ddd7a228855c2a41d666083cba97a232f7ac1fa42ad3f87 SHA512 8d3584d822ea83eb44ed16b474ef448d463929c9b4b4b01ce09a334d89ffc1dde045f5564de4b0b9b1ed18597589fd8281a21b39d54bf0cf56dd6d5d75ce8f0f
 DIST GTorrentViewer-0.2b.tar.gz 247584 BLAKE2B 52f9e011e22d543a79e9eea4bb4686a8b966a0bac91cf66c111ce3553b23cbe7b6db3603da770d8840c7eb1941d10fab4b322191380ae88a007442d5cd9dcb8e SHA512 4e8a0181d0492e9a88de09fe6399b9c6e4ca16913550b53597c00c2a413cd4c332b305b4b24735fa2b84bea87618ce7c22b111779f452a8d977470830d145b10
-EBUILD gtorrentviewer-0.2b.ebuild 929 BLAKE2B 3d161c0c6d31b0e5f40115329072a8cb7bb794bedfb5b6d3f9eed0b00a07e917ce8ca2a7a9913aaa1d35e2fbc4fbf6746bb6e8c34ebe7779ea957843181d4c17 SHA512 8c6a7eb789cccb1f3a8528abd66e5296529931a1e3110299f48155c348b15ef8052d578f597b3239003ff765b847d247f9f3093235cfce729bbcf14379361c4d
+EBUILD gtorrentviewer-0.2b.ebuild 919 BLAKE2B ad8de98931be2ceaeaeca45a2ef9e6971395e7b2ef2caa4f9b77cd1d484aa48c656bd7b311cb42cfef4b18ad5a5f58f951e026430c1afc1b8d349f9331fcbaec SHA512 ef59d5c31b059103c440d030816cf88228cc7ed6e5e3e7c5e97cca98c1af39d23add0976852cf4b2ef10196b650124feec77402af4b19ecf7e8fcfab17f6f694
 MISC metadata.xml 251 BLAKE2B ef741cd6536d5f2d664d9c86956ba90a4e68663f8c7d6c0ff58a65b7765e724b6962dd225410ab1bae0044b9ebddd2d6e4b4977bb188ee5eee6f43da288b32b1 SHA512 6aa002666249e169350fc4fc954fbf5cf8e4ccd1095a80ce2f89d1fae77629f25da7fa95b0b1851de7aad2d75b36823ea7ec9393fde3f3b59e20e8737dd08a83
diff --git a/net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild b/net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild
index dafc8d425819..e9712a50b7fd 100644
--- a/net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild
+++ b/net-p2p/gtorrentviewer/gtorrentviewer-0.2b.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtorrentviewer.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gtorrentviewer/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 SLOT="0"
 IUSE=""
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 1c7ee445f515..1f7ffe4b5eb6 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -3,8 +3,9 @@ AUX ktorrent-5.1.1-kdehig.patch 1320 BLAKE2B b34d97f8e55358e97a898c6c4e0b88040a4
 AUX ktorrent-5.1.1-missing-header.patch 609 BLAKE2B 9d27522bb0309775dd330447993ba13d6b2730de74a241ebf091b9fe96a41fa157bf34ac4ec95820ce285c7305f8ebed9010a74af82fc8a26116bb68a95f60cb SHA512 571736ad190d2e75e5d6e1457d688e177388477e346e18f37c05bc74b9d97d3834897d0352b09c6469f3d5e996b093b827ebc0e5054005b8cfa5a5fc5b9fda16
 AUX ktorrent-5.1.1-scanfolder-memcorruption.patch 2244 BLAKE2B 53efe0320124f954adff60144981d740e5cdf45ed4712fa43f112bb6133fb24b4303e6f969d9a73598525dea4f6706c22e57d2e5c7378c69e494dd924360a307 SHA512 8d3868a6f75e2f53fa11762378a676736df09e14e6fbde04f0dcfb45eb56e8b739d17b3ea96af4be21edb22edad610982865b33508847f07ac2eba744f62ae5e
 AUX ktorrent-5.1.1-singlefile-torrent.patch 4654 BLAKE2B 8bef064068df9db5b82eb16e5ca04bb618378c94a5d218654aabb5e49dcc5db1a8b8fd92a4ed6e3e922f8a2eebdf23f4d460261fd396b7a7b8319cc102dce9f8 SHA512 e74632a86967440733ed0d3da9249a04dfe401d3966bc385581b5ba5e50e864b288fb0ca4e1ac17b754289fd8aeb70119f8c1981e9478afff434e17138beb151
+AUX ktorrent-5.1.2-crash-on-exit.patch 13261 BLAKE2B 735100f666ad7b6d0dccfcf3b5cd8582b52a6d818cd76e6ceb10e5a4a57e488eff625a94002156a5d01480c6f87e4dd05d5d5669b9accbe2973ac586bd4ef820 SHA512 5ba7b1c9bea3eae2886d2e6c6394464077b56cf1e77322a504ddb200db7a0b4130d6fdf75bfe7d3d9786c7c5507d8cb0b48c387cdf0eb77c54f9e8510287568b
 DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06
 DIST ktorrent-5.1.2.tar.xz 2048604 BLAKE2B 761df1e0aab5c4457311ae821a47ebf7b5b82b2839b4bf238491231caa213370cc649a1c0cafd332b42bbb84230f4a313e5172db722ff3c7af81c0daba450a98 SHA512 b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621
 EBUILD ktorrent-5.1.1-r1.ebuild 3192 BLAKE2B 5d0e9eb5e8a38f4f81c1928158f96973695f179fe7e423317e00959627ea2b66547d1ad043297898dd06ddb230735c1999180c3b43e7385d44689b4b74053ace SHA512 ee10006a6f529e1860f9499cf85df90e19ec8f2c39d03c714465e8a72104bfd82ee09b062f56307c9483f579d1df646549d2bd17df4a77f62e4b9ad3cec31899
-EBUILD ktorrent-5.1.2-r1.ebuild 3063 BLAKE2B 2cdcf72ed9b3d6193d289d1630c9c79c6c75fdebda904c010a39600babe1567f5d81e7d8a5a6855e49cc2903ee0bfb86a94b810680de2e7023e5b0fc8cc42827 SHA512 4ce7cfe84a0136e7bbadd2ffd08239b9eb064a00ba05066ff7e2dc0643ed69507119b9e29d3a5922814754fbee6f5ea12e33a257142e8bb2a5dff043a5d0bb75
+EBUILD ktorrent-5.1.2-r2.ebuild 3118 BLAKE2B a4d3853d387bf201e40df11167bbca60693b5140c6d8ea4d3dd8224f138afbef6445479552ed9731f88e9dc75c971890b5a59685b200a542dfd64dcb1a267ad9 SHA512 7585567f8ee55a9e50b447c02c9a01ccc340c977a9c339b87f0777ed4e9dab562867dc76a594370d915d9a56f608b5cb66e9503e5a090ee573fd3028bde37de1
 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.2-crash-on-exit.patch b/net-p2p/ktorrent/files/ktorrent-5.1.2-crash-on-exit.patch
new file mode 100644
index 000000000000..5cb6640d16f4
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-5.1.2-crash-on-exit.patch
@@ -0,0 +1,386 @@
+From b819ef6a35495e12a204cbb241cdb2502c4cd11e Mon Sep 17 00:00:00 2001
+From: Valerii Malov <jazzvoid@gmail.com>
+Date: Sun, 22 Sep 2019 21:20:47 +0300
+Subject: Cleanup ViewModel a bit and try to fix crash on exit
+
+Summary:
+removeTorrent makes changes to torrent list we are currently iterating
+on per-item basis, this causees heap-use-after-free in onExit
+Just call removeRows which should be functionally the same, but should
+delete all items in one batch
+
+CCBUG: 383127
+
+Compact ViewModel::Item::update
+Fix a few warnings (0 as nullptr, c-style casts)
+Remove useless ViewModel::torrentFromIndex variant
+Remove unused headers
+add CMakeLists.txt.user to gitignore
+
+Test Plan: build with asan, run & exit, see asan stacktrace before changing onExit
+
+Reviewers: stikonas
+
+Differential Revision: https://phabricator.kde.org/D24149
+---
+ .gitignore                  |   1 +
+ ktorrent/CMakeLists.txt     |   1 +
+ ktorrent/view/viewmodel.cpp | 197 ++++++++++++--------------------------------
+ ktorrent/view/viewmodel.h   |  21 +++--
+ 4 files changed, 63 insertions(+), 157 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index 2ad76d6..d88e731 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,3 +1,4 @@
+ build
+ .kdev4/
+ ktorrent.kdev4
++CMakeLists.txt.user
+diff --git a/ktorrent/CMakeLists.txt b/ktorrent/CMakeLists.txt
+index 75ba8a1..bf605a5 100644
+--- a/ktorrent/CMakeLists.txt
++++ b/ktorrent/CMakeLists.txt
+@@ -91,6 +91,7 @@ set(KTORRENT_ICONS_PNG
+ ecm_add_app_icon(ktorrent_SRC ICONS ${KTORRENT_ICONS_PNG})
+ 
+ add_executable(ktorrent_app ${ktorrent_SRC})
++set_property(TARGET ktorrent_app PROPERTY CXX_STANDARD 14)
+ set_target_properties(ktorrent_app  PROPERTIES OUTPUT_NAME ktorrent)
+ 
+ target_link_libraries(ktorrent_app
+diff --git a/ktorrent/view/viewmodel.cpp b/ktorrent/view/viewmodel.cpp
+index 6834186..b9feeab 100644
+--- a/ktorrent/view/viewmodel.cpp
++++ b/ktorrent/view/viewmodel.cpp
+@@ -32,18 +32,17 @@
+ 
+ #include <KLocalizedString>
+ 
+-#include <util/log.h>
+-#include <util/sha1hash.h>
+-#include <util/functions.h>
++#include <groups/group.h>
+ #include <interfaces/torrentinterface.h>
+-#include <interfaces/trackerinterface.h>
+-#include <torrent/timeestimator.h>
+ #include <torrent/queuemanager.h>
+-#include <groups/group.h>
++#include <torrent/timeestimator.h>
++#include <util/functions.h>
++#include <util/sha1hash.h>
++
+ #include "core.h"
+-#include "viewdelegate.h"
+-#include "view.h"
+ #include "settings.h"
++#include "view.h"
++#include "viewdelegate.h"
+ 
+ using namespace bt;
+ 
+@@ -80,125 +79,45 @@ namespace kt
+     {
+         bool ret = false;
+         const TorrentStats& s = tc->getStats();
+-        if (status != s.status)
+-        {
+-            to_update.append(model->index(row, NAME));
+-            status = s.status;
+-            if (sort_column == NAME)
+-                ret = true;
+-        }
+-
+-        if (bytes_downloaded != s.bytes_downloaded)
+-        {
+-            to_update.append(model->index(row, BYTES_DOWNLOADED));
+-            bytes_downloaded = s.bytes_downloaded;
+-            if (sort_column == BYTES_DOWNLOADED)
+-                ret = true;
+-        }
+-
+-        if (total_bytes_to_download != s.total_bytes_to_download)
+-        {
+-            to_update.append(model->index(row, TOTAL_BYTES_TO_DOWNLOAD));
+-            total_bytes_to_download = s.total_bytes_to_download;
+-            if (sort_column == TOTAL_BYTES_TO_DOWNLOAD)
+-                ret = true;
+-        }
+-
+-        if (bytes_uploaded != s.bytes_uploaded)
+-        {
+-            to_update.append(model->index(row, BYTES_UPLOADED));
+-            bytes_uploaded = s.bytes_uploaded;
+-            if (sort_column == BYTES_UPLOADED)
+-                ret = true;
+-        }
+-
+-        if (bytes_left != s.bytes_left_to_download)
+-        {
+-            to_update.append(model->index(row, BYTES_LEFT));
+-            bytes_left = s.bytes_left_to_download;
+-            if (sort_column == BYTES_LEFT)
+-                ret = true;
+-        }
+-
+-        if (download_rate != s.download_rate)
+-        {
+-            to_update.append(model->index(row, DOWNLOAD_RATE));
+-            download_rate = s.download_rate;
+-            if (sort_column == DOWNLOAD_RATE)
+-                ret = true;
+-        }
+-
+-        if (upload_rate != s.upload_rate)
+-        {
+-            to_update.append(model->index(row, UPLOAD_RATE));
+-            upload_rate = s.upload_rate;
+-            if (sort_column == UPLOAD_RATE)
+-                ret = true;
+-        }
+ 
+-        int neta = tc->getETA();
+-        if (eta != neta)
+-        {
+-            to_update.append(model->index(row, ETA));
+-            eta = neta;
+-            if (sort_column == ETA)
+-                ret = true;
+-        }
+-
+-        if (seeders_connected_to != s.seeders_connected_to || seeders_total != s.seeders_total)
+-        {
+-            to_update.append(model->index(row, SEEDERS));
+-            seeders_connected_to = s.seeders_connected_to;
+-            seeders_total = s.seeders_total;
+-            if (sort_column == SEEDERS)
+-                ret = true;
+-        }
+-
+-        if (leechers_total != s.leechers_total || leechers_connected_to != s.leechers_connected_to)
+-        {
+-            to_update.append(model->index(row, LEECHERS));
+-            leechers_total = s.leechers_total;
+-            leechers_connected_to = s.leechers_connected_to;
+-            if (sort_column == LEECHERS)
+-                ret = true;
+-        }
+-
+-        double perc = Percentage(s);
+-        if (fabs(percentage - perc) > 0.001)
+-        {
+-            to_update.append(model->index(row, PERCENTAGE));
+-            percentage = perc;
+-            if (sort_column == PERCENTAGE)
+-                ret = true;
+-        }
+-
+-        float ratio = s.shareRatio();
+-        if (fabsf(share_ratio - ratio) > 0.001)
+-        {
+-            to_update.append(model->index(row, SHARE_RATIO));
+-            share_ratio = ratio;
+-            if (sort_column == SHARE_RATIO)
+-                ret = true;
+-        }
++        const auto update_if_differs = [&](auto &target, const auto &source, int column){
++            if (target != source) {
++                to_update.append(model->index(row, column));
++                target = source;
++                ret |= (sort_column == column);
++            }
++        };
+ 
+-        Uint32 rdl = tc->getRunningTimeDL();
+-        if (runtime_dl != rdl)
+-        {
+-            to_update.append(model->index(row, DOWNLOAD_TIME));
+-            runtime_dl = rdl;
+-            if (sort_column == DOWNLOAD_TIME)
+-                ret = true;
+-        }
++        const auto update_if_differs_float = [&](auto &target, const auto &source, int column){
++            if (fabs(target - source) > 0.001) {
++                to_update.append(model->index(row, column));
++                target = source;
++                ret |= (sort_column == column);
++            }
++        };
++
++        update_if_differs(status, s.status, NAME);
++        update_if_differs(bytes_downloaded, s.bytes_downloaded, BYTES_DOWNLOADED);
++        update_if_differs(total_bytes_to_download, s.total_bytes_to_download, TOTAL_BYTES_TO_DOWNLOAD);
++        update_if_differs(bytes_uploaded, s.bytes_uploaded, BYTES_UPLOADED);
++        update_if_differs(bytes_left, s.bytes_left, BYTES_LEFT);
++        update_if_differs(download_rate, s.download_rate, DOWNLOAD_RATE);
++        update_if_differs(upload_rate, s.upload_rate, UPLOAD_RATE);
++        update_if_differs(eta, tc->getETA(), ETA);
++        update_if_differs(seeders_connected_to, s.seeders_connected_to, SEEDERS);
++        update_if_differs(seeders_total, s.seeders_total, SEEDERS);
++        update_if_differs(leechers_connected_to, s.leechers_connected_to, LEECHERS);
++        update_if_differs(leechers_total, s.leechers_total, LEECHERS);
++
++        update_if_differs_float(percentage, Percentage(s), PERCENTAGE);
++        update_if_differs_float(share_ratio, s.shareRatio(), SHARE_RATIO);
++
++        update_if_differs(runtime_dl, tc->getRunningTimeDL(), DOWNLOAD_TIME);
++        const auto rul = (tc->getRunningTimeUL() >= tc->getRunningTimeDL()
++                              ? tc->getRunningTimeUL() - tc->getRunningTimeDL()
++                              : 0);
++        update_if_differs(runtime_ul, rul, SEED_TIME);
+ 
+-        Uint32 rul = tc->getRunningTimeUL();
+-        rul = rul >= rdl ? rul - rdl : 0; // make sure rul cannot go negative
+-        if (runtime_ul != rul)
+-        {
+-            to_update.append(model->index(row, SEED_TIME));
+-            runtime_ul = rul;
+-            if (sort_column == SEED_TIME)
+-                ret = true;
+-        }
+         return ret;
+     }
+ 
+@@ -223,13 +142,11 @@ namespace kt
+                 return BytesPerSecToString(download_rate);
+             else
+                 return QVariant();
+-            break;
+         case UPLOAD_RATE:
+             if (upload_rate >= 103) // lowest "visible" speed, all below will be 0,0 Kb/s
+                 return BytesPerSecToString(upload_rate);
+             else
+                 return QVariant();
+-            break;
+         case ETA:
+             if (eta == bt::TimeEstimator::NEVER)
+                 return QString(QChar(0x221E)); // infinity
+@@ -237,7 +154,6 @@ namespace kt
+                 return DurationToString(eta);
+             else
+                 return QVariant();
+-            break;
+         case SEEDERS:
+             return QString(QString::number(seeders_connected_to) + QLatin1String(" (") + QString::number(seeders_total) + QLatin1Char(')'));
+         case LEECHERS:
+@@ -397,7 +313,7 @@ namespace kt
+         connect(core, &Core::torrentRemoved, this, &ViewModel::removeTorrent);
+         sort_column = 0;
+         sort_order = Qt::AscendingOrder;
+-        group = 0;
++        group = nullptr;
+         num_visible = 0;
+ 
+         kt::QueueManager* qman = core->getQueueManager();
+@@ -635,7 +551,7 @@ namespace kt
+         if (!index.isValid() || index.row() >= torrents.count())
+             return QVariant();
+ 
+-        Item* item = (Item*)index.internalPointer();
++        Item* item = reinterpret_cast<Item*>(index.internalPointer());
+         if (!item)
+             return QVariant();
+ 
+@@ -699,7 +615,7 @@ namespace kt
+             return false;
+ 
+         QString name = value.toString();
+-        Item* item = (Item*)index.internalPointer();
++        Item* item = reinterpret_cast<Item*>(index.internalPointer());
+         if (!item)
+             return false;
+ 
+@@ -796,28 +712,20 @@ namespace kt
+         }
+     }
+ 
+-    const bt::TorrentInterface* ViewModel::torrentFromIndex(const QModelIndex& index) const
+-    {
+-        if (index.isValid() && index.row() < torrents.count())
+-            return torrents[index.row()]->tc;
+-        else
+-            return 0;
+-    }
+-
+-    bt::TorrentInterface* ViewModel::torrentFromIndex(const QModelIndex& index)
++    bt::TorrentInterface* ViewModel::torrentFromIndex(const QModelIndex& index) const
+     {
+         if (index.isValid() && index.row() < torrents.count())
+             return torrents[index.row()]->tc;
+         else
+-            return 0;
++            return nullptr;
+     }
+ 
+-    bt::TorrentInterface* ViewModel::torrentFromRow(int index)
++    bt::TorrentInterface* ViewModel::torrentFromRow(int index) const
+     {
+         if (index < torrents.count() && index >= 0)
+             return torrents[index]->tc;
+         else
+-            return 0;
++            return nullptr;
+     }
+ 
+     void ViewModel::allTorrents(QList<bt::TorrentInterface*> & tlist) const
+@@ -854,10 +762,7 @@ namespace kt
+     void ViewModel::onExit()
+     {
+         // items should be removed before Core delete their tc data.
+-        for (Item* item : qAsConst(torrents))
+-        {
+-            removeTorrent(item->tc);
+-        }
++        removeRows(0, rowCount(), QModelIndex());
+     }
+ 
+     class ViewModelItemCmp
+diff --git a/ktorrent/view/viewmodel.h b/ktorrent/view/viewmodel.h
+index d4e0a64..6422396 100644
+--- a/ktorrent/view/viewmodel.h
++++ b/ktorrent/view/viewmodel.h
+@@ -22,9 +22,15 @@
+ #ifndef KTVIEWMODEL_H
+ #define KTVIEWMODEL_H
+ 
+-#include <QList>
+ #include <QAbstractTableModel>
+-#include <interfaces/torrentinterface.h>
++#include <QList>
++
++#include <torrent/torrentstats.h>
++#include <util/constants.h>
++
++namespace bt {
++    class TorrentInterface;
++}
+ 
+ namespace kt
+ {
+@@ -98,21 +104,14 @@ namespace kt
+          * @param index The model index
+          * @return The torrent if the index is valid and in the proper range, 0 otherwise
+          */
+-        const bt::TorrentInterface* torrentFromIndex(const QModelIndex& index) const;
+-
+-        /**
+-         * Get a torrent from a model index.
+-         * @param index The model index
+-         * @return The torrent if the index is valid and in the proper range, 0 otherwise
+-         */
+-        bt::TorrentInterface* torrentFromIndex(const QModelIndex& index);
++        bt::TorrentInterface *torrentFromIndex(const QModelIndex& index) const;
+ 
+         /**
+          * Get a torrent from a row.
+          * @param index The row index
+          * @return The torrent if the index is valid and in the proper range, 0 otherwise
+          */
+-        bt::TorrentInterface* torrentFromRow(int index);
++        bt::TorrentInterface* torrentFromRow(int index) const;
+ 
+         /**
+          * Get all torrents
+-- 
+cgit v1.1
diff --git a/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
index af5cd52308e7..a23633e653d4 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild
@@ -76,7 +76,10 @@ RDEPEND="${COMMON_DEPEND}
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.1.1-singlefile-torrent.patch" ) # git master
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.1-singlefile-torrent.patch" # git master
+	"${FILESDIR}/${P}-crash-on-exit.patch" # bug #632588
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-p2p/mktorrent-borg/Manifest b/net-p2p/mktorrent-borg/Manifest
deleted file mode 100644
index 066c9fe2be8c..000000000000
--- a/net-p2p/mktorrent-borg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mktorrent-0.9.9.tgz 6087 BLAKE2B f0df8e7469deb9fdeac42d28d13237786fc8ab6acac316376ea9855cccc87e83ab9019a7e4319f43143d918960626fcf11ed7e799756f2f58dff3ab88f1f2591 SHA512 ff702383c99d5c80b4433fb279968e1f19c6315216a2b74064ba57240ecd990b674195c035278c7e54801b77ab76fbb94667d8d7938d5ce2348faf015de27c5f
-EBUILD mktorrent-borg-0.9.9.ebuild 629 BLAKE2B 6dfde7b4c7f94a6d7168bb1c40e8b3da546d132dd58bcebd2d2f6f4293a62361d48286b7a6474d1566a9f6e26b62a0dd6b9103b16714e238471a91673027a42b SHA512 02c56d7a2de4be65e64a3749651e01abcaba237016a1d5ca70dfcdef107da8ae9850cf6928ec4a7eebbd6731d5ae4d153754f3b313feb00858b591aed35d4203
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-p2p/mktorrent-borg/metadata.xml b/net-p2p/mktorrent-borg/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-p2p/mktorrent-borg/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-p2p/mktorrent-borg/mktorrent-borg-0.9.9.ebuild b/net-p2p/mktorrent-borg/mktorrent-borg-0.9.9.ebuild
deleted file mode 100644
index eb02e99c77d5..000000000000
--- a/net-p2p/mktorrent-borg/mktorrent-borg-0.9.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Console .torrent file creator. It support Multi Trackers (tier groups)"
-HOMEPAGE="http://borg.uu3.net/~borg/"
-SRC_URI="ftp://borg.uu3.net/pub/unix/mktorrent/mktorrent-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN%-borg}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/CC=gcc/CC=$(tc-getCC)/g" \
-		-e "s/^CFLAGS =/CFLAGS +=/g" Makefile
-}
-
-src_install() {
-	newbin mktorrent mktorrent-borg || die "newbin failed"
-	dodoc CHANGES
-}
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 99b86244e43d..066ebc0998cd 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -4,7 +4,7 @@ AUX ocaml-4.03.patch 5140 BLAKE2B 592dbb7bd8bc53e039a0cf806d9e69cbb6e70ca002152c
 AUX ocaml4.patch 547 BLAKE2B e2cb8eb12121beb5cc81ba34dcf8ddd78f2ab9826d4c6cdc028c14b3f04e6bcc041bf153ec1d6aaf2d78c97c9d70e26f4ccbc87e7c2cef2499b22bf157dd2695 SHA512 f99d4050613e210c2092153a7b1a45028ea26d4e90d295b1d19ed3a25b7ae656c15efca84a5f694703dca339c1a5e7baec5d71ad815f96c41620a8ed7c34422c
 DIST mldonkey-3.1.5.tar.bz2 2847382 BLAKE2B 60df6ffba295d0a230f1ca2d143e21529387fb453529cd89e84911b72248c0fec15261b7d3ed54be2c8d1de84bf4e8faaebcfa2019960af845493fb2385e46c8 SHA512 96e75acf91d7ecc41490f898e06d284da27404c7e567f173936d8113885a3b4b6bc93341358f92a30d3f699eef681d97ce56414a37bb02a535ad2da4d4ad13a3
 DIST mldonkey-3.1.6.tar.bz2 2886916 BLAKE2B f92c7195c67e3a9186cb9e691114dc2c1b967dab93a7c280a6fe25c2f3a18d97e849f738d0f4669f0e967c3b717ed0329f40d95c07be13a46fb5a96fc49ff716 SHA512 d0c7256c7c43934bc132183cfe0c8d85c61a874e295b86ba989f43fd4d9f3672bdf18439a9fefce52c30a6a8df08a5a464dcc21d4bf199d1b502fa344683081a
-EBUILD mldonkey-3.1.5-r1.ebuild 4356 BLAKE2B 4fffa30f9bda190d601eb0e8e4cc7ab217575d99b8ebf91663ff1b642cf558942abf1e3ed00409428b48d77ab49eb6c491981bd032e4b6599d003437636ac660 SHA512 37c85135b6f346e65513e80733f84f8fd42345b5698322c70e9d5af08fa4e8a70d2ba44155b7bd3f1e9d8e090797d80ca1c104088e57563ad8490dca63320102
-EBUILD mldonkey-3.1.6-r1.ebuild 4463 BLAKE2B 0c67e039fdd1c9fd9571c5f46541baadcadc465460dba345823a2ebe52aa1d9baac529662311dcd8bf08406b1002a7622f65f5d2d1ee258b17b5842503cefc4e SHA512 898892a8884166e050d1205e78bee827f5fcad3a2adad3bbce03badcfb171c5102f0d158b6c26ef3b365e2ef70268b6107fbf8df7fd2e5b492738481aad2ae54
-EBUILD mldonkey-3.1.6.ebuild 4330 BLAKE2B da18da74f5300bc30921ee25049387eac3c9a5cf43518af9bae1fba6bea3cd47328077563beae8655a861eb916c345234c16b7a096a800705b023319effd3fa4 SHA512 3da6cdb7e908c71985c0ecb043fdd810614c60986c18375e6e24b39c26a96b27e37290b262427b82e90cbfc904be22d9c0650f4ac1d07da4c80dfc1eb8c3519e
+EBUILD mldonkey-3.1.5-r1.ebuild 4346 BLAKE2B 7513e58d1e14df7bf4faf0532c7486396d45661730490410003f86de23f6f153b3935965c385ceb606ccc2b2adec89d143c3b3a5d5ac69da84767f68ec9af3c6 SHA512 8df2d36ab91e2d539fa3a241739d9ea74d87e6783892a3e0844532568e808af66aa2bdea0913d471937447c342d49a5176ef71568b9cf9224f49ea48e42e6de9
+EBUILD mldonkey-3.1.6-r1.ebuild 4453 BLAKE2B 440753ae53e894aae8c69409c37a8a49adddc3c7ad4b52186d5c47aa5fbfec442c361550cfe063d6c658a463a605f44d098439c0709e2c8d3175448ae34d3065 SHA512 b7f6005af2f70c91ff8d7c82c4d8ecb4b71f7ad1fc51e04146aaa47c9f496828fe950fd1c69996d426413ca8be2a517ed205ea5873e3e764f40b8ebe5b22c7bb
+EBUILD mldonkey-3.1.6.ebuild 4320 BLAKE2B b29ecc98ce41a4ca232c658caca7538ad296c0e8659dec1325b00a92f1a80d2d5a51763559f04eef1e8dc3983ef674b380ee026ae3f8e68c45d62753b6b26a5d SHA512 b1273d8b84660a185da4b3f389f14c3dea57868cc7b02803de5926038622065824aaf73671b12d3c7aa42e30bbc7ff454eb66c0aa6ed3181be23e726f760cdd4
 MISC metadata.xml 740 BLAKE2B 96af3507e4e0714fd01d369619b3f0e4e68a2a88e97189565a2e73ebaf9666f07063a91a33aae63f9ada4d155300a44a2361df6d5d499645f9b5df9646528b4d SHA512 ecca594b6b356c1d8c86217dc9792ed09fb842cbe015b78baae1d4c4885e86f81a9cfd694dcd8a3fbca420ede35c8ae228a15f64f1d5013d139542e06290d160
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
index 2f99a446acca..37f706a8420a 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86"
 
 RDEPEND="dev-lang/perl
 	dev-ml/camlp4:=
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
index a92fc8ae4722..c79384659d71 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_a
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-lang/perl
 	dev-ml/camlp4:=
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
index 06defbcd139a..6aa27aceb28f 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_a
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
 
 RDEPEND="dev-lang/perl
 	dev-ml/camlp4:=
diff --git a/net-p2p/myster/Manifest b/net-p2p/myster/Manifest
deleted file mode 100644
index f76d8d5f2e30..000000000000
--- a/net-p2p/myster/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Myster_PR8_Generic.zip 934533 BLAKE2B 35343d2aa3af5d2462e08f61dbabda607f533ae61ac99fe9cac755ae0de83546169ff976e0685cb3570b6683dcf618443fd4cf757e1aed2dec89b3bfccc344e5 SHA512 2b946f72afb5df4b9b1425067669975f7e2aa048c8d798010a286e8d612e819577982663983e78f26c3b72975d3580738347515669fac94fdb32f146700bd018
-EBUILD myster-8.0-r1.ebuild 564 BLAKE2B cd6b739f4d6b70c38247ed7c20e17a3a717229531f78bef10dad632108d55e109a266a0ea495277a0b8aca7558fb84d6156c762169344acc8624d64debbff144 SHA512 41444627537799eb4dbba811396a17463d3a50923a9e39dadc00d78a9831c77fc14c7e555b4df00ac54e0bfd4a3aa738ec534a58e803d1165c3ead2de0152f22
-MISC metadata.xml 243 BLAKE2B 082a439cce2d8216dfa9f74bdb1c35ae701a817b4814e023d838ab968365b2a21e5344320a2188eb23af5215907f0707ca3c07e9ed8178a5412cd4952aeb44ed SHA512 317828c9fbdae9118b45123ed22f36e2cc6fdc2b26f5ff6b953999881d0f49143023012b37f2119f40169421e84e0afe7cfc0b7833adce31aa96f5615061697d
diff --git a/net-p2p/myster/metadata.xml b/net-p2p/myster/metadata.xml
deleted file mode 100644
index 164317fa5965..000000000000
--- a/net-p2p/myster/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">myster</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-p2p/myster/myster-8.0-r1.ebuild b/net-p2p/myster/myster-8.0-r1.ebuild
deleted file mode 100644
index 54197b81b0b4..000000000000
--- a/net-p2p/myster/myster-8.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit java-pkg-2
-
-MY_PV=${PV/.0/}
-DESCRIPTION="Myster is a decentralized file sharing network"
-HOMEPAGE="http://www.mysternetworks.com/"
-SRC_URI="mirror://sourceforge/myster/Myster_PR${MY_PV}_Generic.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-src_install () {
-	insinto /opt/myster
-	doins -r */*
-	java-pkg_regjar "${D}"/opt/myster/*.jar
-	java-pkg_dolauncher ${PN}
-}
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 619612852e0d..380bbef858f7 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,3 +1,3 @@
 DIST nicotine+-1.4.1.tar.gz 3824830 BLAKE2B def211a4d06b1cb6a409917579652b3a1c8c36ec5ecfe5e295b9fabeaaca02cd4999fd20935c8999d4cf989f3ecff0a0a2c7f52a40f8c2b03e05b6c9dc2feca9 SHA512 894dfb318b205b6be21face0308f183da15772f329158c6a9a8a816dfdf231ad89245188acad5538821b2a778c8a8a6201ce8548cc58550c4eb6c0763db9d66a
-EBUILD nicotine+-1.4.1-r1.ebuild 746 BLAKE2B 48b5e06ac531ff0e3abebeea391e9c6fee9f6a2cbb164ca36c165a4b1905c6f141f407d2f56d0b570f717d29f0288a84d6e82c030c5064a235c2ed347e2049d2 SHA512 b72db2e76e4149e9a3b719c85c38bf7e7d2913da0067cc2d84374d633294575de363805cca072b43f1f3673af03abf9a8cd1a0fab5dbb9486001fc3714cb0f49
+EBUILD nicotine+-1.4.1-r1.ebuild 736 BLAKE2B af33d384f9db8d1d9aa48a6b4814ae595f511dd8ad5c986046c781fa8f36990956cd011cd08455cc1beb39caf47121f1276109f59f5dec37814744a68d8fd72c SHA512 a3c5e676bbdd23f15c9c9b9b48fca1063404e5452ab08808efd61024df8a1205d916c53cc75f9a953708118e255a7ef6d4887ef672ac9fcc25bfd7d0646a6054
 MISC metadata.xml 257 BLAKE2B eefbd95091b941aef3073689259e7bed1a9cd7db0a4d46ca77608a0d6bab835122b56ce9047e7fb21d7ca706b331f3b6b50f2dfff68561da40b3b8d6e63de62c SHA512 a7df7842124c688e7ed9fc4ca49372517e3570f1c461e78f32364902fafe04255a6db8fde42a72cbe2ed61426a5d49e89baa792aa3c9900cb4a83cc647c56cd5
diff --git a/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild b/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild
index 97f31a510c6b..6244745090a0 100644
--- a/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz ->
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 6c692bdeb578..4c5eb92b0cf0 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,7 +1,6 @@
-AUX qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch 1177 BLAKE2B e11b201b5852017e17343340ff79b106667117b1271dc1b53d99d4ca44df31f81cbfa5ef8403695a0902e8e2350d499f5e52e2e83e5331a3808d4fc23a7a870f SHA512 65637b31469f2fe5b9a97383adf63f3bdc65d90c759d5d71981ebc8e65ed653b761b3fa5d35dbf407cbff75a97e9442dc799624f957a0a74561098969ed779d8
-DIST qbittorrent-4.1.6.tar.gz 7780676 BLAKE2B fe2572bece5a014d821cf905a13a45f71c63eda661b338a90517a23d257d83f556c1ad1bd064cc2840e9731886d7afaafa36ea50f8c3fe8ff05fc3ec3a12c478 SHA512 14c337257a71a7a6f850bbbbe3effe6f34c299fe71486c1a71160f54ccc7377a5c8e742ca2fd85cf198b2a603fdfee50bdb19b33a10899f86f8499468ca8a735
 DIST qbittorrent-4.1.7.tar.gz 7803389 BLAKE2B 6a8cf01c2bd86b63b629877fd3446db4aedd1591058af24c14dd4b69f0abae7f3ca715190fa0496b1a3ec742d4ee12585dd27e27c1465a1d22a149c2d47608ca SHA512 59fc6dc9696fbcfb9325017dcb5514f866e7f9e9eda9b4487c29c94d445709f1f3fab35f9817b62da75757360239362d77024d708eae48e89dffdde4ed272be4
-EBUILD qbittorrent-4.1.6-r1.ebuild 1544 BLAKE2B 3f55264180555674103b3297165b760ddb1e818fbed002526cbc683dd2616bbc84c4e7bf81fb803d6680412f9c4b183638a2039a388664cb636cc2bd02f0463b SHA512 7fd200c4163f71b1a88fd818f9bdb52ecf771d713c6b589bd4958f425a045a50428f5f17212b2a23b7d02e3e1dedaecfbdf434710fbfee4040725bb9f31646c2
-EBUILD qbittorrent-4.1.7.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db
+DIST qbittorrent-4.1.8.tar.gz 7803739 BLAKE2B ee56e004945025f06b179b08e938c6a3182f252c3bed6990158634ea1fdfd525fd67d105fd7ecdf0217a4bd73d847c5007d1e95f492f4f4e41c32d22dd6b7523 SHA512 8920e98f8db5dd738caab8815cc4a10950c34ba2eaa19b50479bb2ab548f6f297534759d71791caa4c8bfbea92d4b71d223a27fae150e00cc0a262eb3370a1e3
+EBUILD qbittorrent-4.1.7.ebuild 1471 BLAKE2B 4425b0c76189dc80766092cfcea3939951918051fe73c14c9b7bc270ce4cdd4cea1bf9d879ca0aa1791d197bd331e4426fdb195eae78d59e0764cbff948d45d5 SHA512 e3660d0920d56b236f0309eeb9af01b4fe83d091687a814970ea33d7c5ed7be242bb1f7996b0cbbbacfd3b3e998250b175c412d0abca05a42b53bf80fc35bada
+EBUILD qbittorrent-4.1.8.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/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch b/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch
deleted file mode 100644
index 361f7aa22553..000000000000
--- a/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9a4dd3ea9d1fc2af0cc5724ebb19fc99297c2960 Mon Sep 17 00:00:00 2001
-From: Ekin Dursun <ekindursun@gmail.com>
-Date: Tue, 7 May 2019 02:08:46 +0300
-Subject: [PATCH] Don't turn screen blank when closed to system tray
-
-Closes #9240 and possibly #9121, as @zeule suggested here: https://github.com/qbittorrent/qBittorrent/issues/9240#issuecomment-408025722.
----
- src/gui/mainwindow.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
-index 4c62ba5d90..0b8b41ebab 100644
---- a/src/gui/mainwindow.cpp
-+++ b/src/gui/mainwindow.cpp
-@@ -1158,8 +1158,8 @@ void MainWindow::closeEvent(QCloseEvent *e)
- #else
-     const bool goToSystrayOnExit = pref->closeToTray();
-     if (!m_forceExit && m_systrayIcon && goToSystrayOnExit && !this->isHidden()) {
--        hide();
--        e->accept();
-+        e->ignore();
-+        QTimer::singleShot(0, this, &QWidget::hide);
-         if (!pref->closeToTrayNotified()) {
-             showNotificationBaloon(tr("qBittorrent is closed to tray"), tr("This behavior can be changed in the settings. You won't be reminded again."));
-             pref->setCloseToTrayNotified(true);
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild
index e4e1c16a3150..19a8c92ab041 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S="${WORKDIR}/qBittorrent-release-${PV}"
 fi
 
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.8.ebuild
index 1031d3dfb61f..e4e1c16a3150 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 	S="${WORKDIR}/qBittorrent-release-${PV}"
 fi
 
@@ -44,8 +44,6 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-no-screenblank-on-close-to-systray.patch" )
-
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 
 src_configure() {
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 2ccbb88830b8..f19a667ae9ac 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -5,5 +5,5 @@ DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B 63a32ee3a22f4df8b9f6cff149be2c9a9c
 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 3924 BLAKE2B 899639f2a428d41f80a155c5d8641522377c07692eaccec0cb972616b3ee73966fc7ab97b7774f19e296b8a60f968b4bd64a4634f8fdae251a15633c00c47c63 SHA512 127a61c608f7e4bc2fadd301d0fcfe06cfedd462ce1db1b919f2ebc0ff141321e20bc0035e3316a74101864a40fb486ba379ab31549025f06091314d53c96c0c
+EBUILD retroshare-0.6.5.ebuild 3921 BLAKE2B c35a753c86ad3ba4a6778e8d8375b01dda13b5dc87703144ef37cc1b467ba7e3b1130e3c8855608ad272196d7e993a21fe58659cc20bae29973bea112c23d1cf SHA512 6b0ff8a74ca4f998d99342e5403e4edd11aeeb25a47c834974cc4b11a3f0f7df0b929d7d380853d443390ad44a1083098bfcdb96083e22854be2389a93135dbd
 MISC metadata.xml 1758 BLAKE2B 7c3cea20af17ad1ba4c5a9923929ada21f986706bc2cc7b43512e272d01e10cb8cbbfa8556159402c9b6aa8165e0b8ff0befea34fa0186115b9af254a35be88f SHA512 b4f152eca444ff069446dbf78b40cf128ff36f6a01689d160b6399c631439489847585dcef3d7ee9afd8e72b5fd88ee8daaf0fd49df45efbc102ae85554efdae
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index 0a7090d16613..7bf5fdbe3a97 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 8b979d0c483f..01cf76d76f79 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -6,7 +6,7 @@ AUX rtorrentd.init 871 BLAKE2B 3f83e6bb52044e293127aaf7ae505c1dc6422698360537edb
 AUX rtorrentd_at.service 308 BLAKE2B 2aac1f49a25d35136db25a13c08d1847d21701272d56a6ca06eee6a8426719c340a041568cc1d575fae341a49fa1f53a132ba11ff73180b1bee246197d8119c2 SHA512 cc707500af2dbb0cc0c8297512807f9312445cf70de00bcf2f7267388834f1d0454eaaa9a8b52387e5f84288400286414225c55af0f560f61a8d0858971a8615
 DIST rtorrent-0.9.7.tar.gz 610149 BLAKE2B 3f1316b0142dade9662630ad40132c5968d7b0ded32d7ae13d1ec1fdb7fec794812203fece367bf6abfd02212ed94d308046d40eb3e7562c408e8da13b23c23d SHA512 e663bd8984bcec91868beaf16d215708bdea8872338365ba6a05c9ea830b2aff045257bbc8bd0414d84009ee85852822c97bb073dfb41c21e3b0081ecaeecc00
 DIST rtorrent-0.9.8.tar.gz 647523 BLAKE2B 3562ed03dee3baa4a702d20c7c91b9248d9de0f25d1f8cd182863101f293a0ef13cb49164e4d16b25e72a4fbe1cc1a2fbde176d3068c749edbcb2287ef260b2b SHA512 016685948d0290694ab9635ae218c7acd876e6d45bea1bdba3a29c545e64f5d824c5e2f6693a4c2e9200196177881d54f312d72e0a19742bd74a03bd19ca05c7
-EBUILD rtorrent-0.9.7-r1.ebuild 1924 BLAKE2B 8a50e86d753f8bc99aa87bb85233bddcb0150b417858bb4d23edbf76f67519eb721e09984d1bb0abfba8e4ad381cd791da8b5cb5f94a2911dc2b5e200cfbe2f8 SHA512 8c8497ba0f78e7dcbc385e01c07e80221958eac15d0bbb18b4de326cd5a41839137157f76f482e07935334e1d3bbdd144f5ecb1626828ae6105ee872fb4bcc4b
-EBUILD rtorrent-0.9.7.ebuild 1874 BLAKE2B ec68f1ab5fa5bcdc6988d637867e7bec8dc288d6670f882dd2faa94ec560c4277c621500ece8ab85bd03dc789fa96c4978b46e0db7540febaa6b641632c35530 SHA512 07011915793efe4770b212cac6494c07c907c7066b480b3fb0d36f828c81e63d2a3c5f611f5a7d9d8abdc6d7624c592469c8fab1cb88f4d2c2afe5eea92e2ac4
-EBUILD rtorrent-0.9.8.ebuild 1789 BLAKE2B 3e2c5acd4f572feea6d36c7f2d90222ae6313c6bacb8e5310984ec8d61be26b3ce262ae41c77d3bb8cdb7be9d0c6fdc103fc814714d250628b2dc61cd28cfb94 SHA512 4d94e12e90a74cafd72ab7171ed2eccbeea2af3181bc3ee7778494b7dc27cc509d824d6d00787de39e553fb37310309e1688d0ef78228b4e68cedb0d0fa4b7ab
+EBUILD rtorrent-0.9.7-r1.ebuild 1914 BLAKE2B b61711b339266df20091cfcae15d8da1f0ded2a0ba7ea51a461b75913bca203c1a293e5eed9299beb640a29f53d5292c0bc2da89c1e1d2bd8a533908094e280f SHA512 6184c66cb9c56d2bd9cef04924c6c2242b65df0526de4aa05199462182915a80ed161c98de5851215f025dfe3ed816a8a8d120dae31f575706c12b2f728ec8f2
+EBUILD rtorrent-0.9.7.ebuild 1864 BLAKE2B 13b9ba37586c5e8739d931c7415b0045e8619a503159425dbef7621565b55e01c55785713801d592abd3f207779b281baa6ae7236879973c25f5a5c310886549 SHA512 382e3a07e0ab9f7ca8c0d552d59b3bfc0f57e9cb2df8fd77aeab80971f5fe75857f6c81747d1e47bba21dc58155bf631a7235a77b5bc2f8d0ef0386901006daa
+EBUILD rtorrent-0.9.8.ebuild 1779 BLAKE2B 723de92ef660f28180d8586155b58b466c43dbd27c2f46475e3ad739778cc08f8bc1862455c7b378bc4018cc8017abde310661d852bbe6151d3cca2b6466a039 SHA512 b3f18e83c44961ceafca66d0e2ef49e72b0822f2c1531efc7c52a01c87211b0791056b20e7d3eb4a5f1e0880ba52c6b8b1b320d8f8e6edafad4e08efded87557
 MISC metadata.xml 676 BLAKE2B ec4ff11bbb2ba69ce911f527e77d14f2891307bf9f321a7da4eda884dd0bb93961275592617e19070f958b9ac91372133130f33770f527623076f5b5338e0969 SHA512 f2e5e3a709b1be52e3947529e4aa4bc9d279820333287d562c0254b761962ebb19ad9a47c8c9f181eb103ae1580ebd4d68b8ce1684598cde0aad0faa126dbbd6
diff --git a/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
index c7f4029d87d6..7ca9f998eb11 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug selinux test xmlrpc"
 
 COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
diff --git a/net-p2p/rtorrent/rtorrent-0.9.7.ebuild b/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
index 1a03605b643d..4a6d9d7c3572 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug selinux test xmlrpc"
 
 COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
diff --git a/net-p2p/rtorrent/rtorrent-0.9.8.ebuild b/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
index bd9462e4dd92..bce8766397aa 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug selinux test xmlrpc"
 
 COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
diff --git a/net-p2p/saku/Manifest b/net-p2p/saku/Manifest
deleted file mode 100644
index 2417fdb68bee..000000000000
--- a/net-p2p/saku/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX saku 496 BLAKE2B 8cce7329fd0ed2b4e26105edf1858b02a2837a0bb485b4413ff876290aa1682ac8f968d49709d0af1156d1aa38e861f20eb852141e5ac969d014b272384ff2dd SHA512 4a88d8132e503a85a9146807f6af3bfaeab1830c73beb2fc9f63eb8440c8c6fb0245c74476115167b08c429df80e5a8df741b7cf6c02d8f9e0f403f79206fc53
-AUX saku.ini 638 BLAKE2B bba7d20f88391cba8ed520d2c8d1fbb382732507395409b3fbb5f99632b18192be570d1cda99d7b79cdbe0e77708c5f16efe5886d004d0a90ee4c0d80539274d SHA512 18e91a7b3cbc0bf7f0142be20a2b3f6dde91c5b24ab1ed2fd6a6a6821bda65d52f5347d3de7a2d799473564d578540643fff0ef95df29ab786cd01c09b6f7dff
-DIST saku-3.11.0.tar.gz 239772 BLAKE2B 6bafef5d649274e5c3a4744b7ef2805ec7c186c8841a3d25ae4e5ea5f383f89d68ef1590c8f721c2d37bb87226184516d33076ccff0a28ce7b6e1040d4b24e4c SHA512 e6cb37fa555a43d69523a90d1039dcd9bdbc4e4d14e7a4063849cfcaf3a67f1947bd7e5341f97726030eddf53915304ad948f67ce7fb1cb2b6344e1556cc8467
-EBUILD saku-3.11.0-r2.ebuild 928 BLAKE2B 2bb8b37713976afc674663eeec08606cee897b7f1e47236c1be46a2d84548cb5e4f6418c71f58788c2203530600fa9985038cd9afd0b7f5587269b0c8d1204ed SHA512 faea7f3e08d5746c42ef7af966b8eb072aa36a86385393fab887404f004ba76e84138e36cf072e9124384ca115d7de3105bb989895e5a66c9def75f666fd20e5
-MISC metadata.xml 303 BLAKE2B 32c756f2b8ff492455a678f90a62e882f662ce76ead5b57695650023c427665649ef18600ae47dfd62a5122841edf25d18ba0bea45de8bfd6fdaff661e3d11f5 SHA512 e0e26140640025bbf8c0c251cab5e5ff10df7a8b03ea9ba0c0d0dbdb6cd4da3a0a83b2bdf907b2f59bf15eb47139c3f37b19027b144e661a3268d5ae9a3c05e7
diff --git a/net-p2p/saku/files/saku b/net-p2p/saku/files/saku
deleted file mode 100644
index 6c600f57904c..000000000000
--- a/net-p2p/saku/files/saku
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PID_DIR=/var/run/saku
-
-depend() {
-	use dns
-	need net
-}
-
-start() {
-	mkdir -p $PID_DIR
-	rm -f ${PID_DIR}/pid.txt
-	ebegin "Starting p2p bbs: saku"
-	start-stop-daemon --start -u saku -g saku --quiet -b \
-	    -p ${PID_DIR}/pid.txt --exec /usr/bin/saku
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping p2p bbs: saku"
-	start-stop-daemon --stop --quiet -p ${PID_DIR}/pid.txt
-	eend $?
-}
diff --git a/net-p2p/saku/files/saku.ini b/net-p2p/saku/files/saku.ini
deleted file mode 100644
index 21a9461783cb..000000000000
--- a/net-p2p/saku/files/saku.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Sample saku.ini to run saku in distributed directory.
-# Copyright (c) 2005-2007 shinGETsu Project.
-# $Id: saku.ini 1513 2011-01-03 10:17:08Z sbwhitecap $
-#
-
-[Network]
-port: 8000
-upnp: no
-
-[Path]
-prefix: /usr
-var: /var
-sysconfig: /etc
-docroot: %(prefix)s/share/saku/www
-file_dir: %(prefix)s/share/saku/file
-template_dir: %(prefix)s/share/saku/template
-log_dir: %(var)s/log/saku
-run_dir: %(var)s/run/saku
-cache_dir: %(var)s/spool/saku
-spam_list: %(sysconfig)s/saku/spam.txt
-initnode_list: %(sysconfig)s/saku/initnode.txt
-node_allow: %(sysconfig)s/saku/node_allow.txt
-node_deny: %(sysconfig)s/saku/node_deny.txt
-
-[Gateway]
-visitor: ^127
diff --git a/net-p2p/saku/metadata.xml b/net-p2p/saku/metadata.xml
deleted file mode 100644
index 0ef1d8a861c8..000000000000
--- a/net-p2p/saku/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>naota@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">shingetsu</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-p2p/saku/saku-3.11.0-r2.ebuild b/net-p2p/saku/saku-3.11.0-r2.ebuild
deleted file mode 100644
index fc437fb14e4f..000000000000
--- a/net-p2p/saku/saku-3.11.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="a clone of P2P anonymous BBS shinGETsu"
-HOMEPAGE="http://shingetsu.info/"
-SRC_URI="mirror://sourceforge/shingetsu/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/cheetah[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup saku
-	enewuser saku -1 -1 /var/run/saku saku
-}
-
-python_prepare_all() {
-	sed -i -e "/^prefix/s:/usr:${EPREFIX}/usr:" file/saku.ini || die
-	sed -i -e "s:root/share/doc/saku/:root/share/doc/${PF}/:" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/saku
-	doins "${FILESDIR}"/saku.ini
-
-	doinitd "${FILESDIR}"/saku
-
-	diropts -o saku -g saku
-	keepdir /var/log/saku
-	keepdir /var/spool/saku
-}
diff --git a/net-p2p/smet2html/Manifest b/net-p2p/smet2html/Manifest
deleted file mode 100644
index 927e08ed21a3..000000000000
--- a/net-p2p/smet2html/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST smet2html-0.1.tar.gz 4669 BLAKE2B 68c150e0379077e30902deaf8b02610d984011961652978757bc0173c124ca2d001817d170434a7c255a83acd1e21a14f333b9c7431b0f1f77b62da6138a0caf SHA512 4b08c0c112f62b054167dce463653b3723f3a237c2a77d7da6a989297bac632feef7786e70957dd4b24206a282ea283038f76011f965aed8d328446a3248580e
-EBUILD smet2html-0.1.ebuild 555 BLAKE2B 182ee3742d1e34fe6c6a7dcb3bd78f76401f5f98353623d00775107a718b0d24fc6562f0476d1cf044387d51a3aa394a1d6ca86cfe73c84cf7fdd5dd77101a6b SHA512 cd1a69970351181be52296ee8f85673222eeca1eeb9199a3b920fb8671738e55b68004c25a04c56635cdd543e9d7297a26a8d7338de0282e84ce336ebf67421a
-MISC metadata.xml 247 BLAKE2B cf63b59904d3db94f7af585e9b51e3ad151485d6862bca7dd2310776decd79b10dab2732f326d60f30448768b5489f4d28940a1ea6328c93c56a60b214b696af SHA512 0fd2dabec194318e31d99cea9b5ddd499f0e545af32fdf63d570c5cfb49650c57de6c1a131f936a5f4867f7651f771b0db464ef461eb08363b96112d3eedbce4
diff --git a/net-p2p/smet2html/metadata.xml b/net-p2p/smet2html/metadata.xml
deleted file mode 100644
index 60470d6a6f41..000000000000
--- a/net-p2p/smet2html/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">ed2k-tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-p2p/smet2html/smet2html-0.1.ebuild b/net-p2p/smet2html/smet2html-0.1.ebuild
deleted file mode 100644
index ac90dbab6419..000000000000
--- a/net-p2p/smet2html/smet2html-0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Convert eDonkey2000 server.met to html"
-HOMEPAGE="http://ed2k-tools.sourceforge.net/${PN}.shtml"
-SRC_URI="mirror://sourceforge/ed2k-tools/${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i -e "s:gcc -Wall:gcc ${CFLAGS} -Wall:g" ${S}/Makefile
-}
-
-src_compile() {
-	make || die "make failed"
-}
-
-src_install() {
-	dobin smet2html
-}
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 799a051c4dc8..0cc3d7fe7087 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -13,10 +13,12 @@ DIST github.com-AudriusButkevicius-pfilter-0.0.5.tar.gz 3241 BLAKE2B 43d4c85e7dd
 DIST github.com-AudriusButkevicius-recli-v0.0.5.tar.gz 12368 BLAKE2B 7a84c0bcb604b555164b3452436b258ecc28495e1849c2f791d79f0fb10132ef9c7ef23e47946345c22095d3f6de203fca9398417f5d6d38c8489ba838994bcb SHA512 f3716820f3e61d792998b1c391d2ef06b75f34d93cbd9f62f77202bf0393e85829a549800fae1aba916f0e1619100f163658ab214e3cc6f195883157d5ac667d
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
 DIST github.com-beorn7-perks-v1.0.0.tar.gz 10866 BLAKE2B bebb0b77adef45fd5c89302ba637e3b5e8e918276ff798dbeb11fbf9d490f3efa760cf4685b21c8a736469fbe7ebce3f20bbcc66092766e418a654d149caa401 SHA512 23a6660dd9e806efc841fe3acf702dc3471808770c86cbfa3353adfa9d9534eb6d20591bb60be2c798ebf8823907b2d5188339869f4b0f61bb2e9ecf74b4ea77
+DIST github.com-beorn7-perks-v1.0.1.tar.gz 10867 BLAKE2B 373c4dc08cc964430f187a05a8165df751ea7398b2dd271b85fd13dfe5c9a33c2f8df32ca6f6229b332358e60e90de6d4670d54eb1b9808d1eada0ec7a83e0f6 SHA512 686eefcc824c5bde49385d63916299e2797be205523bda66500404c5ad64ed4d1ebe8ee50958237b41a4c481579f5040288b99c9d2ff1082abbf172893f389f1
 DIST github.com-bkaradzic-go-lz4-7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz 233008 BLAKE2B 3d8ce6b5d27dc692fc583ad0955dc531b658a806bd13aa3da68a6b15133fc6f610dcbba7252aa25b5b974f375f434a3057aaa98db92cb5444e7b9bc784e0fed9 SHA512 8d37e7068d39f24ee8f3266ae4508f064e857dd741db4e5a5eec7f215e3a922fe50c58443e3cd79c474a44e16156cf480203aad3a2a0f98dbf910c82abc844da
 DIST github.com-calmh-du-v1.0.1.tar.gz 2344 BLAKE2B 03207d407bbc1ffcf5d2fe100fa3c1d267ee2fc7429653063deeffc78777eecb2b299809963f812907d9861bb3e1366830cf5a650a7e40bfaa85548255e76b70 SHA512 05a5c3d5be4d06442368ad19c4743e32a6869f341a625230d0f6cfeb39b3bfe37318277a8dd2ff1573a6a7ef273a34be6082ae31348962ae1088ea719fe5d3c5
 DIST github.com-calmh-xdr-v1.1.0.tar.gz 10530 BLAKE2B 758d92071934bf1636b8d3e9a61a88d83d1f3c7db67682c536dc3b00764fb8e2086b6c1f236a9d4638c2039ebaa37ceac04157ca4e7cc9939886ef86877d35ae SHA512 3d439746cd1e6d0f503d58d901efddde31af12264c724dd7d1226d110a5641f799f70e3fdf97a64c274c78545756550b53b0fdb0cf2ed3a839e43ae44152f8e4
 DIST github.com-ccding-go-stun-be486d185f3d.tar.gz 14126 BLAKE2B 75202fa40d2ac806a79494da945b09ead265a2e880abb4c84a99bc36d355cbe1677e42465932075907325e4b2cfece45a27bb40898dc953069b840d26a9d8cc7 SHA512 935edec5205da5637da1fb89c0233f0def5d265b33b5ed7a1d3c7ff7bb0f19163dfab681600ed5955345555018bfd0029725e703cd98824449458671fa2a2e60
+DIST github.com-certifi-gocertifi-a5e0173ced67.tar.gz 155606 BLAKE2B 844299f2865a6f763fb76cfd028f94e68b27ed4bd4470e07c111b6f19a9e4fba3b32d7c839f3e650f5d658220c9993134d1e69e263eee847f6068cc2a38543dc SHA512 2402afe82ceb2f95ecfab04efc12936a2f73d61f07d7cf1bd56d614d7930502c94323894c6907e9b2b0c4535f26169ff47319d9927b894335925a0bd8ab2322e
 DIST github.com-certifi-gocertifi-d2eda7129713.tar.gz 155615 BLAKE2B 71896fdf49a2e87a7009ff51978472733b182d078cd482b680f167a6f40b715b9a9dc96764dd7439606b4d94ad73854bac95a252289536b8a92a9a620ae58b48 SHA512 3cc5d734c4bf8f4a5350f2f12050a6f5ce7a310eda19913a467a0b190469f948b4bd3bd3f799f7d8f77ce86756eb483a3d3da6ba647fb9824555a829c414aef0
 DIST github.com-cheekybits-genny-v1.0.0.tar.gz 15585 BLAKE2B 0b5d4e398b75ba2e413cd41d455bce346aadf8b31b9233b6287608b88264e0f698863bb151d44d75488caae011ce4e68fb574b301fcca77be53b32865b7db4ea SHA512 a045ce3dbe5c54e1e04705b87d2e3a18bebd71382a68156f975e28c6426aa82861e68e6ff162d3765704d5538a0493693cb973781e35b9d1b9ef8c4541ec1e19
 DIST github.com-chmduquesne-rollinghash-a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz 22391 BLAKE2B fc58e00f0df0f24d87a907926f0a0a0f2a1317fb78d0919d6f925522c00514f393be8c434efc3e65d9b38334c56ee51aa134d486f559913ad18052a500498a5d SHA512 a1fef7d7d9123cba6cfe688120be9931d0ea71597c271db30c96d068ab0658436f96391fb7ccb61e4872633a3f9a473baf2e722d91a5de0db7fdd3725d41e2f5
@@ -30,50 +32,74 @@ DIST github.com-go-ldap-ldap-v2.5.1.tar.gz 36393 BLAKE2B 5960961d019058f3cd5bdd5
 DIST github.com-go-yaml-yaml-v2.0.0.tar.gz 64746 BLAKE2B 5e73cb1c987eb40dbe3d3a1ba3bcaf866322f61fd08f1c240cd746128670229dd83c936e701e8c4ca10be3827f4280d8e0addbb102d3f38d9ef3c00e8f719da2 SHA512 29f3f33e53b7a1f2625c89c74818e3ad1f2c78b2461113fc43a8f3924adde5813d3b7a9495d864cd32fb4842a04dd9adfdb81f53cf65f5319e76f30d21b11217
 DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
 DIST github.com-gobwas-glob-51eb1ee00b6d931c66d229ceeb7c31b985563420.tar.gz 25031 BLAKE2B 6dd32175053b576e8d59e8de18841b7a1237274a9a8da25906c51f878cbef70ab3f756fc98689e414e596ff8a125a7da044f058c20bb7fbd4fa6363d2b8c8384 SHA512 b393292834ef91224a1179bb84a98733f2d99c34fa89208603554b6dcd2bf90b6f4f795366a551b764e5cf615f2b68381ddc6f7f58e9700bc7b1ec7e8a473b57
+DIST github.com-gobwas-glob-v0.2.3.tar.gz 25962 BLAKE2B edc7e7ea8db6312690989d007d2a292f197a22c6efa7b5737cd925c2608e4a0ee38571082bb0dca57088d4531bb5b1dfad6341b09cd7fd4bbb57943640d9b441 SHA512 b91b27389e1f172d7c2c181f19ebc27d566e6bd6397cc6ad924ecf5f2ace98ecca639e020e05c9e281fb8549f9065610f7eb6070c63e3f9e7c6fd190c457e42b
 DIST github.com-gogo-protobuf-v1.2.1.tar.gz 2017393 BLAKE2B d55fc545759add352512c2ef81d948c598f71131fdb1649ee526b59989457a324b03144e989a3c651b5614a2eee9e7b1652d3d259733cd3752c97fc2f6720705 SHA512 7cb48dc85e76cf6b116015441e29e86a25514667b409c0a1d335ce1c844a080fc9b37f48911959531aac8ece009b6d8401b1fb7bc463fc8e6fb5e133c9846e64
+DIST github.com-gogo-protobuf-v1.3.0.tar.gz 2031976 BLAKE2B e237bb7436ed74344cd9618cc158675a1d3bf89a8f0bb81aeadd3cdd8df819b52d1ae18bec7b7444c3de754440eee209254302113d0f3b9f704cfdc55d6fe882 SHA512 c88e27245519f13f9091a8f9bdbf1a56f710f098dfb500ea3d0e5949ee8b3b4945d6fa1d1c0c94fcd2c3e1f57f45643b8a806001537ab160b35e33d591898a0f
 DIST github.com-golang-crypto-0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8.tar.gz 1444273 BLAKE2B f304c3984fc3239077dd2ad41972f37ecd4dff7d8dbaf5299811cdd15e2d74d1e98eba4fe7542daeb7961c362d9a4310c48379a3da748d8dde713c689a966765 SHA512 09ed21929d26480f6b9f760c655b8c3445daecd65acf71d084a7807253ee73dd0fec46ed058ecd2e3761b431761df6dff2a4e12586631b6ecf9dc1e12f66c584
 DIST github.com-golang-crypto-5c40567a22f8.tar.gz 1690995 BLAKE2B ce33e064cf8ed8d1939dd39b5176293f5de1db975e5325d6eb4a481960451e8ad77cb48bc2bc36fead10a6a1811bfe95b44a191ca7272508d7776168033d9f52 SHA512 003608c7b791212dbec4c9d22dd695245a6b570e93dff06593e7baf9aed2e2cd02355a0fa8c12b69bb451b9ff27b85a82099a751872c5a0d02163a034f72d829
+DIST github.com-golang-crypto-9756ffdc2472.tar.gz 1693333 BLAKE2B aa50207831927736c73eb2a33612baea37aae506734079094ef811fa03ecffc3a4a17027a9c6b0d35497d59d077681890d0ca9c72f556e4503f185ad63a8e49b SHA512 918d2959219f0af630fc198c72f8d4fc2f5218dff6ab31626f4d9cd1b1012223ec05a0c53f9725963f7296d4ae97f35864dff036bec1a18743b13c7c3c2d4227
 DIST github.com-golang-groupcache-84a468cf14b4376def5d68c722b139b881c450a4.tar.gz 25841 BLAKE2B 38026e1d9783d366af5996ed0c25f6fcd366a56e976c2665d7b815ac8aff371aa6b7c322176f1cd4c79e0dd1a29de2ec4f563a05ef8473876f74a0816cf628c7 SHA512 e56e2e7c604f485a188bc7be3c3e58cd129359d346ccfd30f55c0c768b7128390d7d0264f093387d75484aa687b9c2c811ce7b2a272942bf14854775270a0648
+DIST github.com-golang-groupcache-869f871628b6.tar.gz 26038 BLAKE2B 154828b6d5f8be97ee9b462a766834e36f8012e7e15a8d7d30f0a5a8a3d1773aeb9b103b3dd1470f7553fb5a5ddff52860565dc6d47f0c49af608309d1be67b2 SHA512 0245e645d9cdca84f8413d58f507a9bdcd8b047784aed2a9175cf31ecdd9de19a088afdd28a1079200fd13ad1ba6f647d29ba54bbeff10811af8cccdd0bc2837
 DIST github.com-golang-net-351d144fa1fc0bd934e2408202be0c29f25e35a0.tar.gz 967715 BLAKE2B b18360cf29bc50b936ed6a0c48fc3a8a283e4610bad302ab732a345e51a9fc2922904a824e173047cba15c189e169160af14d717ffe3877a44a1c74d90723440 SHA512 6778a4d08064c8cbfc9d7ea0dc30a4bd6af7c68f9101c1dc4cda4b037348acde3fcd8c72fd25a61e94a64c659851380137e0d60c54edace03af3bc7f05554053
+DIST github.com-golang-net-ba9fcec4b297.tar.gz 1100219 BLAKE2B 763e2e4b38adf4f7abed20974aaeadbd22356f7224957b6f8d99146d07355ba6924727e93ef71f0e3b0416a7f5269539321223c56c9b3b4667160ff947a544b5 SHA512 8ad57611de7fcc6766da4ff1c29adf2e9d21eb888dcf0c1160b31b310f1f94d4c3bd45a1a3627d9f2ab9fcc8f4c0960beceae3771083b8a2cddc2568f5c4f1a2
 DIST github.com-golang-net-d28f0bde5980.tar.gz 1097929 BLAKE2B 91c413c045cd08756ef900df0617d4f3d070047ab05177e21c199607afb71383188eb412afa0221ae6189ed302b25b6824179206f1d0c3722910a3f0e08bf0a1 SHA512 022763ab0d57aa789d645665b761d8ca8374f95c7079f50b66ad959b5af6cfd3a3cc3f23fb459d980cf46ec93b40394773b1fcd6c3ef2d08e1073892f02f8ae2
 DIST github.com-golang-protobuf-v1.2.0.tar.gz 332565 BLAKE2B 6916341aaa30f593c9a27363d4d73c548d0f7a629adffeab927078bb3ebc64f59a5c568b7bb7999c7505d526ce0ead0c9163908080f24ecd6c7b94ed2db28335 SHA512 a0f596ee96f7501ee47da75ea234c1e29c0abb2c3fda731acd601a55880502ae90d70f6d3da9c9a35e493fd1bcb69971c062e16b1e49a0996137950dac2effac
 DIST github.com-golang-protobuf-v1.3.1.tar.gz 310884 BLAKE2B 704efef653d39b4954798537e7451d15dd1d913c67d1332ffc016b396b028a0dd03487765a89b0bc5f920b75cf4f51be79a8da9d3291e0f02873c47601360080 SHA512 7dfc6d7851c7181e1a73effe9e8a97752bb428bf207a44b065412a8e87e0e3e200b5eef3d8c68af33a0721d12a8b98bfa88b22add074b19b6e1759e9268abf25
+DIST github.com-golang-protobuf-v1.3.2.tar.gz 312285 BLAKE2B 381ae3c4bad3d3b3d489a3b66752e9e2405d17d9ed2c55aa1ec06ce6c18171b1c7625f6cc6e28490551a6410835f6e774a408de39f6e9ea9b3cddaf46e3b859a SHA512 ef9190f7773b18005760eb755a1dee25eff38c188687033362635e2431cf2c7372a59a3fec91acd6e4f63aa31d08391f7521a8dafef7895268b6a1a78735dd8a
 DIST github.com-golang-snappy-553a641470496b2327abcac10b36396bd98e45c9.tar.gz 62076 BLAKE2B 0c44cd5633864eb1aef91e83706c8d2e0469722603eea1969c4f38ad013dac411ce80ace29a89478f9027951a4e469fc442c60988a729f4efbf4caff2361c423 SHA512 a324c8a7687e820f6b322930a054d1e7fc4c37bb66a95d473ef2a67fed703de90e8cc3072273ad2f9c681b1cf7ec1acc0ee9dc735ab593e23eea5cde96eea8a6
 DIST github.com-golang-snappy-v0.0.1.tar.gz 62605 BLAKE2B 0af2dc71967b38aa4677e5286c8f0fe4167deedb32f065d9612e318bf1e09dd220014e5b05d30418a625dda138dd33ced8b9e73781f2c6e8f7f301246c8103d1 SHA512 87a934b1b5af6a19341b99170d6dfa078ca33753a4c1b2ec120cb54c55a51bb4e808d38d77d498115c9c53678adddf897b4bd81b7a9480564c57a209e2745f42
 DIST github.com-golang-sys-04f50cda93cb.tar.gz 1450689 BLAKE2B b1b33bb265344ef4d3473bbd267276dccaa344d2a1c8f9bb9d16f9892640aba6a1e97fa18b7e3ef634c3eec3a298109d8b310d158834586847d10f54b796f8be SHA512 dcb88fc4cd02d92cefb2913513567076c8a9e163f6f7afb1d0df6cb4d39fe058a2979a89803605d0f64b470a6f5b24174ba674b0add9b5dd16054a0b781b3c9d
 DIST github.com-golang-sys-4d1cda033e0619309c606fc686de3adcf599539e.tar.gz 1121248 BLAKE2B b1c9ca1b9f2c60e8915c944afb5058cbc2acca7acea1f7a1a093499c371c2bdcaa82e60c1715b59a375060ccdf0140641bc06291569d4f5e6486a9bb90993b7a SHA512 5e4c95cde60807191f2d980505b2fd5745966b8f3049180422c129408bdb37fefd8403127597af38e3b13cedee8892af1ea4ca26ce150b61bf02bf2b98a040c9
+DIST github.com-golang-sys-749cb33beabd.tar.gz 1470192 BLAKE2B ea87d94d0e1dcd9bbfba56ed8281f39cb1d3dd36c674900e002e16ff57f36b0c9c14483ccc4025ee8661e239f82c1c057985d35c86166f2d3b60ab15c38d0ad4 SHA512 482467a0547281cc3348ee1ce1cf9377c223e12dba4c9dd94b53189dda0b7ce0e36c88367346e24635522080c5bbfc94dad18d2137e0c9ed599789f7986bc0d3
 DIST github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz 6112971 BLAKE2B 46e4358a177a6253797177a31d0509e63c2986645c61fb833c479498fcf3a8cb2304a81c47c562340087dc7eba5273690cfc86bdb978e72b1183715c8e9cc662 SHA512 555dfd99a41705b0e1aa7ee5a6465fbe53d1dedeeccc226a26edafb1f41d5f7a137cd4ed6ad02146d112055ca324569ccbe2863933dd363e5ed002cdbda6fa90
 DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
 DIST github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz 9548 BLAKE2B 8e29ac7d44106d5d36e580aba5677d5688ef3e850f6efaa83c01c4e4e6bda253adca564a01e2720f9b8216bd12abe99c2a519adb3e26085af8363d0c2b88e819 SHA512 12c4c592391f5e7f7334f28dc76193eeb8fb66df2294d91931daaf19912aa20a3ed27c8ece1bc02139b93d8767d22ec7dadbf800f91ae1f94aa635b490245feb
+DIST github.com-golang-time-9d24e82272b4.tar.gz 9318 BLAKE2B f2d50340655d21b1bcded6cb76ae16026c1d43a40a45a45dcfdda8171722c64bde3fcdddde9eca4e1f9ceb994a58750687ebd439464f962652cfb004329b6310 SHA512 d4f6336675a491f5de855c33a506baa99c33c02f59fa9c5284e29ab4638eb55ff5f7d24dd5a1c480211f41cbd3bffa6366594828c333f5f039a7f3009515beb6
 DIST github.com-jackpal-gateway-5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz 4009 BLAKE2B 6825c0ca6ba94354f6d30d496ef5dc31cc1a1dd6e192f22bfb57d375b6ba2755f973ddc8cfc121ffbf46534e3c8d444002e95b0e6df307184b0bd1f22b8a49eb SHA512 6e5929fe2000461abe2c2d26f7e092134c2de5ced57ffd8ebd42af68cb3d7a0d2e476044c6eebefd8f6e0ba263524c78db71a004c5408ec14e6ff675458004e8
+DIST github.com-jackpal-gateway-v1.0.5.tar.gz 4284 BLAKE2B d463b080fe05c1e2b3064a8f63a638d6d23d4c2782fc76be9cb376a9bd2ab8c3e5047224b790fe33fa328c5b1714fc8c1275ad0d86292ae7424722681f4a4585 SHA512 ae490a8d5a7480d3548fdcb444b6c3e8741ff2254a037b3a3bb4e0dfeae8ff969e5e3a0df1ef454165cec152c4cbfec864eb2f2d2188f95bbfe0a0b3ffc5e24d
+DIST github.com-kballard-go-shellquote-95032a82bc51.tar.gz 4327 BLAKE2B ca31068aeb60ebea4568901fe91de1aedb6842533c98a9b2cfe2a989d6f0a3dc76cb113989c84acae934150f599173af186b7886661ba94a549dedd3508b3cf5 SHA512 6fc381005c055aff7e451145bd2dd5a20591481b416d2d94c1c05ddcfac84c76e3915046d86073f3ace97ddb38eeb6e8a925825ca4629f1687b7f274809d9c83
 DIST github.com-kballard-go-shellquote-cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz 4205 BLAKE2B c9df02705dff0d28cfdb4bd8cd4e5e74b490bd15c5b9d28138f7f4f4abc085f7dc59b34227adbe7d25874c8928a96b0f19cfebffbc79068d314eaf90d87cd4fa SHA512 d738d2bce5abac7c3246f20f52ff069f43cd6b4e43e3e03c245688342d178f8bb2ae6923f9dca2d191458fd46356d17c3e065d09c1918541d27544ac2f046f8f
 DIST github.com-kr-pretty-v0.1.0.tar.gz 8550 BLAKE2B 210bbedee436b225b678ccbc363a2feb09b6903bf459e34d0d6950333dc273db5713a828b003ad0b52da0718de38aa3665ff7be6c99b865a7766998e37e55fb9 SHA512 7a367c317043d40cfbf7fac631a286c0bbb8b45a716fe7388d6271431e354b3913505398b8ccf7ffbb01abf71f04216738936a4282c3c9645e26c51b7692e820
 DIST github.com-lib-pq-v1.1.1.tar.gz 95305 BLAKE2B 2e7cdc435305effb1c4dd65919a6c2c1fbf6bf1c8ce621b6484f20dca8b767b1004bb85bff17eb2b2a7692b904b58fcaeeda81ddee389d01453c4044be7c622c SHA512 62e991b80458841a1aff7996a91bb085eb33ed8f4e36de7f6fb0acd8d4c974df1358431740a85628ac0a020b0a31777c4448ab8d5659f20d7e1cbfe262c91b19
 DIST github.com-lib-pq-v1.2.0.tar.gz 96083 BLAKE2B 391a24495e3d7c9bbea8f1fc99a7e0a8a3fb17b5afbfccf1a039f66cb7d96fa4befce59b55238d05d73afe77e9fd39e7224ced5036c8d6d7fbc7aab866d24d41 SHA512 f0a1252d575d92dcdddb9e5286f1beed77d3d4b3d499ff9d828c160f36a3188546a71799255c311a66c13c7cd0f41bd231d5abb1d674e761195ca2b7fbe7195a
 DIST github.com-lucas-clemente-quic-go-v0.11.2.tar.gz 321908 BLAKE2B 327bcb2e180f62c858dedc3f8d0e26f9f4efce42995a14fff086815b9800f8fb504ef2fd35dca2046890d80ce3920d6fc80173f58541708418c020bd2a21d7e2 SHA512 bf5fc1b40a98a70036b9d932b7d3cdde4b39e3e8332e6f53d7804bf034ee910fc89d8ad050796ecb4af3c8823780d1f7157005f9c0745b5e4066f1e3515796dd
+DIST github.com-lucas-clemente-quic-go-v0.12.0.tar.gz 351958 BLAKE2B eee00ef6c7a5601956700835cabd4eb62bdaca37126f2a24aa4c510c3379fa1045ed9594ffb5e5675c80271eee06324cd1014ab1bf969a78dfc32ecb3f872ade SHA512 b06cd4bcaed2f0a3c44a4832d802ff2abf0142dd83b81cf7ca7e5ecf33d07aff1059e81e694b3ebdcd5a037cd3ab6e62d8ba8cd81fdd841025f54d998c5253a2
 DIST github.com-marten-seemann-qtls-v0.2.3.tar.gz 389521 BLAKE2B ed9b07ffbc06274fa6942eb43bebdd2889971931e03e749db4f13929cbdb8120e3375f31114754d88e512592b8c4d9bb2a734bd3fcc2a4872ba613c5f635a3c1 SHA512 3f8bbe93ca8e36d98efcfc41f38505423fc159091ed0394fd7c7837cb8ff4aa879bd54253a8976ff5a8f84b06d050ba418e5295a38e31a6faea7405980bde28f
+DIST github.com-marten-seemann-qtls-v0.3.2.tar.gz 392129 BLAKE2B 98f3f08bc2730df42dea5a91567ea284d6f37fb962eac62217c805aa478c0bfce083c8b3690fef392183cb33d9fb47940f12256d423a0bc8337682a647afe704 SHA512 f28e0be6a91e08d7cc325181fc0dc862204d2852a5c8cf269a28f6ae6115a92686cd0e1796d935a346bdffe46b604fa8ec4910f4f170a9f4bd39251b9d963004
 DIST github.com-maruel-panicparse-v1.3.0.tar.gz 1174190 BLAKE2B 5b2926ff65e32914409f3b6d8c39b2ecfb84636ea8aa5d1533e58f1091b16ad7d7e7ae546792ec8704f596911ce8c63de55622d885ad553a6b803183c8c404be SHA512 74e7b5cdc6dde46cfefc55097728864cc3fd1c76ded1c660eea87efca30167b2ac88dc573061142f32236f4df3a42d39c82ac9d24c02824f1f0655b6d681b037
 DIST github.com-mattn-go-isatty-v0.0.7.tar.gz 3559 BLAKE2B 1f65f3d33cf25459b63fb70912810dd094e3fc6f3f94db293539d4c95e22e495bc93e7d676d161e15f5a8ca6afe082d17dd5173a931382e66ce2cefcc44a59ef SHA512 f067811fd5483c8f49770132f42156e78256843672891448d725c9dbdd25ecaa941802e5e9d08ca9c20ae23a553e51a4653e8205f48f7cc979e5be0b4646f13e
+DIST github.com-mattn-go-isatty-v0.0.9.tar.gz 3904 BLAKE2B 20178fb090805cf70ab6f98af75d4df4a049ba7a44f9023378e947e717952b985e64d640594edf8ddd63b9217f847a02f81a29e8b138159ceb2f2e3801e71d08 SHA512 3044e4fcd5cb76014b905f2c50838ee8cda6b1c865955a8504566b164cd851317e9ad69404d0125d6317be2a269584d7f72de551e4363c9c05a1b8068fa2dac3
 DIST github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz 37184 BLAKE2B 9ad023f9b70938f45e6dd44624a7008c1895e488e63124bcd8f8492292ef98479e966ed627a62de32e0fe84a57e60710227e02e4a276aabece81f021af9408a5 SHA512 63d9963502e967e47253f638a19dfbeaa2b63efab74ed790539ceaa9b4a0b695aa107f9e0c920c0da547ac1abe81af22d47f6de547c500deeb005fd8a5e22660
 DIST github.com-minio-sha256-simd-cc1980cb03383b1d46f518232672584432d7532d.tar.gz 64704 BLAKE2B 6838142d5f7b3496e9a28cb829ae54a08fafcb022f46b6eeab462d851428d2040a1941b2b8532340f35597afd311e6904bf2b0e126441e48d8db48ee6c6b6ae9 SHA512 2d8307280540919af2154d551b2b76b0ea929770d18af0266440e05e39d0f16469b6b98db739f022eb579d8f40bccd67dd5f66bed9575f304e863bd07a5e6e97
+DIST github.com-minio-sha256-simd-v0.1.0.tar.gz 65406 BLAKE2B 7d3306d90e7017cce8f1af0aeefae8fdb63f03029db2098470290a44057c5f090d27b614c3797e54c2c891d56f6e1f96b383c519eda62d6be63054def13bcfb8 SHA512 6196a2e271169fab8c38934f535c4c77eb8526fd60d52bf99021eea3bfa79e739d8be11f20de6ea2ff4db2851b377c568a39ca9cd9d77f97f127876570ffb95c
 DIST github.com-onsi-ginkgo-6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz 127951 BLAKE2B b8b981f2c98bfaecd4e65db1a97f00190c8935da866f5b7cb77a0c437063dab8cb94fb19eb77ec6bff9b361d91aa772945cc51dbafabc7870268326b0e458da0 SHA512 f6e99db70c540a08e064358c0034e8978f2cb7d2c27be439f3a90d0fd0c741ade9a15a30c837da71ee1c8df6b80b124799f4820ca25b71994d7e8de207ba4eb2
 DIST github.com-onsi-ginkgo-v1.8.0.tar.gz 133392 BLAKE2B 42105f337a583d1d07554e07a13ac141edbe6bfa7c04a2a83c9ee49eff3f7b5b9b9acb35d824d33045cd991876f03457f8271a6eb3d493fd9288b23a1f07e704 SHA512 ed8a21d07c63dff1291a3ea0413dd5168f54738630bc0ebe1938765f3e0cd5d41e01f3836e401d3c2c96770281506440bbaf83d745a6c5b3be4cb5cde84f3d9f
+DIST github.com-onsi-ginkgo-v1.9.0.tar.gz 134036 BLAKE2B 9343e0affd2529f9063c5c8a7d75e5077865f1f0d12f1e1d10be47a13732e13d1412b5a021dfb78e32e18e14fad8496c52f4e543ead173d4570056358b9c5c06 SHA512 9a46809cbec75a6f6353866370af19ac65df9dd5224ed35df0711e59842c45cc7d62124ceeaf8a1afe7ba85812c5d85cfa186036c58cea0c5e207ea219567ae9
 DIST github.com-onsi-gomega-ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz 81608 BLAKE2B 78522352a6774340d5de89545ec8189102bfdf002e6e2d637c3e4aa6a6b270f4cac7d999bebc5c0741ecf6d2580bf34f5983dab173ec5d8ba04a722475c1fda1 SHA512 7f8ec51545f322537b50173338a3ecc04eb4214d1536395ae08ef41e3353b9455ffcfa7c0c69717e8e4bf316bec4d17e37ee1d1f604da38abec46afe5c7d76e6
 DIST github.com-onsi-gomega-v1.5.0.tar.gz 88642 BLAKE2B de8a842d9cd48d11f5f0df905bdeabf37d6467ffb3d8e4f30f160061e00452d5e5fb63384fcd64b83de69106859a89cb9de3667624a5db2853b9bd95f31bbd0f SHA512 96420cc6fca24ad8144bdf207a702c67f9787be6fee041875e22fc8762b257649b54be5f4e926a2b0b2e52bc0ffa1f3297d0db39c8668dea5ccb1c0d9240df41
+DIST github.com-onsi-gomega-v1.6.0.tar.gz 90096 BLAKE2B 303bfded9fa9fc631e1a048c1a27c6cc019944fdb6478e307ed976d7acee17f00d6b562c85097fc6656bd5a4c68b7a10f2bc3f8e8a314fbc97d0ceb6d3d3e74c SHA512 7f1f8c8cf684eb3c62dc05341bdd722b594019d275fcf5a06e00c335ed2832240915880a99ee981693e278ace98fd224d60c5d45d6bd99ec546603358b46dbec
 DIST github.com-oschwald-geoip2-golang-v1.3.0.tar.gz 6595 BLAKE2B 4d6eb86ef10e97284de0ac9326ffa348e421f034fdbb85565f93ddb774546197a196270bc65a1ec32bd8c99684cd39a31a5f4e806886bc79860f2c9c07b66bdc SHA512 841a716429fb01775e72d1398c3780294257be606b568524631a076ad22cd1330a11aa70b4f7c8b4bedccd22432613919b9cadf3bd4c4b34c097e1b123834209
 DIST github.com-oschwald-maxminddb-golang-26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz 17818 BLAKE2B ce68d48e238a674f492b2cbe63d9c74f2a839d3cbb744df8442f4bdd7d5705f0a5d4f2114bd4faa431c76c05331d67edd090db658ccb5546a266e40386d9ccbb SHA512 41c37ab97728b1d1a3e30dac22f29846cad487dff7e8211d2225f1d1b70a05849680dbce79134d5f9685a46f5db51c23a2b11744fea237a79ccefd90bc840c92
+DIST github.com-oschwald-maxminddb-golang-v1.4.0.tar.gz 19912 BLAKE2B 8271c066b8c2e889d9a427d193c410bcec97c90db8feb571d292f6c1ef0b1723b24fb2ca8dfa2fe509614b98accce0e1d599538757c6ed2d9b39c809ff2c831a SHA512 354abf2cacb4ec67300cc000c4ba01c9ee36e2c2070963b9cee298dfc45bb4cda1f634524027c3df61349357b9d438723e0815c521eec2e055f18bc9e75af612
 DIST github.com-petermattis-goid-3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz 6598 BLAKE2B 39b08b8bbf3525bb16279beec310dbcb9756960d3475f75866a483aa30e5ce4189dbf1d7324b02e284c4abf40543a15d3272630f8bfc55bb8c36d07e03e1806c SHA512 60c161fa5c1e1f21c8ed1568aeadf9bcc3744bf52b4ff51124095d436b1c5b665b18d9b151bcb1fef98cccf48b420d8135a8df1c40cee88a4bdbd37980c44b54
+DIST github.com-petermattis-goid-b0b1615b78e5.tar.gz 6816 BLAKE2B 11ac50a4a9c618d136c918a1041651355b6374e78f3269711c40c35d33ec6d388a8eaaf3700e964487bc738b9141f777f7102eda1cbae5bdd735071d03954d15 SHA512 52068f22edbc627623002a09979c0762aaf6d96c2a0cb248d47945a364e117df40a35d9937e3e98b8d47f109df5edcac470f963eec0117bc1c515419d72e393d
 DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
 DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
 DIST github.com-prometheus-client_golang-v0.9.2.tar.gz 130109 BLAKE2B 01368039e66033ef4a7266672f648724138710748b5e0472a615bc7e7a66a244ee6ed2a51ff1524de6f5865cdbdc03e603f8b1a9b2f9c27a4fe7fc595794c7bb SHA512 b42c3fbbdde9de732f8ea999e571be862dc022c5f87a2802b65141c745fc2182a4ab5edadf58ea75cd40f03fcd1f2ad46bd2c1bd65fe56cdcb2950a6455ee355
 DIST github.com-prometheus-client_golang-v0.9.4.tar.gz 142795 BLAKE2B dcf60337b5afe26825c58b88db415cefeeda1127d529eca1708a8b79594cb7cf677c32bd644408a1864258a47b28268d7b650416db2ca67c6298831ceb1e91a2 SHA512 45c07c0673c2db1c5a7a6bb47d26d0a33c71efac52ed38d6540bb81cfdc37f4160d112614a7d771ff70dbdf59b6837854c4c44674d63fd2df62e8d26606f1d4e
+DIST github.com-prometheus-client_golang-v1.1.0.tar.gz 140006 BLAKE2B 39c57a3e8e0dc41ab84b9c6e0fd53ed169da6126c2f39bd6298d80aef9043e39a785e26f075becdeefd337521d0376efbe89eee39a9e2fb8775804e9136fa822 SHA512 21f0ab86dafce3f02cadb7cdfcd7fdf50a67c5a8c0eccb24392a0ee64bac0288988ea491525c80628891b98a67715624a84033a754fe783c0966c579efac190f
+DIST github.com-prometheus-client_model-14fe0d1b01d4.tar.gz 57541 BLAKE2B acc5701969d724df3d0c85a3b456b1e397b6c72ba33fb2ff98a04702423e8873c2c3ce2aa68ef7f62ab2a6b4ab881dcfec740217f88f29bd35a7d99df298ec19 SHA512 d9cf5775446d349767573831df1020aec72fb340e6fd3d181ff7e6cad9e972a2b26f1aeb1382d70431470933e1452d718782c8f0a0c4159a81069e9ee5623198
 DIST github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz 57195 BLAKE2B 08fa9bf28957a15e543e2d86e5a19fc302f7ef5284796d6dec24c182ce7a3889a5bbe53d58fc018cabbd0bc717b36533043c3ccb3e3355d8434fa7e3dd399b50 SHA512 e44828e3790282e088bedd5c8786948192beb5061e8dedd4f0b2508e31f641569c2c2a7e3899c2eebf4aac0c0fb3a22fc9172e0460fa2372fa876e23807d23b8
 DIST github.com-prometheus-common-v0.1.0.tar.gz 87363 BLAKE2B 5b9c46c8169fccab40c8d6f0213754495691d5324508018095983111b67912e668b8c9ccac7dcaadddc603b59a93ee5a86375d728cd5e3e524f32b305e58d3a2 SHA512 a5966bd0c66d3d6c5aa98c15918c8b1fd4d9f68bef54d180984f4e71a3f209feab25ca01e6f9338e462aa7ac9452938e2da14ae94847249771947a1664796e08
 DIST github.com-prometheus-common-v0.4.1.tar.gz 98631 BLAKE2B 1f2d4780c6e0bac957320ebdfb83c6ab9de28abe8b5ea6f75d76d8af76ecef37231da82a070da28c5e05886241c7db0f9538cf85e0b26d20aad610639310e9a4 SHA512 36860b02c9ed11fa02aea619e2e7bcb58f2ade54dae2210194d6b83200ea76e743b07e62d8ac8c20f31806bb0ec680c579da359d41d4400ce50ed6c902e9b534
+DIST github.com-prometheus-common-v0.6.0.tar.gz 99696 BLAKE2B 4d49d93ec732c963ce3784aa7a074e91f87ae58acea46a1e6b8b58b012332b6954f90df83041d097d86ed7bca992fb4214c1a05c11746d8f74f0001d4a822abb SHA512 9ed108c0e13d879921c9f9892713f1de1da5fccd03cd11bee2b4728fb09aa3eb8adfa98f2701a6d68fb35b8458c4d59027e48ec0e94e90a441cedb1d25c08945
 DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
 DIST github.com-prometheus-procfs-v0.0.2.tar.gz 78550 BLAKE2B cded530ef80939cda11dde97d02289ffc1033cd90e7c7eb758468ccbad9f9bde7a259324c067c84b9d16c45be0c2971bc2652b507118045acb23b2a7b36a8f9b SHA512 93635aa795027e71cb79bbd35cf5141617634b09e2d56cad578abfb69edeb54fbda4971b9c81fccd51eb7837fc23f6773fd723b250dd6b16a25acb41aa37bcf4
+DIST github.com-prometheus-procfs-v0.0.4.tar.gz 108252 BLAKE2B 5ea5fa4b57595584afce1953d9de7366d5bac30a85cc3069d256362f6ec87686c65b4cef99e486a8e3b95bd39aff96d8ca9f6f76c9d4e79e5ec1cf743e856fc8 SHA512 030bf68684f61eb3cf2b5e5a6d33b7dbdc3b3bc1a3d50a282c20f1ca339984d2e9cb4fa3460719753626b8d9542bff2cbc0922b7b42ec3e1a03a95f552f2b989
+DIST github.com-rcrowley-go-metrics-cac0b30c2563.tar.gz 37566 BLAKE2B 210728e887a9c45a6ee278f444a93aafbb28653f8551fe96e51c38da01c533a2ea56a7c71d731008fd879014f15b4828ad37b89ac6f2340e9e11499e33687a78 SHA512 c042058531ef3283fde66c0d49e0dfeba414ae8f1db61d20c8c72c8de0c021d52417f8c252fdd25019df5f267d7dce400fd81546de204d99b2e556bbeabbc6df
 DIST github.com-rcrowley-go-metrics-e181e095bae94582363434144c61a9653aff6e50.tar.gz 35594 BLAKE2B a41d55f6d88310214bd1764a51900f6beb277b44ef0da900231c45113777db6af1a5f1055a5909cd0247c02b453be01ccac47858e7751eb676199077c5840aad SHA512 efd184873803e50379dc27f85a8aee6fa185d070501a4f4d80745ffa6df5c02d6023753a3affc56569d85ac328031bf4c2e0dfe7d9302e5249aeac59754d1fbb
 DIST github.com-sasha-s-go-deadlock-v0.2.0.tar.gz 9957 BLAKE2B 764bcf1ac0f018253b91b475e03ebca0edfcde4eb526c473df3a245a5397a742db678a70a767a452d6ecac25961059d9f304e21bc623807f6f6c9f6d9f504b69 SHA512 114461313768b79966669817b3a12502fa787e7dad288deda1440825605c962959da89c9106fd179cbe4f603a5c4f7f87c491f29def80936d7fa6eba7a1a1cc3
+DIST github.com-shirou-gopsutil-47ef3260b6bf.tar.gz 129842 BLAKE2B c36ce4de493a866b035038fe604c1f878a5c16ac435fc88484edde4dc36c02a9e3ff2b96046e381829938c3590b5f5a27231c42c0c7a4bfceb214e9d30d4c066 SHA512 a752ad06f7ace7780e2c98465493324b7e9d24fb70b09f9d1a4398c07acce7c8db39366745ec2776037e8aecae9b951bbe6e6f860de4f1b9f8b67a03faf51685
 DIST github.com-stretchr-testify-v1.2.2.tar.gz 101698 BLAKE2B 8280ff92a5005f9862ebfb80c6904b61105315189b6f56f087ba891dba47eaa5789a055e63c602b355c6c0c6ad68eefe3c26de9f1fac7a6dc44f9715bbbd86f8 SHA512 d925fe6c118f212868967cf1985aa70ca460bf4e3486d58be689e05ff6368485b42cc9a4ae1d5ce40eed38be45678b11d399a26000ce35d6e5ad218fc7d022ed
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
 DIST github.com-syncthing-notify-4e389ea6c0d84e6195eb585ffaf62c8c143306ae.tar.gz 57108 BLAKE2B a0bdc8393e17823b0b1df0c5e0b2e39b499486e6f00472cd273409b361d9bac4c3cbcdf4e0c95c8933d5a9e313aca6121486d747b785002cd504ddcc36847abe SHA512 55988ceecb308c896c8a5126bafa5651e4ac2b3b265dc7a2dba0820a59bb6505260d1fe422480785943ca877a589e52a16320e6c52991d50b5c2c522a88562b8
@@ -82,9 +108,12 @@ DIST github.com-syndtr-goleveldb-34011bf325bce385408353a30b101fe5e923eb6e.tar.gz
 DIST github.com-syndtr-goleveldb-c3a204f8e965.tar.gz 147696 BLAKE2B 22156bca1e2056f512defe2ec5d52a3e2c0e834c5e347bfc3ae64af3e97153d25aef02db7ac72c3d7db8d5d5bee7716a2c1e4f22b70b3a7ad52ce6c99999578a SHA512 8a0639bee268989fa8b5d76b3795849b4f104c05e11baff441b3b213016e622586a673a6484c2a463fecea78c2e7306510d51e08d1726cd1bf6bf929f25c8530
 DIST github.com-thejerf-suture-v3.0.2.tar.gz 18047 BLAKE2B 6b6915ca6db2a8b8e8ae5f34150b862d16b2b82227c25022e7b5f258849c340d57d345a1b8cb87fc14ea7eb36b72025a55b2844270c01830e68bb2177b5dd82f SHA512 08780cdcd8d2a86fe1c42f80a0b7c05ab1aee2a1aef4caef462111bad65a28dbfac2c05f7339de80b698f7b22609f19b52588ecf4d4ea0e971e0d57c55da78e4
 DIST github.com-urfave-cli-v1.20.0.tar.gz 58397 BLAKE2B 0f623bff26139e57f29a2939c70ad8ba0c8daaf3721cc6f4d061fc88209102b1ece790dc0772f5fad66649f1129836482feee20def3dc0d63e728020664016ec SHA512 0a47a47121e25bceb6ebdf10a55ab3bc7531214284b1669fe20237c3ac938c7cd154ebc408759202d936688350e27e47d14f6a6b0793271c10534f2e90bd1fb5
+DIST github.com-urfave-cli-v1.21.0.tar.gz 68419 BLAKE2B 4fe7091cfe3dd58d1c73d7ade84c70efbfeda354f8dfeb1cf7572b8792ed15c14432b4815107aae900a7d45e08a81dd261c97edac1a94a2e9557c3e595824e20 SHA512 8bd1dc64220eb5388da99a9d98971097b7e64dc054cdaff54c86fd427667962aa8add7edaeb045d17515bb15df885c369f939a5d374e8bcc010c7f0fdd554763
 DIST github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz 23973 BLAKE2B e272dc6a3f433d0b1479438a251561071e32a25f83784350f25cbbc0022ee1b23da4cac21e2eba76326ffd2838e93edbba816e593ab2bb3b703fd2c1ae65f15d SHA512 cc7ae47017191bd71136796334dd77b9f90e2564d348fa2c03086b593fb73f07cbd5ffe48f3d43ea2f7f32b64ed10f3a095013b27ee6afc25d08eb60f99d72a1
 DIST syncthing-1.1.4.tar.gz 4700261 BLAKE2B bf766d7d3701ac66d0d4ac266d9b4a9f02b2f97a6fa320b192f3e46fbe9055091ea5ae71bf405ccce4a9665efdf41477098af3b98562ea06bf0c4f828653bd51 SHA512 cb57cdf6bbab0147a700f72e800cddff0855835280a176883089e5e1dc06352e0dacf615569a35b16f98a857651f534c915f369c46bb592d416d7a01efe5b5ba
 DIST syncthing-1.2.1.tar.gz 4740427 BLAKE2B 2f102100030f646f069a51c5af7c5ab448ea59fa0629d78b14432e32cbfbe90f1b95c49cc3d5812b8cd228ef0454ba5d95f9ddf5910492370018234bc1c66438 SHA512 226386af38c3e99434496f24aa571bd1edd3d1e0528dac06c08b4148b2c63b898b67261728cc6c92dbd0496c24b32f0b1189571d03f6ab5dd592e78f2a5beb3b
-EBUILD syncthing-1.1.4.ebuild 5935 BLAKE2B 795f102a3a51c2a39850f1475459d82918cd5bc770c2ab5c0cc8080b299315dac1f19e306f596cc3698f7c5919217c279bd11f7c0fbc9ee2c4046ed69b4be600 SHA512 21fc8e3c367ab3751a54940f700ce13fa44e106ae4d6a160d9d5a12c1d1ec391af382ea0536a45b788ab01848726bcefa6794e7fabde693b9de05c7e28493166
-EBUILD syncthing-1.2.1.ebuild 5535 BLAKE2B 6ddcb51678fd4d04e1b9186edeb5afc9d40aa4e199690ba809073a0786a54ba0b3843348a3dd5af22646839993be76f5df945d5dc6dd9ae337b019089ebe3f87 SHA512 9cab546773a1fe6f7562434a46ea3dc6af95df8bbb96c439f20a1c76ee78e77c8e5af24a609e121f2981707b3be6976132f2d4e316c6c7a0ec059cee0a879202
+DIST syncthing-1.3.0.tar.gz 4753744 BLAKE2B 1fb731ca41fa2c703af7cc6cccdf7fabbee3972a6146f8f92cc8f5a2635083956134c46396f9b64e3b67d8377e4e74b59cfdde98cc4f92741f638f5b48e431c0 SHA512 aea1f979f3441e81c10dfbf0a5c22080814486a16999eabf7179928c6ea960c0f49d6684ea8626ffb2e2431777231e30c5de326fc500f17ee9c51e74cb1b3d5a
+EBUILD syncthing-1.1.4.ebuild 5974 BLAKE2B 2115e3d26f93044b48cc361b0b65be68ba9624a24fc14e6c7272ecd675d02ce99bbf6cf978a9e7d806bb5b504edeae5ed1f8843e7cb21ceab03a65a4b66aa2f9 SHA512 d5feaccbca635da35adf513f98dcc2a12cdb94279c9befd1d98acfa81372e7f9ddada2acf93050e4e6c1eab1fda087c10502c7cefd4eda25fd12273e99f5e59e
+EBUILD syncthing-1.2.1.ebuild 5574 BLAKE2B 7c4d6538463495a4953ac832eadb75912c5d52898956e3bea05d189f2238e212583a777b2c4f51d59236f80264af294b9dff3a71149daadf22dcb0f9845a08cd SHA512 90214fc183320a8037868b4d461239d62e1d87299f597c485551e89e5181ad06d83b148de4496af15851bae88f884c6b9601cdaa39d6bc14151476a0e4ade5a1
+EBUILD syncthing-1.3.0.ebuild 5605 BLAKE2B ccbe4c2e84102da99b1a91a367b5377bbcbcd4c752b6edba257a420485da2d54cf6b0e867e40668384793d6840d3d9f6948981b634ce1224ca529ca98a140d40 SHA512 b6931ecb5fb6abd6710774773d9d46963bb15ca1baaa9a2406429b7edb6ef8c29181c42dcaad6795c6f284f700afc827819bf73b42d5b35ff1a2c8b94b7854e7
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.1.4.ebuild b/net-p2p/syncthing/syncthing-1.1.4.ebuild
index f26f972cbdae..5d420952a0b5 100644
--- a/net-p2p/syncthing/syncthing-1.1.4.ebuild
+++ b/net-p2p/syncthing/syncthing-1.1.4.ebuild
@@ -66,7 +66,7 @@ HOMEPAGE="https://syncthing.net"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="MPL-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE="selinux tools"
diff --git a/net-p2p/syncthing/syncthing-1.2.1.ebuild b/net-p2p/syncthing/syncthing-1.2.1.ebuild
index 8528e3366039..6f0d17ef5458 100644
--- a/net-p2p/syncthing/syncthing-1.2.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.2.1.ebuild
@@ -74,7 +74,7 @@ HOMEPAGE="https://syncthing.net"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="MPL-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="selinux tools"
diff --git a/net-p2p/syncthing/syncthing-1.3.0.ebuild b/net-p2p/syncthing/syncthing-1.3.0.ebuild
new file mode 100644
index 000000000000..97b8359ac791
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.3.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/${PN}/${PN}"
+
+EGO_VENDOR=(
+	"github.com/AudriusButkevicius/go-nat-pmp 452c97607362b2ab5a7839b8d1704f0396b640ca"
+	"github.com/AudriusButkevicius/pfilter 0.0.5"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/bkaradzic/go-lz4 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/ccding/go-stun be486d185f3d"
+	"github.com/certifi/gocertifi a5e0173ced67"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/chmduquesne/rollinghash a60f8e7142b536ea61bb5d84014171189eeaaa81"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff"
+	"github.com/getsentry/raven-go v0.2.0"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gogo/protobuf v1.3.0"
+	"github.com/golang/groupcache 869f871628b6"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/jackpal/gateway v1.0.5"
+	"github.com/kballard/go-shellquote 95032a82bc51"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/lib/pq v1.2.0"
+	"github.com/lucas-clemente/quic-go v0.12.0"
+	"github.com/marten-seemann/qtls v0.3.2"
+	"github.com/maruel/panicparse v1.3.0"
+	"github.com/mattn/go-isatty v0.0.9"
+	"github.com/minio/sha256-simd v0.1.0"
+	"github.com/onsi/ginkgo v1.9.0"
+	"github.com/onsi/gomega v1.6.0"
+	"github.com/oschwald/geoip2-golang v1.3.0"
+	"github.com/oschwald/maxminddb-golang v1.4.0"
+	"github.com/petermattis/goid b0b1615b78e5"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/prometheus/client_golang v1.1.0"
+	"github.com/rcrowley/go-metrics cac0b30c2563"
+	"github.com/shirou/gopsutil 47ef3260b6bf"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/syncthing/notify 69c7a957d3e2"
+	"github.com/syndtr/goleveldb c3a204f8e965"
+	"github.com/thejerf/suture v3.0.2"
+	"github.com/urfave/cli v1.21.0"
+	"github.com/vitrun/qart bf64b92db6b05651d6c25a3dabf2d543b360c0aa"
+	"golang.org/x/crypto 9756ffdc2472 github.com/golang/crypto"
+	"golang.org/x/net ba9fcec4b297 github.com/golang/net"
+	"golang.org/x/sys 749cb33beabd github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time 9d24e82272b4 github.com/golang/time"
+	"gopkg.in/asn1-ber.v1 v1.2 github.com/go-asn1-ber/asn1-ber"
+	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
+	"gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+	# These are only used by the test suite but conditional vendoring is messy
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/prometheus/client_model 14fe0d1b01d4"
+	"github.com/prometheus/common v0.6.0"
+	"github.com/prometheus/procfs v0.0.4"
+)
+
+inherit golang-vcs-snapshot systemd xdg-utils
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="selinux tools"
+
+BDEPEND="<dev-lang/go-1.13"
+RDEPEND="acct-group/syncthing
+	acct-user/syncthing
+	tools? ( acct-group/stdiscosrv
+		acct-group/strelaysrv
+		acct-user/stdiscosrv
+		acct-user/strelaysrv )
+	selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+
+	# As of 1.3.0, stupgrades fails to compile. This command was not present
+	# in releases older than 1.3.0, is not compiled in by default (USE=tools
+	# must be set) an in any case we do not really need this, therefore just
+	# get rid of the offending code until upstream has fixed it.
+	rm -rf src/${EGO_PN}/cmd/stupgrades
+}
+
+src_compile() {
+	export GOPATH="${S}:$(get_golibdir_gopath)"
+	cd src/${EGO_PN} || die
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	cd src/${EGO_PN} || die
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	pushd src/${EGO_PN} >& /dev/null || die
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+	popd >& /dev/null || die
+
+	# openrc and systemd service files
+	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+
+		systemd_dounit "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 3bea35c3ea12..d7865ceb4cb2 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 3777 BLAKE2B a6af0614b29f30277e398fafad3860940363fed39dfe75cc12f3e0acb1cdc9c4529917e08df8c3961b2f0236b0263b4d06d089d8d68648f0aa0ed6f3840fc459 SHA512 cf0ae34c109f31247c8fc6d1850c36e46f8d54e84a3dabf2c91dc7a52235765169c6b9e880b4e58cd4c4ff565c458509fee7238019843b9cdd28857a8d43e15e
-EBUILD transmission-9999.ebuild 3293 BLAKE2B 5ff20121f1ce486e9d4a2e035ee56c113be45399fb52be6071f7d916423ca5540fa1efc98f5363fcdcecc2beae0aa3b97a8816c6ef57da2fe9afad12bc14452e SHA512 f0b04b023c37a52af09d928cb5d71515396e8f941794edf3fef0a0489a5cfe40d68d07b235b66068737fdf53e69beae16b76d49a0d0079ed27b41c2b004a453e
+EBUILD transmission-2.94-r1.ebuild 3767 BLAKE2B bf9b797791d2e1a0d7ab8861e4f72d333c6394059aec10c8a9424db835469b548eabae4d4c04624a8f4d159663bbdc8a3821ca1d76c6f5e559baf88b47cee92e SHA512 4a98cc567e7ebc68d02de3566aba2ec154a90e60460ed1849aeb766ec9fe1e8a25ce928281f7f4a7c64a13ca4979e668798796f956d57d7b8e675cc086569b19
+EBUILD transmission-9999.ebuild 3283 BLAKE2B b46f662aa34587a8f42812180da867c63969decac2fb194824f57ef566cf1d8c136048ff18a2c70afa4199ef6d3ea7f0722c9ab3e06af949feb650f51903711c SHA512 30cb354ab3cc0e20b374bec0525b41989d2efa8c4064ad8a3d1459997ab4acc6d798475d16f389f07f52877d3ac2bee121b6dd31f57a40a770f086d2b39b82a8
 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 c2e85f5d064b..f82f46f2b050 100644
--- a/net-p2p/transmission/transmission-2.94-r1.ebuild
+++ b/net-p2p/transmission/transmission-2.94-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.t
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT=0
 IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux"
 
 ACCT_DEPEND="
 	acct-group/transmission
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index dc8e81488004..c3356d081423 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
 	SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
diff --git a/net-p2p/xnap/Manifest b/net-p2p/xnap/Manifest
deleted file mode 100644
index bcc439a5bb34..000000000000
--- a/net-p2p/xnap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xnap-2.5r3.jar 1320779 BLAKE2B ed5103e4371aa9bc96cb1610c9fcdfcf8177ffcbe8c1801f2130e6e5ac9bd7fdb0b91c8bca8fd3e411f72b3dd6cd7284a6fab8da35c026385347c6a64a21e2d5 SHA512 6dcfc7b6d56c86a8a2e554b67449c60c784033cdc8962613dc0e4555b9139c71c7cc958f40b2a5a14e60c4abfde747b5ba9868a358837ceee3b730af34cf5f69
-EBUILD xnap-2.5-r3.ebuild 609 BLAKE2B e9ca818a43eaf43967a0a7b3a654b847002423e65110f195670f39d45e8e50edb4f890849d3585ffd29f7624cb460a1f7d8c6e4f19e98cda04a4f84cc2247c89 SHA512 fe9847fdb5a0b37c9bb58f3cb77fea78ffee95b9725afb85e3f3c33909f9242619c57775bb4685381e35a560b8e0cf42a2dcff4667cffcca7dd4472112aa14f2
-MISC metadata.xml 676 BLAKE2B 7c001310cd973732c3bd57d15a4199d59e74bd65b5eb8ed4fb9919704ae5fbdb5a727b483002f145153d33182545672e1313fd6d1b5ccd44d5b289c3e7e71b98 SHA512 60ea34fc1d512f325b5fb05cbfc99fe7ae8934e1c744dd17709a7067bc9fd7ff0d245c3e6597e43a9d5065b83904aad19d1820283f566fd41a62e816bf39104e
diff --git a/net-p2p/xnap/metadata.xml b/net-p2p/xnap/metadata.xml
deleted file mode 100644
index c1b47035759d..000000000000
--- a/net-p2p/xnap/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		XNap provides a plugin enabled framework for peer-to-peer (P2P) applications and a client which is based on that framework. It is free software and licensed under the GNU Public License .
-
-		XNap is purely written in Java. The client features a modern Swing based user interface and console support that will run nicely on every platform with a recent Java Runtime Environment (1.3 or higher).
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">xnap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-p2p/xnap/xnap-2.5-r3.ebuild b/net-p2p/xnap/xnap-2.5-r3.ebuild
deleted file mode 100644
index c77d4e4539f6..000000000000
--- a/net-p2p/xnap/xnap-2.5-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A P2P framework and client"
-HOMEPAGE="http://xnap.sf.net"
-SRC_URI="mirror://sourceforge/xnap/${P}r3.jar"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-RDEPEND=">=virtual/jre-1.3"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp ${DISTDIR}/${A} ${WORKDIR}/
-}
-
-src_install() {
-	mv ${S}/${A} ${S}/${PN}.jar
-	insinto /opt/${PN}/lib
-	doins ${PN}.jar
-
-	echo "#!/bin/sh" > ${PN}
-	echo "cd /opt/${PN}" >> ${PN}
-	echo '${JAVA_HOME}'/bin/java -jar lib/${PN}.jar '$*' >> ${PN}
-
-	into /opt
-	dobin ${PN}
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /net-p2p
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)