Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: net-p2p/ktorrent/
Date: Wed, 27 Jul 2016 13:22:26
Message-Id: 1469625731.084c9732d53fa2910ec60a5ddd03608e33fab5b8.kensington@gentoo
1 commit: 084c9732d53fa2910ec60a5ddd03608e33fab5b8
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Tue Jul 26 14:40:26 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 27 13:22:11 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=084c9732
7
8 net-p2p/ktorrent: Add back USE=kross,rss,scanfolder
9
10 Package-Manager: portage-2.2.28
11
12 net-p2p/ktorrent/ktorrent-9999.ebuild | 34 ++++++++++++----------------------
13 net-p2p/ktorrent/metadata.xml | 3 +++
14 2 files changed, 15 insertions(+), 22 deletions(-)
15
16 diff --git a/net-p2p/ktorrent/ktorrent-9999.ebuild b/net-p2p/ktorrent/ktorrent-9999.ebuild
17 index 978204d..f33d84f 100644
18 --- a/net-p2p/ktorrent/ktorrent-9999.ebuild
19 +++ b/net-p2p/ktorrent/ktorrent-9999.ebuild
20 @@ -31,8 +31,9 @@ DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
21 HOMEPAGE="http://ktorrent.pwsp.net/"
22
23 LICENSE="GPL-2"
24 -IUSE="+bwscheduler +downloadorder +infowidget +logviewer
25 -+magnetgenerator +mediaplayer +shutdown +stats +upnp +zeroconf"
26 +IUSE="+bwscheduler +downloadorder +infowidget +kross +logviewer
27 ++magnetgenerator +mediaplayer rss +scanfolder +shutdown +stats
28 ++upnp +zeroconf"
29
30 COMMON_DEPEND="
31 $(add_frameworks_dep karchive)
32 @@ -55,7 +56,6 @@ COMMON_DEPEND="
33 $(add_frameworks_dep kwindowsystem)
34 $(add_frameworks_dep kxmlgui)
35 $(add_frameworks_dep solid)
36 - $(add_frameworks_dep sonnet)
37 $(add_qt_dep qtdbus)
38 $(add_qt_dep qtgui)
39 $(add_qt_dep qtnetwork)
40 @@ -63,10 +63,15 @@ COMMON_DEPEND="
41 <net-libs/libktorrent-${LIBKT_VERSION_MAX}:5
42 >=net-libs/libktorrent-${LIBKT_VERSION_MIN}:5
43 infowidget? ( dev-libs/geoip )
44 + kross? ( $(add_frameworks_dep kross) )
45 mediaplayer? (
46 media-libs/phonon[qt5]
47 >=media-libs/taglib-1.5
48 )
49 + rss? (
50 + $(add_frameworks_dep kdewebkit)
51 + $(add_kdeapps_dep syndication)
52 + )
53 shutdown? ( $(add_plasma_dep plasma-workspace) )
54 stats? ( $(add_frameworks_dep kplotting) )
55 zeroconf? ( $(add_frameworks_dep kdnssd) )
56 @@ -78,32 +83,17 @@ DEPEND="${COMMON_DEPEND}
57 RDEPEND="${COMMON_DEPEND}
58 !net-p2p/ktorrent:4
59 "
60 -# add back when ported - DEPEND
61 -# kross? ( $(add_frameworks_dep kross) )
62 -# rss? ( $(add_kdeapps_dep kdepimlibs) )
63 # add back when ported - RDEPEND
64 # ipfilter? (
65 # app-arch/bzip2
66 # app-arch/unzip
67 # $(add_kdeapps_dep kdebase-kioslaves)
68 # )
69 -# kross? ( $(add_kdebase_dep krosspython) )
70 -
71 -# src_prepare() {
72 -# add back when ported
73 -# if ! use plasma; then
74 -# sed -i \
75 -# -e "s:add_subdirectory(plasma):#nada:g" \
76 -# CMakeLists.txt || die "Failed to make plasmoid optional"
77 -# fi
78 -#
79 -# kde5_src_prepare
80 -# }
81
82 src_prepare() {
83 kde5_src_prepare
84
85 - punt_bogus_dep KF5 Kross
86 + use kross || punt_bogus_dep KF5 Kross
87 }
88
89 src_configure() {
90 @@ -112,9 +102,12 @@ src_configure() {
91 -DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
92 -DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
93 -DWITH_SYSTEM_GEOIP=$(usex infowidget)
94 + -DENABLE_SCRIPTING_PLUGIN=$(usex kross)
95 -DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
96 -DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
97 -DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
98 + -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
99 + -DENABLE_SYNDICATION_PLUGIN=$(usex rss)
100 -DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
101 -DENABLE_STATS_PLUGIN=$(usex stats)
102 -DENABLE_UPNP_PLUGIN=$(usex upnp)
103 @@ -122,9 +115,6 @@ src_configure() {
104 )
105 # add back when ported
106 # -DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
107 -# -DENABLE_SCRIPTING_PLUGIN=$(usex kross)
108 -# -DENABLE_SYNDICATION_PLUGIN=$(usex rss)
109 -# -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
110 # -DENABLE_SEARCH_PLUGIN=$(usex search)
111 # -DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
112 kde5_src_configure
113
114 diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
115 index 46e450b..5f5fd25 100644
116 --- a/net-p2p/ktorrent/metadata.xml
117 +++ b/net-p2p/ktorrent/metadata.xml
118 @@ -13,9 +13,12 @@
119 <flag name="bwscheduler">Schedule upload and download limits over a period of a week</flag>
120 <flag name="downloadorder">Specify the download order of a multi-file torrent</flag>
121 <flag name="infowidget">Displays general information about a torrent in several tabs</flag>
122 + <flag name="kross">Enable kross scripting support</flag>
123 <flag name="logviewer">Displays the logging output</flag>
124 <flag name="magnetgenerator">Generates magnet URI's</flag>
125 <flag name="mediaplayer">Phonon-based media player</flag>
126 + <flag name="rss">Syndication plugin for KTorrent, supporting RSS and Atom feeds</flag>
127 + <flag name="scanfolder">Scan folders for torrent files and load them</flag>
128 <flag name="shutdown">Shutdown when done</flag>
129 <flag name="stats">Shows statistics about torrents in several graphs</flag>
130 <flag name="upnp">Forward ports using UPnP</flag>