gentoo resync : 01.10.2021

15 files changed, 323 insertions, 14 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index d371de067c1d..ef9eb0a934da 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 8021c8372814..5a054d2049e3 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -3,6 +3,8 @@ AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b
 AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508
 DIST airdcpp-webclient-2.11.0.tar.gz 967326 BLAKE2B 47d257e47c332b4fd5351a680f0585360cb7329cd1bcf3c478d0a7847adbee68c024af7136eeb3b551188d3af7c4a6db2257eefaca7f82ee4670667a4a6e3e63 SHA512 926457e76b6bd29e0124c519b67d9e0f3cee48192c1b56e073b84d65f0171d53a7a4dbaf55e100f0685e01116935f4e4e2c193dab0ef0bed08d8101e12c33b82
 DIST airdcpp-webclient-2.11.1.tar.gz 967966 BLAKE2B d95760f3ae945255a396f20504995a2ea8843071ab19574a6faac919fb411a0a4e44ebcb005afce0056d960729d6b8bdd9df4ca457cea91931eedb1d329c7a12 SHA512 03f6ce82467f824d1b4e10075bf9e28b45282fb977b3feb67fc948044ed592672a83182d4716d0c10591c0b7568417997b335e25827d8e78fbd3735605cd052e
+DIST airdcpp-webclient-2.11.2.tar.gz 978294 BLAKE2B cb15e02dc5381cc5f0ecb1b4d65cdd1c4a3d007f3ea1e78a159b8a62af03831318b8f6d8c0692c5a9145dda616627ea97f4bd3eeb1270a7452c7d78bf01d147f SHA512 281d4a9da88f23a4c02eef7f09c4fc2c91c44ac93d932ea4bfe097029b45dbd12a8d04d4ef8b493d261f5dade15b62ed4d564197fbfb2d9d98b9dfcc9a9e6379
 EBUILD airdcpp-webclient-2.11.0-r1.ebuild 1373 BLAKE2B c6bebaf300f527c18f91c6139c9856597186f24b3fe5de48816768fff0698534bf41d3fe7331593e5c4156f57189f7d301d02a5c54d7e8d32ff411bb2163bb3c SHA512 faf36f8eeb9dfe6a4a33855996382bcae0186e7e29920aa075b1b59815daed4fbaea530dfbc5e63ee407c9bc0cfb4a1bf13e48f71a9d090fcb2338d25a0b9398
 EBUILD airdcpp-webclient-2.11.1.ebuild 1376 BLAKE2B 47d2187db6f8f01de207a8337f4886b56ef0741ea120cf5d49b109ff1d5f55ef3269e9bbfb28e85afcf97ebbf8e102ef07d90384b31ef8ba755c8d68084c9437 SHA512 68a72d07ffc123c6514333d8bd45421923bb7e2d5f47c162edcef0c01457c3138995591e723dbb51ab84b8738df92c8c1e18014b849fe02c59f8d36ac2a7f5ad
+EBUILD airdcpp-webclient-2.11.2.ebuild 1376 BLAKE2B f9e55574cf07c7769b8789813e95f61a58d1e2f98c090a5f76fdfc9e1c5715a285fb079c5113dce3c8621d82510ce38fc21c9bea8cb283f6c13d944854c5165e SHA512 450415512c0cc493bdc31fd6f89eabb5099012639f0d43b924c3fe18cfd7463dbf748297ad880101a43d00b7c13423702c94a87c36d9678f3315745583db9868
 MISC metadata.xml 805 BLAKE2B f62a540005c5d447e9ddd18b31eb88b1e875161af3b54e8c8753034700a70f28b3d4059d34988a8cf9225c2588ac921b39293e30ed2abf65a2bd0970b75a4628 SHA512 f8ff1e2d21ad685843abdb11672450b08c190203fbaead9170985dcf14332b7deebefb1565df6ce88671a87eb5e22ae80df5eaccf4c42ad49e882dd00b7ec81d
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
new file mode 100644
index 000000000000..48c674e1b803
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit cmake python-any-r1 systemd
+
+DESCRIPTION="Cross-platform Direct Connect client"
+HOMEPAGE="https://airdcpp-web.github.io/"
+SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug nat-pmp +tbb +webui"
+
+RDEPEND="
+	acct-user/airdcppd
+	acct-group/airdcppd
+	app-arch/bzip2
+	dev-cpp/websocketpp
+	dev-libs/boost:=
+	dev-libs/leveldb:=
+	dev-libs/libmaxminddb:=
+	dev-libs/openssl:0=[-bindist(-)]
+	net-libs/miniupnpc:=
+	sys-libs/zlib
+	virtual/libiconv
+	nat-pmp? ( net-libs/libnatpmp:= )
+	tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+PDEPEND="webui? ( www-apps/airdcpp-webui )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NATPMP=$(usex nat-pmp)
+		-DENABLE_TBB=$(usex tbb)
+		-DINSTALL_WEB_UI=OFF
+	)
+	CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
+	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
+	systemd_dounit "${FILESDIR}/airdcppd.service"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Run 'airdcppd --configure' to set up ports and authentication"
+	fi
+}
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 8e884d9d010d..6b772a2bbe12 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,7 +1,9 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
 DIST cpuminer-opt-3.16.4.tar.gz 1830534 BLAKE2B c9fa07c36b634b0d1250b847baa4a971aad0b249aaf7792b4a69c42c5c98cc6b3e4fe20c95fdab9884520decc6e9d7071158a641863f1c0d2443dd096e372f2b SHA512 7459a9c6ad7afd85fdb8f7ff62c9deae2a2fc8341e3cf39da0f72e81bff8829e094bb830fb614fbce9665bbb259d764eb64b6d2a44ac45ecdd9ee870190d6539
 DIST cpuminer-opt-3.17.1.tar.gz 1840571 BLAKE2B db07547ec79df92f644e903485fb51abfddeafe2ecaffd18c0438cf292d51c6167eafaf7aa2b89cb6b7698d4358a4ef970459bff7b063cfd6d3a95ad878126eb SHA512 463d755bbb3146ef94292ae64a8a2397485e28b55d4b510881dd91461e3bcc2786a323cf575dd070481236b150c35af2898b5ab2b0db90c34f528821988af74c
-EBUILD cpuminer-opt-3.16.4.ebuild 969 BLAKE2B 0deb9f25cd276a34807e0300ade515ad826b611482fb9adf30fb36aa24d2ec9db17f271db57752eeda309058f50990df94ee2e970fa1b9ad8776362a2a464213 SHA512 1437e49e6f1830f60df9a8d395f02747ea8a2b25b14c4f48709ec69664aefdd89dcaffb104901de2d9f94f95bbe465fdd1666a1abc0757ebc5ce9d74b8bb0039
-EBUILD cpuminer-opt-3.17.1.ebuild 969 BLAKE2B 0deb9f25cd276a34807e0300ade515ad826b611482fb9adf30fb36aa24d2ec9db17f271db57752eeda309058f50990df94ee2e970fa1b9ad8776362a2a464213 SHA512 1437e49e6f1830f60df9a8d395f02747ea8a2b25b14c4f48709ec69664aefdd89dcaffb104901de2d9f94f95bbe465fdd1666a1abc0757ebc5ce9d74b8bb0039
-EBUILD cpuminer-opt-9999.ebuild 969 BLAKE2B 0deb9f25cd276a34807e0300ade515ad826b611482fb9adf30fb36aa24d2ec9db17f271db57752eeda309058f50990df94ee2e970fa1b9ad8776362a2a464213 SHA512 1437e49e6f1830f60df9a8d395f02747ea8a2b25b14c4f48709ec69664aefdd89dcaffb104901de2d9f94f95bbe465fdd1666a1abc0757ebc5ce9d74b8bb0039
+DIST cpuminer-opt-3.18.0.tar.gz 1869910 BLAKE2B 23e090cb9c077fc69f6eee64a522676c078de268e512c588a7d93e1bd3e3904a9e5dbc937a58c21b031f685175b2f2164df04a4f7f22f8129d5183d1b990ec2f SHA512 9144a39b7470682835b57b5ff34810933af5712b4bb2e83a2b5241aeeb13747884f5f48e22e9a71512831b56d345ee5f0e6fd226a8a30d5d10243b4a99f1476c
+EBUILD cpuminer-opt-3.16.4-r1.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
+EBUILD cpuminer-opt-3.17.1-r1.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
+EBUILD cpuminer-opt-3.18.0.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
+EBUILD cpuminer-opt-9999.ebuild 971 BLAKE2B 88f563eda244f85ce1974b8d393709d4f8ced749d11546d041c1b2485bfa84e2fb8f85b031e8a498402ee39b64522f50d9ff0b035d6963fd1e88e7335d300dac SHA512 ee51e03d978f455cd4adda150d2e6010719ef071c9a3b4588f2ee35a5b3a9128a9d01967d8bb436b20ccd65dd47072783b571eed674ebed855bce5f18e4b2abb
 MISC metadata.xml 334 BLAKE2B f5b55d2366d5e2bc0fa04e0bbfd20fb8fb21993a352641b1f63b0d33075c97611fee985b6296cb1338a8b8b613f6835efcf8621cb8ca89d6598bd4a493673bb8 SHA512 a7b29760fbd65f440341fe862a157676a66caea1ac0d51b324e3cb79297a1293de9464ff1a460b9ee0b9399f3e637bf4ec8eb6022db957db792fe13282585ffa
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild
index fb5ffe94cd29..1cd33b0d51cc 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.16.4-r1.ebuild
@@ -12,8 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 REQUIRED_USE="cpu_flags_x86_sse2"
 DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
+	dev-libs/gmp:=
+	dev-libs/jansson:=
 	>=net-misc/curl-7.15[ssl]
 	dev-libs/openssl:0=
 "
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild
index fb5ffe94cd29..1cd33b0d51cc 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.17.1-r1.ebuild
@@ -12,8 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 REQUIRED_USE="cpu_flags_x86_sse2"
 DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
+	dev-libs/gmp:=
+	dev-libs/jansson:=
 	>=net-misc/curl-7.15[ssl]
 	dev-libs/openssl:0=
 "
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild
new file mode 100644
index 000000000000..1cd33b0d51cc
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.18.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 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"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:=
+	dev-libs/jansson:=
+	>=net-misc/curl-7.15[ssl]
+	dev-libs/openssl: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-9999.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
index fb5ffe94cd29..1cd33b0d51cc 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
@@ -12,8 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 REQUIRED_USE="cpu_flags_x86_sse2"
 DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
+	dev-libs/gmp:=
+	dev-libs/jansson:=
 	>=net-misc/curl-7.15[ssl]
 	dev-libs/openssl:0=
 "
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index bf4b64b3dc8e..a0bd3d19d5a3 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -13,7 +13,8 @@ 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-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
+EBUILD deluge-2.0.3-r10.ebuild 4762 BLAKE2B d4f4b226bc6e7bc6cfa0808d1a9a435dcce50fdc5744224d580f2900b587b7c3a71a78719d79594d7692bca0cf8fd9658c20417d8a38d79e025743edecb2ecd4 SHA512 22a3503fbb361efdbc44a2e4892afaf878afde0a01b8a0879990c271347df10af92207f1dce1325ea73d5f5cd593c61c44aeeb2d1db4e06e77b1a3b783b71f0b
 EBUILD deluge-2.0.3-r8.ebuild 4503 BLAKE2B 1df878622e276d8f195ac4dbcec94c6d3363db2fd6d2f946c898cc7331a62af91a3b92dd0d0ef07d8eddd5b673321c8e6c36d47765717c60d945654fb4a3e5e3 SHA512 f660a0f90acec654e72d7acb98e16cffb30776ace3ade819841dff22dd448c05a280ca3d1ed59330bb98883311bd63a94eec0fc6e24b9eb4b89d92919d9e8095
 EBUILD deluge-2.0.3-r9.ebuild 4512 BLAKE2B 9e17b7849b0caed5d4bbd2a55a4b356464f56466190b1402feb7ddbf301cd0b16f4ee7e3c4531b78227b8cc71104a912dd2b34781f30743fb7123a69b8559eec SHA512 2a0f697404637ecb45ec33fdcb2b2484af3f3c940cdadf0e253f2cf720987357810d57b4968e8c34984bf503b6a3ecca4d6a4602a0f20ab33f9e9131d020b80b
-EBUILD deluge-9999.ebuild 4535 BLAKE2B ba15c2eec0b6c51b4f549a83468fcbaf9d39d2f31b0a16d9b132caa979f411bd2e201e448feef1a3f9bc8b85ee3ff74da8e07cc1e64796155aeff9c33b5a92b6 SHA512 48e8dfaa7ca6592ec59219bf809f57f038400d09a87e7ea57984ceb8e67ad769c9c06ee26a7f9758bebfcc0a3e839c74ba49a8f577051aba171ade8f9d50bdf3
+EBUILD deluge-9999.ebuild 4762 BLAKE2B d4f4b226bc6e7bc6cfa0808d1a9a435dcce50fdc5744224d580f2900b587b7c3a71a78719d79594d7692bca0cf8fd9658c20417d8a38d79e025743edecb2ecd4 SHA512 22a3503fbb361efdbc44a2e4892afaf878afde0a01b8a0879990c271347df10af92207f1dce1325ea73d5f5cd593c61c44aeeb2d1db4e06e77b1a3b783b71f0b
 MISC metadata.xml 675 BLAKE2B 79c1f6e56c1e5331a1722d6b98da4431e0fd9e19d1c1fd00677c20e3d2214f97d4f71b751edac9ef70e2552abac2b650ed704121275a218374386ff95ef404dd SHA512 1da3e3937d14728111aff841900bcb33912ffe29cae6c14dc401547897d777df37e373f2f65ba0fde00624855d33222445ec3a4edcc0478976bb992ac915d5b1
diff --git a/net-p2p/deluge/deluge-2.0.3-r10.ebuild b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
new file mode 100644
index 000000000000..be0397a7f781
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg 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 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( gtk )
+	sound? ( gtk )
+"
+
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
+# instead. It doesn't seem like Deluge supports >= 2 right now.
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	')
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
+RDEPEND="
+	$(python_gen_cond_dep '
+		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}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${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 )
+		)
+		dev-python/mako[${PYTHON_USEDEP}]
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
+	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
+	"${FILESDIR}/${P}-fix-pickle.patch"
+	"${FILESDIR}/${P}-log.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 -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${ED}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_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 0d7b3a317c07..be0397a7f781 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -27,9 +27,12 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
+# instead. It doesn't seem like Deluge supports >= 2 right now.
 DEPEND="
 	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	')
 	dev-util/intltool
@@ -47,6 +50,7 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
@@ -54,7 +58,6 @@ RDEPEND="
 			gnome-base/librsvg
 			libnotify? ( x11-libs/libnotify )
 		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
 		dev-python/mako[${PYTHON_USEDEP}]
 	')"
 
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 68d4f405b7dc..6765e370011e 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -2,8 +2,10 @@ DIST nicotine+-2.2.2.tar.gz 3373462 BLAKE2B 6dbcf4e9d7f85bb2e03194047c8ca9c374ae
 DIST nicotine+-3.0.2.tar.gz 3126152 BLAKE2B 8575c61fc32083e687eac841e403366c516e0420c792bad2bf31b49b83dd80d2b99ace20879f7968dffd0d48e52bc6c6638300216b4eae44773c0723888ca96e SHA512 297aab9b6016df4b45e065d5e6493e237e99ef6ebbd475b7ccf66d2c476053f77c72c2ecd672c20046b422dc1f5eb431e701de687d33f2364619de5643ccef6d
 DIST nicotine+-3.0.4.tar.gz 3141967 BLAKE2B d58072026ee766d81ca88dd4a11aa72f7aaee7a6e37c966e7d4cd0bdee40c8ef6537f01ea92c006b12e9692612d63fffd744011b982ee4cada2df03d2abae064 SHA512 8cc02b8b269267cc775b21ec246d84b932c1c7ef8f0983c63e3bb21de5b4c0de5fa65acdb0a07240b90c3529648f500d43fffbc0a462a260e534e86653a332a8
 DIST nicotine+-3.0.6.tar.gz 2786594 BLAKE2B 69b43c3eec37c8a01a0bd42cd11c02580a5be9ca994106e34e7f588eaabb7cfa85fd312bd527d453e62b3f8c0fb4f031eedf06207e3c1d8602e822958d98ee65 SHA512 42846568948d45559206c85c7ed708be044a5cf55f994318c209506dcc9024d6ccfd141fa21ca57f00c320a1a5ec3ab09faf211ebd442bf1d5060b960f43e8c2
+DIST nicotine+-3.1.1.tar.gz 2775643 BLAKE2B 9c595f8bf2bb4e7c79c3a5a57cadcfea8d2f0df6c89cd93f63f1e5c1117dbe5d85f98ac94c5f7e367e145869e136c701dbf61d1caa270959b29544ab5da17314 SHA512 28eaca5f270176ff5562f693906b4dfef180b91f0113332e3fc1659acaa6bb49e8f956b03612effab14f6833e9e7c00ebca75ca3c49906cd990d1e82e1bb5be3
 EBUILD nicotine+-2.2.2.ebuild 837 BLAKE2B 275ed5b79caeb4a8a6090c25ea3a6ad43e03608700364dd3e17acbea2dbde07b3dd2c60a2913369da0a90b5107623445a0068caeb725778896edefe9af507e11 SHA512 41777ba58191572c64092300f2833e4868145fb12bf3e534eaaa41563a5e92586729b5e0690a03b92ec827c8971b2c15d7519e6f6c682b4059cf203f40d7e197
 EBUILD nicotine+-3.0.2.ebuild 840 BLAKE2B 4c1a16f620db8656b3c74a57425368efc111b18f3171ad98a5b891216737b96ca328b590aacd24afb60bbc356b6e7fa3fea164c07f8474f6da8ae9506279b2c2 SHA512 0e7b479f78b315ad7ab215ddd6482bfb198d4ec249b8b67253110db11a62ada6e49c3160b4724b8cf2039e3f69429f6f7266c758a862cd3ee8b0804d9ea5054d
 EBUILD nicotine+-3.0.4.ebuild 840 BLAKE2B 6a6d98e0dad0b6945739363227a7d33c6f46d6e8027364e7d7752e460aed840d66cc3c7981b02697bef9e33b1b39f9a226f4a51536c9d7ebb6d3e8f78db0dada SHA512 1516681e63829571495610042d25ec4444192033727a9fba9be39f7f78303cb073834ae65217aefb2a7dbbacc8f4e27349ee3fd81b2984657a3f51adf66141ae
 EBUILD nicotine+-3.0.6.ebuild 840 BLAKE2B 6a6d98e0dad0b6945739363227a7d33c6f46d6e8027364e7d7752e460aed840d66cc3c7981b02697bef9e33b1b39f9a226f4a51536c9d7ebb6d3e8f78db0dada SHA512 1516681e63829571495610042d25ec4444192033727a9fba9be39f7f78303cb073834ae65217aefb2a7dbbacc8f4e27349ee3fd81b2984657a3f51adf66141ae
+EBUILD nicotine+-3.1.1.ebuild 840 BLAKE2B 6a6d98e0dad0b6945739363227a7d33c6f46d6e8027364e7d7752e460aed840d66cc3c7981b02697bef9e33b1b39f9a226f4a51536c9d7ebb6d3e8f78db0dada SHA512 1516681e63829571495610042d25ec4444192033727a9fba9be39f7f78303cb073834ae65217aefb2a7dbbacc8f4e27349ee3fd81b2984657a3f51adf66141ae
 MISC metadata.xml 345 BLAKE2B 511ecb1a01b9dd891b37d035ec3a7e7835de48f147fd851e256a3c2cdfb356018f91c14a07f7ca4cf6f96ece8728454917fc02f70081ccaf142c32e8368a6a38 SHA512 a885286829ac4ddf04ccf11a9105d2b5ab5862a8a84eedaa547da4cf0c53b5b1c4957fe40826df87b23fd6de7f514a5dbf374b9f87f761c5f17385769a07dd8d
diff --git a/net-p2p/nicotine+/nicotine+-3.1.1.ebuild b/net-p2p/nicotine+/nicotine+-3.1.1.ebuild
new file mode 100644
index 000000000000..3717d1e247d6
--- /dev/null
+++ b/net-p2p/nicotine+/nicotine+-3.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
+HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
+SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	${DEPEND}
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/nicotine-plus-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index a099e4851264..88385292c3c6 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -841,6 +841,6 @@ DIST syncthing-1.18.1.tar.gz 6145390 BLAKE2B 9c40daad6016a90dda135f91a3d17cf6d5c
 DIST syncthing-1.18.2.tar.gz 6152347 BLAKE2B cab3ae2aa0d77f00b423b1e54bfe257a69f208f82af693db0b35b7f6b150a78d7286e3c15e0eaa84b73ec6e3bd10cae2280ddbfb1df2df01265f2e5bd81ac215 SHA512 b5acd207aed1163d8de1534fffe04faeefb1c6aca00933d4b7b96db10451d71acdce5c8147d2b0c3d13a37c3dcfa70da1ac0a9f14dc3a60046da94a960c169f5
 EBUILD syncthing-1.15.1.ebuild 39791 BLAKE2B 8cd048b2e8bd021aec1da09b6493b19c82a97d2b144df685a0dc76c868506ca4a3fc82eb4626bb8091300903bb4c51f4745cc1a8a6f8cb224db384def1bd835f SHA512 8112c6436bfde905c6db91e7662b55c48879de2d737395b50faee7920abafe57a054a569632a185f93e323fd7b570dac06aaad859d7b36b953f847ae5eb7d796
 EBUILD syncthing-1.17.0.ebuild 41735 BLAKE2B 4f1ca65ed4b503948f332cf214b050228284351068c161a9c6162d41e969e44a6d7fb7b9c3cd5321275f774ff7cbaac4367904d27f5c481c7b575244ebf1496d SHA512 595ac309c7fdc7acf2f3459bb7d87d771f2d45373ec45318bafe14b440f3eef904340b043ccf8f312b2272c64d6ea26aa7ad2e61a754324dc5fe07964e40494a
-EBUILD syncthing-1.18.1.ebuild 41408 BLAKE2B 52e8b14f41a55204260a3040dc37fca315a249628c2f7343be5e00e0c426af5d0ea9543e2670ac394ec9a36079f7932d5da7525b9216d531f0867aa9ba592929 SHA512 4e0d39fa7cc6b199afd97796d22b0bd6e2b71a5f82cae6282bfef2dc7cbbcb5074862d2080abf1cc932579ba5fb36c4ae58731dba641b9da69dd8bb2ccec79e1
+EBUILD syncthing-1.18.1.ebuild 41407 BLAKE2B 4cc44eac24fac75c043454ea9fa0f9bd65325f76753bf4ffe4aaed215cc977e2dba11b2c0a5690a8a53c7099a92a1f3d20432a961e7b93d896515ca3448ea377 SHA512 6f84bfe2483df6e2da8ddcd6fa1a7d4b41948025c42607555e3588d403839ac4944891cb98968881f81aab36102820ac4281d8daf8801c29a2c9731e40b98cc5
 EBUILD syncthing-1.18.2.ebuild 42485 BLAKE2B 6d788821a799da5c8b5fe99f343a4e506095191b61e0a96c1bb2f3b6dde9ee26fc7f110fa72d48f284a2a51d1e9fba6f23266e5e1a89ec1db28786d53c63e2f7 SHA512 99ac407856802ae27e4188293768ab61231a0e948d1013488e1a78c7f2f657a89f5265c202a2ca80e916eb2b15bd40ddaff4cc424666bff262c2a403fe44ec85
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
diff --git a/net-p2p/syncthing/syncthing-1.18.1.ebuild b/net-p2p/syncthing/syncthing-1.18.1.ebuild
index 5f28aa9dd886..3530a8a1cef6 100644
--- a/net-p2p/syncthing/syncthing-1.18.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.1.ebuild
@@ -723,7 +723,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing