gentoo resync : 25.08.2020

6 files changed, 31 insertions, 120 deletions

diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index eddc25fbfa01..c10923ec6d03 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,7 +1,4 @@
-AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c702a9b77bbbdda66d7ae44fa0a83993a007897ed2cc9193a4ddd8aba6c8ddc4b1319694246c0bb6bae94bf4dfc4c1591588 SHA512 94f2663bef9c5d31ebdc69538a4dc80b17b9f6835c4975f5b52f13a6bc03ba526b50ee91e1b4515c426e80e95e64f41e8d38980585638a4eb15c328e37fe6ac4
-AUX libktorrent-2.1.1-fileops.patch 748 BLAKE2B 5c36ed8660b28b76ea2302801ffc2cd098f3743a80fbdc29ac15ce2afe00e0fe05717bbd8ad3375c0a95e4a1c9072b3d1257a572ef1392441393443ea35e764f SHA512 f07cfbbd135d8a726ddbc16a8263676126370438d219c49e23f2796321970dbf10c34a96df92b96da870f5a488b2832049579dab3aabf48370ebb787b30be104
-DIST libktorrent-2.1.1.tar.xz 357516 BLAKE2B 8bcec166fa1d4f09b72c4f31c771d5316f7411da538b789b111b641c8ba551d9c88bd1d68d8ad96396e125bb6b16f9d4e2a42a6b2166b40572d730d692d3cf5d SHA512 5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37
+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
-EBUILD libktorrent-2.1.1.ebuild 1549 BLAKE2B b28f9f065dc542e90fb9ba9b74f3594446a5953ca760e7cce92129ed3af7b7f2910d771a4928c61729ef263042a09f6c8fa30bf2515fd0ee02201b555f3a04cc SHA512 23c283c72592ca9369187514a286ce2b6a1f0add2ae4ab99a79eba8428305fab30fa1b44ac55f214986b2fe816be52f9e0d1bc826ac1103c481d0e3aa66b36cb
-EBUILD libktorrent-2.2.0.ebuild 1498 BLAKE2B 6564bc13ed8debff400ce18e9b2b90645c3a59302c12ca7c6cad119a40d54f113de2d661fca10fe2a1e6cc7f2e9cd0818d8f082b4c4c29bcb372e93c086d7fa9 SHA512 6895485134172a9c0834367d04a5fc5fc8fae85d86bed4e5483739a722620c2af1c92c8aeb4290a4cf47591343d2d6aff6b7aa67bb0750394d58a714068306cb
+EBUILD libktorrent-2.2.0-r1.ebuild 1566 BLAKE2B 7cfb88beaab697d0d0ff3861213034fa06497964b94d521218954dc45ed2202552d7138244b2befd3e948840a9ba37ff94f484cef4e29d66534beea3b2267f28 SHA512 ccfece0c049cdad6f01adb2e26e6a5d17fd92358696de9db9bea9310b1b3826448fd2b6219da8735cf32190fedeb8d09e8ade66850d8d12f30b0422eae17e9ea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch b/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch
deleted file mode 100644
index 636c59d1b065..000000000000
--- a/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e7c4847d9bbdc5d7c7435039aa5088d276ca5bce Mon Sep 17 00:00:00 2001
-From: Jonathan Riddell <jr@jriddell.org>
-Date: Mon, 10 Jun 2019 13:27:29 +0100
-Subject: remove unused link to kcrash, it can be used by the apps which use
- libktorrent but it needs to be initialised not just arbitrarily linked to
-
----
- src/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d347e07..1578bf4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -235,7 +235,6 @@ PRIVATE
-     qca-qt5
- PUBLIC
-     KF5::Archive
--    KF5::Crash
-     KF5::KIOCore
-     KF5::KIOWidgets
-     KF5::Solid
--- 
-cgit v1.1
diff --git a/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch b/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
deleted file mode 100644
index 87d25e26b7be..000000000000
--- a/net-libs/libktorrent/files/libktorrent-2.1.1-fileops.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1e8ce6e98d7ca0088624778964b9aed4696ce030 Mon Sep 17 00:00:00 2001
-From: Christoph Feck <cfeck@kde.org>
-Date: Thu, 14 Nov 2019 14:19:42 +0100
-Subject: Fix build with XFS
-
-BUG: 414050
----
- src/util/fileops.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/fileops.cpp b/src/util/fileops.cpp
-index c76b0e3..cfe4d5e 100644
---- a/src/util/fileops.cpp
-+++ b/src/util/fileops.cpp
-@@ -366,7 +366,7 @@ namespace bt
- 
- 	bool XfsPreallocate(const QString & path, Uint64 size)
- 	{
--		int fd = ::open(QFile::encodeName(path), O_RDWR | O_LARGEFILE);
-+		int fd = ::open(QFile::encodeName(path).constData(), O_RDWR | O_LARGEFILE);
- 		if (fd < 0)
- 			throw Error(i18n("Cannot open %1: %2",path,strerror(errno)));
- 
--- 
-cgit v1.1
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
new file mode 100644
index 000000000000..bafdbaffefa5
--- /dev/null
+++ b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch
@@ -0,0 +1,26 @@
+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-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
deleted file mode 100644
index a71a4a0418bc..000000000000
--- a/net-libs/libktorrent/libktorrent-2.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent
-https://userbase.kde.org/KTorrent"
-SRC_URI="mirror://kde/stable/ktorrent/5.1.2/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	>=dev-libs/gmp-6.0.0a:0=
-	dev-libs/libgcrypt:0=
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-libs/botan[gmp(-)]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fileops.patch" # bug 700090
-	"${FILESDIR}/${PN}-2.1-unused-link.patch" # git master
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
-	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
-		CMakeLists.txt || die
-	sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
-		KF5TorrentConfig.cmake.in || die
-}
-
-src_test() {
-	# failing network tests
-	local myctestargs=(
-		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
-	)
-
-	ecm_src_test
-}
diff --git a/net-libs/libktorrent/libktorrent-2.2.0.ebuild b/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
index ea246055bc8d..dc2cd337b1ed 100644
--- a/net-libs/libktorrent/libktorrent-2.2.0.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://kde/stable/ktorrent/5.2.0/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
@@ -42,6 +42,8 @@ RDEPEND="${COMMON_DEPEND}
 	!dev-libs/botan[gmp(-)]
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-MultiFileCache.patch" ) # 2.2 branch
+
 src_prepare() {
 	ecm_src_prepare