[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[Johannes Huber]

commit:     63488059efef2b291c7c86f77dcbfb8b3b365cdb
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 16:47:55 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 16:50:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63488059

media-sound/tomahawk: EAPI 6

Package-Manager: portage-2.2.28

 media-sound/tomahawk/tomahawk-9999.ebuild | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild 
b/media-sound/tomahawk/tomahawk-9999.ebuild
index 10d684f..f93c527 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_REQUIRED="optional"
-inherit kde4-base ${GIT_ECLASS}
+inherit kde4-base
 
 if [[ ${PV} != *9999* ]]; then
        SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2";
        KEYWORDS="~amd64 ~x86"
 else
-       GIT_ECLASS="git-r3"
+       inherit git-r3
        EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
        KEYWORDS=""
 fi
@@ -77,11 +77,13 @@ DOCS=( AUTHORS ChangeLog README.md )
 src_configure() {
        local mycmakeargs=(
                -DWITH_CRASHREPORTER=OFF
-               $(cmake-utils_use_build hatchet)
-               $(cmake-utils_use_with xmpp Jreen)
-               $(cmake-utils_use_with kde KDE4)
-               $(cmake-utils_use_build !qt5 WITH_QT4)
-               $(cmake-utils_use_with telepathy TelepathyQt)
+               -DBUILD_TESTS=OFF
+               -DBUILD_TOOLS=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