gentoo resync : 19.07.2019

3 files changed, 85 insertions, 0 deletions

diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 2d99bbfa521c..be5eecb91762 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,3 +1,5 @@
+AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c702a9b77bbbdda66d7ae44fa0a83993a007897ed2cc9193a4ddd8aba6c8ddc4b1319694246c0bb6bae94bf4dfc4c1591588 SHA512 94f2663bef9c5d31ebdc69538a4dc80b17b9f6835c4975f5b52f13a6bc03ba526b50ee91e1b4515c426e80e95e64f41e8d38980585638a4eb15c328e37fe6ac4
 DIST libktorrent-2.1.tar.xz 355476 BLAKE2B c86205174ac0526455cc9d2049cd918fa1127e85ca18422823f89c3714950d6e4f606dabbeca4d615a17fc18d8032ef0cf86aa4d80726116ea667d9f257e0ddc SHA512 28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4
 EBUILD libktorrent-2.1-r1.ebuild 1326 BLAKE2B 1e04b16a55c073df66afe29fafa9d8ff1dd0002d4345a10d49e2e05761d3ee6bca908c8f114fd12fbfb6dff39bfd187f48c14713b289f2eea00c73344530f7ec SHA512 9193ee0e624eda49cdb70ae68fe8f48f7578b75ea7f07d60c8e8a06c408ae9582cff1c29d0261cdfd39e4bd94661b5400c3fe1191fe498683717551f1e7d6a4a
+EBUILD libktorrent-2.1-r2.ebuild 1358 BLAKE2B 82841bdd24bf9dad048f5947130ab721780037bc2bbd641450921884111363d6450d3ec5b65908254211aa57983a542f538ec42be075b529f92c065de3cdd6e1 SHA512 ae1c814a77cafa6880e224d2bbe7104af5608d66ebf0c3a84286cea84c14d95b40b96b92da245d5f992f8d515f86c38bf038c86b800ada95398d7ced339bcaab
 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
new file mode 100644
index 000000000000..636c59d1b065
--- /dev/null
+++ b/net-libs/libktorrent/files/libktorrent-2.1-unused-link.patch
@@ -0,0 +1,24 @@
+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/libktorrent-2.1-r2.ebuild b/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
new file mode 100644
index 000000000000..230154addc5c
--- /dev/null
+++ b/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="BitTorrent library based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+SRC_URI="mirror://kde/stable/ktorrent/5.1/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="sys-devel/gettext"
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5(+)]
+	>=dev-libs/gmp-6.0.0a:0=
+	dev-libs/libgcrypt:0=
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/botan[gmp(-)]
+"
+
+PATCHES=( "${FILESDIR}/${P}-unused-link.patch" )
+
+src_prepare() {
+	kde5_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|transmit)"
+	)
+
+	kde5_src_test
+}