[gentoo-commits] repo/gentoo:master commit in: net-libs/libktorrent/files/, net-libs/libktorrent/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     1895e43781508b9ba35eb9eef3fa4f90f96ee41a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 20:15:08 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 21:33:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1895e437

net-libs/libktorrent: Drop 2.1.1

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/libktorrent/Manifest                      |  1 -
 .../files/libktorrent-2.1-unused-link.patch        | 24 --------
 .../files/libktorrent-2.1.1-fileops.patch          | 25 ---------
 net-libs/libktorrent/libktorrent-2.1.1.ebuild      | 65 ----------------------
 4 files changed, 115 deletions(-)

diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 8ac1557721f..b62315abb6a 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,2 +1 @@
-DIST libktorrent-2.1.1.tar.xz 357516 BLAKE2B 8bcec166fa1d4f09b72c4f31c771d5316f7411da538b789b111b641c8ba551d9c88bd1d68d8ad96396e125bb6b16f9d4e2a42a6b2166b40572d730d692d3cf5d SHA512 5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37
 DIST libktorrent-2.2.0.tar.xz 357364 BLAKE2B 66a91fc32dc11a680d22755468513896c9cea1cbaef8664c84633860b78efba85e5c9e47684fdaaf7fb6f03f624268f9158ee2b8c6fc3d14b0e70339c1f6903e SHA512 2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a

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 636c59d1b06..00000000000
--- 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 87d25e26b7b..00000000000
--- 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/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
deleted file mode 100644
index a71a4a0418b..00000000000
--- 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
-}