From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1715F1381F3 for ; Sat, 19 Oct 2013 16:28:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8F41E0B22; Sat, 19 Oct 2013 16:28:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6DCD7E0B22 for ; Sat, 19 Oct 2013 16:28:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5808533F164 for ; Sat, 19 Oct 2013 16:28:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 08ACDE5308 for ; Sat, 19 Oct 2013 16:28:03 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1382200071.49b7d85ea99c8c32defe81a6aefa72dd0bc15361.johu@gentoo> Subject: [gentoo-commits] dev/johu:master commit in: media-sound/tomahawk/ X-VCS-Repository: dev/johu X-VCS-Files: media-sound/tomahawk/metadata.xml media-sound/tomahawk/tomahawk-9999.ebuild X-VCS-Directories: media-sound/tomahawk/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 49b7d85ea99c8c32defe81a6aefa72dd0bc15361 X-VCS-Branch: master Date: Sat, 19 Oct 2013 16:28:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ed83bc4c-9d54-4a80-b593-437f5a655029 X-Archives-Hash: 67d00340e2f2de8b6c520f615e11b154 commit: 49b7d85ea99c8c32defe81a6aefa72dd0bc15361 Author: Johannes Huber gentoo org> AuthorDate: Sat Oct 19 16:27:51 2013 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Oct 19 16:27:51 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=49b7d85e [media-libs/tomahawk] Update live ebuild by upstream changes Package-Manager: portage-2.2.7 --- media-sound/tomahawk/metadata.xml | 1 + media-sound/tomahawk/tomahawk-9999.ebuild | 42 ++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml index df344c1..c2ec31a 100644 --- a/media-sound/tomahawk/metadata.xml +++ b/media-sound/tomahawk/metadata.xml @@ -7,6 +7,7 @@ Johannes Huber + Enable support for the real-time communication framework telepathy Enable twitter support diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild index 7eaa460..3f58275 100644 --- a/media-sound/tomahawk/tomahawk-9999.ebuild +++ b/media-sound/tomahawk/tomahawk-9999.ebuild @@ -4,27 +4,26 @@ 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,18 +32,30 @@ DEPEND=" >=dev-libs/libattica-0.4.0 dev-libs/qjson dev-libs/quazip - >=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 + dev-libs/qtkeychain[qt5?] + >=media-libs/libechonest-2.1.0 >=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 ) + !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} @@ -56,6 +67,9 @@ 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) )