[gentoo-commits] dev/johu:master commit in: media-sound/tomahawk/

[Johannes Huber]

commit:     36ff1d9773364a36826f23355632b7992cba5c76
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 29 22:41:44 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 22:41:44 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=36ff1d97

[media-sound/tomahawk] Fix qt5 build

Package-Manager: portage-2.2.15

---
 media-sound/tomahawk/tomahawk-9999.ebuild | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild 
b/media-sound/tomahawk/tomahawk-9999.ebuild
index e14b939..51298f8 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -25,17 +25,11 @@ IUSE="debug +hatchet jabber kde qt5 telepathy"
 
 REQUIRED_USE="telepathy? ( kde )"
 
-# TODO
-# qt5 use flag needs some work:
-# - deps with missing qt4/qt5 use flags
-# - does not build with in-tree only deps
 DEPEND="
        dev-cpp/lucene++
        dev-cpp/sparsehash
        dev-libs/boost
        dev-libs/quazip
-       >=media-libs/libechonest-2.2.0:=
-       media-libs/liblastfm
        >=media-libs/taglib-1.8.0
        >=net-libs/gnutls-3.2
        x11-libs/libX11
@@ -54,6 +48,8 @@ DEPEND="
                dev-qt/qtsvg:4
                dev-qt/qtwebkit:4
                media-libs/phonon[qt4]
+               >=media-libs/libechonest-2.3.0:=[qt4]
+               media-libs/liblastfm[qt4]
                telepathy? ( net-libs/telepathy-qt[qt4] )
        )
        qt5? (
@@ -66,6 +62,8 @@ DEPEND="
                dev-qt/qtwidgets:5
                kde-frameworks/attica:5
                media-libs/phonon[qt5]
+               >=media-libs/libechonest-2.3.0:=[qt5]
+               media-libs/liblastfm[qt5]
                telepathy? ( net-libs/telepathy-qt[qt5] )
        )
 "