gentoo resync : 21.06.2020

4 files changed, 66 insertions, 24 deletions

diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index b248d6e669c9..86c5151aea21 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,5 +1,6 @@
+AUX qtfm-6.2.0-qt-5.15.patch 1037 BLAKE2B cb48575cb9097b84ed1bb739c0f6254d1bf88196d08e5ceee7b43ebae71f45dd0bf68dadfd0dce7b7f94958453d9d40f1750f291049a6c2936d24c79d2943ebe SHA512 19ffb3a4d322b1fce676819c75e13ef2952dd50182e3162c55dde26badf90f29cb4db1f388b894699cf55f7c123b6bb810864f2f603ab6c01116ceac78bfabba
 AUX qtfm-99999-cmake.patch 323 BLAKE2B 023794991cc9a91792388e8d56d54542f50cf42ebe0d3a4bbf534d59acb869ada9465ab216b0e2a7978dd60d7ab9a15198f3e272707400d5d6f14b823ef1ac6b SHA512 74ee9c0e39bd826bc73aedfb79208e18bfc1348a49e7c0290d7a96375f3c56ec5d074d463bcf8256cb6ee5155b2d88f7c4c20544193c574db30356260c74bc52
 DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
-EBUILD qtfm-6.2.0.ebuild 1063 BLAKE2B 11a90f7c2a39a1d13376d0dd811476c74e612c3465ad377c324c486d333b5d4454ad98f99d1c90099e27f509acf054832662adee2a878b14a88995b3a9dc1cec SHA512 cae5d0cc10fb49a56cc60fc256daaf332c5b114472eabf9a9d59368711d06fd550904bcef6115627c2d076928de28dc2d80ff87685fa6929b23d951cea1236c9
-EBUILD qtfm-99999.ebuild 1021 BLAKE2B a842a5bd39efd90d37c227232177f5e59c9845e22c640b04b6802d57ee20f8bdf2c1f213f8160cd1268a365f1fcac345abd83cb79f641bd16dbcb74b118ca13e SHA512 db9bee8e1a655ffe5e94bfe9f40f40f63dfb5303fecb6e5f5fc88b88fda6682a7c7041e040f366a57f3f93593d717c0658f7c7db52bf7707ceaf34f43e9736ee
+EBUILD qtfm-6.2.0.ebuild 1104 BLAKE2B 761437994d50ca6f4a9bc7165238f41e434d33290d4fe566423be1c1133ea62a1baa877eb8a1cb9a6d92ec91b2a11d8b9ed873fd7831f2dd8fefebf4c976a691 SHA512 c64343feebb7c46cd7ad67b98a9f1386144b39e43fd80cef811e2ea1d110e998563d7cbbc5e731560561bf6bcb138ab5674ba6df4d9a0c7c5983b77334af791f
+EBUILD qtfm-99999.ebuild 1016 BLAKE2B 4c85b061cd9b00363ae50c83a2da79b81bf52e394a2d7e8e9f5d2cd47058992d1b8966805d35c458ad78bb14b53d9e52ac24a35f6604c1eb83c7cf98e82f53de SHA512 c68b2e850ccea6ef67be140bf10f87f4178ee4e73d022e33df680814e63ea2d4bf994a1a1a5a6e78f8dad553618de9c383b0898c88b02acc086e6a30cfd3fb40
 MISC metadata.xml 535 BLAKE2B aecaf2f611f0c47f5ec04b5fab8d45d7d0cf4c3b029a4605f2dadcf11237fd3fce56d10e8fab1611e716c70f303ca93deba25c3f884aeb7c798b9e411be7a024 SHA512 28844f26bfd8c62e896340bbe7f8466903eecf97e8eba6f5003c407258692ac76fc2799836c7a27643b1c4f9a5ba7033366414acc8f60b4f72b352e740026a7b
diff --git a/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch b/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch
new file mode 100644
index 000000000000..783d33d42328
--- /dev/null
+++ b/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch
@@ -0,0 +1,38 @@
+From c80a7f7e89f5810fab889dc2660d078438727c05 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 14 Jun 2020 20:25:46 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ libfm/iconlist.cpp | 2 ++
+ libfm/iconview.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/libfm/iconlist.cpp b/libfm/iconlist.cpp
+index ca72f2e..9b25dd2 100644
+--- a/libfm/iconlist.cpp
++++ b/libfm/iconlist.cpp
+@@ -1,5 +1,7 @@
+ #include "iconlist.h"
+ 
++#include <QPainterPath>
++
+ QSize IconListDelegate::sizeHint(const QStyleOptionViewItem &option,
+                                  const QModelIndex &index) const
+ {
+diff --git a/libfm/iconview.cpp b/libfm/iconview.cpp
+index 7b72bfb..f1abbd2 100644
+--- a/libfm/iconview.cpp
++++ b/libfm/iconview.cpp
+@@ -1,5 +1,7 @@
+ #include "iconview.h"
+ 
++#include <QPainterPath>
++
+ bool IconViewDelegate::eventFilter(QObject *object,
+                                    QEvent *event)
+ {
+-- 
+2.27.0
+
diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
index 8ec496a5bd70..2701a220c7e8 100644
--- a/x11-misc/qtfm/qtfm-6.2.0.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit xdg-utils qmake-utils
 
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Small, lightweight file manager based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
 SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -13,6 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+dbus shared"
 
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -22,11 +27,9 @@ RDEPEND="
 	sys-apps/file
 	dbus? ( dev-qt/qtdbus:5 )
 "
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
 
 src_configure() {
 	eqmake5 \
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
index 4bdc1441aaa0..d61d41015c7a 100644
--- a/x11-misc/qtfm/qtfm-99999.ebuild
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 xdg-utils cmake
 
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+inherit cmake git-r3 xdg-utils
+
+DESCRIPTION="Small, lightweight file manager based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
 EGIT_REPO_URI="https://github.com/rodlie/qtfm/"
 
@@ -13,6 +14,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+dbus ffmpeg imagemagick"
 
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -24,20 +29,15 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg )
 	imagemagick? ( >=media-gfx/imagemagick-7:= )
 "
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-99999-cmake.patch
-)
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-99999-cmake.patch )
 
 src_configure() {
-	mycmakeargs=(
-		-DENABLE_DBUS="$(usex dbus)"
-		-DENABLE_FFMPEG="$(usex ffmpeg)"
-		-DENABLE_MAGICK="$(usex imagemagick)"
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_MAGICK=$(usex imagemagick)
 	)
 	cmake_src_configure
 }