[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/

[Andreas Sturmlechner]

commit:     0dcba99bbb44ae5fae739c27cc13f00872232c5e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 19:42:15 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 19:43:42 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0dcba99b

kde-plasma/plasma-desktop: Drop IUSE emoji

Also, plasma-emojier was moved out of ibus dependence.

Upstream commit 8e251dbce5dd95e43074acc8d43926ae8e004119

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 48446240d6..a155706c27 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz";
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="emoji ibus +kaccounts scim screencast +semantic-desktop telemetry"
+IUSE="ibus +kaccounts scim screencast +semantic-desktop telemetry"
 
 COMMON_DEPEND="
        dev-libs/wayland
@@ -81,11 +81,6 @@ COMMON_DEPEND="
        x11-libs/libXi
        x11-libs/libxcb
        x11-libs/libxkbfile
-       emoji? (
-               app-i18n/ibus[emoji]
-               dev-libs/glib:2
-               media-fonts/noto-emoji
-       )
        ibus? (
                app-i18n/ibus
                dev-libs/glib:2
@@ -116,6 +111,7 @@ RDEPEND="${COMMON_DEPEND}
        >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
        >=kde-plasma/kde-cli-tools-${PVCUT}:5
        >=kde-plasma/oxygen-${PVCUT}:5
+       media-fonts/noto-emoji
        sys-apps/util-linux
        x11-apps/setxkbmap
        x11-misc/xdg-user-dirs
@@ -139,9 +135,6 @@ src_prepare() {
                        -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
        fi
 
-       use emoji || cmake_run_in applets/kimpanel/backend/ibus \
-               cmake_comment_add_subdirectory emojier
-
        # TODO: try to get a build switch upstreamed
        if ! use scim; then
                sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
@@ -155,14 +148,12 @@ src_configure() {
                -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
                -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
                -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+               $(cmake_use_find_package ibus GLIB2)
                $(cmake_use_find_package kaccounts AccountsQt5)
                $(cmake_use_find_package kaccounts KAccounts)
                $(cmake_use_find_package semantic-desktop KF5Baloo)
                $(cmake_use_find_package telemetry KUserFeedback)
        )
-       if ! use emoji && ! use ibus; then
-               mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
-       fi
 
        ecm_src_configure
 }