gentoo resync : 15.01.2020

5 files changed, 105 insertions, 61 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 5aebb7538112..7c780a07f43c 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,6 @@
-DIST kdeplasma-addons-5.16.5.tar.xz 600480 BLAKE2B 146c7ba77eb4ff973afb5e051d3000baebdea317b9e17482fa07cf575b2d4d8bce69590c66b0b4756cb971109ff701e8786a25108729aa7d65bdcb89cc945a40 SHA512 0bcbff113d71bb33a6542d78a250dacb8eff66c5f8bc84f9ec0055fe74ccb7ad2b5706ef3782e754909c75a95b133f3233b93cd7290d354df1d54dca1401d875
+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
-EBUILD kdeplasma-addons-5.16.5.ebuild 1502 BLAKE2B 76742e80bfe694ba50e6a6939bec9d92343393cd3703e368cbc954dc9015bfe2a1e97117f5afee0420246ce8293431e07c7746ec8362008f9000dc8f10f4e6d2 SHA512 77ce447aff550b73bfbcc83d09f2df741d81d94a54101908f3de22226cb85aef5fa7107da7e0cb8c78056a5b76b0feb32ae55eda179f62d5e8206e90c65ea19a
-EBUILD kdeplasma-addons-5.17.4.ebuild 1747 BLAKE2B 964874e10a1bcc2228b42887cd31f6be5a59c8522daeff2bcb2381efa5bad704e761a20ad8319ba0f33850be55a44217487a9524560e45d1e0e33f1dd53fc924 SHA512 29f7ebd3bb45539f80cd4120f14ca4a890149a78f860f36b65a50baf094bb50b10767d46bc3494b43bca6c5b91967e98c89bf933cebbc843985728884ce7ac9b
+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 1747 BLAKE2B 10099d2469e1f250df29143432356a6cb371b10ec662b571d7b37b4b25e91dffaab7ee4faf23912e33fe0d9eb16500d0992f79ba0762f93b547929e447a66e28 SHA512 aff4f99f495a4e2124f83c0420364d57971e7dd1ae7fc7e213100ede6cb8b03f796ac3b1f70002ee358bb08f638afbde0f1790f388576b2370b1eb52d503f863
 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
new file mode 100644
index 000000000000..58a1316171e1
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch
@@ -0,0 +1,37 @@
+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.16.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.5.ebuild
deleted file mode 100644
index 6c4bbbb1a6c5..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="share webengine"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	share? ( $(add_frameworks_dep purpose) )
-	webengine? ( $(add_qt_dep qtwebengine) )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package webengine Qt5WebEngine)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild
new file mode 100644
index 000000000000..3f793af92091
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.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"
+IUSE="share webengine"
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-weather-applet-size-regression.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild
index 5d6cf315bc28..de0742d88a6a 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7