gentoo resync : 22.01.2021

5 files changed, 8 insertions, 85 deletions

diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index d07dfbe10205..8e3fe21951df 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,7 +1,5 @@
-AUX kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch 1052 BLAKE2B 517e9e9956a8c773272a05b6217d18360742fd0ed72fb5179a6dcecc1426fd5eeae5b0d6b759612f13d3f88d5fe5659921631758ef98e9632d1a3f0474f1b03f SHA512 543ec519467800d4e27836834fbb9f846335a283a13e5414caf1fa8684d21a464a151709d8f238a37fc48ae2aee1cb5ebfdcd63c566d43406d3ec99c46f2ccdc
-AUX kirigami-5.74.0-revert-fix-avatar-loading.patch 969 BLAKE2B a44a3d4961b523fabc79fdc8ea4abc9b036c7b51e16b88dcfd6167046066f4589860ff3d0d37cc00d473617a72f02b2130dcae686c0f93875915e71d2b240309 SHA512 3626e74ad0be79b0861f1b4fcf10ec6d07495cbc9a4879d12b93e5b14d70ea0b432d5174d40f2c0a370e932a30eba235a3d19a2f75e04cb07cae62b29cf25ea1
-DIST kirigami2-5.74.0.tar.xz 282820 BLAKE2B bd3cbdf3b98ee88518a9347180f59fb7cdb262fa6acf824da1de3103c516213a42cf106425eafaf497cab5be15f91bbf9dc4f3e10c7464cce19f0e0b564b4f4d SHA512 43059bc682e2d729a0a926e26ce5ba68947f275ffdd74836c124d9e063273429ccde8c0cebaef53168c46cfd62f41cb2c33d86f1f515ca619bde604aa7f5da5f
 DIST kirigami2-5.77.0.tar.xz 297028 BLAKE2B b75781fb89b3feec655fb6bc288e0c9ccdfc04d8a507c307001fdfd3c18a7204e4ea75be906d3f36595c12831d2d85b847a5fbf7e795d9b71289b305c27bbf83 SHA512 06e68f649f4cb93606eba2d0e726c004339a5410d5f559184c80e904841952af422d44db663add1144be626c4ac8b5f26eee2df8e0327d51b473027838be5bd6
-EBUILD kirigami-5.74.0-r1.ebuild 1115 BLAKE2B 2233ac6eeb8a1ba60e9dd3cd76a0c48ec61237c86ad737b208187dfafba7705ab54dc34a24a8b88c1b4da9e51262d0e9b7b360c8af02a2415d5b1580cd548314 SHA512 94c20ceee82f6039e332c14fb67ef337a88fa892a6a149f8c367307ab77017f818026bd222961c7f8f9914317f5df9fefbd25db002b391bd095d7b3ec4ed2561
-EBUILD kirigami-5.77.0.ebuild 978 BLAKE2B b1e201f2e1cc4f9ea0d31ee5cb678dfe74099baba515fae7a24fbef5381945ca082e647bc298df5d559568b550aa197ed099851b91088404b0045d5a35d48deb SHA512 149e7d8479ba6becfc092438057448b8f054545e1a00f30e4b5d54af9a0e9bbf54d68788499c52ea112201432845fd0868e34b178cd5312f8636588dacb127af
+DIST kirigami2-5.78.0.tar.xz 299628 BLAKE2B 15adf9840618ec9aee218bee34a264c9ea41f87ead46dc3785caa430a25424d972ba80b1053ffd7eb537a0e9fe25d8f00603a0bca348eb21caaf426f1ebab76c SHA512 11789fe6d9cc6c3213e37d47c0dbe6f7cb180e6fadfb16ff461c5d6f60fa896d201694f49984a7db0e44589ff5b7af4772d924641e4aa5d59da4c6f55827285e
+EBUILD kirigami-5.77.0.ebuild 975 BLAKE2B 581843601075e0596538ddb0bc6bd86844b27b353ad6b3ed454c485f949a42795f98133e22117b81cb2681a8cc558d0cd34a8e23f927b9f612dc31ed2c0071e5 SHA512 cef74f4222bcd56ca0b63085f044d8cae2d5dfefac8f60f926ae62dd11d3f74b07ca2854a3eca44db9ce414fcaf49252178031ce1b5df2ce42eea55f73c9f477
+EBUILD kirigami-5.78.0.ebuild 978 BLAKE2B 61a5d76a6254940582f9713d6017fcc04961d3b7df0216de275d02fccea681843a4bfc8ba608846b2e4f3de40d86bb0bc193ec71851f1811e4ed53764a7f8ac9 SHA512 3f941589dfe8c3f3670d1208736eab20772a0be94453ce9a2fee0dfa14ad24d669b9da07dd253a19c5f3acdc64c8b23fbd0970f96a3c308f43f41244e9a2fbef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch b/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch
deleted file mode 100644
index 192ba9dcf67f..000000000000
--- a/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6eaefba5001445fa7e198e4caa0bde738240d66f Mon Sep 17 00:00:00 2001
-From: Arjen Hiemstra <ahiemstra@heimr.nl>
-Date: Wed, 9 Sep 2020 13:00:59 +0200
-Subject: [PATCH] Remove actions and delegates from ToolBarLayout when they get
- destroyed
-
-Otherwise we're keeping around stale entries that no longer point to
-valid stuff.
-
-BUG: 425670
----
- src/toolbarlayout.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/toolbarlayout.cpp b/src/toolbarlayout.cpp
-index cbf31062..c2df5998 100644
---- a/src/toolbarlayout.cpp
-+++ b/src/toolbarlayout.cpp
-@@ -112,6 +112,18 @@ void ToolBarLayout::addAction(QObject* action)
-     d->actions.append(action);
-     d->actionsChanged = true;
- 
-+    connect(action, &QObject::destroyed, this, [this](QObject *action) {
-+        auto itr = d->delegates.find(action);
-+        if (itr != d->delegates.end()) {
-+            d->delegates.erase(itr);
-+        }
-+
-+        d->actions.removeOne(action);
-+        d->actionsChanged = true;
-+
-+        relayout();
-+    });
-+
-     relayout();
- }
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch b/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch
deleted file mode 100644
index 60dae8389abf..000000000000
--- a/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From aaaabf1ea84d9c5ae9cf50a306b79f15f44f5b35 Mon Sep 17 00:00:00 2001
-From: Carson Black <uhhadd@gmail.com>
-Date: Sat, 19 Sep 2020 12:21:33 -0400
-Subject: [PATCH] Revert "Fix: avatar loading"
-
-This reverts commit 338d91be7254099c1ad4c1f475acb6368df2b114, which
-introduced a visual regression in the users KCM among other places
-that use the Avatar by causing the image to fail to resize according
-to the size of the avatar component.
----
- src/controls/Avatar.qml | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/controls/Avatar.qml b/src/controls/Avatar.qml
-index a4f59448..775e5987 100644
---- a/src/controls/Avatar.qml
-+++ b/src/controls/Avatar.qml
-@@ -133,9 +133,6 @@ QQC2.Control {
-             mipmap: true
-             smooth: true
- 
--            sourceSize.width: avatarRoot.implicitWidth
--            sourceSize.height: avatarRoot.implicitHeight
--
-             fillMode: Image.PreserveAspectFit
-             anchors.fill: parent
-         }
--- 
-GitLab
-
diff --git a/kde-frameworks/kirigami/kirigami-5.77.0.ebuild b/kde-frameworks/kirigami/kirigami-5.77.0.ebuild
index f936381eb1f3..c9ac581ea048 100644
--- a/kde-frameworks/kirigami/kirigami-5.77.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.77.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
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.78.0.ebuild
index bf28cdcaad5a..cf073175ace8 100644
--- a/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.78.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
@@ -7,7 +7,7 @@ ECM_EXAMPLES="true"
 ECM_QTHELP="false"
 ECM_TEST="true"
 KDE_ORG_NAME="${PN}2"
-QTMIN=5.14.2
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
@@ -37,11 +37,6 @@ RDEPEND="${DEPEND}
 # requires package to already be installed
 RESTRICT+=" test"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-revert-fix-avatar-loading.patch
-	"${FILESDIR}"/${P}-remove-actions-from-ToolBarLayout-when-destroyed.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=$(usex examples)