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

["Johannes Huber" <johu@gentoo.org>]

commit:     c8bb2188f64af63ef0e264e01c491688d74989b9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 16 23:28:07 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan 16 23:28:07 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=c8bb2188

[media-sound/tomahawk] Update dependencies

Package-Manager: portage-2.2.15

---
 media-sound/tomahawk/metadata.xml         |  1 +
 media-sound/tomahawk/tomahawk-9999.ebuild | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index 21a6857..55e1aa0 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Johannes Huber</name>
 	</maintainer>
 	<use>
+		<flag name="hatchet">Enable support for the synchronisation through Hatchet</flag>
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index b46f902..ccd9b6c 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -21,25 +21,26 @@ HOMEPAGE="http://tomahawk-player.org/"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-IUSE="debug jabber kde qt5 telepathy"
+IUSE="debug +hatchet jabber kde qt5 telepathy"
 
 REQUIRED_USE="telepathy? ( kde )"
 
 # TODO
-# qt5 use flag needs a lot of work:
+# qt5 use flag needs some work:
 # - deps with missing qt4/qt5 use flags
 # - does not build with in-tree only deps
 DEPEND="
 	app-crypt/qca:2
-	>=dev-cpp/clucene-2.3.3.4
+	dev-cpp/lucene++
 	dev-cpp/sparsehash
-	>=dev-libs/boost-1.41
+	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
+	hatchet? ( dev-cpp/websocketpp )
 	jabber? ( net-libs/jreen )
 	!qt5? (
 		>=dev-libs/libattica-0.4.0
@@ -53,6 +54,7 @@ DEPEND="
 		dev-qt/qtsvg:4
 		dev-qt/qtwebkit:4
 		media-libs/phonon[qt4]
+		telepathy? ( net-libs/telepathy-qt[qt4] )
 	)
 	qt5? (
 		dev-libs/qtkeychain[qt5]
@@ -63,8 +65,8 @@ DEPEND="
 		dev-qt/qtwidgets:5
 		kde-frameworks/attica:5
 		media-libs/phonon[qt5]
+		telepathy? ( net-libs/telepathy-qt[qt5] )
 	)
-	telepathy? ( net-libs/telepathy-qt )
 "
 RDEPEND="${DEPEND}
 	app-crypt/qca-ossl
@@ -75,6 +77,7 @@ DOCS=( AUTHORS ChangeLog README.md )
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_CRASHREPORTER=OFF
+		$(cmake-utils_use_build hatchet)
 		$(cmake-utils_use_with jabber Jreen)
 		$(cmake-utils_use_with kde KDE4)
 		$(cmake-utils_use_build !qt5 WITH_QT4)