commit: 3baffb1f1c9af99eb937545c05bc27878c2ae5fc Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Tue Jul 22 16:43:50 2014 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Tue Jul 22 16:43:50 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=3baffb1f
[media-sound/tomahawk] Sync with tree Package-Manager: portage-2.2.10 --- media-sound/tomahawk/metadata.xml | 1 - media-sound/tomahawk/tomahawk-9999.ebuild | 31 +++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml index c2ec31a..21a6857 100644 --- a/media-sound/tomahawk/metadata.xml +++ b/media-sound/tomahawk/metadata.xml @@ -8,7 +8,6 @@ </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 bf6776f..b46f902 100644 --- a/media-sound/tomahawk/tomahawk-9999.ebuild +++ b/media-sound/tomahawk/tomahawk-9999.ebuild @@ -16,30 +16,35 @@ else KEYWORDS="" fi -DESCRIPTION="Qt playdar social music player" +DESCRIPTION="Multi-source social music player" HOMEPAGE="http://tomahawk-player.org/" LICENSE="GPL-3 BSD" SLOT="0" -IUSE="debug jabber kde qt5 telepathy twitter" +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.1.0 - >=media-libs/liblastfm-1.0.1 - >=media-libs/phonon-4.5.0 - >=media-libs/taglib-1.6.0 + >=media-libs/libechonest-2.2.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,17 +52,19 @@ 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 ) - twitter? ( net-libs/qtweetlib ) " RDEPEND="${DEPEND} app-crypt/qca-ossl @@ -67,11 +74,11 @@ DOCS=( AUTHORS ChangeLog README.md ) src_configure() { local mycmakeargs=( + -DWITH_CRASHREPORTER=OFF $(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) ) if [[ ${PV} != *9999* ]]; then