gentoo resync : 02.02.2022

4 files changed, 9 insertions, 51 deletions

diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index b3118e3984d9..e44807bd8e99 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,6 +1,5 @@
-AUX breeze-5.23.4-fix-kstyle-crash.patch 1248 BLAKE2B 800d1e1015e6b3a1bb759d410e8982601ad0d582b912b76f5ed5280ee7a7550d61d921c3a46b11e177cef9004225c63a73e86ad2de342afc0342ac61d7cf7915 SHA512 d7355350ed98c648c150e300adc2bf8f0885bb3f64e3b91647f61f258703e0dbc41d2e046f31bac0384aa28c012eb381325e02df4a0992b4979f897ece714c2b
-DIST breeze-5.23.4.tar.xz 73813800 BLAKE2B 0821a0b484dac61c8c7a492248f9c9bc52abb347b0998a69567f931fd436df4c3f84fdfd7153453b15a7fb7015000012bd45c56d625edf8e952296748ebb5413 SHA512 5273100b059c58689028fbafbfc25f9d185f9b21abe011f8b7e8c9301c8b6d7f1846989c292709016b8c5c5edf627985f99968a809b779d46c23a7c7f773e913
 DIST breeze-5.23.5.tar.xz 73813928 BLAKE2B 4ae30793f9694ff7fd00d41894cc8464c2034641365e2e92d46e76a5ca37a8d0e6c1fa40956f1f36ade9e4f26f824182a067a30ab9de373c23ac173c29984dd9 SHA512 a2002a5399376028fbaa1d742f56f6ee4af1076d61d9537e7c7a792dd6e1f8e0f35806cd374b789d682477a9dbcb38f428c7b8605ab3f6c0a6b237cde78614dc
-EBUILD breeze-5.23.4-r1.ebuild 1327 BLAKE2B 02c4640398300ee12ae1a704e5017ade484ea0ebb6eec911075a8d5256d4265697fb9accd7657147b1b3a8bb7de08559797cb423176fd6d8aaa7f11f44adf8bd SHA512 6391dcf4f3921a017798f8b9d861535e1113c0136a07e4e10569229fc515645afe95675dc493c35f5ec949fe36e7a57fa740a252076f5f6747340db253bc5bd2
-EBUILD breeze-5.23.5.ebuild 1275 BLAKE2B 771bac06941e04fccf40a8671bdf0bd84d8cf4dc05a1117b28dfa1b4c8dc4feb19c8a67a704378bff72eab0d30888fb1c712021a064b2ded78dfc2e64917c4f0 SHA512 7e6d785de651e010f3a981db232bca8ede05895a3dbf7670fa8d9288867b57830c793104041b0087087b45edd9e2e44bcf2e78b45be297c663842718af2c1f17
+DIST breeze-5.23.90.tar.xz 43032320 BLAKE2B d87d3269e5dbd1f2c0718a29cbd3de30e09521c4c8a398d1ddc96efd9a2025ef20e9f94d0c50032f5dfe6419adf1635a40c6ad4979b9137213de8be48876e216 SHA512 a4d6e9210a7553e3f195777d30253c6aeff38f5eb326d959dfb56d034dd47d834f09a38c601c283929e6a1ac59b9e5b695b464a8cd7275c766927cc892abead7
+EBUILD breeze-5.23.5.ebuild 1233 BLAKE2B fb2f62800e45ef4d6d44761d5fd93fd32818c376a09991b2df0ea5e05a0b3329bf01f49398bdb324622ebabc6d102e295bde2075adac4a3c6845e3307a741c3a SHA512 8a238177bb4ddbf94aaa31056bf51b7a36dd0923c0e3cd40d05175dded514d19c433334a95cd98a96219976410417948790ab8b4d850de9cd093b8b2e43ba566
+EBUILD breeze-5.23.90.ebuild 1236 BLAKE2B c2066770a6017b9dc0035a4412b3a6c784caf81ba1c5cf0035c0dc27c7cd5cc364967ffacd21266a01c3da1d34b95a5c55c5553aa96466d68a4d5afbdc5b0c90 SHA512 3f7dd6e088de3e8e9a3db3c4c4c84352d07264871aa36eb9ea7cef54a32fcf1fc22624e89a913e16ad94abbd9a3cb3468c6ee7a00d801671001c769e9214252f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze/breeze-5.23.5.ebuild b/kde-plasma/breeze/breeze-5.23.5.ebuild
index 86fdcde0d1b1..df465f79dcc0 100644
--- a/kde-plasma/breeze/breeze-5.23.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.23.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="X"
 
 RDEPEND="
@@ -35,9 +35,7 @@ RDEPEND="
 	>=kde-plasma/kdecoration-${PVCUT}:5
 	X? ( x11-libs/libxcb )
 "
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kpackage-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
 PDEPEND="
 	>=kde-frameworks/breeze-icons-${KFMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
diff --git a/kde-plasma/breeze/breeze-5.23.4-r1.ebuild b/kde-plasma/breeze/breeze-5.23.90.ebuild
index adf3225d6dbe..85267450136c 100644
--- a/kde-plasma/breeze/breeze-5.23.4-r1.ebuild
+++ b/kde-plasma/breeze/breeze-5.23.90.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 RDEPEND="
@@ -35,16 +35,12 @@ RDEPEND="
 	>=kde-plasma/kdecoration-${PVCUT}:5
 	X? ( x11-libs/libxcb )
 "
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kpackage-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
 PDEPEND="
 	>=kde-frameworks/breeze-icons-${KFMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}"/${P}-fix-kstyle-crash.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X XCB)
diff --git a/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch b/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch
deleted file mode 100644
index 1d714c7aa6df..000000000000
--- a/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2aa08ed366917b7b207842844b78e5dadd5a06ed Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Sun, 5 Dec 2021 16:50:10 +0000
-Subject: [PATCH] [kstyle] Fix logic error in
- drawIndicatorButtonDropDownPrimitive
-
-The current code checks for !complexOption, but then continues to
-de-reference it in the second clause of the statement leading to an
-inveitable crash.
-
-I assume it's meant to be an `or` for the latter part of the statement
-to make sense.
-
-
-(cherry picked from commit b09dbd9282f848e779e74840a5a3ef13c71fa82e)
----
- kstyle/breezestyle.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
-index ee06f41c..1337d26e 100644
---- a/kstyle/breezestyle.cpp
-+++ b/kstyle/breezestyle.cpp
-@@ -4024,7 +4024,7 @@ namespace Breeze
- 
-         // cast option and check
-         const auto complexOption( qstyleoption_cast<const QStyleOptionComplex*>( option ) );
--        if( !complexOption && !(complexOption->subControls & SC_ToolButtonMenu) ) return true;
-+        if( !complexOption || !(complexOption->subControls & SC_ToolButtonMenu) ) return true;
- 
-         // button state
-         bool enabled = option->state & QStyle::State_Enabled;
--- 
-GitLab
-