gentoo resync : 07.08.2021

8 files changed, 37 insertions, 9 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 314925039628..76494f40a29f 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 a2ce2327dfb8..920801ff03f9 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,8 +1,8 @@
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
 AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508
-DIST airdcpp-webclient-2.10.1.tar.gz 964433 BLAKE2B aa0db1c199e0546a35dddb7750ae9b2723afe09ab77a3ee17c02a1f592afc4075eab1017ea4114f07ee2e4d363aabfde510647f4e25569835312f120677cb1c6 SHA512 82a0ab406fa5861deea5be6a06682f2a756d3140ec85faf0cd1f9c5ddbae3a63acdad560f7196e7a25de0183e6647954ad7428fc327f81578a4b64a0e2ce088f
 DIST airdcpp-webclient-2.11.0.tar.gz 967326 BLAKE2B 47d257e47c332b4fd5351a680f0585360cb7329cd1bcf3c478d0a7847adbee68c024af7136eeb3b551188d3af7c4a6db2257eefaca7f82ee4670667a4a6e3e63 SHA512 926457e76b6bd29e0124c519b67d9e0f3cee48192c1b56e073b84d65f0171d53a7a4dbaf55e100f0685e01116935f4e4e2c193dab0ef0bed08d8101e12c33b82
-EBUILD airdcpp-webclient-2.10.1-r1.ebuild 1375 BLAKE2B 8b89e42b19e9f5d0f21fa79f401860b4679bb9b270b80d6383bc6c6335b947405369a322eb2ccae9f9ded17b87aad77f1115e5e67fcd2656c5bc05b6e2e9b46d SHA512 d4bd48a915a917c6b82360cc30a26a247c8ec0c56e9833821fdea6bcb36277ccd2e3a4721659501023eedb38a28e71b0f396dad8bdb7fb83cbff1f9ea0103192
+DIST airdcpp-webclient-2.11.1.tar.gz 967966 BLAKE2B d95760f3ae945255a396f20504995a2ea8843071ab19574a6faac919fb411a0a4e44ebcb005afce0056d960729d6b8bdd9df4ca457cea91931eedb1d329c7a12 SHA512 03f6ce82467f824d1b4e10075bf9e28b45282fb977b3feb67fc948044ed592672a83182d4716d0c10591c0b7568417997b335e25827d8e78fbd3735605cd052e
 EBUILD airdcpp-webclient-2.11.0-r1.ebuild 1375 BLAKE2B 8b89e42b19e9f5d0f21fa79f401860b4679bb9b270b80d6383bc6c6335b947405369a322eb2ccae9f9ded17b87aad77f1115e5e67fcd2656c5bc05b6e2e9b46d SHA512 d4bd48a915a917c6b82360cc30a26a247c8ec0c56e9833821fdea6bcb36277ccd2e3a4721659501023eedb38a28e71b0f396dad8bdb7fb83cbff1f9ea0103192
+EBUILD airdcpp-webclient-2.11.1.ebuild 1376 BLAKE2B 47d2187db6f8f01de207a8337f4886b56ef0741ea120cf5d49b109ff1d5f55ef3269e9bbfb28e85afcf97ebbf8e102ef07d90384b31ef8ba755c8d68084c9437 SHA512 68a72d07ffc123c6514333d8bd45421923bb7e2d5f47c162edcef0c01457c3138995591e723dbb51ab84b8738df92c8c1e18014b849fe02c59f8d36ac2a7f5ad
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.1-r1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.1.ebuild
index b70ff5e20049..cc018d24b40d 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.1-r1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit cmake python-any-r1 systemd
 
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 6bbd813ed092..7de913676e3d 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,5 +1,6 @@
+AUX ktorrent-21.04.3-fix-tests.patch 1093 BLAKE2B aabbbca3fcf6cdd8d8b9d5c49732351e6daf2da710b984a439a43fb26920ad250f0226a4aed0edb3940852034480fc0bb737bd3579d44924b1385aa8cec903bf SHA512 d65322f860482b0fe7983ebb1642df72bf358cea96816ecd9975126e8c63ac5b2dc3db9410ee17fd61e7085cf26e23b33f1e23d47d9cfd4363e264a6c26df4c2
 DIST ktorrent-20.12.3.tar.xz 2141556 BLAKE2B 8c1bfd675597a724ae6143bddb88005da0ec852a93ef3cc843605b4a3a47d80acba23df2a2cc13ff49efa9e4576269f3157e8456c80388b7e309527befbf0297 SHA512 fb54341368b3260ceefdb9be8bbc62c74397ada1a824a96f9de316caa365be438adc96ed15ee0bc44b7cc0db8eb1082c9ffb49eacb9448c31e8fbfe6e6314e93
 DIST ktorrent-21.04.3.tar.xz 2091116 BLAKE2B bd03c3730a5082c17c58d6453d035fa785b5ee6e0f253d5cd37adb5e43508315deedbdd423a2e453a116a8ab9dedfe78cef063fd11262579d910b1a0f5a36e05 SHA512 70e8baf2d04fe86be09fd4583ba20375ccbec67e5e8b7a8aac252bbe04469ccfb36c55fc5088497f8575f3bef59cff40f48f648d73071e06f676b45504aa935e
 EBUILD ktorrent-20.12.3.ebuild 3088 BLAKE2B f7285f9e6d0071698ec7af6c329a4537e4766aa073265af0c08c50921cd853c4e7db6c8f256102c2292c982c4aadee50b7872a49e6cfbbf621b33bcd4715835f SHA512 736a156c76972306a0e08d376fee53dde944a9434890eca28f8e70535d6a041f7518b20ebc2439e7d612726dc25ad45f506a1c2ba88eee4972947415295d865e
-EBUILD ktorrent-21.04.3.ebuild 3080 BLAKE2B 34e6edcc5b843aff51bd44c57ff24b9714b403c76810543fad88339bbbf8cdc3accc64af42cfe11a17e6c7edca51adc152da42ad7bd5c0d3b22a5bd0aa164577 SHA512 756fc3a8b501bb779aeb28ab21958dd9f7754e694e4dde186ef81948f7bb99a7e7df84d142d2ca08b0fa775810ac15438a75006cdfd12ad0594319b28fe7f58f
+EBUILD ktorrent-21.04.3.ebuild 3126 BLAKE2B 267d8ab24fe076f6f3a93413d12a260812ecfc1755297e444ded9200b65b3801a2c29ce9e84a84b47cdd6cf3113891ce6236deac7bfd5213d7c79c5edb597bf1 SHA512 5868ca0090c8a02404a377323379e0e4ca6d68d0bdddb2e870969f664b829da4fbc46e83eec7eafc5a27c48c9e0d73008a7b9b2573c261f21fb7214ced0c9cff
 MISC metadata.xml 1389 BLAKE2B b928cdf2526433fcf48c5600049b27c9f7c12aa043a332931b5a567d1baff9fa0bb0ac6e4e8de056947637d1253ee338a8b6620e52b294b20cdd7127a3b1c81d SHA512 4cf5204afc5a9f451752efcf1bae64a947c3bbb0d259641a85771071a7c390ee50818518a15c38f47f7778cdb3ff10732428dfff3c99a09049ca8c2486736991
diff --git a/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch b/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
new file mode 100644
index 000000000000..fc644bd80b8e
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
@@ -0,0 +1,25 @@
+From dfc063a4d1f174cd5f84b82154a58b86da334d35 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
+Date: Tue, 18 May 2021 15:15:26 +0000
+Subject: [PATCH] Fix tests with new ecm sytle
+
+* asturm 2021-08-04: Merged w/ c8701e6a9ff52c04c364e8f5dd8f32f44bfeaa93
+---
+ plugins/ipfilter/tests/CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/ipfilter/tests/CMakeLists.txt b/plugins/ipfilter/tests/CMakeLists.txt
+index ec839aac..6c34b2d0 100644
+--- a/plugins/ipfilter/tests/CMakeLists.txt
++++ b/plugins/ipfilter/tests/CMakeLists.txt
+@@ -1,5 +1,2 @@
+-set(ipblocklisttest_SRCS ipblocklisttest.cpp ../ipblocklist.cpp)
+-add_executable(ipblocklisttest ${ipblocklisttest_SRCS})
+-add_test(ipblocklisttest ipblocklisttest)
+-ecm_mark_as_test(ipblocklisttest)
+-target_link_libraries(ipblocklisttest Qt5::Core Qt5::Network Qt5::Test ktcore)
++include(ECMAddTests)
++ecm_add_test(ipblocklisttest.cpp ../ipblocklist.cpp TEST_NAME ipblocklisttest LINK_LIBRARIES ktcore Qt5::Core Qt5::Network KF5::Torrent  Qt5::Test)
+-- 
+GitLab
+
diff --git a/net-p2p/ktorrent/ktorrent-21.04.3.ebuild b/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
index 2728b9034f1a..a98fb3e20e7d 100644
--- a/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
+++ b/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
@@ -17,11 +17,10 @@ HOMEPAGE="https://apps.kde.org/ktorrent/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
 
-BDEPEND="sys-devel/gettext"
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -76,6 +75,9 @@ RDEPEND="${COMMON_DEPEND}
 		>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	)
 "
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 1f8562a861d0..c323eefa3d58 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -792,8 +792,8 @@ DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f36
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST syncthing-1.15.1.tar.gz 6110326 BLAKE2B 0d1db888cb5a23fd09856f3733433c0848658c6ceadbaf3acd2fa34e9e03a0477e24392251bdde3ab42f0f43ed1011225227fee28e37915e857720ff76e5f57f SHA512 fdcf9e5b43f8d7923553979bd7cbab8a65deac16def727c4982fb1aae6d43c0c38cc6e3e140cf04ceed3fe6661e8d5fc087df3034e9c32e1ba08ef71f0b96832
 DIST syncthing-1.17.0.tar.gz 6093692 BLAKE2B 20ac82f916bb58c2390d49403e6d2934f5e26029d55750ddf03811294af23cb048d534e28953627d17e5c49532740acbe1c31fd5e3fd45139e0c0c8b4620930f SHA512 6ccc43bf21ce20543031e070b14e5383a1bee6a0c6df5a0e1a914d2fae51f04d7776f715e4874c2b854798cc89236028955be6a462574bdafb6bc9dd56bce854
-DIST syncthing-1.18.0.tar.gz 6143299 BLAKE2B 31510722fa409c9ed4adce62107329933d81eec830b7baf4aa6aea1dbe35168be5370e5654a8a8a0d5f1d6a649ec7ff6a01d7c1195bf33ca86606417a8223a0e SHA512 d8b3de5b4511c5e5a979abb5ca3ba8880e3fd3dd490123d80135d65067bcc3bd16513d2584b1f2427d761923de34289ba68731caef3923190ce0945177dd484f
+DIST syncthing-1.18.1.tar.gz 6145390 BLAKE2B 9c40daad6016a90dda135f91a3d17cf6d5cd0803417488720491fda9d56811bcb6ab6d32c8b638374b2354077261428f1de578ad8171baf4430b937b5ab68d5f SHA512 b20e49ccffda2646ebcf3904077a3496c6ef2744600d98fdd5db45758d9511c0dd9f2f3b5ac37c275e9bdb01827e37a0551bdcec92c118651937cf72ae7adb6e
 EBUILD syncthing-1.15.1.ebuild 39791 BLAKE2B 8cd048b2e8bd021aec1da09b6493b19c82a97d2b144df685a0dc76c868506ca4a3fc82eb4626bb8091300903bb4c51f4745cc1a8a6f8cb224db384def1bd835f SHA512 8112c6436bfde905c6db91e7662b55c48879de2d737395b50faee7920abafe57a054a569632a185f93e323fd7b570dac06aaad859d7b36b953f847ae5eb7d796
 EBUILD syncthing-1.17.0.ebuild 41736 BLAKE2B a523da4c5af2cb733b9d5f71b856341307aebe3a0c1274bfade3730b495fb0a8a35a3096084ebab76bf6f78f4e4843eb3109a9363530ceaf3ea4d90a315c1c7f SHA512 f1c7a83e1d66df27177240e14b835967e1898d8b94f3754f93a41e4c6288dbfe50efbc0c930e8ee21b41b5c00d3de1a72a8a84c38cafd7e9d1ab0f092c8bdbf5
-EBUILD syncthing-1.18.0.ebuild 41411 BLAKE2B 831c0ecc38474b1616df46fb285b32fe325c0b15dfbb8b888e29e1154157f1ad6e377bface2692813b35b4553a0ad7fc6fa12a734983d39d6d927dd0be7f9b7a SHA512 482768dc93ddb86d0166882e29992dc8179cc3d7a0577ce2c507e3183bfe1466fca77147409282730f58f05278dfdbb147844c3035155442dda7f83aa651e51e
+EBUILD syncthing-1.18.1.ebuild 41411 BLAKE2B 5ceca1b939e92f12eb8d330f9a995b226e5046b5a8f8a9ba7a8c87df6a880940f6339528250c10caac0e32b00fd1ee97451f9718d3a90f29cce3262dcc5622e5 SHA512 e42ac3d1dba26ced690eccab7351c845a2549ecbd3196beafc84ce1dfdda96973a6878bdad99e7db66f25cb6c08d19d72938931bd03549fa73be04ed1ab1c37d
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.18.0.ebuild b/net-p2p/syncthing/syncthing-1.18.1.ebuild
index 5f13140be27a..8355b3d6a6e1 100644
--- a/net-p2p/syncthing/syncthing-1.18.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop go-module systemd xdg-utils