Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/johu:master commit in: media-sound/tomahawk/
Date: Thu, 29 Jan 2015 22:42:06
Message-Id: 1422571304.36ff1d9773364a36826f23355632b7992cba5c76.johu@gentoo
1 commit: 36ff1d9773364a36826f23355632b7992cba5c76
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 29 22:41:44 2015 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 29 22:41:44 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=36ff1d97
7
8 [media-sound/tomahawk] Fix qt5 build
9
10 Package-Manager: portage-2.2.15
11
12 ---
13 media-sound/tomahawk/tomahawk-9999.ebuild | 10 ++++------
14 1 file changed, 4 insertions(+), 6 deletions(-)
15
16 diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
17 index e14b939..51298f8 100644
18 --- a/media-sound/tomahawk/tomahawk-9999.ebuild
19 +++ b/media-sound/tomahawk/tomahawk-9999.ebuild
20 @@ -25,17 +25,11 @@ IUSE="debug +hatchet jabber kde qt5 telepathy"
21
22 REQUIRED_USE="telepathy? ( kde )"
23
24 -# TODO
25 -# qt5 use flag needs some work:
26 -# - deps with missing qt4/qt5 use flags
27 -# - does not build with in-tree only deps
28 DEPEND="
29 dev-cpp/lucene++
30 dev-cpp/sparsehash
31 dev-libs/boost
32 dev-libs/quazip
33 - >=media-libs/libechonest-2.2.0:=
34 - media-libs/liblastfm
35 >=media-libs/taglib-1.8.0
36 >=net-libs/gnutls-3.2
37 x11-libs/libX11
38 @@ -54,6 +48,8 @@ DEPEND="
39 dev-qt/qtsvg:4
40 dev-qt/qtwebkit:4
41 media-libs/phonon[qt4]
42 + >=media-libs/libechonest-2.3.0:=[qt4]
43 + media-libs/liblastfm[qt4]
44 telepathy? ( net-libs/telepathy-qt[qt4] )
45 )
46 qt5? (
47 @@ -66,6 +62,8 @@ DEPEND="
48 dev-qt/qtwidgets:5
49 kde-frameworks/attica:5
50 media-libs/phonon[qt5]
51 + >=media-libs/libechonest-2.3.0:=[qt5]
52 + media-libs/liblastfm[qt5]
53 telepathy? ( net-libs/telepathy-qt[qt5] )
54 )
55 "