summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2014-07-22 18:37:57 +0000
committerJohannes Huber <johu@gentoo.org>2014-07-22 18:37:57 +0000
commit02ad65bcf67051d8e201e70bc23c97b66759797c (patch)
tree8bc5748cbe6d8d1bfc4933315f8ed669f32ef9a2 /media-sound/tomahawk
parentamd64/x86 stable, bug #507872 (diff)
downloadgentoo-2-02ad65bcf67051d8e201e70bc23c97b66759797c.tar.gz
gentoo-2-02ad65bcf67051d8e201e70bc23c97b66759797c.tar.bz2
gentoo-2-02ad65bcf67051d8e201e70bc23c97b66759797c.zip
Update dependencies, bug #517616.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'media-sound/tomahawk')
-rw-r--r--media-sound/tomahawk/ChangeLog5
-rw-r--r--media-sound/tomahawk/tomahawk-9999.ebuild24
2 files changed, 20 insertions, 9 deletions
diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index c84a22674f9d..3437384ed24b 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,9 @@
# 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.39 2014/07/19 11:40:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.40 2014/07/22 18:37:57 johu Exp $
+
+ 22 Jul 2014; Johannes Huber <johu@gentoo.org> tomahawk-9999.ebuild:
+ Update dependencies, bug #517616.
19 Jul 2014; Johannes Huber <johu@gentoo.org> tomahawk-0.6.1.ebuild,
tomahawk-0.7.0.ebuild, tomahawk-9999.ebuild:
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 4529c1952ca6..33b9b9122965 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,6 +1,6 @@
# 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-9999.ebuild,v 1.26 2014/07/19 11:40:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.27 2014/07/22 18:37:57 johu Exp $
EAPI=5
@@ -25,21 +25,26 @@ IUSE="debug jabber kde qt5 telepathy"
REQUIRED_USE="telepathy? ( kde )"
+# TODO
+# qt5 use flag needs a lot of 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/sparsehash
>=dev-libs/boost-1.41
- dev-libs/qjson
dev-libs/quazip
- dev-libs/qtkeychain
>=media-libs/libechonest-2.2.0:=
- >=media-libs/liblastfm-1.0.1
- >=media-libs/phonon-4.5.0
- >=media-libs/taglib-1.6.0
+ media-libs/liblastfm
+ >=media-libs/taglib-1.8.0
+ >=net-libs/gnutls-3.2
x11-libs/libX11
- jabber? ( >=net-libs/jreen-1.1.1 )
+ 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
@@ -47,14 +52,17 @@ DEPEND="
dev-qt/qtsql:4[sqlite]
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
+ media-libs/phonon[qt4]
)
qt5? (
- >=dev-libs/libattica-0.4.0[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 )
"