commit:     b5ba335689dedeb3b428832d6882d056d2c48a3a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 17:57:11 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 17:57:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b5ba3356

kde-plasma/plasma-desktop: introduce ibus and scim USE flags

kimpanel is moved from kde-plasma/kdeplasma-addons in 5.6

Package-Manager: portage-2.2.27

 kde-plasma/plasma-desktop/metadata.xml                      |  2 ++
 kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild      | 12 +++++++++++-
 kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild | 12 +++++++++++-
 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild        | 13 +++++++++++--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/plasma-desktop/metadata.xml 
b/kde-plasma/plasma-desktop/metadata.xml
index f9500cd..9bb79ff 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -9,7 +9,9 @@
                <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.5.95.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild
index 2d93736..70e9d5e 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad"
+IUSE="+evdev +fontconfig gtk2 gtk3 ibus legacy-systray pulseaudio +qt4 scim 
touchpad"
 
 COMMON_DEPEND="
        $(add_frameworks_dep attica)
@@ -78,11 +78,19 @@ COMMON_DEPEND="
                x11-libs/libXft
                x11-libs/xcb-util-image
        )
+       ibus? (
+               $(add_qt_dep qtx11extras)
+               app-i18n/ibus
+               dev-libs/glib:2
+               x11-libs/libxcb
+               x11-libs/xcb-util-keysyms
+       )
        pulseaudio? (
                dev-libs/glib:2
                media-libs/libcanberra
                media-sound/pulseaudio
        )
+       scim? ( app-i18n/scim )
        touchpad? ( x11-drivers/xf86-input-synaptics )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -133,7 +141,9 @@ 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 pulseaudio PulseAudio)
+               $(cmake-utils_use_find_package scim SCIM)
                $(cmake-utils_use_find_package touchpad Synaptics)
        )
 

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 5838c1c..b07dc4b 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 legacy-systray pulseaudio +qt4 touchpad"
+IUSE="+evdev +fontconfig gtk2 gtk3 ibus legacy-systray pulseaudio +qt4 scim 
touchpad"
 
 COMMON_DEPEND="
        $(add_frameworks_dep attica)
@@ -78,11 +78,19 @@ COMMON_DEPEND="
                x11-libs/libXft
                x11-libs/xcb-util-image
        )
+       ibus? (
+               $(add_qt_dep qtx11extras)
+               app-i18n/ibus
+               dev-libs/glib:2
+               x11-libs/libxcb
+               x11-libs/xcb-util-keysyms
+       )
        pulseaudio? (
                dev-libs/glib:2
                media-libs/libcanberra
                media-sound/pulseaudio
        )
+       scim? ( app-i18n/scim )
        touchpad? ( x11-drivers/xf86-input-synaptics )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -133,7 +141,9 @@ 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 pulseaudio PulseAudio)
+               $(cmake-utils_use_find_package scim SCIM)
                $(cmake-utils_use_find_package touchpad Synaptics)
        )
 

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 0ec2a99..b07dc4b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -10,13 +10,12 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
 KEYWORDS=""
-IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad"
+IUSE="+evdev +fontconfig gtk2 gtk3 ibus legacy-systray pulseaudio +qt4 scim 
touchpad"
 
 COMMON_DEPEND="
        $(add_frameworks_dep attica)
        $(add_frameworks_dep baloo)
        $(add_frameworks_dep kactivities)
-       $(add_frameworks_dep kactivities-stats)
        $(add_frameworks_dep karchive)
        $(add_frameworks_dep kauth)
        $(add_frameworks_dep kbookmarks)
@@ -79,11 +78,19 @@ COMMON_DEPEND="
                x11-libs/libXft
                x11-libs/xcb-util-image
        )
+       ibus? (
+               $(add_qt_dep qtx11extras)
+               app-i18n/ibus
+               dev-libs/glib:2
+               x11-libs/libxcb
+               x11-libs/xcb-util-keysyms
+       )
        pulseaudio? (
                dev-libs/glib:2
                media-libs/libcanberra
                media-sound/pulseaudio
        )
+       scim? ( app-i18n/scim )
        touchpad? ( x11-drivers/xf86-input-synaptics )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -134,7 +141,9 @@ 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 pulseaudio PulseAudio)
+               $(cmake-utils_use_find_package scim SCIM)
                $(cmake-utils_use_find_package touchpad Synaptics)
        )
 

Reply via email to