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

[Andreas Sturmlechner]

commit:     e68151c0a6df725c4a99202924290ba4ebe16398
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 09:25:40 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 23:57:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e68151c0

media-sound/tomahawk: Drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/tomahawk/Manifest                      |  1 -
 .../tomahawk/files/tomahawk-qtkeychain-cmake.patch | 28 --------
 .../tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild  | 82 ----------------------
 3 files changed, 111 deletions(-)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 9a77cda1e42..dfa5a8e4793 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,2 +1 @@
-DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 BLAKE2B 8d12eaaf055da7dfe0dc4ff3e07c2be824983ca160d8ccd592ab611a8df09cead0d334e2ca3113c1bc34dea85c61edcf1bdeb6208316f1c372caf08bc04243e1 SHA512 fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9
 DIST tomahawk-0.9.0_pre20170808.tar.gz 9913232 BLAKE2B 5a7ebd9419fece090c0aec1f8f47bf35e1f0fbae5cd6a41803ac265e7310dadac61ba4f2e25b0d2fbbb0068cbb3f7098c1d330ac81e671be1028ed3b78d32560 SHA512 edaa4c1637ca460f838dfdd7ecc9d5dae0b66a8280deb8dc6140c673ecc76aa1055efbbac1e9b2937ec01d6dd657935b907cadceb2059f8e055305e872866c2b

diff --git a/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch b/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
deleted file mode 100644
index e4b3bf0304c..00000000000
--- a/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 00f602e10203b76fc28b4615868c567e6bd4ced4 Mon Sep 17 00:00:00 2001
-From: Dominik Schmidt <dev@×××××××××××××××.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 )

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
deleted file mode 100644
index 39c73c56872..00000000000
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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
-}