gentoo auto-resync : 23:09:2022 - 23:30:45

4 files changed, 71 insertions, 7 deletions

diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index 1c1d71f183aa..f80bc3139334 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,4 +1,6 @@
 AUX massif-visualizer-0.7.0-fix-window-icon.patch 815 BLAKE2B 253bd14bef04a2f1abe531d0dffaec837502a4ae56db341a875888160553a3246cd71fcb01977844482eccbf123dbb4fc4ddcb4b50c06230ce7544dfebb4cb57 SHA512 ecb5d0aceefd82bc05da91fe2e76f999078e41f10821534e512a52f13f43ac247ddf88e7f5d0952e5d8aa07c2714f7ea8f2e31b8361a2a0eb1de5a25692dd984
+AUX massif-visualizer-0.7.0-linking.patch 1145 BLAKE2B 9fd6f9af189837ac6d76c7bbc9bfcd3d934c415e4176ed1ced88bbc393a058226776b894b91b01455bff55c00ad393e08e761d1866adf70e720acdbc64bce4f6 SHA512 18e9d4603898bdd55004694f64fc9b0d9417f479756a02959864502588f90d1a1b52d1836cacad315a4cbd03f78bccbaf472b87e8d0e1f19883fc01803f64219
+AUX massif-visualizer-0.7.0-unused-dep.patch 529 BLAKE2B 1641d497bdd34a6c2c4bd1d93c72f19e428d315b063384f21c090a5f797240769db732b5f3253eb9e3264f69fa832e1218fecf3ea125cb862242e41c0d0da87b SHA512 cbec2ae9f04c8c1411bd3a298dfcf6e55cd85ad00f3208eef912e99104435a5276d5bb3db63a88200d74766833950d92f168d36644485d178e811109504a15f8
 DIST massif-visualizer-0.7.0.tar.xz 257380 BLAKE2B fa6cce5377c2c8eb8d170970304384ec7d745ebf7e324ebe42fb4f57f230e1f39bc9078bf89ea5de7d84e0e669a61e4e6f027ebd7ebec31ab0479336f1cd72f7 SHA512 058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561
-EBUILD massif-visualizer-0.7.0-r1.ebuild 1223 BLAKE2B 0d01853adba67f58eedab30ae4be2b875051835b9ee84df163b3bb993198b970585a02a731455685c9e5570c0e36a9df3df43e2b8e5c849bf1428810ed14701b SHA512 bf9093effd15663b66be01dcc275561aecce1d58e7570123f3f8037c022ed9f1daada3561615777dec72f07d1574cd67b5cf0ff70380c5967a618335acdd0730
+EBUILD massif-visualizer-0.7.0-r1.ebuild 1259 BLAKE2B 4fef6bdaf5b4d4a90aea33e10c83621516d3b6dcabe66f59fdedc395a0ce79c77f7cdcdd61506888d2c612a4bbe1940dd78669566bbdeffaf61d3ccae226f73b SHA512 321aafc5bc8ff13a56677c1a736d98e0211193fe4d6ad88afd1923babdf6e6dc0fdd33bc8b88115eef05787efa98d724b2e901aecf769e29d513e563ecb8701a
 MISC metadata.xml 439 BLAKE2B 84769f8b1a94b2661706e00447a047ff287c06347f4f5571d8deba82147bc9fc35d67774c45abd3b40ed3a11ea6a7f8ebe0e535ceb824b98abda6b3d417578a8 SHA512 9c5869ac9741956f11163181eec4483ead5578e5de85c4ea6f1850423c2b94be7cfaaee6ee4634bffb2f9f2cdd9e29fc19bddb2b3113c876365b6fb7ba4ec630
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-linking.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-linking.patch
new file mode 100644
index 000000000000..252d75ba6a0e
--- /dev/null
+++ b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-linking.patch
@@ -0,0 +1,36 @@
+From d49c8946fea8ce239e258c5e69fefd1cae5cb5fe Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Tue, 6 Apr 2021 00:29:33 +0200
+Subject: [PATCH] Add some missing linkages
+
+Currently things work due to transitiveness, but we better not rely on that
+---
+ massifdata/CMakeLists.txt | 1 +
+ test/CMakeLists.txt       | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/massifdata/CMakeLists.txt b/massifdata/CMakeLists.txt
+index a8a7b98..4881a30 100644
+--- a/massifdata/CMakeLists.txt
++++ b/massifdata/CMakeLists.txt
+@@ -21,4 +21,5 @@ LINK_PRIVATE
+     KF5::Archive
+     KF5::KIOCore
+     KF5::I18n
++    KF5::ConfigCore
+ )
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 38c510e..7ccbc2d 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ ecm_add_test(datamodeltest datamodeltest.cpp modeltest.cpp
+     TEST_NAME "datamodeltest"
+-    LINK_LIBRARIES mv-massifdata mv-visualizer Qt5::Core Qt5::Test KF5::KIOCore
++    LINK_LIBRARIES mv-massifdata mv-visualizer Qt5::Core Qt5::Test KF5::KIOCore KF5::ConfigCore
+ )
+ 
+ add_executable(massifparser massifparser.cpp)
+-- 
+GitLab
+
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-unused-dep.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-unused-dep.patch
new file mode 100644
index 000000000000..d6333da7185a
--- /dev/null
+++ b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-unused-dep.patch
@@ -0,0 +1,24 @@
+From c66b5a33885211da16cd720fd0f6ab5b4abba297 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 28 Oct 2021 00:20:53 +0200
+Subject: [PATCH] Remove unused XmlPatterns
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 569974f..f2f15f2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
+     Core
+     Widgets
+     Svg
+-    XmlPatterns
+     Test
+     PrintSupport
+ )
+-- 
+GitLab
+
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
index 81ddb609d337..da42e66688b4 100644
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 KFMIN=5.60.0
@@ -35,11 +35,13 @@ RDEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	callgraph? ( media-gfx/kgraphviewer:5 )
 "
-DEPEND="${RDEPEND}
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
+DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-fix-window-icon.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-fix-window-icon.patch"
+	"${FILESDIR}/${P}-linking.patch"
+	"${FILESDIR}/${P}-unused-dep.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(