gentoo resync : 16.09.2021

5 files changed, 4 insertions, 110 deletions

diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 79556b2185a1..86edc611780b 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,6 +1,3 @@
-AUX breeze-5.21.5-fix-splitter-proxy.patch 2306 BLAKE2B 5d95c306c34482a1aa07a64671ecd4687dc61048829b129d15c302b16c30a79d97c2896f1b84c7fa7e2dc26d486742b3cbfbb9e8b42166b92586baf6efef3a3e SHA512 6e2eb41d9c44acca58d2e4c2a93c3fd73e808bc6eccafeae8278351b9a780a0f75d8ee80343fb55cee0880fd4081537223caf430ed2093edb8b59f1b27f84fee
-DIST breeze-5.21.5.tar.xz 26286020 BLAKE2B 437666f0b509fa9d63f5ad04702831dc0ec4eedf763594c831d335b5b69a6b04052af6adc2c550b903c94a084b353d700d88cec47af537778afa31f7150e38b6 SHA512 5e449624543e2bd437bd4311e7ff091ffae33c4da34da2b9968f9551970b66350d337e6aee974f9e2cd82eff877a4ab5c6f52ec52d4f2724fe93b747f021e9eb
 DIST breeze-5.22.5.tar.xz 34548108 BLAKE2B aa92a0ac1054043e3584bfa82d783d5798b54d29edbc953ed69731295b6e076cae31606f5262313f5dd9e2036c05f4609c43b1e064e8b2308e4e4d56ace21ee7 SHA512 b9cc95dfbc21097f289d5c463f788b51ecc9523e5361981241a08ee80028a5f72f9dba3fc019006ec934104323c9c0a4d80742ae60a12f3d00751f75cccac66d
-EBUILD breeze-5.21.5-r1.ebuild 1322 BLAKE2B efa9c3f9ad57d368c3256d5a506db91c9c68a5e50841aa23e9085ce59a9c51aaba4d9fa72f8b0cc8b02280e1b1dc7afdad3249bc5666c5640b0fb35ef897ac9f SHA512 b8ac6e723a12e554c848a9f55adb0a411fc0a1523074ab70b972f31030b4517792341759515ee1abfd6b81b3ee06146784b5e9bbdfb4491e91d55bf5d65388bd
-EBUILD breeze-5.22.5.ebuild 1275 BLAKE2B 51b39f0084c0ac6ae6fe68ebd00734ede91dc453f18e8a79194422f6e875711072f201cca10bf1165421792ae24be9c9cd67b6403a4f98c5a8401972903a431e SHA512 c407ce7b3775abb2b1a7d236ce790c0130379be0b73e2b1da8ad01ef5fdaa9aa340c05d1a3e0ed82c35fe1ff32af0c71f0b581f6d414f47ad3fef40588880dd1
-MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
+EBUILD breeze-5.22.5.ebuild 1272 BLAKE2B 16bc96592da6d84fbfe8b5ef73386aa7cefb10499c67282641f74a475628bea30fb3f8c1a1258e3795fcd2266b73f8a9271a82b3823c1a43a3d838e9f4bcf2ba SHA512 65d6702cc8efb303f69022de57ba4afd01937d91e4d03635443c642a88d140f540c393847fcb9d1086455e6dba89f0b334f75395c07b48b7c2538fb5b760cbed
+MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze/breeze-5.21.5-r1.ebuild b/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
deleted file mode 100644
index 813a7e50e8d0..000000000000
--- a/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/breeze"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	X? ( x11-libs/libxcb )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kpackage-${KFMIN}:5
-"
-PDEPEND="
-	>=kde-frameworks/breeze-icons-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-splitter-proxy.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X XCB)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.22.5.ebuild b/kde-plasma/breeze/breeze-5.22.5.ebuild
index 968d1fdc77d2..afeb0d84c6cb 100644
--- a/kde-plasma/breeze/breeze-5.22.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.22.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="
diff --git a/kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch b/kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch
deleted file mode 100644
index 52646721a4b8..000000000000
--- a/kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From f99b7ef621c9c69544158d245699fd8104db6753 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sat, 15 May 2021 17:45:54 +0200
-Subject: [PATCH] Fix informing the underlying widget when leaving
- SplitterProxy
-
-While the SplitterProxy is active, it intercepts all relevant events, so that
-the underlying widget still thinks it's in the same "on splitter" state. When
-the SplitterProxy is left, the underlying widget is sent a HoverLeave/HoverMove
-event to make it aware of the new current cursor position. Without this, it
-doesn't know that it's not supposed to be in the "on splitter" state, and when
-it regains focus it just re-activates the SplitterProxy at the current cursor
-position.
-
-This was broken by accident in d201a1f187 ("Fix SplitterProxy not clearing
-when above another QSplitterHandle"), which moved the hide() call past the
-call to QCoreApplication::sendEvent. Previously that made isVisible() false,
-which also prevented the interception of the HoverLeave/HoverMove events.
-
-BUG: 436473
----
- kstyle/breezesplitterproxy.cpp | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/kstyle/breezesplitterproxy.cpp b/kstyle/breezesplitterproxy.cpp
-index 0cf5685f..d4db407b 100644
---- a/kstyle/breezesplitterproxy.cpp
-+++ b/kstyle/breezesplitterproxy.cpp
-@@ -341,11 +341,14 @@ namespace Breeze
-         // send hover event
-         if( _splitter )
-         {
--            QHoverEvent hoverEvent(
--                qobject_cast<QSplitterHandle*>(_splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove,
--                _splitter.data()->mapFromGlobal(QCursor::pos()), _hook);
--            QCoreApplication::sendEvent( _splitter.data(), &hoverEvent );
-+            // SplitterProxy intercepts HoverLeave/HoverMove events to _splitter,
-+            // but this is meant to reach it directly. Unset _splitter to stop interception.
-+            auto splitter = _splitter;
-             _splitter.clear();
-+            QHoverEvent hoverEvent(
-+                qobject_cast<QSplitterHandle*>(splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove,
-+                splitter.data()->mapFromGlobal(QCursor::pos()), _hook);
-+            QCoreApplication::sendEvent( splitter.data(), &hoverEvent );
-         }
- 
-         // kill timer if any
--- 
-GitLab
-
diff --git a/kde-plasma/breeze/metadata.xml b/kde-plasma/breeze/metadata.xml
index 3b4441f9bf47..d925f2439758 100644
--- a/kde-plasma/breeze/metadata.xml
+++ b/kde-plasma/breeze/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>