1 |
commit: 15803f3cd9add1d01617e7bb39fc869cb28250fc |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 4 16:25:06 2017 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 4 16:25:06 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=15803f3c |
7 |
|
8 |
kde-plasma/plasma-desktop: Add use flag appstream |
9 |
|
10 |
Upstream commit ed73ecd6a3de4be92a0630bbeb5815a038706a7d |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
|
14 |
kde-plasma/plasma-desktop/metadata.xml | 1 + |
15 |
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 8 ++++---- |
16 |
2 files changed, 5 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml |
19 |
index 16d958c..ebc98a2 100644 |
20 |
--- a/kde-plasma/plasma-desktop/metadata.xml |
21 |
+++ b/kde-plasma/plasma-desktop/metadata.xml |
22 |
@@ -6,6 +6,7 @@ |
23 |
<name>Gentoo KDE Project</name> |
24 |
</maintainer> |
25 |
<use> |
26 |
+ <flag name="appstream">Enable AppStream software metadata support</flag> |
27 |
<flag name="gtk2">Add support for gtk+2-based applications using legacy xembed systray icons via libappindicator.</flag> |
28 |
<flag name="gtk3">Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator.</flag> |
29 |
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> |
30 |
|
31 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
32 |
index d53e4a9..401b26d 100644 |
33 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
34 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
35 |
@@ -11,10 +11,9 @@ inherit kde5 |
36 |
|
37 |
DESCRIPTION="KDE Plasma desktop" |
38 |
KEYWORDS="" |
39 |
-IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus |
40 |
-legacy-systray pulseaudio +qt4 scim +semantic-desktop" |
41 |
+IUSE="appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics |
42 |
+ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop" |
43 |
|
44 |
-# TODO appstream optional https://phabricator.kde.org/D3923 |
45 |
COMMON_DEPEND=" |
46 |
$(add_frameworks_dep attica) |
47 |
$(add_frameworks_dep kactivities) |
48 |
@@ -68,7 +67,6 @@ COMMON_DEPEND=" |
49 |
$(add_qt_dep qtwidgets) |
50 |
$(add_qt_dep qtx11extras) |
51 |
$(add_qt_dep qtxml) |
52 |
- dev-libs/appstream[qt5] |
53 |
media-libs/phonon[qt5] |
54 |
x11-libs/libX11 |
55 |
x11-libs/libXcursor |
56 |
@@ -76,6 +74,7 @@ COMMON_DEPEND=" |
57 |
x11-libs/libXi |
58 |
x11-libs/libxcb |
59 |
x11-libs/libxkbfile |
60 |
+ appstream? ( dev-libs/appstream[qt5] ) |
61 |
fontconfig? ( |
62 |
media-libs/fontconfig |
63 |
media-libs/freetype |
64 |
@@ -143,6 +142,7 @@ pkg_setup() { |
65 |
|
66 |
src_configure() { |
67 |
local mycmakeargs=( |
68 |
+ $(cmake-utils_use_find_package appstream AppStreamQt) |
69 |
$(cmake-utils_use_find_package fontconfig Fontconfig) |
70 |
$(cmake-utils_use_find_package ibus IBus) |
71 |
$(cmake-utils_use_find_package input_devices_evdev Evdev) |