diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-p2p/ktorrent | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'net-p2p/ktorrent')
-rw-r--r-- | net-p2p/ktorrent/Manifest | 8 | ||||
-rw-r--r-- | net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch | 23 | ||||
-rw-r--r-- | net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch | 40 | ||||
-rw-r--r-- | net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch | 24 | ||||
-rw-r--r-- | net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch | 69 | ||||
-rw-r--r-- | net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild | 109 | ||||
-rw-r--r-- | net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild | 83 |
7 files changed, 44 insertions, 312 deletions
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index d737fd87eead..1c4d917a3689 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,11 +1,5 @@ -AUX ktorrent-5.1.1-kcrash.patch 616 BLAKE2B 3293f03911337f447b56ec7bfff36dbdfc4bfa1ed39b06f58522c3a1d31cb87d1df47fec689090eb77927cb14956df3e127d70a8b633013d75ddd6ac2db5ed96 SHA512 c4b2ce42fc2e9048ec1137d522b22d5be8a96e2e73e6b2506d1e9c640403f3fb7ef67c54881975d90907b8324cb04e8a8518a4de4840299ed54f81b415b2d4c8 -AUX ktorrent-5.1.1-kdehig.patch 1320 BLAKE2B b34d97f8e55358e97a898c6c4e0b88040a4965a11b3d0ca3904e51d529912265887cdfc4c57200f793fca41495d2ec31511ef1bce987c9ff3ac0579ea9ab7527 SHA512 fbfedc1fc9d17cc4705f66b03853e749b693d6a9477981d6564735a6cf3711b7ff237c0728a300ac8c63378c3085073318ae89da8cfb7f56c854910bdcc90fca -AUX ktorrent-5.1.1-missing-header.patch 609 BLAKE2B 9d27522bb0309775dd330447993ba13d6b2730de74a241ebf091b9fe96a41fa157bf34ac4ec95820ce285c7305f8ebed9010a74af82fc8a26116bb68a95f60cb SHA512 571736ad190d2e75e5d6e1457d688e177388477e346e18f37c05bc74b9d97d3834897d0352b09c6469f3d5e996b093b827ebc0e5054005b8cfa5a5fc5b9fda16 -AUX ktorrent-5.1.1-scanfolder-memcorruption.patch 2244 BLAKE2B 53efe0320124f954adff60144981d740e5cdf45ed4712fa43f112bb6133fb24b4303e6f969d9a73598525dea4f6706c22e57d2e5c7378c69e494dd924360a307 SHA512 8d3868a6f75e2f53fa11762378a676736df09e14e6fbde04f0dcfb45eb56e8b739d17b3ea96af4be21edb22edad610982865b33508847f07ac2eba744f62ae5e AUX ktorrent-5.1.1-singlefile-torrent.patch 4654 BLAKE2B 8bef064068df9db5b82eb16e5ca04bb618378c94a5d218654aabb5e49dcc5db1a8b8fd92a4ed6e3e922f8a2eebdf23f4d460261fd396b7a7b8319cc102dce9f8 SHA512 e74632a86967440733ed0d3da9249a04dfe401d3966bc385581b5ba5e50e864b288fb0ca4e1ac17b754289fd8aeb70119f8c1981e9478afff434e17138beb151 AUX ktorrent-5.1.2-crash-on-exit.patch 13261 BLAKE2B 735100f666ad7b6d0dccfcf3b5cd8582b52a6d818cd76e6ceb10e5a4a57e488eff625a94002156a5d01480c6f87e4dd05d5d5669b9accbe2973ac586bd4ef820 SHA512 5ba7b1c9bea3eae2886d2e6c6394464077b56cf1e77322a504ddb200db7a0b4130d6fdf75bfe7d3d9786c7c5507d8cb0b48c387cdf0eb77c54f9e8510287568b -DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06 DIST ktorrent-5.1.2.tar.xz 2048604 BLAKE2B 761df1e0aab5c4457311ae821a47ebf7b5b82b2839b4bf238491231caa213370cc649a1c0cafd332b42bbb84230f4a313e5172db722ff3c7af81c0daba450a98 SHA512 b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621 -EBUILD ktorrent-5.1.1-r1.ebuild 3192 BLAKE2B 5d0e9eb5e8a38f4f81c1928158f96973695f179fe7e423317e00959627ea2b66547d1ad043297898dd06ddb230735c1999180c3b43e7385d44689b4b74053ace SHA512 ee10006a6f529e1860f9499cf85df90e19ec8f2c39d03c714465e8a72104bfd82ee09b062f56307c9483f579d1df646549d2bd17df4a77f62e4b9ad3cec31899 -EBUILD ktorrent-5.1.2-r2.ebuild 3116 BLAKE2B 82308ad33f720e1227de906fd5d5d43040ca14010d49ef9699f80810619a825eb9e6f86d702ff9299b4bf96cc46c60f042c907dada286fe8d160c467e8c3c274 SHA512 42a9685512c197308bc791574cf2c6936d81ca4abbf0b9804aae513550059d9c1605852985972d5a6cc56643b95af17d9ec58dbd0e3148bbb5157396a3804fe4 +EBUILD ktorrent-5.1.2-r2.ebuild 3347 BLAKE2B 5bb90db40f6f451603cd3d0c4d56ce0db5965839ae708830494448aec38fc42fa21b10acc31fa4428af68baee41d3dcc6d7ffc385105b70552d67ec1f356834d SHA512 2d3e7220badc77282b556acaa31722e1a5beb227a610c55cfeabbc226744bc17137de8548a1c4af2327549b80041ae85718cc8eb2b2e1bc3fd2e8293d80469b6 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80 diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch deleted file mode 100644 index 8beffd97b4cc..000000000000 --- a/net-p2p/ktorrent/files/ktorrent-5.1.1-kcrash.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3ff87f67e984e514a968ddf388a4056f8aa2e723 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Tue, 11 Jun 2019 22:59:15 +0200 -Subject: Fix build. Needs KCrash - ---- - ktorrent/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ktorrent/CMakeLists.txt b/ktorrent/CMakeLists.txt -index e8c29af..326c59a 100644 ---- a/ktorrent/CMakeLists.txt -+++ b/ktorrent/CMakeLists.txt -@@ -110,6 +110,7 @@ target_link_libraries(ktorrent_app - KF5::WidgetsAddons - KF5::WindowSystem - KF5::XmlGui -+ KF5::Crash - ) - - install(TARGETS ktorrent_app ${INSTALL_TARGETS_DEFAULT_ARGS}) --- -cgit v1.1 diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch deleted file mode 100644 index 971152298895..000000000000 --- a/net-p2p/ktorrent/files/ktorrent-5.1.1-kdehig.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c77b09fe37ac00c86e6ac43db5e43b325fa4d8a1 Mon Sep 17 00:00:00 2001 -From: Carl Schwan <schwancarl@protonmail.com> -Date: Thu, 14 Mar 2019 23:24:27 +0100 -Subject: Follow KDE HIG by using ellipis - -Summary: -See https://hig.kde.org/style/writing/placeholder.html#actions - -@stikonas I add you as reviewer because I saw that you are last contributor to KTorrent :D - -Test Plan: Build and run - -Reviewers: #vdg, stikonas, ngraham - -Reviewed By: #vdg, stikonas, ngraham - -Subscribers: stikonas - -Maniphest Tasks: T10258 - -Differential Revision: https://phabricator.kde.org/D19772 ---- - ktorrent/view/torrentsearchbar.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ktorrent/view/torrentsearchbar.cpp b/ktorrent/view/torrentsearchbar.cpp -index 045d695..2e9c428 100644 ---- a/ktorrent/view/torrentsearchbar.cpp -+++ b/ktorrent/view/torrentsearchbar.cpp -@@ -46,7 +46,7 @@ namespace kt - - search_bar = new QLineEdit(this); - search_bar->setClearButtonEnabled(true); -- search_bar->setPlaceholderText(i18n("Torrent filter")); -+ search_bar->setPlaceholderText(i18n("Filter...")); - connect(search_bar, SIGNAL(textChanged(QString)), view, SLOT(setFilterString(QString))); - connect(this, SIGNAL(filterBarShown(QString)), view, SLOT(setFilterString(QString))); - --- -cgit v1.1 diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch deleted file mode 100644 index b574d3028249..000000000000 --- a/net-p2p/ktorrent/files/ktorrent-5.1.1-missing-header.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 909215cc912d89fbc8573f2f98e3b433472d8eae Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 9 Aug 2019 20:54:52 +0200 -Subject: [PATCH] Add missing QVector - ---- - libktcore/plugin/pluginmanager.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libktcore/plugin/pluginmanager.h b/libktcore/plugin/pluginmanager.h -index 50eaa768..3a04a729 100644 ---- a/libktcore/plugin/pluginmanager.h -+++ b/libktcore/plugin/pluginmanager.h -@@ -23,6 +23,7 @@ - - #include <QList> - #include <QStringList> -+#include <QVector> - - #include <KPluginInfo> - #include <KPluginMetaData> --- -2.22.0 - diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch b/net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch deleted file mode 100644 index 4c41a6af11db..000000000000 --- a/net-p2p/ktorrent/files/ktorrent-5.1.1-scanfolder-memcorruption.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 2d73d5f25a1a364a2115fb1d3262377f7fdf99cd Mon Sep 17 00:00:00 2001 -From: Valeriy Malov <jazzvoid@gmail.com> -Date: Wed, 5 Sep 2018 20:43:51 +0300 -Subject: Fix memory corruption in ScanFolder plugin - -Summary: -Reasoning behind this patch is kinda dubious because I don't fully understand what happens, but it shouldn't make the matters worse either - -Seems like deletion of KDirWatch objects from scan_folder in ~ScanThread(), after said QThread has been stopped, causes memory corruption. - -Preemptively deleting scan_folder contents before we stop the thread resolves this. - -also mark booleans shared across main thread and KDirWatch callbacks as atomic - -Test Plan: -Without this patch unloading ScanFolder plugin sometimes crashes ktorrent, including unloading on exit -Doesn't happen anymore with this patch - -Reviewers: stikonas - -Reviewed By: stikonas - -Differential Revision: https://phabricator.kde.org/D15265 ---- - plugins/scanfolder/scanthread.cpp | 5 +++++ - plugins/scanfolder/scanthread.h | 5 +++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/plugins/scanfolder/scanthread.cpp b/plugins/scanfolder/scanthread.cpp -index 0e62768..d7b13e0 100644 ---- a/plugins/scanfolder/scanthread.cpp -+++ b/plugins/scanfolder/scanthread.cpp -@@ -156,6 +156,11 @@ namespace kt - void ScanThread::stop() - { - stop_requested = true; -+ -+ // XXX seems like deleting KDirWatch object(s) created in scan_folders -+ // in destructor of this QThread after it has been stopped -+ // causes memory corruption, so we delete them early -+ scan_folders.clear(); - exit(); - wait(); - } -diff --git a/plugins/scanfolder/scanthread.h b/plugins/scanfolder/scanthread.h -index d13ca08..fb214a4 100644 ---- a/plugins/scanfolder/scanthread.h -+++ b/plugins/scanfolder/scanthread.h -@@ -29,6 +29,7 @@ - #include <util/ptrmap.h> - #include "scanfolder.h" - -+#include <atomic> - - class QDir; - -@@ -88,8 +89,8 @@ namespace kt - private: - QMutex mutex; - QStringList folders; -- bool stop_requested; -- bool recursive; -+ std::atomic<bool> stop_requested; -+ std::atomic<bool> recursive; - bt::PtrMap<QString, ScanFolder> scan_folders; - }; - --- -cgit v0.11.2 diff --git a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild deleted file mode 100644 index 443883b0dbca..000000000000 --- a/net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="optional" -KDE_TEST="optional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks" -HOMEPAGE="https://kde.org/applications/internet/ktorrent/" -[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator -+mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf" - -BDEPEND="sys-devel/gettext" -COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - >=net-libs/libktorrent-2.1:5 - infowidget? ( dev-libs/geoip ) - kross? ( - $(add_frameworks_dep karchive) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kross) - ) - mediaplayer? ( - media-libs/phonon[qt5(+)] - >=media-libs/taglib-1.5 - ) - rss? ( - $(add_frameworks_dep kdewebkit) - $(add_frameworks_dep syndication) - ) - search? ( - $(add_frameworks_dep kdewebkit) - >=dev-qt/qtwebkit-5.212.0_pre20180120:5 - ) - shutdown? ( $(add_plasma_dep plasma-workspace) ) - stats? ( $(add_frameworks_dep kplotting) ) - upnp? ( $(add_frameworks_dep kcompletion) ) - zeroconf? ( $(add_frameworks_dep kdnssd) ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - ipfilter? ( - app-arch/bzip2 - app-arch/unzip - $(add_frameworks_dep ktextwidgets) - $(add_kdeapps_dep kio-extras) - ) -" - -PATCHES=( - "${FILESDIR}/${P}-scanfolder-memcorruption.patch" - "${FILESDIR}/${P}-kdehig.patch" - "${FILESDIR}/${P}-singlefile-torrent.patch" - "${FILESDIR}/${P}-kcrash.patch" - "${FILESDIR}/${P}-missing-header.patch" -) - -src_configure() { - local mycmakeargs=( - -DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler) - -DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder) - -DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget) - -DWITH_SYSTEM_GEOIP=$(usex infowidget) - -DENABLE_IPFILTER_PLUGIN=$(usex ipfilter) - -DENABLE_SCRIPTING_PLUGIN=$(usex kross) - -DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer) - -DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator) - -DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer) - $(cmake-utils_use_find_package rss KF5Syndication) - -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder) - -DENABLE_SEARCH_PLUGIN=$(usex search) - -DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown) - -DENABLE_STATS_PLUGIN=$(usex stats) - -DENABLE_UPNP_PLUGIN=$(usex upnp) - -DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf) - ) -# add back when ported -# -DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface) - kde5_src_configure -} diff --git a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild index 95f9bf8408b4..cac1657e6a9e 100644 --- a/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild +++ b/net-p2p/ktorrent/ktorrent-5.1.2-r2.ebuild @@ -3,66 +3,69 @@ EAPI=7 -KDE_HANDBOOK="optional" -KDE_TEST="optional" +ECM_HANDBOOK="optional" +ECM_TEST="optional" +KFMIN=5.60.0 +QTMIN=5.12.3 VIRTUALX_REQUIRED="test" -inherit kde5 +inherit ecm kde.org DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks" -HOMEPAGE="https://kde.org/applications/internet/ktorrent/" +HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent" [[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz" LICENSE="GPL-2" +SLOT="5" KEYWORDS="amd64 arm64 ~x86" IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf" BDEPEND="sys-devel/gettext" COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 >=net-libs/libktorrent-2.1.1:5 infowidget? ( dev-libs/geoip ) kross? ( - $(add_frameworks_dep karchive) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kross) + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kross-${KFMIN}:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( - $(add_frameworks_dep kdewebkit) - $(add_frameworks_dep syndication) + >=kde-frameworks/kdewebkit-${KFMIN}:5 + >=kde-frameworks/syndication-${KFMIN}:5 ) search? ( - $(add_frameworks_dep kdewebkit) >=dev-qt/qtwebkit-5.212.0_pre20180120:5 + >=kde-frameworks/kdewebkit-${KFMIN}:5 ) - shutdown? ( $(add_plasma_dep plasma-workspace) ) - stats? ( $(add_frameworks_dep kplotting) ) - upnp? ( $(add_frameworks_dep kcompletion) ) - zeroconf? ( $(add_frameworks_dep kdnssd) ) + shutdown? ( >=kde-plasma/plasma-workspace-5.15.5 ) + stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 ) + upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 ) + zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 ) " DEPEND="${COMMON_DEPEND} dev-libs/boost @@ -71,8 +74,8 @@ RDEPEND="${COMMON_DEPEND} ipfilter? ( app-arch/bzip2 app-arch/unzip - $(add_frameworks_dep ktextwidgets) - $(add_kdeapps_dep kio-extras) + >=kde-apps/kio-extras-19.04.3 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 ) " @@ -92,7 +95,7 @@ src_configure() { -DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer) -DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator) -DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer) - $(cmake-utils_use_find_package rss KF5Syndication) + $(cmake_use_find_package rss KF5Syndication) -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder) -DENABLE_SEARCH_PLUGIN=$(usex search) -DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown) @@ -101,6 +104,6 @@ src_configure() { -DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf) ) # add back when ported -# -DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface) - kde5_src_configure +# -DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface) + ecm_src_configure } |