gentoo resync : 28.04.2021

4 files changed, 10 insertions, 39 deletions

diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index eea1accce8fd..46917c4a924b 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,6 +1,5 @@
-AUX libktorrent-2.2.0-fix-MultiFileCache.patch 905 BLAKE2B a82395415166f2bb3475703e0ba3a7a428cd968e1ae3bb2df401f08db5d3f91518da38a7aba694bb7d56e4f089370c0532def676ace5c502549e718693783950 SHA512 99cd120d2e03bb9a64413d66810f67160afff066d9c15f36da335c838ee7d38f32d88ba9a4c7df1d0bf92c79bf50a080c0ddfc1004973f6c711d5d0aa9200bb8
-DIST libktorrent-2.2.0.tar.xz 357364 BLAKE2B 66a91fc32dc11a680d22755468513896c9cea1cbaef8664c84633860b78efba85e5c9e47684fdaaf7fb6f03f624268f9158ee2b8c6fc3d14b0e70339c1f6903e SHA512 2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a
 DIST libktorrent-20.12.3.tar.xz 604488 BLAKE2B e51bba82990632744aaadf3e40043fa80e64395f6f3721992780ff77d7663a0a3600aaf7d2653a00f32366555f1000a961c3e99de6d2e2cfecc4c1f79d1ebb00 SHA512 e2259251e8edbef6154674898614f81b3a29d5c711e9f751435450edbbb987c5e2a1d8ff864da5aa180b5d1adc3ef611f46175f2126faca52d1b1338d986d1cb
-EBUILD libktorrent-2.2.0-r1.ebuild 1551 BLAKE2B ea1add797a2ef00905b0c4bd7ddf18782e7f0d9f4e1533ce87df1bccb7fa7949a8edcab68891cc2ba0e46c574d5296dcd2aef9d05e3a72dbb231f2ae764f951a SHA512 7b1f88e1a44febb76014ed62e20b00f69910c56ff487d77003079ebf0551a34fa8158f01cc9239f853ff24cea3d0422a4ef93961c74effadcb0aedf46424f351
-EBUILD libktorrent-20.12.3.ebuild 1453 BLAKE2B 6af1132f972c7de12bc388f359979ce31b5f29028ed541b4a46f5c848efcc22aa262aa0ef6f94f42a610d383d70b9f650e60b86b40209002ea873fa9737ffd0e SHA512 ef93f6aba70813fee1822d7e69dc6a05dda7eff2bc8ed8ff301d1c707c7f508ceb2234560d2d1ae2baa41cb576a0b10766667ffa733edf5e274847d53655aeb5
+DIST libktorrent-21.04.0.tar.xz 603584 BLAKE2B 5fe1012bf5f18d3d8e08f1372216ccd975e544daf79063267285e06e29be20e9ca3f2a443bb52a8dec5a3bb3c3b927eec024e91c549cc22ff707db4e2d5bdd92 SHA512 b0455a589bf0d452c3df142182d677659fb4d0a3e4e80ca0dad9abc8c4c276bcd7b2f0889a0bf33ceddf1e71aaceaa3e654b26e904988a96e62ea42a0ba0952d
+EBUILD libktorrent-20.12.3.ebuild 1450 BLAKE2B 9622963f20945eb74d30d6a87fac967d4970d73dcd4ad2ebec04b528c708df172fa8a7ff7e8a19f3b6de5e91cc005259b1ab96ba613a530ac5a32e5f15c0b6e2 SHA512 c041d91582cff0e468eaf24319a79bfa482f238f9bdefb59bbac604aef15bf9cc5317564f31e62a1c142bd8df8aa8a4a7e9c35f6628b11db4a735f686f8def0d
+EBUILD libktorrent-21.04.0.ebuild 1442 BLAKE2B d5b0abc6b02740cefad1ad9ee4d25b8e47fd0b03148498d759fbcdb4173abf66a5862630e9292bd6f53b7109e921314698499cd291af2ee19ac720bdda12bdda SHA512 09ee605ddfb77fda18bdddf9361487b2cc846ba089760ef94e5a5aed6f6e7f776d7faa7f94aab786c09254e7d187bfe15cca827a5123d1189b910b2fd37de32c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
deleted file mode 100644
index bafdbaffefa5..000000000000
--- a/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b0abf8378d497c5a8881771518df6a02404d031 Mon Sep 17 00:00:00 2001
-From: Alexander Trufanov <trufanovan@gmail.com>
-Date: Tue, 16 Jun 2020 13:47:42 +0300
-Subject: [PATCH] Fix a bug in MultiFileCache
-
-Differential Revision: https://phabricator.kde.org/D29852
----
- src/diskio/multifilecache.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/diskio/multifilecache.cpp b/src/diskio/multifilecache.cpp
-index 0a513ad..882630e 100644
---- a/src/diskio/multifilecache.cpp
-+++ b/src/diskio/multifilecache.cpp
-@@ -455,7 +455,7 @@ namespace bt
- 			off = file_off + (piece_off - chunk_off);
- 			len = piece_len;
- 		}
--		else if(piece_off >= chunk_off && piece_len < chunk_off + chunk_len)
-+		else if(piece_off >= chunk_off && piece_off < chunk_off + chunk_len)
- 		{
- 			// The start of the piece lies partially in the current file
- 			off = file_off + (piece_off - chunk_off);
--- 
-GitLab
-
diff --git a/net-libs/libktorrent/libktorrent-20.12.3.ebuild b/net-libs/libktorrent/libktorrent-20.12.3.ebuild
index 3bb33235eb97..d1f8b32bb18d 100644
--- a/net-libs/libktorrent/libktorrent-20.12.3.ebuild
+++ b/net-libs/libktorrent/libktorrent-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/ktorrent https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild b/net-libs/libktorrent/libktorrent-21.04.0.ebuild
index 95565a6e37af..13cda9ce275e 100644
--- a/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.04.0.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="forceoptional"
+KDE_GEAR="true"
 KDE_ORG_CATEGORY="network"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="BitTorrent library based on KDE Frameworks"
 HOMEPAGE="https://apps.kde.org/en/ktorrent https://userbase.kde.org/KTorrent"
-SRC_URI="mirror://kde/stable/ktorrent/5.2.0/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
+	>=app-crypt/qca-2.3.0:2
 	>=dev-libs/gmp-6.0.0a:0=
 	dev-libs/libgcrypt:0=
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -41,8 +41,6 @@ RDEPEND="${COMMON_DEPEND}
 	!dev-libs/botan[gmp(-)]
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-MultiFileCache.patch" ) # 2.2 branch
-
 src_prepare() {
 	ecm_src_prepare