gentoo resync : 05.04.2019

3 files changed, 8 insertions, 75 deletions

diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index 1261e75bfa2f..aa91d74c55d3 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1,4 +1,4 @@
-AUX colord-kde-0.5.0-unused-deps.patch 2022 BLAKE2B 68e61c1e7a65618cf61b42522a9bef344644f9447a6cd1132bf809d6940792025e91dde28695827b77f5efc73d092b4a8b219a453f4e35eb861efb8e683e1275 SHA512 7ecee4ed82bcdb2b4c2616956267e6ae5dd88862a76f50b830d13b211973d94ebe685509e4397160dd83ba9388d02c490b7fb5c9eddada398be01d52a727334a
+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.ebuild 1217 BLAKE2B 7ecbb709d5158a3c2946b4b5e85b1e45a4a3883de54f73dd914fa1868e6e4d861b6384ca8917a62bed6c321f5767585de94ddcf0b37b577d780052c270c3875b SHA512 98fd1ae9f661ca509bbde1858c9fcf1ee0cad930a6fcc686bc49e87667f7cad78710ec0e8fcfb8d165d2de27c483415db3967c704fb4b0e65ab1751cc787fb72
+EBUILD colord-kde-0.5.0-r1.ebuild 1236 BLAKE2B ee7d992c933d1c04a387f95f0d90187a04204333bcb950800380198cafce15af57e701a393effdfec8fecd9eead55f65c6d87827e5bacff9fae6f642e3aa855d SHA512 d8fa43e82d626c01e33eb88d77024ff03e180f74078507c544e69d153a789e4fdf8b3191256b0d9ba282f90b5abb0ec9be01264fe533e58e1c2b2d2d2a5759d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/colord-kde/colord-kde-0.5.0.ebuild b/kde-misc/colord-kde/colord-kde-0.5.0-r1.ebuild
index 174efa5979c9..74efceffb01a 100644
--- a/kde-misc/colord-kde/colord-kde-0.5.0.ebuild
+++ b/kde-misc/colord-kde/colord-kde-0.5.0-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
 DESCRIPTION="Provides interfaces and session daemon to colord"
-HOMEPAGE="http://projects.kde.org/projects/playground/graphics/colord-kde"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+HOMEPAGE="https://cgit.kde.org/colord-kde.git"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
@@ -38,7 +39,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/colord
 "
 
-PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+PATCHES=( "${WORKDIR}/${P}-patches" )
 
 pkg_postinst() {
 	kde5_pkg_postinst
diff --git a/kde-misc/colord-kde/files/colord-kde-0.5.0-unused-deps.patch b/kde-misc/colord-kde/files/colord-kde-0.5.0-unused-deps.patch
deleted file mode 100644
index 48b1f4277df5..000000000000
--- a/kde-misc/colord-kde/files/colord-kde-0.5.0-unused-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From be1d302200fb3f3f2ef9cf41c34cb4ac5d970df2 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Sat, 22 Oct 2016 21:46:18 +1100
-Subject: [PATCH] Remove unused dependencies.
-
-REVIEW: 129240
----
- CMakeLists.txt              | 4 ++--
- colord-kcm/CMakeLists.txt   | 1 -
- icc-importer/CMakeLists.txt | 2 --
- icc-importer/main.cpp       | 1 -
- 4 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcace67..6d6093a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,8 +28,8 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
- find_package(X11)
- find_package(XCB COMPONENTS XCB RANDR)
- 
--find_package(KF5 REQUIRED Config ConfigWidgets CoreAddons DBusAddons IconThemes I18n KCMUtils KIO
--             Notifications Plasma WidgetsAddons WindowSystem ItemViews)
-+find_package(KF5 REQUIRED ConfigWidgets CoreAddons DBusAddons I18n KCMUtils
-+             WidgetsAddons WindowSystem)
- 
- add_definitions(-DTRANSLATION_DOMAIN=\"colord-kde\")
- 
-diff --git a/colord-kcm/CMakeLists.txt b/colord-kcm/CMakeLists.txt
-index a078ed3..712bf1a 100644
---- a/colord-kcm/CMakeLists.txt
-+++ b/colord-kcm/CMakeLists.txt
-@@ -53,7 +53,6 @@ target_link_libraries(kcm_colord
-     Qt5::DBus
-     KF5::CoreAddons
-     KF5::I18n
--    KF5::IconThemes
-     KF5::KCMUtils
-     ${LCMS2_LIBRARIES}
- )
-diff --git a/icc-importer/CMakeLists.txt b/icc-importer/CMakeLists.txt
-index af3cee0..a6ac1f9 100644
---- a/icc-importer/CMakeLists.txt
-+++ b/icc-importer/CMakeLists.txt
-@@ -18,8 +18,6 @@ target_link_libraries(colord-kde-icc-importer
-     KF5::CoreAddons
-     KF5::I18n
-     KF5::WidgetsAddons
--    KF5::IconThemes
--    KF5::ConfigCore
-     ${LCMS2_LIBRARIES}
- )
- 
-diff --git a/icc-importer/main.cpp b/icc-importer/main.cpp
-index 2af0e85..bb72f32 100644
---- a/icc-importer/main.cpp
-+++ b/icc-importer/main.cpp
-@@ -31,7 +31,6 @@
- #include <QCommandLineParser>
- 
- #include <KMessageBox>
--#include <KConfig>
- #include <KAboutData>
- #include <KLocalizedString>
- 
--- 
-2.7.3
-