gentoo (valentine's day) resync : 14.02.2021

4 files changed, 60 insertions, 7 deletions

diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index ad934fd36e49..ac9b32ae8a87 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,5 +1,6 @@
-DIST kpmcore-20.12.1.tar.xz 584128 BLAKE2B e3a4032f3dac60342799c6c2e91728e36b37af90a00d81e3eb5f12a3b0e3734742714d1a037c8f8ff893dcfdd8cb27348014920d985d5e93c3c387c914a48a2f SHA512 b59e97faee594eeb79c649638dde10d081752ee561af8e40d1503bba599a91f81af7730beec5302cb0991c10161188c064caf0efc12144a15dd37ce19b79d576
+AUX kpmcore-4.2.0-kf-5.77.patch 1468 BLAKE2B 1dc930e1fb6cc01891ab3e9def4f843cd0e0d1c92e8f5ecd0105bd338a9f0f60c370039ee8aa2950385f846b18aab0169f89c3925198475e9908319f2e4cc96e SHA512 1e0ece24224bbfbe4d2a33c19834b55f84b0c2c08eb840b8ea63aeb45e9e8813f4ea069f5c2752e74b99144616b766a41a7fe77ae69c3b78bb474003cfa064e5
+DIST kpmcore-20.12.2.tar.xz 584284 BLAKE2B 8b3aeba1e0b55fe4daa221076298965ffe94b3ad31c0e5824ffce2756e6aebc4f2728deb9e075d94c9dc13d58c3abd40c5143ffeaf1251970349d12086a6acce SHA512 6e3327ef47cb481211887e285ac93646001690f9c468f7c8bfaf6037d262bc2e90582a83d8006d4a3f1c32d2354cc6f6d77ef248773d8cdb5d904a2164615063
 DIST kpmcore-4.2.0.tar.xz 441320 BLAKE2B 5eeae806e47a1d068b2052b7706fbe16acfd609e3d0bcb396758f2055154e43b5b1fc7b7a65795ba0804ebc34c7d0cda18995ce3975e16e74d015ac9d8203e1e SHA512 71c5411f3ec24149695bbc1ec0c2bb7423b1cfd24ea9c2f33492c6310b1e911ea14a0a46a53024d7a1afebf0cbc5b56fb7cf5be22b832fb49239a270b63404f0
-EBUILD kpmcore-20.12.1.ebuild 754 BLAKE2B 9fb97f1a9ace20c87581112d998dbdd6ab2beb47989d20363080b86d686c5ec7218f95405a771023e8516cc1df875236419a85b6d0d16fc27f68f7c8da9f6167 SHA512 dd9f748201826d965fc0e96fd994cdc20972e2a5747a77f291af8189086b073a52f5efdd80b9f6a36ae3f242771738130c1e21e23be52b1e519bc6f65d348dbc
-EBUILD kpmcore-4.2.0.ebuild 870 BLAKE2B 587696037266fe5d19933168d8796db92cd9ca33811708da39455b59fd87bfb54d9ec565fb08cde74a98665a167837bbd3f398c3bfd8052699d33a524c4781ae SHA512 1a6f4c16e2e92270aaf74dd9d85d78fae705dbeb92568eb27b9fa12c81d4e6bbd655a5ba91503e9a2464663e4352874099bc21ce351512a24230272bdca11f90
+EBUILD kpmcore-20.12.2.ebuild 754 BLAKE2B a55d684d8b771c6a41bdf7474e2c8f99354be512f46b6cc0a45d6e2e75f395a3c9bac9b946b209864e1209a3fafc83d84898f6bb9ea4f7eec6835e4f28ac3d6b SHA512 8337a443e6a4fcd65dd841e11c1d85848783893a9aae99b7f282e2110e5cc505a504908bd9af99207d879d1d9537f0c7ab3fafeb2894240962d702b9f28ed034
+EBUILD kpmcore-4.2.0.ebuild 929 BLAKE2B 249aa44c720455172855b55169eb4d48cf78f0d7e32d5f958815f7115c149b415a0ec46c1d668d0438424d399178e9b4d0e867a16b25eb026762ab2504b49aaf SHA512 14534457c2155ab9529663fafbb85c14b85bb1d114ac2902cf50b3acd1ce7494507d0afd173d709fec4c1a3f8b8d38de483019fde694112020424c11b172cd42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/files/kpmcore-4.2.0-kf-5.77.patch b/sys-libs/kpmcore/files/kpmcore-4.2.0-kf-5.77.patch
new file mode 100644
index 000000000000..f45ad5a682ba
--- /dev/null
+++ b/sys-libs/kpmcore/files/kpmcore-4.2.0-kf-5.77.patch
@@ -0,0 +1,50 @@
+From 07e5a3ac2858e6d38cc698e0f740e7a693e9f302 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Mon, 16 Nov 2020 17:14:52 +0100
+Subject: [PATCH] Make plugins compatible to latest KPluginFactory code
+
+That one uses std::is_constructible<impl, QObject *, const QVariantList &>
+which will fail for our current plugin constructors due to being private
+and with only friend class KPluginFactory.
+---
+ src/plugins/dummy/dummybackend.h   | 4 +---
+ src/plugins/sfdisk/sfdiskbackend.h | 4 +---
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/plugins/dummy/dummybackend.h b/src/plugins/dummy/dummybackend.h
+index 815b020..8d67158 100644
+--- a/src/plugins/dummy/dummybackend.h
++++ b/src/plugins/dummy/dummybackend.h
+@@ -24,11 +24,9 @@ class QString;
+ */
+ class DummyBackend : public CoreBackend
+ {
+-    friend class KPluginFactory;
+-
+     Q_DISABLE_COPY(DummyBackend)
+ 
+-private:
++public:
+     DummyBackend(QObject* parent, const QList<QVariant>& args);
+ 
+ public:
+diff --git a/src/plugins/sfdisk/sfdiskbackend.h b/src/plugins/sfdisk/sfdiskbackend.h
+index e709f61..0571add 100644
+--- a/src/plugins/sfdisk/sfdiskbackend.h
++++ b/src/plugins/sfdisk/sfdiskbackend.h
+@@ -27,11 +27,9 @@ class QString;
+ */
+ class SfdiskBackend : public CoreBackend
+ {
+-    friend class KPluginFactory;
+-
+     Q_DISABLE_COPY(SfdiskBackend)
+ 
+-private:
++public:
+     SfdiskBackend(QObject* parent, const QList<QVariant>& args);
+ 
+ public:
+-- 
+GitLab
+
diff --git a/sys-libs/kpmcore/kpmcore-20.12.1.ebuild b/sys-libs/kpmcore/kpmcore-20.12.2.ebuild
index 432efffb1bc7..b8217a3ea9e6 100644
--- a/sys-libs/kpmcore/kpmcore-20.12.1.ebuild
+++ b/sys-libs/kpmcore/kpmcore-20.12.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_NONGUI="true"
 KDE_RELEASE_SERVICE="true"
 KFMIN=5.74.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Library for managing partitions"
diff --git a/sys-libs/kpmcore/kpmcore-4.2.0.ebuild b/sys-libs/kpmcore/kpmcore-4.2.0.ebuild
index 2103dab3c119..6530cb3632d6 100644
--- a/sys-libs/kpmcore/kpmcore-4.2.0.ebuild
+++ b/sys-libs/kpmcore/kpmcore-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,9 @@ LICENSE="GPL-3"
 SLOT="5/10"
 IUSE=""
 
+# bug 689468, tests need polkit etc.
+RESTRICT+=" test"
+
 BDEPEND="
 	>=kde-frameworks/kauth-${KFMIN}:5
 	virtual/pkgconfig
@@ -36,5 +39,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-# bug 689468, tests need polkit etc.
-RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-kf-5.77.patch" ) # bug 768249