gentoo resync : 15.01.2020

4 files changed, 47 insertions, 27 deletions

diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 5c3260691f5d..e80e679f419b 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,6 @@
+AUX frameworkintegration-5.66.0-unused-dep.patch 744 BLAKE2B 23364d0657d165151d12730157cc085fd90e146bfdbc2a98cd66eb776f792a8366e835deca5e6b841034a2215283ccf0857c96373f5170435c41d96313a462a7 SHA512 e9e060aeb3e0f65c28f90119847873d0d263312e7cd06774f4f20719578f04c8c80cb044f44b27b138de477fa762ab60d6a004c7540940d9ac5eb9e69762d396
 DIST frameworkintegration-5.64.0.tar.xz 1754716 BLAKE2B a9812b62c8973b5286b06388a5a9bb2f65bed49684b72c56696ab8e5ea7a03b24ba9d8b58b210cfbd06d46a695106d81f22b5fbd6440bc68dc639c5385dbce62 SHA512 7288578fcec9c1fe1d768692380acff00267513e0092361b0c0739e669a86ffde1df96f20e0ce91685df440ae7fcd7786d96fc18c1faa00e5e82d7fc9b8d60df
-DIST frameworkintegration-5.65.0.tar.xz 1755240 BLAKE2B d126efbec1e2a18fa49bf279a0cfbf80feed3b263eeb3589fa6e28db8f6e9b1708865c16db85735c73c39f830e69eb8771d51ba19d58bff3b5ac623e75439f47 SHA512 0af9b631e40d44c06661fd671898f102930f2efec9273f9efc1f7b11a16a42e25525e1a5a9c165e9d901cff01b08f36c1ac9845f316368b7f630a06dd32f414e
-EBUILD frameworkintegration-5.64.0.ebuild 1305 BLAKE2B d1eaf112784ae465ce4332955032c95da2d4d5e9639e13b8c4864d3116153a532c99031f4e6b1756036bcebd437661fdea1fb892dba3ba4b3ed8084c4201df76 SHA512 4ae58416e9863d3d5123cad8bd2bfd59ed7c54b1f59057889e8d9fa6ba0472c887c0cf0b8422440dd25bae705770f9ec0880ecd1342af84779cb94ab916fe0e5
-EBUILD frameworkintegration-5.65.0.ebuild 1290 BLAKE2B b47c9225f359c5b6ce805cbe0cee69434d3c745d1a2e791130a1c40e855861ea1ad7c10862927095058b94fdd861104b664575b2f28a42c5b252ee7142ca3377 SHA512 406fb23b766c4b9c69ee7a36819cf71127a195d9117cbf90b36dd319705cf4d737a376ee90d25236e7f66e7186546355ab756515a2ea767802b92cbb41ee34cd
+DIST frameworkintegration-5.66.0.tar.xz 1753696 BLAKE2B e365fac7c3ea7e6583edc94fcfe68cdc3f020e887c1383cba0792a19f4e5aebd29098071fd10b8cb70efd322ce5923159e1126ef7dae74521a8ec505fc5af77a SHA512 d22cc4a2f5552705c0b863d2b73dfffd70a0020bf31dcf17874ac5a8c05de8bbbc88c7e12d455d1a98bc64916cb174a7fdb9677833cb5404c0b7c8f1c9bea2f2
+EBUILD frameworkintegration-5.64.0.ebuild 1287 BLAKE2B 8d1d3a1103da52c9d8e8d4e503651e0d82ad338886ee096c68e1965ec3f2ad26b17372b1fd8b20f461ff8327696fc6689c7b3ed405d17e6f9572e31efe4432dd SHA512 822d0ec74e2bd6dbebc5974353648b17f48f8516211b4f63c764ef931286610591a239092ac3dc31c53f614014718567493758127325235f777cf55324d2ec24
+EBUILD frameworkintegration-5.66.0-r1.ebuild 1180 BLAKE2B 91c42c469dc1de064a1b18481c8e27b8de1d890463c29d375f2ffa90f5ada8040a850d12e510658db21f846ce803afd6d15a8c6e9ca2caaea64a15f0b345ad4c SHA512 ad0c5e11fc9f2ca27fb132e4dcba2d4e022ab56bd022a3e316a0c1745b18a007473c2b4e1cc6aa1840a3ccb972055043b6550da1b80c4be372e21e2941dc3e53
 MISC metadata.xml 339 BLAKE2B 9adff6fc4d48a8e94cd7701e7a3b956963b25af1538793345846c70186d7536597bcd9a1cac92b292220de5d6c2562864b64556c36cd579041b567d970db6828 SHA512 cf6eaaca36d7a193361608ad80cd1a4e79f71952926fb01c8905879422c91d38d6988e473a14960437491e5b43d227497500b79ff3696f0d96cbc1b69f9165c1
diff --git a/kde-frameworks/frameworkintegration/files/frameworkintegration-5.66.0-unused-dep.patch b/kde-frameworks/frameworkintegration/files/frameworkintegration-5.66.0-unused-dep.patch
new file mode 100644
index 000000000000..1e8ea5dafcc9
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/files/frameworkintegration-5.66.0-unused-dep.patch
@@ -0,0 +1,25 @@
+From 85c0bd7aa6cc635efa54e4d07c49878cfa0bb553 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 12 Jan 2020 01:24:11 +0100
+Subject: [PATCH] Drop unused dependency
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c0eb508..e6d0713 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(KDECMakeSettings)
+ 
+ set(REQUIRED_QT_VERSION 5.12.0)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets)
++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Widgets)
+ 
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX FRAMEWORKINTEGRATION
+-- 
+2.24.1
+
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild
index 3ddc4945e821..d12e52dd57fc 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild
@@ -47,9 +47,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package appstream packagekitqt5)
-		$(cmake-utils_use_find_package X XCB)
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package appstream packagekitqt5)
+		$(cmake_use_find_package X XCB)
 	)
 
 	ecm_src_configure
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.65.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.66.0-r1.ebuild
index fe0c4fd45943..9c67c6caffb6 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.65.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.66.0-r1.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
@@ -10,46 +10,40 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="appstream X"
+IUSE="appstream"
 
 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-DEPEND="
-	>=kde-frameworks/kconfig-${PVCUT}:5
-	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
-	>=kde-frameworks/ki18n-${PVCUT}:5
-	>=kde-frameworks/kiconthemes-${PVCUT}:5
-	>=kde-frameworks/knewstuff-${PVCUT}:5
-	>=kde-frameworks/knotifications-${PVCUT}:5
-	>=kde-frameworks/kpackage-${PVCUT}:5
-	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5=
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/knewstuff-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
 	appstream? (
 		app-admin/packagekit-qt
 		dev-libs/appstream[qt5]
 	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
 
 # requires running kde environment
 RESTRICT+=" test"
 
-src_prepare() {
-	ecm_punt_bogus_dep Qt5 DBus
-	ecm_src_prepare
-}
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package appstream AppStreamQt)
 		$(cmake_use_find_package appstream packagekitqt5)
-		$(cmake_use_find_package X XCB)
 	)
 
 	ecm_src_configure