gentoo resync : 17.02.2020

4 files changed, 8 insertions, 47 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 87d587cb3e08..e03fa156f50d 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,6 +1,5 @@
-AUX kdeplasma-addons-5.17.4-weather-applet-size-regression.patch 1634 BLAKE2B b6eccabcb397f77878876eebf7869539ca98c1c9d3a8e66cbbbc9c068cad0bc84cf366d020b67177a0786df94e24f664451826a6b87a68114dfa021329c9b5fd SHA512 ec43213fd4a484e73d60aef76117c90e4b8c83b6c7debbc8630f0802b62e294d4cba85a646e7780d0ac77d40647dba875bc9363787af407113d2be838dcacaad
-DIST kdeplasma-addons-5.17.4.tar.xz 606816 BLAKE2B 4b304a157f91068778d8a45c3f8b2dfa4790270509d4828201f287d6679f50ded5bdb2129f49105324ff5959a615bd78bec8e73b487ff585fffc987e33116fca SHA512 ae73ec8be325580742bf28f3479e3e27efe8fe9d01ea06c97b731c983e5fd5cf3c98307923f218748df0ac30ad2547804466a01df71eead4fed9bbcee16b0ef6
 DIST kdeplasma-addons-5.17.5.tar.xz 605648 BLAKE2B b6792d6723fc71564f9e583b3a0af8a45e06480150e7369e35dae0168a4eb254d91c268e1cd73064658b53373fd4933c7c7fe9473b904bc291fac4021e93d50c SHA512 ea836cdc99f583448d4b272b6d6b1e98c4926127307ac966dff779236ec10401af627958994dbc22959a13db9b67bf1b4ae05e911491eea874a2ce210c37b2d5
-EBUILD kdeplasma-addons-5.17.4-r1.ebuild 1813 BLAKE2B c92dba1e4dfbe13dbf9b9acbd1383f86172dcfa794215b09e15dcaa1ee9d0dd029707ab8b395c00774fb9a72b2bffe8be5e7b4b907e03c12c41217e294528cc9 SHA512 a41a15305907d71a14549822243044f7f51d90d6faadc00eb019ccc1e483910999b29a93bb283fa6e7f759d5338f98737f5fd8c66c86a0be090b97062e2d2544
-EBUILD kdeplasma-addons-5.17.5.ebuild 1754 BLAKE2B fed1d21867b3fbcc21b50fb2a6a6fa2453de3cb8a41536cc174cfabfa9d39e2a6950a82cccf9cecc839ad08240972b8fd6a2bb092dac0da951d330b12f9d3764 SHA512 2f03d60d923b5bbb9c98d1c7bd80a46693004e34cdfb957d531bb0d9eff3bf8a159d7a12b1375a254d3c9acd3f8c23cc1395c3a74f908bc74399006f2a6e1a4e
+DIST kdeplasma-addons-5.18.0.tar.xz 614856 BLAKE2B 7ddeefaf70ae4fdbc1579d7008c75d9f8ef7d1670716221469e6a9818d325060fbabb05b58ab46e51e67c2497bb75de8fbd39d770d74253b6b776e7a9e0bfbb2 SHA512 d6cb3daf39949e2fe2221cfce48a55ecfffb328ed46ca69da45f42b4323107bb9b908f40975f6f76cf7b1dc1a3481cf597287b46df003b3d3913df18d85f590a
+EBUILD kdeplasma-addons-5.17.5.ebuild 1751 BLAKE2B f0a9a4ea7d68e986da6c105dcd2f598b0331ed4d0fb8dab5bff54467f8c318e8416e7bed886d6b8255769a72cc46ed8c379175f551cef031073be3184c2ba1fb SHA512 ce499f5275e81dc8e7c44cdd95285cd307316047b164a2aed1398c26f27da8f1f13b706e314886a1f869f3173257c00e1be7e01ae990e35d42067f590728c463
+EBUILD kdeplasma-addons-5.18.0.ebuild 1738 BLAKE2B 89ec896f16721a49cc6a779d8fb6a2dd0bcf50fed532089ca95df3e92c4bfe2fdc25e025f0fb7f44e40c56020d05a5fa3ea44f846d65994181549d7e667a05a9 SHA512 83f2ddb624f88c1f2d376193deb5542b2a94f5358442671f7c0a1e9347e03f93ae2d37a1475e94c6ea2a25de66d09548a92f25fa4a95536349491bd368e7cead
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch
deleted file mode 100644
index 58a1316171e1..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 865ae05e8fe280a177fcd6dcf5f847327de36a00 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 15 Dec 2019 14:04:29 +0100
-Subject: [applets/weather] Fix regression in temperature size with short
- panels
-
-BUG: 415187
-FIXED-IN: 5.17.5
----
- applets/weather/package/contents/ui/IconAndTextItem.qml | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/applets/weather/package/contents/ui/IconAndTextItem.qml b/applets/weather/package/contents/ui/IconAndTextItem.qml
-index 7042bf8..dc270e4 100644
---- a/applets/weather/package/contents/ui/IconAndTextItem.qml
-+++ b/applets/weather/package/contents/ui/IconAndTextItem.qml
-@@ -86,9 +86,15 @@ GridLayout {
-                 leftMargin: units.smallSpacing
-                 rightMargin: units.smallSpacing
-             }
--            // This magic value of 0.7 is taken from the digital clock, so that the
--            // text sizes are identical
--            height: Math.min (parent.height * 0.7, 3 * theme.defaultFont.pixelSize)
-+            // These magic values are taken from the digital clock, so that the
-+            // text sizes here are identical with various clock text sizes
-+            height: {
-+                var textHeightScaleFactor = 0.7;
-+                if (parent.height <= 26) {
-+                    textHeightScaleFactor = 0.9;
-+                }
-+                return Math.min (parent.height * textHeightScaleFactor, 3 * theme.defaultFont.pixelSize);
-+            }
-             visible: false
- 
-             // pattern to reserve some constant space TODO: improve and take formatting/i18n into account
--- 
-cgit v1.1
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild
index 9b8bc97a3905..5793ced92fd0 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Extra Plasma applets and engines"
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="share webengine"
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.0.ebuild
index 3f793af92091..b0681938752d 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.0.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.64.0
+KFMIN=5.66.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Extra Plasma applets and engines"
+
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~ppc64"
 IUSE="share webengine"
 
 DEPEND="
@@ -51,8 +52,6 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
-PATCHES=( "${FILESDIR}"/${P}-weather-applet-size-regression.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package share KF5Purpose)