gentoo (leap year) resync : 29.02.2020

4 files changed, 3 insertions, 47 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index cd29a1e8dc3d..5003dea9f0be 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,8 +1,6 @@
 AUX plasma-desktop-5.17.5-revert-activities-jagginess.patch 1214 BLAKE2B 3d6517a6020639a5f0f7720d22e45c985a95553bb62a2d365d219ff05d18eed5c105c17c54b21eb114e85b2012dead46f1e928d1082b7b1387d813e75144f775 SHA512 c7910def604e6a6cf23d11d50c33f585d67a7e539cdfc2d4a81449e46eb4e823fe63e484f5cdb535f4fdec0fcc6be805ede703b74b22b88f4dc941593b6f4fa3
-AUX plasma-desktop-5.18.0-kcm_fonts.patch 503 BLAKE2B 4a9a7f8b0fb7feeeb8b4881950688e2e8372d607270077b8f783e68bb97ed8992ef5530f0bcf0011bd703bb6131d516692b0f8224827bc3a0549344036c5d6cb SHA512 de0bf603d387fbe68ecde24ce6bb03647c04c61e7eee7995506e5d13fbe5e39def4414feb39f9d65d110c641fdc7821c1fcafcfabc94dcd1453988e20e4da4ae
-AUX plasma-desktop-5.18.0-unlock-widgets.patch 722 BLAKE2B 275c9382ed492140a743d375d128172d76409ae906bb53c5b9bccdf5be97b309a8b7b55a828182710f493a520b9bcb032232d35719d30c3f0ab05802ee72f196 SHA512 93c99a9d4503ee6113eeb6633a7fef79b1bea567388d69bf1550e0a435121ffbbb151013c783a85d19458eb114ef2ef1be91482f10710d1b3b35fe3da1a3206a
 DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4
-DIST plasma-desktop-5.18.0.tar.xz 9409548 BLAKE2B 37fe888adc2ce5e21b081a8a062cc620542327161ab490a2248d4e10a8343f524da2a2502218bb63be5ab6b047c906e20015d65058a7d3ba11dae3438da8bd47 SHA512 863516751f4f37193ad5a96713fa9c7eb8d346e3bbe33dc43dcb83fa18955456dc875ddc3e2db990e7f3a017e394a69790e3dc21e13e8fc0c5d6841591c8fb4e
+DIST plasma-desktop-5.18.2.tar.xz 9409616 BLAKE2B 922c58e08702da8ec9eee8e31f3086154306ec64df7cbbef96da272e8e7afcfa01a5cbb13d7d10a66e71c6ee843bf19b964d21155df1beb9d8bbe75c1a5f54e3 SHA512 3f850eb9ab6f7a7ee86b11d024a0e9c5552fbfb24a17502bca141bd01e52a99a509e64669abd708ec7a2617fcbb5c65eaa401084388a812785573ed1c5f9c097
 EBUILD plasma-desktop-5.17.5-r1.ebuild 4071 BLAKE2B 8710be965b9fa342a9c8d4331181cf4ccb1f258fccff4cd19ce2b17a6e0c79a3ef3ef79a5bee41e11ba19a9334c800c57723b18089211111ca5879bc0d2b216a SHA512 669dd8f639d8b7c36b4cd45268972935c18dfe8a274c532100573d65d20d714dedce1c2d4879a543dfc1534827e1a9ab1d1ecca39c7036ef25d4f753ebfd838a
-EBUILD plasma-desktop-5.18.0-r1.ebuild 4156 BLAKE2B 21bedcb8126691a8f3daf974fe53399974d906b1a8d6722cbf8cfc294291157f20590a248392bbc8018daf1d9644b3ef69e365efedb07de39943c757312ef640 SHA512 e6fa891ba2d23a6c18db4db7bcc1ba9e05c83e6a36096ba5a623e7cc57ca264c7fc47174edb815bd5db0e3893a54e4f0f5a5a40852bffdef60693d9ba3dc9c5f
+EBUILD plasma-desktop-5.18.2.ebuild 4047 BLAKE2B d8e739d3935568ffd1bc726e789b0c51a1672eacf4cf95b23540b7d07e17077311673338e2d1a1c0f2006e1208eca76ee56170ed721bc0dfeda7be5bba08cd50 SHA512 14213ad26286728fe7a2a7641a18158dec617555d57f947803980527c51dbc9b9c6fdf0a21abd45a35c7aa296d25fde28bdbc42f7ff61dc01301bf8217138335
 MISC metadata.xml 514 BLAKE2B 31b846e6675005788e3041e22365385edcb4ac253db87f15a048b7d3a0cbe61494ce7a3e495444ef9c9bd3455e566d7a89664a8969041b22a3474eb4e99d1397 SHA512 a14dbd159795a2982ba81c0856f2f058664b807a3c26afe9371e4be3ccb5bb0b8a48c086fd580549c35006821304df4c22ad3a1c7e43d5fda4a37688044fb99d
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch
deleted file mode 100644
index ec05442beff1..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
---- a/kcms/fonts/fonts.cpp
-+++ b/kcms/fonts/fonts.cpp
-@@ -572,8 +572,8 @@
-     // previews
-     engine()->addImageProvider("preview", new PreviewImageProvider(m_settings->font()));
- 
--    // reload state after loading by emiting a settings signal
--    emit m_settings->activeFontChanged();
-+    // KCM expect save state to be false at this point (can be true because of setNearestExistingFonts
-+    setNeedsSave(false);
- }
- 
- void KFonts::save()
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch
deleted file mode 100644
index 9ea643b86597..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 2bc3c5e92d4789146548e8de4d520cd191994e1c Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Tue, 11 Feb 2020 16:41:26 +0100
-Subject: unlock widgets
-
-5.18 doesn't offer a way anymore from the gui
-so unlock them if they're locked
-BUG:417424
----
- desktoppackage/contents/updates/unlock_widgets.js | 2 ++
- 1 file changed, 2 insertions(+)
- create mode 100644 desktoppackage/contents/updates/unlock_widgets.js
-
-diff --git a/desktoppackage/contents/updates/unlock_widgets.js b/desktoppackage/contents/updates/unlock_widgets.js
-new file mode 100644
-index 0000000..c332270
---- /dev/null
-+++ b/desktoppackage/contents/updates/unlock_widgets.js
-@@ -0,0 +1,2 @@
-+
-+__AppInterface.locked = false;
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.2.ebuild
index 1ade6819cc1d..ac56030389cb 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
@@ -117,11 +117,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/kdeplasma-addons-5.15.80
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-kcm_fonts.patch" # KDE-Bug #416358
-	"${FILESDIR}/${P}-unlock-widgets.patch" # KDE-Bug #417424
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package fontconfig Fontconfig)