Fix depend, port the changes to -9999

(Portage version: 2.1.11.52/cvs/Linux ppc64, signed Manifest commit with key 7194459F)

3 files changed, 25 insertions, 16 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index 86735f56e9f4..70f8ce11ca35 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.23 2013/03/27 16:28:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.24 2013/03/27 17:51:21 ago Exp $
+
+  27 Mar 2013; Agostino Sarubbo <ago@gentoo.org> tomahawk-0.6.1.ebuild,
+  tomahawk-9999.ebuild:
+  Fix depend, port the changes to -9999
 
 *tomahawk-0.6.1 (27 Mar 2013)
 
diff --git a/media-sound/tomahawk/tomahawk-0.6.1.ebuild b/media-sound/tomahawk/tomahawk-0.6.1.ebuild
index 1cb7b49b0ba7..52356e2597f9 100644
--- a/media-sound/tomahawk/tomahawk-0.6.1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # 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-0.6.1.ebuild,v 1.1 2013/03/27 16:28:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.6.1.ebuild,v 1.2 2013/03/27 17:51:21 ago Exp $
 
 EAPI=5
 
@@ -27,28 +27,30 @@ SLOT="0"
 IUSE="debug jabber twitter"
 
 DEPEND="
-	app-crypt/qca
+	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
-	>=media-libs/liblastfm-1.0.1
-	>=media-libs/libechonest-2.0.1
-	>=media-libs/phonon-4.5.0
-	media-libs/taglib
-	x11-libs/libX11
 	>=dev-qt/qtcore-${QT_MINIMAL}:4
 	>=dev-qt/qtdbus-${QT_MINIMAL}:4
 	>=dev-qt/qtgui-${QT_MINIMAL}: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
+	>=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=(
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index ae0f7baad094..ec6c5074b2b6 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,17 +1,19 @@
 # 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.11 2013/03/02 22:04:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.12 2013/03/27 17:51:21 ago 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/tomahawk.git"
+	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
 	KEYWORDS=""
 fi
 
@@ -25,22 +27,23 @@ SLOT="0"
 IUSE="debug jabber twitter"
 
 DEPEND="
-	app-crypt/qca
+	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
-	>=media-libs/liblastfm-1.0.1
-	>=media-libs/libechonest-2.0.2
-	>=media-libs/phonon-4.5.0
-	media-libs/taglib
-	x11-libs/libX11
 	>=dev-qt/qtcore-${QT_MINIMAL}:4
 	>=dev-qt/qtdbus-${QT_MINIMAL}:4
 	>=dev-qt/qtgui-${QT_MINIMAL}: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.2
+	>=media-libs/phonon-4.5.0
+	>=media-libs/taglib-1.6.0
+	x11-libs/libX11
 	jabber? ( >=net-libs/jreen-1.1.1 )
 	twitter? ( net-libs/qtweetlib )
 "