gentoo resync : 14.12.2020

4 files changed, 110 insertions, 6 deletions

diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 944180bd02ab..e3d652275f06 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,5 +1,7 @@
 AUX ktorrent-5.2.0-fix-start-in-systray.patch 769 BLAKE2B c9832a15f75bd5495fb59e2521bb82e0bb0fe530d3132ea52147c8dc531162f96e165011fd7f61fc046a4d5dc7e52ca1a9be74a0790b0b2b62ca968bd8c9d45d SHA512 67b9ce967fc295ece3607f909f80cf1362fdd88d7172c9ec556275fab2019d016440b9f605a49e50eb0fd82f7c7c0bc3b78195204215630aba0d848df6d4ba15
 AUX ktorrent-5.2.0-taglib-linking.patch 8105 BLAKE2B 232c167489c139973b1c57cd2330c4f27c5878843593ecfd3c5020384f5bf891c06ac21c0a5644d0881cf846ed712441e7501f560a711b8d4e72481599cb40d6 SHA512 4dc3d63e07c8f8c56019ab95230dadf3e9fbe37eb7d7f9ed31e58ebca9219b47e6bec78049e36ce1b783620b82b386e71ca9fc1d6bb797e56ac521daa5f0d996
+DIST ktorrent-20.12.0.tar.xz 2140524 BLAKE2B bfcdb8aa872dd4f974334bef2cfd794fc667dc08c270fcf0fae369e1ce6a899ad57105e2bdfa307d749b15aab928c8aa5ebac3fff17ccfa512aba39e92822f75 SHA512 bdfa0a67756169625668b2b062c9e4b980127923f7ce45ce7b47201bba9a6278c88f7a51be93055bcea0d21afeabc0203210171d996749c98e1f0662e26ff76d
 DIST ktorrent-5.2.0.tar.xz 2056012 BLAKE2B c59cb34675b9c4e023b6c22f795bf146d64acaea069efa1f1663888a0ada6f7c8328a15bdc2fc453e31a9f451c6b0203dfdfd02098cc52f5d828b87c23d857b5 SHA512 141976612cfe6bf4bd06e96842d7bc51ced7a3ab8e13c25446a00c031054698f851fbb1a31f3425dda5a428408bb1ceb51a4a420eaf2e79193b17a0cc7d7a387
-EBUILD ktorrent-5.2.0-r1.ebuild 3314 BLAKE2B f871be20725d1ad27f0ff93658ee2fc29f660e105f69b4e8bfd0afb5141ca924d49b85d8962eb9a9a0d6f9eace013501292860af0d06f899fdcdfb7f2ce7e71d SHA512 d074b368981deb065a2f36c0505f00e27191a4938a5a6a12739b75e4b6eef946be5baa4299538bbb1d05c023e1a8781907b82ae4a9974d2ac6026764611d31d4
-MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
+EBUILD ktorrent-20.12.0.ebuild 3093 BLAKE2B 49e08a51826b81bde16d861d3d9d884e9b420c54965a20ddf1aa9fe5ea45b36d5afcd709aafbdead1004f2ac4091687024a042555b45e930a5edae9ca81423e5 SHA512 4d39094bf9cb70d0865da7eb781fae57e1845cb13700d5133ea4bb4cfbecd67b815d2a7631cd7577eff49ae2d222a1b868c431452913717c71132ca1604030f6
+EBUILD ktorrent-5.2.0-r1.ebuild 3323 BLAKE2B 5ad47003adf805cc00c62ba4e64ef92ff5e8f65dddd7024478500d5805725ca5c73688c9990662cdccc2512899efd46e4f3f74bb32c6d75317c0ce32cffd4652 SHA512 ecaed570927d6181dd2cfa41a5c0dacafc65252f72e628b64b99a31cd2a0a179e3adcabab3c42b538ed014e5be45801d949edb86188dbfd80354983cde144457
+MISC metadata.xml 1389 BLAKE2B b928cdf2526433fcf48c5600049b27c9f7c12aa043a332931b5a567d1baff9fa0bb0ac6e4e8de056947637d1253ee338a8b6620e52b294b20cdd7127a3b1c81d SHA512 4cf5204afc5a9f451752efcf1bae64a947c3bbb0d259641a85771071a7c390ee50818518a15c38f47f7778cdb3ff10732428dfff3c99a09049ca8c2486736991
diff --git a/net-p2p/ktorrent/ktorrent-20.12.0.ebuild b/net-p2p/ktorrent/ktorrent-20.12.0.ebuild
new file mode 100644
index 000000000000..627b5dd09646
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-20.12.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KDE_RELEASE_SERVICE="true"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/en/ktorrent"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
++mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
+
+BDEPEND="sys-devel/gettext"
+COMMON_DEPEND="
+	>=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-${PVCUT}:5
+	infowidget? ( dev-libs/geoip )
+	kross? (
+		>=kde-frameworks/karchive-${KFMIN}:5
+		>=kde-frameworks/kitemviews-${KFMIN}:5
+		>=kde-frameworks/kross-${KFMIN}:5
+	)
+	mediaplayer? (
+		>=media-libs/phonon-4.11.0
+		>=media-libs/taglib-1.5
+	)
+	rss? (
+		>=dev-qt/qtwebengine-${QTMIN}:5
+		>=kde-frameworks/syndication-${KFMIN}:5
+	)
+	shutdown? ( kde-plasma/libkworkspace:5 )
+	stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 )
+	upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	ipfilter? (
+		app-arch/bzip2
+		app-arch/unzip
+		kde-apps/kio-extras:5
+		>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	)
+"
+
+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_use_find_package rss KF5Syndication)
+		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
+		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
+		-DENABLE_STATS_PLUGIN=$(usex stats)
+		-DENABLE_UPNP_PLUGIN=$(usex upnp)
+		-DENABLE_SEARCH_PLUGIN=$(usex webengine)
+		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
+	)
+# add back when ported
+# 		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
+	ecm_src_configure
+}
diff --git a/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
index f558a1a6c1db..45aada634c71 100644
--- a/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.2.0-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
-+mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
++mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
 
 BDEPEND="sys-devel/gettext"
 COMMON_DEPEND="
@@ -58,10 +58,10 @@ COMMON_DEPEND="
 		>=dev-qt/qtwebengine-${QTMIN}:5
 		>=kde-frameworks/syndication-${KFMIN}:5
 	)
-	search? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 	shutdown? ( kde-plasma/libkworkspace:5 )
 	stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 )
 	upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -99,10 +99,10 @@ src_configure() {
 		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
 		$(cmake_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_SEARCH_PLUGIN=$(usex webengine)
 		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
 	)
 # add back when ported
diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
index 4bd864220a5c..9abfbc50e83a 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -16,10 +16,10 @@
 		<flag name="mediaplayer">Phonon-based media player</flag>
 		<flag name="rss">Syndication plugin for KTorrent, supporting RSS and Atom feeds</flag>
 		<flag name="scanfolder">Scan folders for torrent files and load them</flag>
-		<flag name="search">Search for torrents</flag>
 		<flag name="shutdown">Shutdown when done</flag>
 		<flag name="stats">Shows statistics about torrents in several graphs</flag>
 		<flag name="upnp">Forward ports using UPnP</flag>
+		<flag name="webengine">Embedded search for torrents using <pkg>dev-qt/qtwebengine</pkg></flag>
 		<flag name="zeroconf">Discover peers on the local network using the Zeroconf protocol</flag>
 	</use>
 </pkgmetadata>