Version bump, remove old, bug #528766.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

7 files changed, 140 insertions, 184 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index ac7220573a40..6b562150e4a8 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/tomahawk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.41 2014/12/31 13:22:59 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.42 2015/01/16 23:34:20 johu Exp $
+
+*tomahawk-0.8.2 (16 Jan 2015)
+
+  16 Jan 2015; Johannes Huber <johu@gentoo.org> +tomahawk-0.8.2.ebuild,
+  -tomahawk-0.6.1.ebuild, -tomahawk-0.7.0.ebuild, metadata.xml,
+  tomahawk-9999.ebuild:
+  Version bump, remove old, bug #528766.
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org> tomahawk-0.6.1.ebuild,
   tomahawk-0.7.0.ebuild:
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 9f524c65e23f..824a41275ec6 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,28 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST tomahawk-0.6.1.tar.bz2 5185714 SHA256 c2b8da0cfb3e9e4653439ee349a2446d5d124a07afa51af6c57e743936ce29fe SHA512 a0612cb62573a22dbb8b47f4d22514cad2fa485bee83d8767fdf139c2a5ec7e380db1d7d7ee807b4632c994738e20d88f9c4875ab9e266007189c3568048f490 WHIRLPOOL f8ec753b8afad14d444bc4b3fd3d236cb90a8512895b90e0618a4cd250d750b2ef7f8b3fa9bee0505259ee94d2065b5d97804844379c419ce3088209c5a28996
-DIST tomahawk-0.7.0.tar.bz2 5238386 SHA256 983573409ec5ec57679c26f786e88939151984572e749c192d018d140414288d SHA512 8a2c7e3644530b37866bb4e28730fe244363431374cb093ac363a0b286907dbd101405cea20f6664a04f9c2a961c27251ee0ab2b2adf5beda785fd8116b31188 WHIRLPOOL 8d11e0fe43aa5561f73e25f2d1b50e85e01c1e695330affc9f8600cb1b24b3e3d03e6677d177fdf385a4fc210b356402efbde433765014bcd8daf67af5fbc7bc
-EBUILD tomahawk-0.6.1.ebuild 1679 SHA256 4a4ec7b85454c4474f026ba81e1079e1171f1578979321444ce2d91af5cff269 SHA512 4ab0264ed696dea567c45cec4568f254ff199a5e33ed1d87b4e97b76bc9751fc8824ae70fd02c89f540fbd037a0b8cc15f6dcfc752918922340d17d0ea3adcee WHIRLPOOL 95fde7cc3b5de6a2ac3fc968e403d967c0f1011df198a546d68b9b60ecb57715c568b49a58faf274bed008a868abc54b7efd0654ac43e05b572f3123f184b35b
-EBUILD tomahawk-0.7.0.ebuild 1719 SHA256 faacf5c72fbcba55e1c2ad08ae468d1fdde0a2b70b876627a294bf03271b700d SHA512 e21b8ddac3fd37ece385d5b265c60f533ce59791e8e3178ca469c5d293a3ca269d31690b9b4727b8d06818b62683bbba4af702eb43ccb346c3b5ad6101348f2f WHIRLPOOL 4243b02abf7c02f9d7a57b1f75e0644b8a832119cac61bd8d178d0c970c9cd35f0081993bced00adc1206e2b5b9a15784fb0a7a110754f6fe1e9607954c9037e
-EBUILD tomahawk-9999.ebuild 2061 SHA256 c77e393554dfe25d721af1e7c04a0f58f1e15adfe59d24b801aaecb5d8de0d04 SHA512 c561c90ab25cd2067ce4285ac8dad3d046e85149fc147c9851771d98e655193b78c3264b65f885aa475ef9dfc1e4086c1c3ef1c53e0b3bd7121b8205d15d0d37 WHIRLPOOL b29dff85cf825e48c522eb8fa5c838885e43e980e0662a63c43d977807aa4337d2e4c3e47eef3213a11fd33e359e68adf4d6d406227483432419ce3c6db71c96
-MISC ChangeLog 6629 SHA256 1c4abca98c96d265806a4c8e6494a93ef1068b4e1a0175e6bf60eb203aaa6b3c SHA512 c468d16955fe4e0790e597c3a77cf2698fcabf9bbcb2e9ef07f65a68f6489c9b68b029efab2e5fa3059ee1793956ee2d8853b2ea583a9057c97836357c73df61 WHIRLPOOL c9073c2331d20e5017f8eb0f2e951fda7f4126ce14a6b0474b0b863bc43b39e02be8e28caad11bc16b5d3001ca2e336ac47399f68acbfa9244786e742b40d091
-MISC metadata.xml 417 SHA256 52660ba1988865a98d6b4eb1b0258cbdcbe9c38ceb8d797b6d7a2e9758b7cc5a SHA512 45ab14a300e1249635f0a411e2d68586e91cbf6bf461ff77756b74e22648bbdbba0e2ab215f2b321c804730728e1bd63f774c96da6722ee1719a3f79b81e7154 WHIRLPOOL 3902cc15f409ce6f09df0f8b41788326e694d62db99c354f684b3e29e447a82eb30e4ad3108b4658878013cd6235bc784c5f86b5a4108bfb1b202ee3248b1ebb
+DIST tomahawk-0.8.2.tar.bz2 8563213 SHA256 522d2ef873f8548990ac1fc736c11dd08c347687c77d63b520f55207f19db3ae SHA512 30a95a583796a0a8082aaaf3e3555719b91eb18a8744eb72865c8105d16128b2b477d82838ae6914d38c6b0f09e700761e84083dab79d1375acb1ad88d919a26 WHIRLPOOL f81f3ffd41e9439355a6a9d7808c92a1c8d1295f18eea90be3a4f788e4dcfa80a956b85f8b3745f4c241ca306f51b43762d3d6a38635bc92d0fa59e35af1cc31
+EBUILD tomahawk-0.8.2.ebuild 2168 SHA256 ce1fb9b09fa5af361c9fc94fcdcc42b8a831629f548b7031e17e023459701e38 SHA512 a0882ed0e1ccb206442e50607bbb93293bd266e93a35307a973cfbe17c57ba53173016e140538f970378694a3a505a59dcf7c52eb89495ea4ecd1b0afcd65fc1 WHIRLPOOL 07f1afc074873d1dcaca457657197e0536f7e596d731cda792dd0eda15cda74d7dff95b955dfb67d1869a659265781dc9e0145811c97427f8abb4ab85e62b7ed
+EBUILD tomahawk-9999.ebuild 2168 SHA256 f47e1e6de909d38e75f5d6a9866787882457fe6f8a0465c434a6445ed19c6fa7 SHA512 22a211943eff7454139185169efefbf2ff7a937829ba478b652b3131ff32bb7f8a1aba12a5a9a87741fa08eae49f0e26692cf8686bcc269132fe674bbd9543fc WHIRLPOOL d1e82464e841c7c5c02eaeb06136b0bcb4ac3f222c3a3621d436dec6f924ba71d3482addccc144aeed103fbd63f645380180f2057d772c6a1d0e74291c16d46b
+MISC ChangeLog 6856 SHA256 c4477697bdd693a96b16af6dee19b3f6717827136cb1025de6e77c70e6f14358 SHA512 f59bb96526cab1fa81037050cc4c68060169a327262881061aa4f3e22e03b46e754f8fe1e1c9aeb2d4907ce8f8e923dcd9ed25b38eb6b87a0de192f0fcce565e WHIRLPOOL 76351be269b5b34114868de0eff132477bfd975f858b834399cba4c4fcc45576671aad4fcf99af467dfa99c12565542b54ab870daeb93ef7279ffa6e60557bec
+MISC metadata.xml 449 SHA256 49d0ed467fa509bfdabea945cda8147db6980b565d5cf57ef0f7122d918973f6 SHA512 618943cbf72f232ab56ab529e08e9fb1f600b9c7885dc1a3d7e84f0bbf19bfd13befc253bbfc5b6f22863e9d890040f749fcbf50fe7c3c10825464f30f654343 WHIRLPOOL d13c16baef4735c911d00c682bea15832f0f0dc75b45e151171f498db29820ad8a8ffcc5d98fedafdc66857f681cd3f1455dfa71b71065d82a25bb56f8c5e7a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUo/jERRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7AXVD/0eaQaefkNveqFxvhZ29I5o+my5hMF0eB/1YGrkSiYO103DKyN+g4tgpW3F
-j2GW2QPJbRWZVEsttjTd9mAhR4LuwbLPgBHE7wTf/l9SANcHxRXsvVGZeEEbXqkV
-J5RsHiYa1j43vAaeaNK3j2Ed7Ctj0J8A35tvUnYlb0v08+j13j6IxhmQLZcyJq6r
-YfEmeoeNbebEFiTL+F9TgTpTn9dIpX8moYBLfEBeHb78B41Cbl2nMK28cPp7KtK5
-phSyH30cmDqD38jBVXzfE2xEHKs5SOGGaFhLHHcUhOC4TpjF/yllgoc9HzJs5/iV
-D+Ez6RArfg3Qc+Jrx0Dtn4iXf/9DXmD06tau6JtFlQDJlHF75qJhrLGBAJmbzBOk
-fLcl5XxZZ+zRz02Kjq/8KA/bxsiQEFtoJMvA21J218cvdj9/bySyhvpBUIL4iC+I
-TNVLbcQCgFPtWJBmA0JxXFjxG/Qc63b0nT60+bArEvZgt+UtwNdmqoIbtiKcquw8
-4zDrr+O1JKYmY9Yhwd3ajdfrRKlbcje8Zi6gnUfhFG856R7X+7NZIPr+GSZlCxsa
-7Jm9CnszMmw2DmBiaQ7YV3oaiC7xLNMinnT78R4FPgTNHClboXbmjsYeDlQPQRAS
-swAKo4wh4GrQ1F6o4uRodrJpk/ifNZsdn4lvD1Ro5h9UkYBFwA==
-=wSXj
+iQIcBAEBCAAGBQJUuZ/9AAoJEGVpnaTzz9K9AOsQAL7c+MRrfDhKXkqmZcPfPODc
+HZsQMikjGo4S4i3CS97asN9cgs4p7ZLZ2Is70sCDidjXtQLleyvZSvfi/8Gzj10n
++qSkNxuLtBmF6Qfqd70B4+aTQBfMLUDpDzbrpOgWinsXapjRRzLyKKs7m8o+KTtD
+bWvs5HJUcisIKJEMuyr41L6pPXqRfTxngPd7+5FU+W+XPrnbyODlCMGAZJJmx8uL
+D05WpFHN/36pOqBbUKbc2Kr6scMvUmmIj1BBT28niIEcKzgO1NXr69ZJTo3Q7N1U
+HaTVcRuCImdarCGzqIYm5HzCYjv2WD0j44NEy5eJknM7xP7WM0hNyTce/8LcY8yg
+0o+1bsYRrDnyUezApHUaFEC5PHBmjP/1dtwlUhIWwvtcK1cXIIjfpbJ3B+IDmjGS
+zGMouCI1obTt9dKbwl1hi28EkH0VliPccY7oeB17Wb26AXI2k1/zAfNo9pFdm+OI
+UJ37GqXvBFTQS7C+8pW1BFCgskFJwZ3iqoz7sDOPqsn0ooV1kPadzEFUJNj+HEoW
+4YlKMH1haeAgTg+Ph1v8YljMhpJq2P75aU7d+HD1oxj2O1E/3aSFOMP+wkZ+pgtQ
+2QsN4TL0sDsqG2tHwo0b4bSGPaMUi/dRB2iIGWoGPd0w9b2Km5BRGulBZGxs5WHp
+JS5rr4Q66Ea4El0c5adJ
+=nIkZ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index c2ec31ad259b..55e1aa0ef2ac 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -7,8 +7,8 @@
 		<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>
-		<flag name="twitter">Enable twitter support</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/media-sound/tomahawk/tomahawk-0.6.1.ebuild b/media-sound/tomahawk/tomahawk-0.6.1.ebuild
deleted file mode 100644
index 3750a41d1697..000000000000
--- a/media-sound/tomahawk/tomahawk-0.6.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.6.1.ebuild,v 1.9 2014/12/31 13:22:59 kensington Exp $
-
-EAPI=5
-
-QT_MINIMAL="4.7.0"
-
-CMAKE_MIN_VERSION="2.8.6"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-2"
-	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
-	KEYWORDS=""
-fi
-
-inherit cmake-utils qt4-r2 ${GIT_ECLASS}
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="http://tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="debug jabber twitter"
-
-DEPEND="
-	app-crypt/qca:2
-	>=dev-cpp/clucene-2.3.3.4
-	>=dev-libs/boost-1.41
-	>=dev-libs/libattica-0.4.0
-	dev-libs/qjson
-	dev-libs/quazip
-	>=dev-qt/qtcore-${QT_MINIMAL}:4
-	>=dev-qt/qtdbus-${QT_MINIMAL}:4
-	|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-	>=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite]
-	>=dev-qt/qtsvg-${QT_MINIMAL}:4
-	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
-	>=media-libs/liblastfm-1.0.1
-	>=media-libs/libechonest-2.0.1
-	>=media-libs/phonon-4.5.0[qt4]
-	>=media-libs/taglib-1.6.0
-	x11-libs/libX11
-	jabber? ( >=net-libs/jreen-1.1.1 )
-	twitter? ( net-libs/qtweetlib )
-"
-RDEPEND="${DEPEND}
-	app-crypt/qca-ossl
-"
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with jabber Jreen)
-		$(cmake-utils_use_with twitter QTweetLib)
-	)
-
-	if [[ ${PV} != *9999* ]]; then
-		mycmakeargs+=( -DBUILD_RELEASE=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/media-sound/tomahawk/tomahawk-0.7.0.ebuild b/media-sound/tomahawk/tomahawk-0.7.0.ebuild
deleted file mode 100644
index 7f6015af8ea3..000000000000
--- a/media-sound/tomahawk/tomahawk-0.7.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.7.0.ebuild,v 1.8 2014/12/31 13:22:59 kensington Exp $
-
-EAPI=5
-
-QT_MINIMAL="4.7.0"
-
-CMAKE_MIN_VERSION="2.8.6"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-2"
-	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
-	KEYWORDS=""
-fi
-
-inherit cmake-utils qt4-r2 ${GIT_ECLASS}
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="http://tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="debug jabber twitter"
-
-DEPEND="
-	app-crypt/qca:2
-	>=dev-cpp/clucene-2.3.3.4
-	>=dev-libs/boost-1.41
-	>=dev-libs/libattica-0.4.0
-	dev-libs/qjson
-	dev-libs/quazip
-	>=dev-qt/qtcore-${QT_MINIMAL}:4
-	>=dev-qt/qtdbus-${QT_MINIMAL}:4
-	|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-	>=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite]
-	>=dev-qt/qtsvg-${QT_MINIMAL}:4
-	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
-	>=media-libs/liblastfm-1.0.1
-	>=media-libs/libechonest-2.0.3
-	>=media-libs/phonon-4.5.0[qt4]
-	>=media-libs/taglib-1.6.0
-	x11-libs/libX11
-	jabber? ( >=net-libs/jreen-1.1.1 )
-	twitter? ( net-libs/qtweetlib )
-"
-RDEPEND="${DEPEND}
-	app-crypt/qca-ossl
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with jabber Jreen)
-		$(cmake-utils_use_with twitter QTweetLib)
-	)
-
-	mycmakeargs+=( -DBUILD_WITH_QT4=ON )
-
-	if [[ ${PV} != *9999* ]]; then
-		mycmakeargs+=( -DBUILD_RELEASE=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/media-sound/tomahawk/tomahawk-0.8.2.ebuild b/media-sound/tomahawk/tomahawk-0.8.2.ebuild
new file mode 100644
index 000000000000..405f28533227
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.8.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.1 2015/01/16 23:34:20 johu Exp $
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+inherit kde4-base ${GIT_ECLASS}
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="http://tomahawk-player.org/"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+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="
+	app-crypt/qca:2
+	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
+	hatchet? ( dev-cpp/websocketpp )
+	jabber? ( net-libs/jreen )
+	!qt5? (
+		>=dev-libs/libattica-0.4.0
+		dev-libs/qjson
+		dev-libs/qtkeychain[qt4]
+		dev-qt/designer:4
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtsvg:4
+		dev-qt/qtwebkit:4
+		media-libs/phonon[qt4]
+		telepathy? ( net-libs/telepathy-qt[qt4] )
+	)
+	qt5? (
+		dev-libs/qtkeychain[qt5]
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/attica:5
+		media-libs/phonon[qt5]
+		telepathy? ( net-libs/telepathy-qt[qt5] )
+	)
+"
+RDEPEND="${DEPEND}
+	app-crypt/qca-ossl
+"
+
+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)
+		$(cmake-utils_use_with telepathy TelepathyQt)
+	)
+
+	if [[ ${PV} != *9999* ]]; then
+		mycmakeargs+=( -DBUILD_RELEASE=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 33b9b9122965..76a2f17ba831 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.27 2014/07/22 18:37:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.28 2015/01/16 23:34:20 johu Exp $
 
 EAPI=5
 
@@ -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:
+# TODO
+# 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)