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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     47911b679dc1c69b0c5810d2a66169a32e657cb3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  5 00:08:46 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 00:10:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=47911b67

kde-frameworks/frameworkintegration: Add USE=appstream

Package-Manager: portage-2.3.0

 .../frameworkintegration/frameworkintegration-9999.ebuild   | 13 ++++++++-----
 kde-frameworks/frameworkintegration/metadata.xml            |  3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
index bfc66d2..bde5f3b 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
@@ -10,17 +10,22 @@ inherit kde5
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="X"
+IUSE="appstream X"
 
 RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kpackage)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	appstream? (
+		app-admin/packagekit-qt
+		dev-libs/appstream[qt5]
+	)
 	X? (
 		$(add_qt_dep qtx11extras)
 		x11-libs/libxcb
@@ -38,12 +43,10 @@ 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)
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
 	)
-	# appstream requires app-admin/packagekit-qt and
-	# not yet packaged AppStreamQt 0.10
 
 	kde5_src_configure
 }

diff --git a/kde-frameworks/frameworkintegration/metadata.xml b/kde-frameworks/frameworkintegration/metadata.xml
index 2fdbf33..e2bea7e 100644
--- a/kde-frameworks/frameworkintegration/metadata.xml
+++ b/kde-frameworks/frameworkintegration/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="appstream">Enable AppStream software metadata support</flag>
+	</use>
 </pkgmetadata>