gentoo resync : 14.05.2020

3 files changed, 150 insertions, 6 deletions

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 9c1aaaac0477..7e04b031da1c 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,5 +1,6 @@
 AUX tomahawk-0.9.0_pre20181030-cmakepolicy.patch 926 BLAKE2B 8af469b6186e57db674dc5acaec6032bf43c15d91b5db9a9bf30f617c47b74486149a50774c76eb69bf89157e1ee8eed0d449b9d107e4f8e7e376f9d9d4f9d29 SHA512 7d0c98a6f1708d156ab643439faf3f469fa21a106f618dc1b8b7c569a2f65a9c929670bc1aa679eebf1116e615fd832593116f84e3abe5fff3d91450e1455f21
 AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
+AUX tomahawk-0.9.0_pre20181030-qt-5.15.patch 4668 BLAKE2B 40c40daa9079f1695234dff83102087ab3eaa26ef6b084df36fc2040e9f23d69296a452e3d263a6e7fd902c78f62f2ae12a15ae181b8ff8848e4db0542df3462 SHA512 e5dbef2b9cf042576565ca16fd278778847af1657bf22d9c27cb177b5ba20fbc492f6769cc661657dbfc23bbfde66399f42a657c2fbea2c91d87216b921da8bd
 DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
-EBUILD tomahawk-0.9.0_pre20181030.ebuild 1782 BLAKE2B 0bf943a9e5eacbb90e01f4986870e1c55fe53aa88e9e94213aaa66f6a512cafe3f5d7118821bfb519eed421c9ebf0c972e03f4e11e72145f5a51ddee137112ed SHA512 7c9ac54104f2f81f356785957c2b92e369b031109469d5800b8288fd297a3787f12a5b3159d966076440e8f8c7a4b6371f66a646fc9b43d00fad8a2c58b48ef1
+EBUILD tomahawk-0.9.0_pre20181030.ebuild 1835 BLAKE2B 077307ceebcaeb6c3db3c5b1b2534528435dd6a5f58e94fdd4777546cec9bcebd095fe659d3096ee380ee7539faa5f06ba1fd227fbb56f5bbc0a24f9e72380b0 SHA512 780432d7b50209b140281db8329b4cdfa9409e87285fbbb57e66c1881f5816e498579713abbc29c6864538945a05abcbd2e55971c2b1a70429424e4219c27b35
 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
new file mode 100644
index 000000000000..f07b746a03f7
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
@@ -0,0 +1,140 @@
+From 4fb44c931be648d61ef3c8d10426b34de1b2a53b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 8 May 2020 23:55:43 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath)
+
+---
+ src/libtomahawk/utils/AnimatedSpinner.cpp               | 1 +
+ src/libtomahawk/utils/TomahawkUtilsGui.cpp              | 1 +
+ src/libtomahawk/widgets/DropDownButton.cpp              | 2 ++
+ src/libtomahawk/widgets/HoverControls.cpp               | 1 +
+ src/libtomahawk/widgets/SourceTreePopupDialog.cpp       | 1 +
+ src/libtomahawk/widgets/searchlineedit/SearchButton.cpp | 9 +++++----
+ src/tomahawk/widgets/AccountsPopupWidget.cpp            | 1 +
+ src/tomahawk/widgets/SlideSwitchButton.cpp              | 1 +
+ src/tomahawk/widgets/SocialWidget.cpp                   | 3 ++-
+ 9 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/libtomahawk/utils/AnimatedSpinner.cpp b/src/libtomahawk/utils/AnimatedSpinner.cpp
+index b4778cbe9..a705cfaa2 100644
+--- a/src/libtomahawk/utils/AnimatedSpinner.cpp
++++ b/src/libtomahawk/utils/AnimatedSpinner.cpp
+@@ -28,6 +28,7 @@
+ #include <QApplication>
+ #include <QHideEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QShowEvent>
+ 
+diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+index b35799723..d2733d4a7 100644
+--- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
++++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <QLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QBitmap>
+ #include <QPalette>
+diff --git a/src/libtomahawk/widgets/DropDownButton.cpp b/src/libtomahawk/widgets/DropDownButton.cpp
+index 74aa344d1..106e8b882 100644
+--- a/src/libtomahawk/widgets/DropDownButton.cpp
++++ b/src/libtomahawk/widgets/DropDownButton.cpp
+@@ -19,6 +19,8 @@
+ #include "DropDownButton.h"
+ 
+ #include <QMouseEvent>
++#include <QPaintEvent>
++#include <QPainterPath>
+ 
+ #include "Artist.h"
+ #include "Album.h"
+diff --git a/src/libtomahawk/widgets/HoverControls.cpp b/src/libtomahawk/widgets/HoverControls.cpp
+index 3e31bf236..0b6b20aa8 100644
+--- a/src/libtomahawk/widgets/HoverControls.cpp
++++ b/src/libtomahawk/widgets/HoverControls.cpp
+@@ -27,6 +27,7 @@
+ #include <QPixmap>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ using namespace Tomahawk;
+ 
+diff --git a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
+index 807eb354a..1379c9c53 100644
+--- a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
++++ b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
+@@ -22,6 +22,7 @@
+ #include <QApplication>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDialogButtonBox>
+ #include <QVBoxLayout>
+ #include <QHBoxLayout>
+diff --git a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
+index 1d9f1c4bd..97c5406f2 100644
+--- a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
++++ b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
+@@ -19,10 +19,11 @@
+ 
+ #include "SearchButton.h"
+ 
+-#include <qcompleter.h>
+-#include <qevent.h>
+-#include <qlineedit.h>
+-#include <qpainter.h>
++#include <QCompleter>
++#include <QEvent>
++#include <QLineEdit>
++#include <QPainter>
++#include <QPainterPath>
+ 
+ SearchButton::SearchButton(QWidget *parent)
+     : QAbstractButton(parent)
+diff --git a/src/tomahawk/widgets/AccountsPopupWidget.cpp b/src/tomahawk/widgets/AccountsPopupWidget.cpp
+index cb5739b97..ffd5dcaa1 100644
+--- a/src/tomahawk/widgets/AccountsPopupWidget.cpp
++++ b/src/tomahawk/widgets/AccountsPopupWidget.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QVBoxLayout>
+ 
+diff --git a/src/tomahawk/widgets/SlideSwitchButton.cpp b/src/tomahawk/widgets/SlideSwitchButton.cpp
+index 3c61b4987..103562e00 100644
+--- a/src/tomahawk/widgets/SlideSwitchButton.cpp
++++ b/src/tomahawk/widgets/SlideSwitchButton.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPropertyAnimation>
+ #include <QStyleOptionButton>
+ #include <QPixmap>
+diff --git a/src/tomahawk/widgets/SocialWidget.cpp b/src/tomahawk/widgets/SocialWidget.cpp
+index f0901279d..b43f44c5d 100644
+--- a/src/tomahawk/widgets/SocialWidget.cpp
++++ b/src/tomahawk/widgets/SocialWidget.cpp
+@@ -29,8 +29,9 @@
+ #include "Source.h"
+ #include "Track.h"
+ 
+-#include <QPainter>
+ #include <QDialog>
++#include <QPainter>
++#include <QPainterPath>
+ #include <QPropertyAnimation>
+ 
+ #define ARROW_HEIGHT 6
+-- 
+2.26.2
+
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index fca16414dfb9..e3e201984d00 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 COMMIT=777b31219179b43f56c7b95857d2fbd7f33199aa
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Multi-source social music player"
 HOMEPAGE="https://github.com/tomahawk-player/tomahawk"
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="telepathy xmpp"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -44,7 +47,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/designer:5
-	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 "
 RDEPEND="${COMMON_DEPEND}
@@ -56,6 +58,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-warning.patch"
 	"${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826
+	"${FILESDIR}/${P}-qt-5.15.patch" # pending upstream
 )
 
 src_configure() {
@@ -70,7 +73,7 @@ src_configure() {
 
 	[[ ${PV} != *9999* ]] && mycmakeargs+=( -DBUILD_RELEASE=ON )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {