gentoo resync : 05.12.2021

5 files changed, 10 insertions, 45 deletions

diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index cf5a66942c7a..a5e5417c00b6 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,6 +1,5 @@
-AUX ktorrent-21.04.3-fix-tests.patch 1093 BLAKE2B aabbbca3fcf6cdd8d8b9d5c49732351e6daf2da710b984a439a43fb26920ad250f0226a4aed0edb3940852034480fc0bb737bd3579d44924b1385aa8cec903bf SHA512 d65322f860482b0fe7983ebb1642df72bf358cea96816ecd9975126e8c63ac5b2dc3db9410ee17fd61e7085cf26e23b33f1e23d47d9cfd4363e264a6c26df4c2
-DIST ktorrent-21.04.3.tar.xz 2091116 BLAKE2B bd03c3730a5082c17c58d6453d035fa785b5ee6e0f253d5cd37adb5e43508315deedbdd423a2e453a116a8ab9dedfe78cef063fd11262579d910b1a0f5a36e05 SHA512 70e8baf2d04fe86be09fd4583ba20375ccbec67e5e8b7a8aac252bbe04469ccfb36c55fc5088497f8575f3bef59cff40f48f648d73071e06f676b45504aa935e
 DIST ktorrent-21.08.3.tar.xz 2091880 BLAKE2B aa0c28313d86fec1e472582dbf68023a71cee5c9fa301e243c3e4bc2e25987fcee28b34f21264b253eb1eaac955e4d2f994e5936f75bb6182fdb648617382ff0 SHA512 10ebe41f9ef85d1b6ad927e197193fff5d776947e4a8c4a5d3498d16304372b4ca8afd993a94d783934b89139a375ab86dc4893b1c7eaae2b4f70f02fc36ab5c
-EBUILD ktorrent-21.04.3.ebuild 3125 BLAKE2B 229f27055539af4f7d00649371ecc307763627714c760f2e55151b02fd40202d72a742528f6dc18e8c6c8538d92451da8732c7c952857831ba4028bbfc3f9cd7 SHA512 ccb2aa1b02d3277dcc8948418383b838cb2bd8b658474c9a02503967612773b6400b5a94d1a5af59de5aac113c90815196650bb57a22fe22391d5166da4b2149
-EBUILD ktorrent-21.08.3.ebuild 2941 BLAKE2B 47bff30f8a64f8da0d399a496734ddd745a26a58976c6d06b95174d551322df7e39e19a804d16a9945506b592920bfeff926f8a29a2960cfae5c0af8f1e5f42e SHA512 b9118f524e448c6cbe220fd758ec5a1e75c92f8c71f4de01c7f39bc5fd10dc0fac53360cc62db76931e85edb22ad5a66fa40652a6f94b63574c7396ed6c6153d
-MISC metadata.xml 1458 BLAKE2B 6cb8c49612708be4a5937596081fa07e1cccc8cd5403a0d6db143b981b3a317b7f66fb4d35186a15b214e0a66efd2dd0ac82058cd1bf2198d398273d689755f5 SHA512 9e269df4fd401aada56e3cef3b93917ec04c3fed481be9de25f9f23a16804076ec7e2415f9571f359c3b4f4276ae6f852888a739cdc78d17846ef4c0e40f9362
+DIST ktorrent-21.11.90.tar.xz 2064516 BLAKE2B 17c8b30aae9605445389073177b4078803b302d256f2cd525436f8405a92c7622dc97577c176cf5cf803443d1c76387a06a539e6d13119027c4661056f09c48c SHA512 743f69d05a63edb16c456427070fdc48d7138284cb08ff987e283cfe234d7877a81032a47944a1e7c2d49ce921c675f698641b64aaa039484d07ee1a4e90a5b2
+EBUILD ktorrent-21.08.3.ebuild 2938 BLAKE2B 86e3057b864accbd23418909cb83a6fccc0bf988d87ed748ec55a58fcf232abaa22a627de45c034cb613294a68ab828a62cde2b50b127ddf2af125bebe3ac813 SHA512 f4e7c5e06654a985f050dedd767ff7754e9842b7cc82fc8d863dce6c98594f5c546aeb9d7c1ad0d771e8f9a9bb8a031cf4dbe64f61e52b76fa0cb1ff02b69814
+EBUILD ktorrent-21.11.90.ebuild 2909 BLAKE2B 554f1bc9a41164ded2bee591031a0aa398a26df6f147a59a72116b22f4a864680b1999b0be6b3d14bca8baed4d0c76e49a05f2e6a4a529778d9df9436764ec68 SHA512 885c5691474cd8fc8ae7509d038441867b53af29db0a09ec4c71440ff4fdec6eed0651cd882d1a97f029b53439835a73aa347ed10bcefcd823ca61ef302f0e2b
+MISC metadata.xml 1399 BLAKE2B ec759cf47712862524f1e836d010e231280c767d56c8e2a905ec84cb1f9a9a84d4a83039203e143a6995a12e0c46b36ef2eff743c98e4a6dd7a52d94dfe1cdb6 SHA512 4759b3d9b01da477f1127cac455c002aab62e721ed1838fd60f242ab2c3bee0990ad1da270635f9cbe451af5cde973a3592a0fcbfc4174ae0749f8c55b3b751a
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
deleted file mode 100644
index fc644bd80b8e..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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.08.3.ebuild b/net-p2p/ktorrent/ktorrent-21.08.3.ebuild
index dd5bcb4a1f50..f93aae27bb78 100644
--- a/net-p2p/ktorrent/ktorrent-21.08.3.ebuild
+++ b/net-p2p/ktorrent/ktorrent-21.08.3.ebuild
@@ -17,7 +17,7 @@ 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 +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
 
diff --git a/net-p2p/ktorrent/ktorrent-21.04.3.ebuild b/net-p2p/ktorrent/ktorrent-21.11.90.ebuild
index 36bd73349633..420415c1390d 100644
--- a/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
+++ b/net-p2p/ktorrent/ktorrent-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="optional"
 KDE_GEAR="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -17,8 +17,8 @@ HOMEPAGE="https://apps.kde.org/ktorrent/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
 
 COMMON_DEPEND="
@@ -45,11 +45,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=net-libs/libktorrent-${PVCUT}:5
 	infowidget? ( dev-libs/geoip )
-	kross? (
-		>=kde-frameworks/karchive-${KFMIN}:5
-		>=kde-frameworks/kitemviews-${KFMIN}:5
-		>=kde-frameworks/kross-${KFMIN}:5
-	)
 	mediaplayer? (
 		>=media-libs/phonon-4.11.0
 		>=media-libs/taglib-1.5
@@ -65,7 +60,7 @@ COMMON_DEPEND="
 	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
+	>=dev-libs/boost-1.71
 "
 RDEPEND="${COMMON_DEPEND}
 	ipfilter? (
@@ -77,8 +72,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 BDEPEND="sys-devel/gettext"
 
-PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
@@ -86,7 +79,6 @@ src_configure() {
 		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
 		-DWITH_SYSTEM_GEOIP=$(usex infowidget)
 		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
-		-DENABLE_SCRIPTING_PLUGIN=$(usex kross)
 		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
 		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
 		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
index 8f34748c6af5..3243e4ebf062 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -13,7 +13,6 @@
 		<flag name="downloadorder">Specify the download order of a multi-file torrent</flag>
 		<flag name="infowidget">Displays general information about a torrent in several tabs</flag>
 		<flag name="ipfilter">Filter IP addresses through a blocklist</flag>
-		<flag name="kross">Enable kross scripting support</flag>
 		<flag name="logviewer">Displays the logging output</flag>
 		<flag name="magnetgenerator">Generates magnet URI's</flag>
 		<flag name="mediaplayer">Phonon-based media player</flag>