media-sound/tomahawk: Fix build with echonest 2.3.1

Backport upstream patch to fix build with media-libs/libechonest-2.3.1.
Unfortunately this bug release delivers breakage by introducing suffix for qt5.
At the time where tomahawk 0.8.4 was released this suffix doesn't exist and the
build system ignores it. This was fixed in master in the meantime.

Gentoo-bug: 578570

Package-Manager: portage-2.2.28

3 files changed, 172 insertions, 3 deletions

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
new file mode 100644
index 000000000000..537fa1d933c9
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
@@ -0,0 +1,168 @@
+commit 778b8ee180480e4296fe96d2496b740df8365f02
+Author: Dominik Schmidt <dev@dominik-schmidt.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/tomahawk-0.8.4-r2.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
index 11314ce568f4..535e1abb16f1 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
@@ -48,7 +48,7 @@ DEPEND="
 		dev-qt/qtsvg:4
 		dev-qt/qtwebkit:4
 		media-libs/phonon[qt4]
-		>=media-libs/libechonest-2.3.0:=[qt4]
+		>=media-libs/libechonest-2.3.1:=[qt4]
 		media-libs/liblastfm[qt4]
 		telepathy? ( net-libs/telepathy-qt[qt4] )
 	)
@@ -63,7 +63,7 @@ DEPEND="
 		dev-qt/qtwidgets:5
 		kde-frameworks/attica:5
 		media-libs/phonon[qt5]
-		>=media-libs/libechonest-2.3.0:=[qt5]
+		>=media-libs/libechonest-2.3.1:=[qt5]
 		media-libs/liblastfm[qt5]
 		telepathy? ( net-libs/telepathy-qt[qt5] )
 	)
@@ -78,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-qt55.patch"
 	"${FILESDIR}/${P}-taglib-1.10.patch"
 	"${FILESDIR}/${P}-qca-qt5-linking.patch"
+	"${FILESDIR}/${P}-echonest231.patch"
 )
 
 src_configure() {
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 89198feb3837..8dadfa908e70 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -39,7 +39,7 @@ CDEPEND="
 	dev-libs/boost:=
 	dev-libs/qtkeychain[qt5]
 	dev-libs/quazip[qt5]
-	>=media-libs/libechonest-2.3.0:=[qt5]
+	>=media-libs/libechonest-2.3.1:=[qt5]
 	media-libs/liblastfm[qt5]
 	media-libs/phonon[qt5]
 	>=media-libs/taglib-1.8.0