1 |
commit: dc0f837bde48f0a6fe4d4e0de1a1c05aa89711e9 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 30 05:33:12 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 30 05:38:29 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc0f837b |
7 |
|
8 |
kde-plasma/plasma-desktop: introduce touchpad and mouse USE flags to replace INPUT_DEVICES="..." |
9 |
|
10 |
Since INPUT_DEVICES is being switched to libinput by default, we were running |
11 |
into issues with people missing the mouse and touchpad KCMs. |
12 |
|
13 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
14 |
|
15 |
kde-plasma/plasma-desktop/metadata.xml | 2 ++ |
16 |
kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild | 11 +++++------ |
17 |
kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild | 11 +++++------ |
18 |
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 11 +++++------ |
19 |
4 files changed, 17 insertions(+), 18 deletions(-) |
20 |
|
21 |
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml |
22 |
index 69e075f507..427be9b25a 100644 |
23 |
--- a/kde-plasma/plasma-desktop/metadata.xml |
24 |
+++ b/kde-plasma/plasma-desktop/metadata.xml |
25 |
@@ -11,6 +11,8 @@ |
26 |
<flag name="gtk3">Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator.</flag> |
27 |
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> |
28 |
<flag name="legacy-systray">Add support for applications using legacy xembed systray icons.</flag> |
29 |
+ <flag name="mouse">Enable mouse KCM</flag> |
30 |
<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> |
31 |
+ <flag name="touchpad">Enable touchpad KCM</flag> |
32 |
</use> |
33 |
</pkgmetadata> |
34 |
|
35 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild |
36 |
index 026fe01841..6ece0c5e40 100644 |
37 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild |
38 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.10.95.ebuild |
39 |
@@ -10,8 +10,7 @@ inherit kde5 |
40 |
|
41 |
DESCRIPTION="KDE Plasma desktop" |
42 |
KEYWORDS="~amd64 ~arm ~x86" |
43 |
-IUSE="appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics |
44 |
-ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop" |
45 |
+IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad" |
46 |
|
47 |
COMMON_DEPEND=" |
48 |
$(add_frameworks_dep attica) |
49 |
@@ -87,7 +86,6 @@ COMMON_DEPEND=" |
50 |
x11-libs/libxcb |
51 |
x11-libs/xcb-util-keysyms |
52 |
) |
53 |
- input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) |
54 |
pulseaudio? ( |
55 |
dev-libs/glib:2 |
56 |
media-libs/libcanberra |
57 |
@@ -95,12 +93,13 @@ COMMON_DEPEND=" |
58 |
) |
59 |
scim? ( app-i18n/scim ) |
60 |
semantic-desktop? ( $(add_frameworks_dep baloo) ) |
61 |
+ touchpad? ( x11-drivers/xf86-input-synaptics ) |
62 |
" |
63 |
DEPEND="${COMMON_DEPEND} |
64 |
dev-libs/boost |
65 |
x11-proto/xproto |
66 |
fontconfig? ( x11-libs/libXrender ) |
67 |
- input_devices_evdev? ( x11-drivers/xf86-input-evdev ) |
68 |
+ mouse? ( x11-drivers/xf86-input-evdev ) |
69 |
" |
70 |
RDEPEND="${COMMON_DEPEND} |
71 |
$(add_plasma_dep breeze) |
72 |
@@ -141,11 +140,11 @@ src_configure() { |
73 |
$(cmake-utils_use_find_package appstream AppStreamQt) |
74 |
$(cmake-utils_use_find_package fontconfig Fontconfig) |
75 |
$(cmake-utils_use_find_package ibus IBus) |
76 |
- $(cmake-utils_use_find_package input_devices_evdev Evdev) |
77 |
- $(cmake-utils_use_find_package input_devices_synaptics Synaptics) |
78 |
+ $(cmake-utils_use_find_package mouse Evdev) |
79 |
$(cmake-utils_use_find_package pulseaudio PulseAudio) |
80 |
$(cmake-utils_use_find_package scim SCIM) |
81 |
$(cmake-utils_use_find_package semantic-desktop KF5Baloo) |
82 |
+ $(cmake-utils_use_find_package touchpad Synaptics) |
83 |
) |
84 |
|
85 |
kde5_src_configure |
86 |
|
87 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild |
88 |
index 2e358f0300..86d83e5fd7 100644 |
89 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild |
90 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.11.49.9999.ebuild |
91 |
@@ -10,8 +10,7 @@ inherit kde5 |
92 |
|
93 |
DESCRIPTION="KDE Plasma desktop" |
94 |
KEYWORDS="" |
95 |
-IUSE="appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics |
96 |
-ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop" |
97 |
+IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad" |
98 |
|
99 |
COMMON_DEPEND=" |
100 |
$(add_frameworks_dep attica) |
101 |
@@ -87,7 +86,6 @@ COMMON_DEPEND=" |
102 |
x11-libs/libxcb |
103 |
x11-libs/xcb-util-keysyms |
104 |
) |
105 |
- input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) |
106 |
pulseaudio? ( |
107 |
dev-libs/glib:2 |
108 |
media-libs/libcanberra |
109 |
@@ -95,12 +93,13 @@ COMMON_DEPEND=" |
110 |
) |
111 |
scim? ( app-i18n/scim ) |
112 |
semantic-desktop? ( $(add_frameworks_dep baloo) ) |
113 |
+ touchpad? ( x11-drivers/xf86-input-synaptics ) |
114 |
" |
115 |
DEPEND="${COMMON_DEPEND} |
116 |
dev-libs/boost |
117 |
x11-proto/xproto |
118 |
fontconfig? ( x11-libs/libXrender ) |
119 |
- input_devices_evdev? ( x11-drivers/xf86-input-evdev ) |
120 |
+ mouse? ( x11-drivers/xf86-input-evdev ) |
121 |
" |
122 |
RDEPEND="${COMMON_DEPEND} |
123 |
$(add_plasma_dep breeze) |
124 |
@@ -141,11 +140,11 @@ src_configure() { |
125 |
$(cmake-utils_use_find_package appstream AppStreamQt) |
126 |
$(cmake-utils_use_find_package fontconfig Fontconfig) |
127 |
$(cmake-utils_use_find_package ibus IBus) |
128 |
- $(cmake-utils_use_find_package input_devices_evdev Evdev) |
129 |
- $(cmake-utils_use_find_package input_devices_synaptics Synaptics) |
130 |
+ $(cmake-utils_use_find_package mouse Evdev) |
131 |
$(cmake-utils_use_find_package pulseaudio PulseAudio) |
132 |
$(cmake-utils_use_find_package scim SCIM) |
133 |
$(cmake-utils_use_find_package semantic-desktop KF5Baloo) |
134 |
+ $(cmake-utils_use_find_package touchpad Synaptics) |
135 |
) |
136 |
|
137 |
kde5_src_configure |
138 |
|
139 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
140 |
index 2e358f0300..86d83e5fd7 100644 |
141 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
142 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
143 |
@@ -10,8 +10,7 @@ inherit kde5 |
144 |
|
145 |
DESCRIPTION="KDE Plasma desktop" |
146 |
KEYWORDS="" |
147 |
-IUSE="appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics |
148 |
-ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop" |
149 |
+IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad" |
150 |
|
151 |
COMMON_DEPEND=" |
152 |
$(add_frameworks_dep attica) |
153 |
@@ -87,7 +86,6 @@ COMMON_DEPEND=" |
154 |
x11-libs/libxcb |
155 |
x11-libs/xcb-util-keysyms |
156 |
) |
157 |
- input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) |
158 |
pulseaudio? ( |
159 |
dev-libs/glib:2 |
160 |
media-libs/libcanberra |
161 |
@@ -95,12 +93,13 @@ COMMON_DEPEND=" |
162 |
) |
163 |
scim? ( app-i18n/scim ) |
164 |
semantic-desktop? ( $(add_frameworks_dep baloo) ) |
165 |
+ touchpad? ( x11-drivers/xf86-input-synaptics ) |
166 |
" |
167 |
DEPEND="${COMMON_DEPEND} |
168 |
dev-libs/boost |
169 |
x11-proto/xproto |
170 |
fontconfig? ( x11-libs/libXrender ) |
171 |
- input_devices_evdev? ( x11-drivers/xf86-input-evdev ) |
172 |
+ mouse? ( x11-drivers/xf86-input-evdev ) |
173 |
" |
174 |
RDEPEND="${COMMON_DEPEND} |
175 |
$(add_plasma_dep breeze) |
176 |
@@ -141,11 +140,11 @@ src_configure() { |
177 |
$(cmake-utils_use_find_package appstream AppStreamQt) |
178 |
$(cmake-utils_use_find_package fontconfig Fontconfig) |
179 |
$(cmake-utils_use_find_package ibus IBus) |
180 |
- $(cmake-utils_use_find_package input_devices_evdev Evdev) |
181 |
- $(cmake-utils_use_find_package input_devices_synaptics Synaptics) |
182 |
+ $(cmake-utils_use_find_package mouse Evdev) |
183 |
$(cmake-utils_use_find_package pulseaudio PulseAudio) |
184 |
$(cmake-utils_use_find_package scim SCIM) |
185 |
$(cmake-utils_use_find_package semantic-desktop KF5Baloo) |
186 |
+ $(cmake-utils_use_find_package touchpad Synaptics) |
187 |
) |
188 |
|
189 |
kde5_src_configure |