gentoo resync : 15.01.2020

3 files changed, 18 insertions, 75 deletions

diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index d90dbd760a99..fb03a19d2fe2 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,7 +1,5 @@
 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
-DIST libktorrent-2.1.tar.xz 355476 BLAKE2B c86205174ac0526455cc9d2049cd918fa1127e85ca18422823f89c3714950d6e4f606dabbeca4d615a17fc18d8032ef0cf86aa4d80726116ea667d9f257e0ddc SHA512 28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4
-EBUILD libktorrent-2.1-r2.ebuild 1355 BLAKE2B 6b8e1600b6c8eeb8d447166aeac2310cfc3de7b3ec50df02a087bc8306ed53ef6cb21a9dfb453a136c86ff85d87794db6ac06f17b87edceb6cb731f08f58ab64 SHA512 e11dd93dd788c50b93871d3c1bc8c34fd13bbc3db041933b31a0ab29c3b22f412e31186b977e5347e23b65f04620954e425edfda08302bc09b1122f07b3a2771
-EBUILD libktorrent-2.1.1.ebuild 1420 BLAKE2B 3b04160943d1eb14fa788320ba37b9771764d638857a64013311e103c8e3d274430732d6eccb23d2e1bc6f773c3998ec00cb6c88ae0202cd1ccd7f0427872671 SHA512 07f3566eb6cf8afdecf78985c01d5d9e0b479896087a35d736a26afb0eeacae60e12d410cc47310c449738dfae3473e01233d10687b00042e85fa9d1d54fdb26
+EBUILD libktorrent-2.1.1.ebuild 1549 BLAKE2B b28f9f065dc542e90fb9ba9b74f3594446a5953ca760e7cce92129ed3af7b7f2910d771a4928c61729ef263042a09f6c8fa30bf2515fd0ee02201b555f3a04cc SHA512 23c283c72592ca9369187514a286ce2b6a1f0add2ae4ab99a79eba8428305fab30fa1b44ac55f214986b2fe816be52f9e0d1bc826ac1103c481d0e3aa66b36cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-2.1-r2.ebuild b/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
deleted file mode 100644
index 113538733505..000000000000
--- a/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
-}
diff --git a/net-libs/libktorrent/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
index 9399cfd161ba..a71a4a0418bc 100644
--- a/net-libs/libktorrent/libktorrent-2.1.1.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
@@ -3,31 +3,35 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+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="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(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=
+	>=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
@@ -42,7 +46,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	kde5_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}\" //" \
@@ -57,5 +61,5 @@ src_test() {
 		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }