Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/frameworkintegration/
Date: Wed, 26 Feb 2020 12:57:57
Message-Id: 1582721850.b2f1cc8186bbacdd68f7a5f92d9b10882cea3b90.asturm@gentoo
1 commit: b2f1cc8186bbacdd68f7a5f92d9b10882cea3b90
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 26 12:57:15 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 26 12:57:30 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b2f1cc81
7
8 kde-frameworks/frameworkintegration: Drop USE appstream
9
10 After app-admin/packagekit-qt last-rites.
11
12 Follow-up to gentoo.git commit 8d29ee32ea45d6c08c4ce33c32104e6565e04bbd
13
14 Package-Manager: Portage-2.3.89, Repoman-2.3.20
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 .../frameworkintegration/frameworkintegration-9999.ebuild | 12 ++++--------
18 kde-frameworks/frameworkintegration/metadata.xml | 3 ---
19 2 files changed, 4 insertions(+), 11 deletions(-)
20
21 diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
22 index 06ac41c5f7..d173cf56ed 100644
23 --- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
24 +++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
25 @@ -13,7 +13,7 @@ DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspace
26
27 LICENSE="LGPL-2+"
28 KEYWORDS=""
29 -IUSE="appstream"
30 +IUSE=""
31
32 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
33 RDEPEND="
34 @@ -25,23 +25,19 @@ RDEPEND="
35 =kde-frameworks/kiconthemes-${PVCUT}*:5
36 =kde-frameworks/knewstuff-${PVCUT}*:5
37 =kde-frameworks/knotifications-${PVCUT}*:5
38 - appstream? (
39 - app-admin/packagekit-qt
40 - dev-libs/appstream[qt5]
41 - )
42 "
43 DEPEND="${RDEPEND}
44 =kde-frameworks/kpackage-${PVCUT}*:5
45 =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
46 "
47
48 -# requires running kde environment
49 +# requires running Plasma environment
50 RESTRICT+=" test"
51
52 src_configure() {
53 local mycmakeargs=(
54 - $(cmake_use_find_package appstream AppStreamQt)
55 - $(cmake_use_find_package appstream packagekitqt5)
56 + -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
57 + -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
58 )
59
60 ecm_src_configure
61
62 diff --git a/kde-frameworks/frameworkintegration/metadata.xml b/kde-frameworks/frameworkintegration/metadata.xml
63 index e2bea7e9a6..2fdbf33d96 100644
64 --- a/kde-frameworks/frameworkintegration/metadata.xml
65 +++ b/kde-frameworks/frameworkintegration/metadata.xml
66 @@ -5,7 +5,4 @@
67 <email>kde@g.o</email>
68 <name>Gentoo KDE Project</name>
69 </maintainer>
70 - <use>
71 - <flag name="appstream">Enable AppStream software metadata support</flag>
72 - </use>
73 </pkgmetadata>