gentoo resync : 24.03.2019

3 files changed, 31 insertions, 4 deletions

diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index be19dea5b467..4ad9c4dc4c6b 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,3 +1,4 @@
+AUX massif-visualizer-0.7.0-fix-window-icon.patch 815 BLAKE2B 253bd14bef04a2f1abe531d0dffaec837502a4ae56db341a875888160553a3246cd71fcb01977844482eccbf123dbb4fc4ddcb4b50c06230ce7544dfebb4cb57 SHA512 ecb5d0aceefd82bc05da91fe2e76f999078e41f10821534e512a52f13f43ac247ddf88e7f5d0952e5d8aa07c2714f7ea8f2e31b8361a2a0eb1de5a25692dd984
 DIST massif-visualizer-0.7.0.tar.xz 257380 BLAKE2B fa6cce5377c2c8eb8d170970304384ec7d745ebf7e324ebe42fb4f57f230e1f39bc9078bf89ea5de7d84e0e669a61e4e6f027ebd7ebec31ab0479336f1cd72f7 SHA512 058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561
-EBUILD massif-visualizer-0.7.0.ebuild 1111 BLAKE2B 141c0f6ef1200c2968483a6a11f9f1cba5332889e34f1d90c3ef3889d34b82e6003a96d77251859b946b700448aff5d40905618e865479741fee7879be5a93eb SHA512 53302d3a613bc323845a7a18c5fb3f2368eff015b5e6f7ee59466ef5bd50c0dfdf8e5a40654f2f596b182bd2f03dd976d1b7761acd0f9fa6933deea446ff67cf
+EBUILD massif-visualizer-0.7.0-r1.ebuild 1135 BLAKE2B ff8941c0feabd90eee02ef1ded88406a500332681aef34b2f3a244319ab7d0949e64b9c095dbd5380038cf30b7649ae98b4245c289ea7133d7ff8b8045b70018 SHA512 085d20a0f29457c9c103ef1f5ac9e4d7a391a1eed6c2d1f48901db2c0031b6749aac5b87f1cad73d684868ae5ece9b9c35cd20ef0f471f8496f976965581ecad
 MISC metadata.xml 370 BLAKE2B 8b260169231c67d50430301c4d6b3f87a07b59cc3d6a961a05d7f2e6987128ca7f5582d3b09812fdd6a0079b32f539ba0107b4338905766cba81ca79fd31c155 SHA512 a47938e506c035d69c8e69a4edb2e2587f76e9bd348aa0d9e88455cdf8c0d988b276e9f81c67c2039bef153051dcebd7b62b6b3d6bff1ebbbc572f87bbcd6382
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch
new file mode 100644
index 000000000000..57e27fc9b26b
--- /dev/null
+++ b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch
@@ -0,0 +1,25 @@
+From 51788c6f295651fecd3bb498236bbcf3c263ee84 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Sun, 20 Jan 2019 09:37:43 +0100
+Subject: Fix window icon for non-desktopfile WM to own icon
+ "massif-visualizer"
+
+---
+ app/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index c4526ba..21865e0 100644
+--- a/app/main.cpp
++++ b/app/main.cpp
+@@ -50,7 +50,7 @@ int main( int argc, char *argv[] )
+     aboutData.setOrganizationDomain("kde.org");
+ 
+     KAboutData::setApplicationData(aboutData);
+-    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("office-chart-area")));
++    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("massif-visualizer")));
+ 
+     QCommandLineParser parser;
+     parser.addVersionOption();
+-- 
+cgit v1.1
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
index 3879dd8ec904..bf0964314b2a 100644
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 inherit kde5
@@ -34,9 +34,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(add_qt_dep qtxmlpatterns)
-	x11-misc/shared-mime-info
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-window-icon.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package callgraph KGraphViewerPart)