commit: 40ee8557c5272b87f5eaf6af3c93615b48602c74
Author: Anthony Ryan <anthonyryan1 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 25 14:11:39 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 14:11:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=40ee8557
kde-plasma/plasma-desktop: Use INPUT_DEVICES expanded use
Uses the same INPUT_DEVICES expanded use as x11-base/xorg-drivers
and other packages that have similar input-device specific
functionality.
* Rename USE=evdev to INPUT_DEVICES=evdev
* Rename USE=touchpad to INPUT_DEVICES=synaptics
Package-Manager: portage-2.2.28
kde-plasma/plasma-desktop/metadata.xml | 2 --
kde-plasma/plasma-desktop/plasma-desktop-5.6.0.ebuild | 10 +++++-----
kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild | 10 +++++-----
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 10 +++++-----
4 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/kde-plasma/plasma-desktop/metadata.xml
b/kde-plasma/plasma-desktop/metadata.xml
index 9bb79ff..cc1ef4c 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -6,12 +6,10 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="evdev">Enable configuration module for desktop
input devices.</flag>
<flag name="gtk2">Add support for gtk+2-based applications
using legacy xembed systray icons via libappindicator.</flag>
<flag name="gtk3">Add support for gtk+3-based applications
using legacy xembed systray icons via libappindicator.</flag>
<flag name="ibus">Use ibus input method via
<pkg>app-i18n/ibus</pkg></flag>
<flag name="legacy-systray">Add support for applications using
legacy xembed systray icons.</flag>
<flag name="scim">Enable applets that use
<pkg>app-i18n/scim</pkg></flag>
- <flag name="touchpad">Enable configuration module for
synaptics-based touchpads.</flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.6.0.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-5.6.0.ebuild
index 93889fc..7f8f10f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.6.0.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.6.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="KDE Plasma desktop"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+evdev +fontconfig gtk2 gtk3 ibus legacy-systray pulseaudio +qt4 scim
touchpad"
+IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
legacy-systray pulseaudio +qt4 scim"
COMMON_DEPEND="
$(add_frameworks_dep attica)
@@ -85,13 +85,13 @@ COMMON_DEPEND="
x11-libs/libxcb
x11-libs/xcb-util-keysyms
)
+ input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
pulseaudio? (
dev-libs/glib:2
media-libs/libcanberra
media-sound/pulseaudio
)
scim? ( app-i18n/scim )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep breeze)
@@ -123,8 +123,8 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
dev-libs/boost
x11-proto/xproto
- evdev? ( x11-drivers/xf86-input-evdev )
fontconfig? ( x11-libs/libXrender )
+ input_devices_evdev? ( x11-drivers/xf86-input-evdev )
"
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray
) gtk3? ( legacy-systray )"
@@ -139,12 +139,12 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package evdev Evdev)
$(cmake-utils_use_find_package fontconfig Fontconfig)
$(cmake-utils_use_find_package ibus IBus)
+ $(cmake-utils_use_find_package input_devices_evdev Evdev)
+ $(cmake-utils_use_find_package input_devices_synaptics
Synaptics)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
$(cmake-utils_use_find_package scim SCIM)
- $(cmake-utils_use_find_package touchpad Synaptics)
)
kde5_src_configure
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild
index f058196..398b0ee 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="KDE Plasma desktop"
KEYWORDS=""
-IUSE="+evdev +fontconfig gtk2 gtk3 ibus legacy-systray pulseaudio +qt4 scim
touchpad"
+IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
legacy-systray pulseaudio +qt4 scim"
COMMON_DEPEND="
$(add_frameworks_dep attica)
@@ -85,13 +85,13 @@ COMMON_DEPEND="
x11-libs/libxcb
x11-libs/xcb-util-keysyms
)
+ input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
pulseaudio? (
dev-libs/glib:2
media-libs/libcanberra
media-sound/pulseaudio
)
scim? ( app-i18n/scim )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep breeze)
@@ -123,8 +123,8 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
dev-libs/boost
x11-proto/xproto
- evdev? ( x11-drivers/xf86-input-evdev )
fontconfig? ( x11-libs/libXrender )
+ input_devices_evdev? ( x11-drivers/xf86-input-evdev )
"
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray
) gtk3? ( legacy-systray )"
@@ -139,12 +139,12 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package evdev Evdev)
$(cmake-utils_use_find_package fontconfig Fontconfig)
$(cmake-utils_use_find_package ibus IBus)
+ $(cmake-utils_use_find_package input_devices_evdev Evdev)
+ $(cmake-utils_use_find_package input_devices_synaptics
Synaptics)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
$(cmake-utils_use_find_package scim SCIM)
- $(cmake-utils_use_find_package touchpad Synaptics)
)
kde5_src_configure
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index e3a5863..18a1b13 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="KDE Plasma desktop"
KEYWORDS=""
-IUSE="+evdev +fontconfig gtk2 gtk3 ibus legacy-systray pulseaudio +qt4 scim
touchpad"
+IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
legacy-systray pulseaudio +qt4 scim"
COMMON_DEPEND="
$(add_frameworks_dep attica)
@@ -87,13 +87,13 @@ COMMON_DEPEND="
x11-libs/libxcb
x11-libs/xcb-util-keysyms
)
+ input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
pulseaudio? (
dev-libs/glib:2
media-libs/libcanberra
media-sound/pulseaudio
)
scim? ( app-i18n/scim )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep breeze)
@@ -125,8 +125,8 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
dev-libs/boost
x11-proto/xproto
- evdev? ( x11-drivers/xf86-input-evdev )
fontconfig? ( x11-libs/libXrender )
+ input_devices_evdev? ( x11-drivers/xf86-input-evdev )
"
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray
) gtk3? ( legacy-systray )"
@@ -141,12 +141,12 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package evdev Evdev)
$(cmake-utils_use_find_package fontconfig Fontconfig)
$(cmake-utils_use_find_package ibus IBus)
+ $(cmake-utils_use_find_package input_devices_evdev Evdev)
+ $(cmake-utils_use_find_package input_devices_synaptics
Synaptics)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
$(cmake-utils_use_find_package scim SCIM)
- $(cmake-utils_use_find_package touchpad Synaptics)
)
kde5_src_configure
