[gentoo-commits] proj/kde:master commit in: kde-frameworks/frameworkintegration/

[Andreas Sturmlechner]

commit:     7a9334741467f0c0db6e79f35573abe7a6909ade
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 00:02:14 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 00:46:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7a933474

kde-frameworks/frameworkintegration: Update DEPENDs, drop unused

Upstream commit f583ae9eed99051b77aabdecdede8d17bb9c6b65

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../frameworkintegration-9999.ebuild               | 26 ++++++++--------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
index 89da477291..06ac41c5f7 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
@@ -10,46 +10,38 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="appstream X"
+IUSE="appstream"
 
 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-DEPEND="
+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
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}: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
-}
-
 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