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 A21F659CB2 for ; Fri, 15 Apr 2016 18:46:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEA61E0875; Fri, 15 Apr 2016 18:46:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 806A9E0875 for ; Fri, 15 Apr 2016 18:46:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27950340C53 for ; Fri, 15 Apr 2016 18:46:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E7BB80 for ; Fri, 15 Apr 2016 18:46:13 +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: <1460745965.b2d87a3b018e97057e2c4e1f607fec91a820cc2e.johu@gentoo> Subject: [gentoo-commits] dev/johu:master commit in: media-sound/tomahawk/ X-VCS-Repository: dev/johu X-VCS-Files: 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: b2d87a3b018e97057e2c4e1f607fec91a820cc2e X-VCS-Branch: master Date: Fri, 15 Apr 2016 18:46:13 +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: ad90a51c-1f3a-4979-9f29-ce0c22f4c87b X-Archives-Hash: 26699266983591951d7c841d8f080269 commit: b2d87a3b018e97057e2c4e1f607fec91a820cc2e Author: Johannes Huber gentoo org> AuthorDate: Fri Apr 15 18:46:05 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Apr 15 18:46:05 2016 +0000 URL: https://gitweb.gentoo.org/dev/johu.git/commit/?id=b2d87a3b media-sound/tomahawk: Drop Qt4 support Upstream says it is broken. Package-Manager: portage-2.2.28 media-sound/tomahawk/tomahawk-9999.ebuild | 87 ++++++++++++------------------- 1 file changed, 32 insertions(+), 55 deletions(-) diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild index 7aff77b..89198fe 100644 --- a/media-sound/tomahawk/tomahawk-9999.ebuild +++ b/media-sound/tomahawk/tomahawk-9999.ebuild @@ -4,14 +4,12 @@ EAPI=6 -KDE_REQUIRED="optional" -inherit kde4-base +inherit kde5 -if [[ ${PV} != *9999* ]]; then +if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2" KEYWORDS="~amd64 ~x86" else - inherit git-r3 EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git" KEYWORDS="" fi @@ -21,54 +19,41 @@ HOMEPAGE="http://tomahawk-player.org/" LICENSE="GPL-3 BSD" SLOT="0" -IUSE="debug +hatchet kde qt5 telepathy xmpp" +IUSE="+hatchet telepathy xmpp" -REQUIRED_USE="telepathy? ( kde )" - -DEPEND=" +CDEPEND=" + $(add_frameworks_dep attica) + $(add_qt_dep designer) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtsql) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwebkit) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + $(add_qt_dep qtxml) + app-crypt/qca:2[qt5] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= + dev-libs/qtkeychain[qt5] + dev-libs/quazip[qt5] + >=media-libs/libechonest-2.3.0:=[qt5] + media-libs/liblastfm[qt5] + media-libs/phonon[qt5] >=media-libs/taglib-1.8.0 >=net-libs/gnutls-3.2 x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) - xmpp? ( net-libs/jreen ) - !qt5? ( - app-crypt/qca:2[qt4] - >=dev-libs/libattica-0.4.0 - dev-libs/qjson - dev-libs/qtkeychain[qt4] - dev-libs/quazip[qt4] - 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 - media-libs/phonon[qt4] - >=media-libs/libechonest-2.3.0:=[qt4] - media-libs/liblastfm[qt4] - telepathy? ( net-libs/telepathy-qt[qt4] ) - ) - qt5? ( - app-crypt/qca:2[qt5] - dev-libs/qtkeychain[qt5] - dev-libs/quazip[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] - >=media-libs/libechonest-2.3.0:=[qt5] - media-libs/liblastfm[qt5] - telepathy? ( net-libs/telepathy-qt[qt5] ) - ) + telepathy? ( net-libs/telepathy-qt[qt5] ) + xmpp? ( net-libs/jreen[qt5] ) +" +DEPEND="${CDEPEND} + $(add_qt_dep linguist-tools) + $(add_qt_dep qtconcurrent) " -RDEPEND="${DEPEND} +RDEPEND="${CDEPEND} app-crypt/qca:2[openssl] " @@ -84,24 +69,16 @@ src_configure() { -DWITH_CRASHREPORTER=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF + -DBUILD_WITH_QT4=OFF + -DWITH_KDE4=OFF -DBUILD_HATCHET=$(usex hatchet) - -DWITH_KDE4=$(usex kde) - -DBUILD_WITH_QT4=$(usex !qt5) -DWITH_TelepathyQt=$(usex telepathy) -DWITH_Jreen=$(usex xmpp) ) - if [[ ${PV} != *9999* ]]; then + if [[ ${KDE_BUILD_TYPE} != live ]]; then mycmakeargs+=( -DBUILD_RELEASE=ON ) fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install + kde5_src_configure }