Update live ebuild by upstream changes.

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

4 files changed, 46 insertions, 30 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index 5a0a74403af9..7ef768d80c83 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/tomahawk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.32 2013/07/23 14:07:55 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.33 2013/10/19 16:31:07 johu Exp $
+
+  19 Oct 2013; Johannes Huber <johu@gentoo.org> metadata.xml,
+  tomahawk-9999.ebuild:
+  Update live ebuild by upstream changes.
 
   23 Jul 2013; Michael Palimaka <kensington@gentoo.org> tomahawk-0.6.1.ebuild,
   tomahawk-0.7.0.ebuild, tomahawk-9999.ebuild:
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 2896dd850771..02228d2c3e00 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -5,17 +5,17 @@ DIST tomahawk-0.6.1.tar.bz2 5185714 SHA256 c2b8da0cfb3e9e4653439ee349a2446d5d124
 DIST tomahawk-0.7.0.tar.bz2 5238386 SHA256 983573409ec5ec57679c26f786e88939151984572e749c192d018d140414288d SHA512 8a2c7e3644530b37866bb4e28730fe244363431374cb093ac363a0b286907dbd101405cea20f6664a04f9c2a961c27251ee0ab2b2adf5beda785fd8116b31188 WHIRLPOOL 8d11e0fe43aa5561f73e25f2d1b50e85e01c1e695330affc9f8600cb1b24b3e3d03e6677d177fdf385a4fc210b356402efbde433765014bcd8daf67af5fbc7bc
 EBUILD tomahawk-0.6.1.ebuild 1672 SHA256 181719c49245efbdc780295eaec376732084bd57bb15efd8ffac3c293b49ad12 SHA512 01c58e37e0d19bdf350d0a432acf48cdc91ae34da7418fefed8f41b0e4c331929b384a193d606a7308c7b35e85bb73018bfc5ccdb71d5f6e864c0967fc1a6e01 WHIRLPOOL 6ced5246640560df20bf08907d982d86e31945b36d867dd0a458951e71c393b955c67622135de0d9ccdbed8c9d6db93b8ed90670c1e8ee5399290314ed623f41
 EBUILD tomahawk-0.7.0.ebuild 1712 SHA256 aed5c359880a89ba6d57c15227cb1c16c3f6566d4feb1081fd262d8caacd19d6 SHA512 caedf94f4187340482403c515645100170a790de7ea83b8d43d89022daa20d017c727fdee2da71ebf0e2926b1f8b79738de675c8490e1b08500856d24218324b WHIRLPOOL 2c9bafa0f9b4d92a7ebdc2265ecd8bbe7cc49847161ee0e5e709387c655f8d27bedf96b34e02b30cc5800578f30dc9bb8c40faf17827542b6226208a77868cbd
-EBUILD tomahawk-9999.ebuild 1733 SHA256 262bd6fe9616d559dd1582902112611c34883ab711a1101708281395517d5d63 SHA512 52afa8f1902fa2cc21c0d534e374370778a2a11ece06f4f6d29036ebecec1eec3e719c4ad877a61aa5d9659780d8714f7954e2ab0e758ef492eeec208b39489b WHIRLPOOL 2ed92baedb7232e6d8f281547e1c7d377c938824cffc82701e4a7711aa5939177597944f599e084e45edc778c13cd3dc48cc8d34b4eab21c4639ee3a9e6214dd
-MISC ChangeLog 5289 SHA256 ab69771257baa37d0dddcf48b4d633ff3ab6530cf020e34e18dd59357fab67f4 SHA512 d7d4e4ccc74ddf4e4c584c99c80d02aa09a6a39f0416af3b7f68b8a5f3ff6369c8b53f12fbcc1e3eb41c2d4a3ed105e62f26ddb4594793014582eff44d8c863d WHIRLPOOL 5628f1dfef3ecdf98e147061b5b4ea41bd6e710bc57c5621bcfed70cb5d2a96037653a2192f674a6ea4ff2d1bedafe896e162e3a7821c6c6ca33e723f5b59ffc
-MISC metadata.xml 318 SHA256 110c482959e914940abfdf001e224a4b98315d40030aba341ddf0298d1ed0a75 SHA512 761afbcd315fc46b1ad2fe7912ab2e21988760c229a0f2ba62f0851f8c61e6be6408faa17cdaf9cf925e840710610be82904d84759574d40720da576628a0b2e WHIRLPOOL afa87cac470a565a1d20b615a1c17ccb6df2ec82cc06cb3e8d5c96bedd4b364bf55b7da813cfb2efd8df5fd9c087d291ee226a9c74580ecfdba63317fad6ae38
+EBUILD tomahawk-9999.ebuild 1884 SHA256 c38721b6a122452eb9004f419ff4440967cbb0e59eb4998c74ad9104c3e5f2bc SHA512 6b6a670017dbae1764edf07a161daa64296ca967d7c0bb6db0f8b7a1c9f6760775b87a4b82e06610e300b801f387365a83d0df5f5f521e02feecb059f58dc671 WHIRLPOOL e1f09b2d7cbffc38fc88cc610c5654155c659bb7b73e6ae90d3a23f335aeeaea6b30240452d99ce050a032162dd196e09b7b5940acb58960b56ab5b7f661917e
+MISC ChangeLog 5412 SHA256 b27097730d670bbd15eff9079e441cb206f2a9ab40cf83193379a51ffdc2c037 SHA512 b48c74e908e5ad5d038e7446218c03c237e20944ce4eeb2e523831db43c080275b214a22e9770d6fc335fd3bf2a97bc005cff450ce90174ffbcab0ed7126527a WHIRLPOOL 4af69532dea16ce34c888ae90c5abc884be4133bb01390bcc5f291b363d8495c00fa4ded1a5e877df1cae94dd19ef7696b2467f13fe215cd005b65738c22c06d
+MISC metadata.xml 417 SHA256 52660ba1988865a98d6b4eb1b0258cbdcbe9c38ceb8d797b6d7a2e9758b7cc5a SHA512 45ab14a300e1249635f0a411e2d68586e91cbf6bf461ff77756b74e22648bbdbba0e2ab215f2b321c804730728e1bd63f774c96da6722ee1719a3f79b81e7154 WHIRLPOOL 3902cc15f409ce6f09df0f8b41788326e694d62db99c354f684b3e29e447a82eb30e4ad3108b4658878013cd6235bc784c5f86b5a4108bfb1b202ee3248b1ebb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR7o3FAAoJEMbwO6tnXQ0s+QQIALOw2XBIxhsC0RHcLk2bfOuH
-YeciOConwlce7rFes0NhUC4yhpPMDxhTJQWAckzM66wPxRkUbe1IC8HAmhurZT7O
-jMCp1SjLYIChTC9rswUE5SYxVpKOlQ2gNt/aOC1ayx11P8eV0yZ9YGRkDnnFo6sj
-WrYR1HrrGcUuPhRq195mEA+8+pHjr1XfIPrO/kT1EbApXeyhKfUS2KHNlHuFrGPQ
-2uAkYLZG1Pts6sB3HsbJZw+Q1TZeEWL1BWEPugNv01fkQsDrPOI+JaaAtV7XT+jK
-hvoSKGUGUXp/26mKOVnA0Pz/Ovf+FxPkFOdrpP7JzqnEM0U5XIjKLblUH05BtwI=
-=dpUV
+iQEcBAEBCAAGBQJSYrPNAAoJEO+t9ga+3I3acMsIAK/93OZcGSf1H0Tfxn/+3rX1
+u1sRx3B7lEGSeAV/9l04hGW4kGOYKu2syaw0Gju2nSr3D0RGeZIeHrWy/vP5LgO8
+XsFL0wF6w19diQVbo7WDQt17fSkvP2ZWvqHAB6ERS+Ng7e3TePLXRCnBp4KAuYcj
+rAdBwPs8Cz7+VMKjYjHvKACWViPiQnPb33jNOCJ4KT0WiN4niqfQCZmp1ZVwEKAq
+GpDh97WKvg1N1tuMZL/6ze9UhGSkaR3MmKV7xO6cD/eAjDASPzTF5gbmhxHF12pk
+yBOomY+2fIR9is9iB42yhBErTUOpK9+BcWKrmltL476D1dj4gbj5Ddt8etyb/3g=
+=XhYO
 -----END PGP SIGNATURE-----
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index df344c1b4b05..c2ec31ad259b 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="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-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index fb5448c99c87..7a33d9280e32 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,30 +1,29 @@
 # Copyright 1999-2013 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.19 2013/07/23 14:07:55 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.20 2013/10/19 16:31:07 johu Exp $
 
 EAPI=5
 
-QT_MINIMAL="4.7.0"
-
-CMAKE_MIN_VERSION="2.8.6"
+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-2"
+	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
 	KEYWORDS=""
 fi
 
-inherit cmake-utils qt4-r2 ${GIT_ECLASS}
-
 DESCRIPTION="Qt playdar social music player"
 HOMEPAGE="http://tomahawk-player.org/"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-IUSE="debug jabber twitter"
+IUSE="debug jabber kde qt5 telepathy twitter"
+
+REQUIRED_USE="telepathy? ( kde )"
 
 DEPEND="
 	app-crypt/qca:2
@@ -33,19 +32,30 @@ DEPEND="
 	>=dev-libs/libattica-0.4.0
 	dev-libs/qjson
 	dev-libs/quazip
-	dev-libs/qtkeychain
-	>=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
+	dev-libs/qtkeychain[qt5?]
 	>=media-libs/libechonest-2.1.0
+	>=media-libs/liblastfm-1.0.1
 	>=media-libs/phonon-4.5.0
 	>=media-libs/taglib-1.6.0
 	x11-libs/libX11
 	jabber? ( >=net-libs/jreen-1.1.1 )
+	!qt5? (
+		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
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+	)
+	telepathy? ( net-libs/telepathy-qt )
 	twitter? ( net-libs/qtweetlib )
 "
 RDEPEND="${DEPEND}
@@ -57,11 +67,12 @@ DOCS=( AUTHORS ChangeLog README.md )
 src_configure() {
 	local mycmakeargs=(
 		$(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)
 		$(cmake-utils_use_with twitter QTweetLib)
 	)
 
-	mycmakeargs+=( -DBUILD_WITH_QT4=ON )
-
 	if [[ ${PV} != *9999* ]]; then
 		mycmakeargs+=( -DBUILD_RELEASE=ON )
 	fi