gentoo resync : 15.01.2020

3 files changed, 63 insertions, 18 deletions

diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index aa91d74c55d3..d6df4ad06406 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1,4 +1,5 @@
+AUX colord-kde-0.5.0-icon.patch 1333 BLAKE2B 3514a23167dc7ff2082afe389d7f3a9e289ffde005427ec92c6a933002d22cdf8eeb2cbe46a5ffd0b9e171ee9d541e89a5bae0463eb094e1c148318eda1b703e SHA512 916874e00ffd586213d1089e9c723177ba0db12284bec522f9257e642a6ff026121e81a167035863c5e7520983e8d596798f785ab9ba4ea0fd00fbf44cde8946
 DIST colord-kde-0.5.0-patches.tar.xz 9500 BLAKE2B e8f4b2f07b7e17eeaddf1cba94945b47a5485213941d7cce3fb9bd0f67bcef37467541e154dfda8babac22fd46778809e84691cc4bebc2e149888a3927e73da7 SHA512 0f153413bd55c294eef1bbb8ae0af60972cdd68df4fe41c1a6fade34c4fa37d7195766561a9570a712b87c055cb9bbc54a5c2bf725c7776066f8fa91c00563e5
 DIST colord-kde-0.5.0.tar.xz 97572 BLAKE2B 7cb5434c25e576c98e2ffbf428bf81d37605fd489199bacc2c040d443021f1f1055b3640f2698b622b021e34f4c517e168a45cd2c1006fdc2c24590789b482e3 SHA512 f285931f0f97462fcf173f64aaf2f32752bddb0b724d2055055ce5beb7dbe89ccebc62cb8c2ce455a8d68beb737fd55bf89be8e4dc7eaa37f09878b757370f07
-EBUILD colord-kde-0.5.0-r1.ebuild 1236 BLAKE2B ee7d992c933d1c04a387f95f0d90187a04204333bcb950800380198cafce15af57e701a393effdfec8fecd9eead55f65c6d87827e5bacff9fae6f642e3aa855d SHA512 d8fa43e82d626c01e33eb88d77024ff03e180f74078507c544e69d153a789e4fdf8b3191256b0d9ba282f90b5abb0ec9be01264fe533e58e1c2b2d2d2a5759d8
+EBUILD colord-kde-0.5.0-r2.ebuild 1376 BLAKE2B fbdddbfb4b6600a8efc3edb3469fd81e5d519a7d7239c6f591779143d4cfe345a60646d354aa6dabadbc8c360714a2c8cfba13a581aa1519dd2979469c008580 SHA512 f1dd9ce5333e9556a9a2d7e7dd86f32aaf8bc4df408944618b6371dbf70063db492ac8585a5ababdc73b22a5a32d0dadb3fe723b7de3939dcda5d870f342c712
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/colord-kde/colord-kde-0.5.0-r1.ebuild b/kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
index 74efceffb01a..734e396cf1bb 100644
--- a/kde-misc/colord-kde/colord-kde-0.5.0-r1.ebuild
+++ b/kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Provides interfaces and session daemon to colord"
 HOMEPAGE="https://cgit.kde.org/colord-kde.git"
@@ -12,37 +14,41 @@ https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
+SLOT="5"
 IUSE=""
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	media-libs/lcms:2
 	x11-libs/libxcb
 	x11-libs/libX11
 	x11-libs/libXrandr
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
+	kde-plasma/kde-cli-tools:5
 	x11-misc/colord
 "
 
-PATCHES=( "${WORKDIR}/${P}-patches" )
+PATCHES=(
+	"${WORKDIR}/${P}-patches"
+	"${FILESDIR}/${P}-icon.patch"
+)
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 	if ! has_version "gnome-extra/gnome-color-manager"; then
 		elog "You may want to install gnome-extra/gnome-color-manager to add support for"
 		elog "colorhug calibration devices."
diff --git a/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch b/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch
new file mode 100644
index 000000000000..bcc8ba2586ca
--- /dev/null
+++ b/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch
@@ -0,0 +1,38 @@
+From 7ea14bbaf6b0e923496cb5e50dfcd5068c7858c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Feber?= <bfeber@protonmail.com>
+Date: Sun, 30 Jun 2019 17:50:38 +0200
+Subject: [colord-kde] Use more appropriate icon, because the activities icon
+ got changed
+
+Summary:
+Use a more appopriate icon, because the activities icon got changed in D22155.
+{F6948366}
+
+Test Plan: Open the Color Corrections KCM.
+
+Reviewers: #plasma, #vdg, ndavis
+
+Reviewed By: #vdg, ndavis
+
+Subscribers: #vdg, #plasma
+
+Differential Revision: https://phabricator.kde.org/D22171
+---
+ colord-kcm/ColordKCM.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/colord-kcm/ColordKCM.cpp b/colord-kcm/ColordKCM.cpp
+index f14b4a9..fffbf54 100644
+--- a/colord-kcm/ColordKCM.cpp
++++ b/colord-kcm/ColordKCM.cpp
+@@ -158,7 +158,7 @@ ColordKCM::ColordKCM(QWidget *parent, const QVariantList &args) :
+     connect(watcher, &QDBusServiceWatcher::serviceOwnerChanged,
+             ui->profile, &Description::serviceOwnerChanged);
+ 
+-    ui->devicesTb->setIcon(QIcon::fromTheme(QStringLiteral("preferences-activities")));
++    ui->devicesTb->setIcon(QIcon::fromTheme(QStringLiteral("computer")));
+     ui->profilesTb->setIcon(QIcon::fromTheme(QStringLiteral("application-vnd.iccprofile")));
+ 
+     auto signalMapper = new QSignalMapper(this);
+-- 
+cgit v1.1