diff options
| author |   Johannes Huber <johu@gentoo.org> | 2015-01-29 22:44:23 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-01-29 22:44:23 +0000 |
| commit | 64e1d98d1bdc0053cdf951ed502f338a13d128c3 (patch) | |
| tree | 7ae61df0782e05679a88be412efce9b4b90b2851 /media-sound/tomahawk | |
| parent | Version bump. (diff) | |
| download | gentoo-2-64e1d98d1bdc0053cdf951ed502f338a13d128c3.tar.gz gentoo-2-64e1d98d1bdc0053cdf951ed502f338a13d128c3.tar.bz2 gentoo-2-64e1d98d1bdc0053cdf951ed502f338a13d128c3.zip | |
Fix qt5 build.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'media-sound/tomahawk')
| -rw-r--r-- | media-sound/tomahawk/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/tomahawk/tomahawk-9999.ebuild | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog index de642f48df6c..2b4dc5c6cedb 100644 --- a/media-sound/tomahawk/ChangeLog +++ b/media-sound/tomahawk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/tomahawk # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.43 2015/01/29 00:27:02 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.44 2015/01/29 22:44:23 johu Exp $ + + 29 Jan 2015; Johannes Huber <johu@gentoo.org> tomahawk-9999.ebuild: + Fix qt5 build. 29 Jan 2015; Johannes Huber <johu@gentoo.org> tomahawk-0.8.2.ebuild, tomahawk-9999.ebuild: diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild index 8af61e0c1223..67408eb89bb6 100644 --- a/media-sound/tomahawk/tomahawk-9999.ebuild +++ b/media-sound/tomahawk/tomahawk-9999.ebuild @@ -1,6 +1,6 @@ # 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.29 2015/01/29 00:27:02 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.30 2015/01/29 22:44:23 johu Exp $ EAPI=5 @@ -25,17 +25,11 @@ 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=" 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 @@ -54,6 +48,8 @@ DEPEND=" dev-qt/qtsvg:4 dev-qt/qtwebkit:4 media-libs/phonon[qt4] + >=media-libs/libechonest-2.3.0:=[qt4] + media-libs/liblastfm[qt4] telepathy? ( net-libs/telepathy-qt[qt4] ) ) qt5? ( @@ -66,6 +62,8 @@ DEPEND=" dev-qt/qtwidgets:5 kde-frameworks/attica:5 media-libs/phonon[qt5] + >=media-libs/libechonest-2.3.0:=[qt5] + media-libs/liblastfm[qt5] telepathy? ( net-libs/telepathy-qt[qt5] ) ) " |