gentoo resync : 22.01.2021

4 files changed, 8 insertions, 39 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index bce5ed8883eb..dd77a11ee945 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,7 +1,6 @@
-AUX plasma-5.74.0-fix-pc3-button-icons-color-set.patch 1276 BLAKE2B b74a469f50ba5c31edf6bf7ab80113a68f91eb27ebbabb6eb18b53d8fff1c71fd352fc93baf51114e6f964c75a3ec9ba516c87b02b664fc649fd8d6bc484aab9 SHA512 b527e08d5f116cc00390ccbc960501e6f95f80da6d3d42153c8a07675799aa0d8dd002e4f2f52088d66133090b888e5acef3e6be70f66acf39c38e9652f0cb38
 DIST plasma-5.77.0-fix-broken-background.patch.xz 3732 BLAKE2B 19c656de212e3b2162e5f43e6ee2aface46d9169169179b6ac8af3eee01e64ec54139ac0001a6009f2a6d3cc4a59775951a3e10e8c33c7d04bf2b78543564137 SHA512 a262bebc754102709d1b41a2e5571938e58bfbcfd027dce9d0c1dd5cbdb8adee44a1c18b716976dc36d7f55b1d7e16d0536615e9f2895fa62eebb5f08cf05098
-DIST plasma-framework-5.74.0.tar.xz 3140648 BLAKE2B dfc8df92d351446a146204f48c42cd4d6325f2652b5b61e0a530b27763fb3b6f07bf14319c86a54f933a58329d214977545e00f261cc784c0d8659eebd8cddb0 SHA512 7aae44d94a175dcdbd779a6801626d20e8d986597d1d05c82c5c035997b874ebb9b4412191e1fa7a26aa4e045ceaf22a7ef359d3e817d812357d51219eb5fb46
 DIST plasma-framework-5.77.0.tar.xz 3152748 BLAKE2B 717d620fd5249887d47bbc6ed8ec42f103b56c4e566b0baae3624e64403b48977b5d36ebdbb30b52ae6cbec7694645050cf76eceaf6ab28c3690bcafcf8c7a07 SHA512 abcbb0b5bf063cdda728b0fc03f0d51f0ad84b4c45fb428efe54556aeb27b4cc3c488244ba0f7e3a435c31e802551d09f758bde815ca0a5aa43cf18e916d1ea4
-EBUILD plasma-5.74.0-r1.ebuild 1939 BLAKE2B 7d1e4fbf1808204a47427d9def5a0ce30818096e539107f61134883cf35c128d2474277c3b4ae0c5a6658fa66b3e4856fb081a3b190b4811bb98faa7c87ca310 SHA512 f0ff7c56fad5461f7cf4907bc68443c497013beca852fcfaa0b846862de797cabff7d71774473c00336375aac574d88ea77878f0b1ae98dc9c7c73dc65a01f17
-EBUILD plasma-5.77.0-r1.ebuild 2038 BLAKE2B b94b8626005eec6e98d0802ef806171f41db1b2e96a096c2ae6352bacff8bbe425bb52f8939fdcf194c39d17ef88dafafd0f995ff742c0624e89680cc36e2c79 SHA512 66f3be07950ebcd8ce4efcf80f031727c9c18eaf1fbefbe8042fb03e09e2c26429d1f2f03ab514a3bb6748e744a921f5e2b7536e0133776ea45603ce849bfcc5
+DIST plasma-framework-5.78.0.tar.xz 3154276 BLAKE2B 6df7761e4477629c9effd0b5df16334d1c4402475beb3ccf286afcbb3305bc73382e4a74d09897f6a404ec0698c28e93b2a47bd6054df4abade08107ee66448e SHA512 fb5969e43d634ec750706137753e2e6f8adf3d533cdf23d9322fa3350e454cf5f130eeed02cc0f2b5841c1402f0d1ed098a30f08a0ed522b99b592a15026013c
+EBUILD plasma-5.77.0-r1.ebuild 2035 BLAKE2B d1622a2fbe5566826885a46236d2129c19a1d21464a99efc610c5cd8980431f7d33147417f7c417ff226169c98992ff2afa5f94c7e5cdcf737e0efc58a087c7d SHA512 59e55e49745464b6e78b65c1f1bbd74161e0cffd74c8eeb18e397cb829f08799c0a1709da88d6176967b3b1585ea887e31d6d617da235c6019a426e0eec93623
+EBUILD plasma-5.78.0.ebuild 1873 BLAKE2B 37f9614d4fc363a4e14fff85ed4634b4f71c770ebd4186a0691fa18bc81dc1fbb6f5577f1a7b70cde3bfddbb2f85c60b6cea66afede819417921bce8fcfc171a SHA512 d3e4e9066bf3d5b4ed8bc450e0239eb1c7bc295ad1b87f7a960d931713a19ebfbefcac61a2dad0951d97e6477ecab5d7bf53d0abbf988af9554115ae886d81fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch b/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch
deleted file mode 100644
index 8f938b00b89b..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3167717797d07a8645391e093fa91526c4645f4f Mon Sep 17 00:00:00 2001
-From: Noah Davis <noahadvs@gmail.com>
-Date: Wed, 23 Sep 2020 20:23:08 -0400
-Subject: [PATCH] Fix PC3 Button/ToolButton icons not always having the right
- color set
-
-BUG: 426556
-FIXED-IN: 5.75
----
- .../plasmacomponents3/private/ButtonContent.qml                 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml b/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml
-index 6dc2ce085..91428bdb3 100644
---- a/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml
-+++ b/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml
-@@ -42,7 +42,7 @@ GridLayout {
- 
-         implicitWidth: root.parent.icon.width > 0 ? root.parent.icon.width : defaultIconSize
-         implicitHeight: root.parent.icon.height > 0 ? root.parent.icon.height : defaultIconSize
--
-+        colorGroup: parent.PlasmaCore.ColorScope.colorGroup
-         visible: source.length > 0 && root.parent.display !== T.Button.TextOnly
-         source: root.parent.icon ? (root.parent.icon.name || root.parent.icon.source) : ""
-         status: usingFocusBackground ? PlasmaCore.Svg.Selected : PlasmaCore.Svg.Normal
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.77.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.77.0-r1.ebuild
index 298dcdf54342..aa81b4337d2e 100644
--- a/kde-frameworks/plasma/plasma-5.77.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.77.0-r1.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
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma framework"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-fix-broken-background.patch.xz"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gles2-only wayland X"
 
 BDEPEND="
diff --git a/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.78.0.ebuild
index 214f69e939ba..48ae282b2575 100644
--- a/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.78.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 KDE_ORG_NAME="${PN}-framework"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Plasma framework"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="gles2-only wayland X"
 
 BDEPEND="
@@ -61,8 +61,6 @@ DEPEND="${RDEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-pc3-button-icons-color-set.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2-only OpenGL)