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

[Johannes Huber]

commit:     1e9ac26727286ba78c253684af3bf3ca71bebfd3
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 10:46:40 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 10:46:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9ac267

media-sound/tomahawk: Remove 0.8.4 (r3)

Package-Manager: portage-2.3.2

 media-sound/tomahawk/Manifest                      |   1 -
 .../files/tomahawk-0.8.4-echonest231.patch         | 168 ---------------------
 .../files/tomahawk-0.8.4-qca-qt5-linking.patch     |  70 ---------
 .../tomahawk/files/tomahawk-0.8.4-qt55.patch       |  34 -----
 .../files/tomahawk-0.8.4-taglib-1.10.patch         |  35 -----
 media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild      | 108 -------------
 6 files changed, 416 deletions(-)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index e64b76d..c02148b 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,2 +1 @@
-DIST tomahawk-0.8.4.tar.bz2 8611412 SHA256 0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 SHA512 5b312f593eac39d06de05e24d4ce429122d0777a9d52d6db8c65309ac283d7ae560c2fc189b186f0f8b1a7bbe1135ed0d59e1d850de6a93655e53efe4f5317c7 WHIRLPOOL 3577f47f13b191f0bea42d7c30c00ad8e6346afc7527eb5f5ecb81185183a8e99dcc0559414afbba485db5d80d2e5f9830fe341d4563d3d7427a98f54382e013
 DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 SHA256 de4005fd68dfb11380419829e009f19b901c4b14ccec6dd63400b21612886271 SHA512 fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9 WHIRLPOOL b914df1f2a26cc18af021ef6fce5511b2a103d7243340bcaec3d0c98fa90fc2fcda32cabc8022c2106d9bd9dffa777765e17433dc268f2c317537716c31928f6

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
deleted file mode 100644
index 537fa1d..00000000
--- a/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-commit 778b8ee180480e4296fe96d2496b740df8365f02
-Author: Dominik Schmidt <dev@×××××××××××××××.de>
-Date:   Fri Feb 6 22:48:54 2015 +0100
-
-    Use new echonest5 include dir for Qt5
-
-diff --git a/CMakeModules/FindEchonest.cmake b/CMakeModules/FindEchonest.cmake
-index 2a3625e..1459372 100644
---- a/CMakeModules/FindEchonest.cmake
-+++ b/CMakeModules/FindEchonest.cmake
-@@ -13,7 +13,7 @@ endif()
- 
- PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})
- 
--FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
-+FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest${LIBECHONEST_SUFFIX}/Track.h
-     HINTS
-         ${PC_ECHONEST_INCLUDEDIR}
-         ${PC_ECHONEST_INCLUDE_DIRS}
-diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.cpp b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
-index 92e8c11..a17c4a4 100644
---- a/src/infoplugins/generic/echonest/EchonestPlugin.cpp
-+++ b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
-@@ -23,7 +23,11 @@
- #include "utils/Logger.h"
- #include "utils/NetworkAccessManager.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <echonest5/ArtistTypes.h>
-+#else
- #include <echonest/ArtistTypes.h>
-+#endif
- 
- #include <QNetworkConfiguration>
- 
-diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.h b/src/infoplugins/generic/echonest/EchonestPlugin.h
-index 7388b38..40edd0c 100644
---- a/src/infoplugins/generic/echonest/EchonestPlugin.h
-+++ b/src/infoplugins/generic/echonest/EchonestPlugin.h
-@@ -25,7 +25,11 @@
- #include "infosystem/InfoSystem.h"
- #include "infosystem/InfoSystemWorker.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <echonest5/Artist.h>
-+#else
- #include <echonest/Artist.h>
-+#endif
- 
- #include <QObject>
- 
-diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.cpp b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
-index cb70ed8..5d030c7 100644
---- a/src/libtomahawk/EchonestCatalogSynchronizer.cpp
-+++ b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
-@@ -33,8 +33,13 @@
- #include "TomahawkSettings.h"
- #include "Track.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <echonest5/CatalogUpdateEntry.h>
-+#include <echonest5/Config.h>
-+#else
- #include <echonest/CatalogUpdateEntry.h>
- #include <echonest/Config.h>
-+#endif
- 
- using namespace Tomahawk;
- 
-diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.h b/src/libtomahawk/EchonestCatalogSynchronizer.h
-index 50d7cc2..0e7a5ac 100644
---- a/src/libtomahawk/EchonestCatalogSynchronizer.h
-+++ b/src/libtomahawk/EchonestCatalogSynchronizer.h
-@@ -22,7 +22,11 @@
- #include "DllMacro.h"
- #include "Query.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <echonest5/Catalog.h>
-+#else
- #include <echonest/Catalog.h>
-+#endif
- 
- #include <QObject>
- #include <QQueue>
-diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp
-index 1b14bb2..24f0ad1 100644
---- a/src/libtomahawk/GlobalActionManager.cpp
-+++ b/src/libtomahawk/GlobalActionManager.cpp
-@@ -61,8 +61,12 @@
- #include <QClipboard>
- #include <QMessageBox>
- 
--#include <echonest/Playlist.h>
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <echonest5/Playlist.h>
-+#else
-+#include <echonest/Playlist.h>
-+#endif
- 
- GlobalActionManager* GlobalActionManager::s_instance = 0;
- 
-diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
-index b12108e..5704f35 100644
---- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
-+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
-@@ -24,7 +24,11 @@
- #include <QTimer>
- #include <QPointer>
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <echonest5/Playlist.h>
-+#else
- #include <echonest/Playlist.h>
-+#endif
- 
- namespace Tomahawk
- {
-diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
-index 5ed250c..adb6e6c 100644
---- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
-+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
-@@ -28,7 +28,12 @@
- 
- #include "DllMacro.h"
- 
-+
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <echonest5/Playlist.h>
-+#else
- #include <echonest/Playlist.h>
-+#endif
- 
- namespace Tomahawk
- {
-diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
-index d7e2040..960aadb 100644
---- a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
-+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
-@@ -24,7 +24,11 @@
- #include "utils/TomahawkUtils.h"
- #include "utils/Logger.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <echonest5/Playlist.h>
-+#else
- #include <echonest/Playlist.h>
-+#endif
- 
- #include <QPaintEvent>
- #include <QHBoxLayout>
-diff --git a/src/tomahawk/sourcetree/items/CategoryItems.cpp b/src/tomahawk/sourcetree/items/CategoryItems.cpp
-index 425591f..c830ff9 100644
---- a/src/tomahawk/sourcetree/items/CategoryItems.cpp
-+++ b/src/tomahawk/sourcetree/items/CategoryItems.cpp
-@@ -33,7 +33,11 @@
- #include "utils/ImageRegistry.h"
- #include "utils/Logger.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <echonest5/Playlist.h>
-+#else
- #include <echonest/Playlist.h>
-+#endif
- 
- using namespace Tomahawk;
- 

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-qca-qt5-linking.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-qca-qt5-linking.patch
deleted file mode 100644
index bc52cc3..00000000
--- a/media-sound/tomahawk/files/tomahawk-0.8.4-qca-qt5-linking.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 4fa69d9607b95bf74dd86a151b8f77113f04f205 Mon Sep 17 00:00:00 2001
-From: Dominik Schmidt <domme@×××××××××××××××.org>
-Date: Thu, 29 Jan 2015 06:11:36 +0100
-Subject: [PATCH] Link against correct qca library with Qt5
-
----
- CMakeLists.txt                      | 10 +++++++++-
- src/accounts/hatchet/CMakeLists.txt |  1 -
- src/libtomahawk/CMakeLists.txt      |  5 +----
- 3 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6db3741..65eebb1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -325,7 +325,15 @@ macro_log_feature(GNUTLS_FOUND "GnuTLS"
-     "http://gnutls.org/" TRUE ""
-     "GnuTLS is needed for serving the Playdar/HTTP API via TLS")
- 
--macro_optional_find_package(QCA2)
-+if( TOMAHAWK_QT5 )
-+  macro_optional_find_package(Qca-qt5)
-+  if(Qca-qt5_DIR)
-+      set(QCA2_FOUND ON CACHE BOOL "QCA2 was found")
-+      set(QCA2_LIBRARIES "qca-qt5" CACHE STRING "QCA2 Qt5 target")
-+  endif()
-+else()
-+  macro_optional_find_package(QCA2)
-+endif()
- macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "")
- 
- if( TOMAHAWK_QT5 )
-diff --git a/src/accounts/hatchet/CMakeLists.txt b/src/accounts/hatchet/CMakeLists.txt
-index eb082ff..86ebee4 100644
---- a/src/accounts/hatchet/CMakeLists.txt
-+++ b/src/accounts/hatchet/CMakeLists.txt
-@@ -13,7 +13,6 @@ endif()
- include( ${TOMAHAWK_USE_FILE} )
- 
- find_package(OpenSSL REQUIRED)
--find_package(QCA2 REQUIRED)
- find_package(websocketpp 0.2.99 REQUIRED)
- 
- include_directories(
-diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
-index 238670e..1e07325 100644
---- a/src/libtomahawk/CMakeLists.txt
-+++ b/src/libtomahawk/CMakeLists.txt
-@@ -402,10 +402,6 @@ include_directories(
-     ${QTKEYCHAIN_INCLUDE_DIRS}
- )
- 
--IF(QCA2_FOUND)
--    INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
--ENDIF(QCA2_FOUND)
--
- IF(LIBATTICA_FOUND)
-     SET( libGuiSources ${libGuiSources} AtticaManager.cpp )
-     INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} )
-@@ -491,6 +487,7 @@ IF(APPLE)
- ENDIF()
- 
- IF(QCA2_FOUND)
-+    INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
-     LIST(APPEND LINK_LIBRARIES ${QCA2_LIBRARIES} )
- ENDIF(QCA2_FOUND)
- 
--- 
-1.8.3.2
-

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch
deleted file mode 100644
index 10b71c0..00000000
--- a/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 50e77ce0db45e9c876eba3d8cc6491f62a5de882 Mon Sep 17 00:00:00 2001
-From: Takahiro Hashimoto <kenya888@×××××.com>
-Date: Mon, 22 Jun 2015 14:33:23 +0900
-Subject: [PATCH] fix compilation error with Qt 5.5
-
----
- src/libtomahawk/network/acl/AclRegistry.cpp | 1 +
- src/libtomahawk/utils/TomahawkCache.h       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/libtomahawk/network/acl/AclRegistry.cpp b/src/libtomahawk/network/acl/AclRegistry.cpp
-index b177d19..3bc5056 100644
---- a/src/libtomahawk/network/acl/AclRegistry.cpp
-+++ b/src/libtomahawk/network/acl/AclRegistry.cpp
-@@ -21,6 +21,7 @@
- 
- #include <QThread>
- #include <QVariant>
-+#include <QDataStream>
- 
- #include "utils/Logger.h"
- 
-diff --git a/src/libtomahawk/utils/TomahawkCache.h b/src/libtomahawk/utils/TomahawkCache.h
-index b7c3245..6a4aadd 100644
---- a/src/libtomahawk/utils/TomahawkCache.h
-+++ b/src/libtomahawk/utils/TomahawkCache.h
-@@ -27,6 +27,7 @@
- #include <QObject>
- #include <QTimer>
- #include <QDir>
-+#include <QDataStream>
- 
- namespace TomahawkUtils
- {

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch
deleted file mode 100644
index ff86225..00000000
--- a/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ee4656383a92a78299aff6f8637f174fff328e98 Mon Sep 17 00:00:00 2001
-From: Pinak Ahuja <pinak.ahuja@×××××.com>
-Date: Wed, 2 Sep 2015 14:41:00 +0530
-Subject: [PATCH] Compare taglib version properly
-
----
- CMakeModules/FindTaglib.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
-index e0efbef..f54ff78 100644
---- a/CMakeModules/FindTaglib.cmake
-+++ b/CMakeModules/FindTaglib.cmake
-@@ -34,10 +34,10 @@ ELSE()
- 
- 	  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
- 
--	  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+	  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
- 		 message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
- 		 set(TAGLIB_FOUND FALSE)
--	  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+	  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
- 
- 		 exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
- 
-@@ -48,7 +48,7 @@ ELSE()
- #			message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
- 		 endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
- 		 string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--	  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
-+	  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
- 	  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
- 
- 	else(TAGLIBCONFIG_EXECUTABLE)

diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
deleted file mode 100644
index 2c4d55b..00000000
--- a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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-r3"
-	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="http://tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="debug +hatchet kde qt5 telepathy xmpp"
-
-REQUIRED_USE="telepathy? ( kde )"
-
-DEPEND="
-	dev-cpp/lucene++
-	dev-cpp/sparsehash
-	dev-libs/boost:=
-	>=media-libs/taglib-1.8.0
-	>=net-libs/gnutls-3.2:=
-	x11-libs/libX11
-	hatchet? ( dev-cpp/websocketpp )
-	!qt5? (
-		app-crypt/qca:2[qt4(+)]
-		>=dev-libs/libattica-0.4.0
-		dev-libs/qjson
-		dev-libs/qtkeychain:=[qt4]
-		<dev-libs/quazip-0.7.2[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.1:=[qt4]
-		media-libs/liblastfm[qt4]
-		telepathy? ( net-libs/telepathy-qt[qt4] )
-		xmpp? ( net-libs/jreen[qt4] )
-	)
-	qt5? (
-		app-crypt/qca:2[qt5(+)]
-		dev-libs/qtkeychain:=[qt5]
-		<dev-libs/quazip-0.7.2[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.1:=[qt5]
-		media-libs/liblastfm[qt5]
-		telepathy? ( net-libs/telepathy-qt[qt5] )
-		xmpp? ( net-libs/jreen[qt5] )
-	)
-"
-RDEPEND="${DEPEND}
-	app-crypt/qca:2[ssl]
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt55.patch"
-	"${FILESDIR}/${P}-taglib-1.10.patch"
-	"${FILESDIR}/${P}-qca-qt5-linking.patch"
-	"${FILESDIR}/${P}-echonest231.patch"
-)
-
-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)
-	)
-
-	if [[ ${PV} != *9999* ]]; then
-		mycmakeargs+=( -DBUILD_RELEASE=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}