+++ /dev/null
-From 00f602e10203b76fc28b4615868c567e6bd4ced4 Mon Sep 17 00:00:00 2001
-From: Dominik Schmidt <dev@dominik-schmidt.de>
-Date: Tue, 8 Aug 2017 14:34:49 +0200
-Subject: [PATCH] Fix #619: Correctly detect qt5keychain
-
----
- CMakeLists.txt | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ad5d918ecf..7004e1b700 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -376,12 +376,8 @@ macro_optional_find_package(LibLastFm 1.0.0)
- macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/lastfm/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
-
- if( NOT APPLE )
--if( TOMAHAWK_QT5 )
-- macro_optional_find_package(Qt5Keychain 0.1.0)
--else()
-- macro_optional_find_package(QtKeychain 0.1.0)
--endif()
--macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
-+macro_optional_find_package(Qt5Keychain 0.1.0)
-+macro_log_feature(Qt5Keychain_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
- endif()
-
- if( UNIX AND NOT APPLE )
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- # SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
- SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-else
- EGIT_REPO_URI="https://github.com/tomahawk-player/${PN}.git"
-fi
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://www.tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="+hatchet telepathy xmpp"
-
-CDEPEND="
- $(add_frameworks_dep attica)
- $(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-0.7.2[qt5]
- media-libs/liblastfm[qt5]
- >=media-libs/taglib-1.8.0
- media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
- >=net-libs/gnutls-3.2:=
- x11-libs/libX11
- hatchet? ( dev-cpp/websocketpp )
- telepathy? ( net-libs/telepathy-qt[qt5(+)] )
- xmpp? ( net-libs/jreen[qt5] )
-"
-DEPEND="${CDEPEND}
- $(add_qt_dep designer)
- $(add_qt_dep linguist-tools)
- $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${CDEPEND}
- app-crypt/qca:2[ssl]
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-liblastfm-cmake.patch"
- "${FILESDIR}/${PN}-qtkeychain-cmake.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_CRASHREPORTER=OFF
- -DBUILD_TESTS=OFF
- -DBUILD_TOOLS=OFF
- -DBUILD_WITH_QT4=OFF
- -DWITH_KDE4=OFF
- -DBUILD_HATCHET=$(usex hatchet)
- -DWITH_TelepathyQt=$(usex telepathy)
- -DWITH_Jreen=$(usex xmpp)
- )
-
- if [[ ${KDE_BUILD_TYPE} != live ]]; then
- mycmakeargs+=( -DBUILD_RELEASE=ON )
- fi
-
- kde5_src_configure
-}