[gentoo-commits] proj/kde:master commit in: net-p2p/ktorrent/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     084c9732d53fa2910ec60a5ddd03608e33fab5b8
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 14:40:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 13:22:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=084c9732

net-p2p/ktorrent: Add back USE=kross,rss,scanfolder

Package-Manager: portage-2.2.28

 net-p2p/ktorrent/ktorrent-9999.ebuild | 34 ++++++++++++----------------------
 net-p2p/ktorrent/metadata.xml         |  3 +++
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/net-p2p/ktorrent/ktorrent-9999.ebuild b/net-p2p/ktorrent/ktorrent-9999.ebuild
index 978204d..f33d84f 100644
--- a/net-p2p/ktorrent/ktorrent-9999.ebuild
+++ b/net-p2p/ktorrent/ktorrent-9999.ebuild
@@ -31,8 +31,9 @@ DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
 HOMEPAGE="http://ktorrent.pwsp.net/"
 
 LICENSE="GPL-2"
-IUSE="+bwscheduler +downloadorder +infowidget +logviewer
-+magnetgenerator +mediaplayer +shutdown +stats +upnp +zeroconf"
+IUSE="+bwscheduler +downloadorder +infowidget +kross +logviewer
++magnetgenerator +mediaplayer rss +scanfolder +shutdown +stats
++upnp +zeroconf"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -55,7 +56,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
@@ -63,10 +63,15 @@ COMMON_DEPEND="
 	<net-libs/libktorrent-${LIBKT_VERSION_MAX}:5
 	>=net-libs/libktorrent-${LIBKT_VERSION_MIN}:5
 	infowidget? ( dev-libs/geoip )
+	kross? ( $(add_frameworks_dep kross) )
 	mediaplayer? (
 		media-libs/phonon[qt5]
 		>=media-libs/taglib-1.5
 	)
+	rss? (
+		$(add_frameworks_dep kdewebkit)
+		$(add_kdeapps_dep syndication)
+	)
 	shutdown? ( $(add_plasma_dep plasma-workspace) )
 	stats? ( $(add_frameworks_dep kplotting) )
 	zeroconf? ( $(add_frameworks_dep kdnssd) )
@@ -78,32 +83,17 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!net-p2p/ktorrent:4
 "
-# add back when ported - DEPEND
-# 	kross? ( $(add_frameworks_dep kross) )
-# 	rss? ( $(add_kdeapps_dep kdepimlibs) )
 # add back when ported - RDEPEND
 # 	ipfilter? (
 # 		app-arch/bzip2
 # 		app-arch/unzip
 # 		$(add_kdeapps_dep kdebase-kioslaves)
 # 	)
-# 	kross? ( $(add_kdebase_dep krosspython) )
-
-# src_prepare() {
-# add back when ported
-# 	if ! use plasma; then
-# 		sed -i \
-# 			-e "s:add_subdirectory(plasma):#nada:g" \
-# 			CMakeLists.txt || die "Failed to make plasmoid optional"
-# 	fi
-#
-# 	kde5_src_prepare
-# }
 
 src_prepare() {
 	kde5_src_prepare
 
-	punt_bogus_dep KF5 Kross
+	use kross || punt_bogus_dep KF5 Kross
 }
 
 src_configure() {
@@ -112,9 +102,12 @@ src_configure() {
 		-DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
 		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
 		-DWITH_SYSTEM_GEOIP=$(usex infowidget)
+		-DENABLE_SCRIPTING_PLUGIN=$(usex kross)
 		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
 		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
 		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
+		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
+		-DENABLE_SYNDICATION_PLUGIN=$(usex rss)
 		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
 		-DENABLE_STATS_PLUGIN=$(usex stats)
 		-DENABLE_UPNP_PLUGIN=$(usex upnp)
@@ -122,9 +115,6 @@ src_configure() {
 	)
 # add back when ported
 # 		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
-# 		-DENABLE_SCRIPTING_PLUGIN=$(usex kross)
-# 		-DENABLE_SYNDICATION_PLUGIN=$(usex rss)
-# 		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
 # 		-DENABLE_SEARCH_PLUGIN=$(usex search)
 # 		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
 	kde5_src_configure

diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
index 46e450b..5f5fd25 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -13,9 +13,12 @@
 		<flag name="bwscheduler">Schedule upload and download limits over a period of a week</flag>
 		<flag name="downloadorder">Specify the download order of a multi-file torrent</flag>
 		<flag name="infowidget">Displays general information about a torrent in several tabs</flag>
+		<flag name="kross">Enable kross scripting support</flag>
 		<flag name="logviewer">Displays the logging output</flag>
 		<flag name="magnetgenerator">Generates magnet URI's</flag>
 		<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="shutdown">Shutdown when done</flag>
 		<flag name="stats">Shows statistics about torrents in several graphs</flag>
 		<flag name="upnp">Forward ports using UPnP</flag>