gnome-base/gnome-control-center: rename USE=i18n to USE=ibus

USE=ibus local USE flag has become more prevalent by now, so move over to
it now as well.

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.2.ebuild
index 2e464bcbdabd95d30f5c82ec4841b9e0dc587add..8f7421eb945f910584dbe1cbd1f1314da8f961fa 100644 (file)
--- a/gnome-base/gnome-control-center/gnome-control-center-3.22.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.22.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 
 LICENSE="GPL-2+"
 SLOT="2"
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
+IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # False positives caused by nested configure scripts
@@ -60,7 +60,7 @@ COMMON_DEPEND="
        gnome-online-accounts? (
                >=media-libs/grilo-0.3.0:0.3=
                >=net-libs/gnome-online-accounts-3.21.5:= )
-       i18n? ( >=app-i18n/ibus-1.5.2 )
+       ibus? ( >=app-i18n/ibus-1.5.2 )
        kerberos? ( app-crypt/mit-krb5 )
        networkmanager? (
                >=gnome-extra/nm-applet-1.2.0
@@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
                app-admin/system-config-printer
                net-print/cups-pk-helper )
        input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-       i18n? ( >=gnome-base/libgnomekbd-3 )
+       ibus? ( >=gnome-base/libgnomekbd-3 )
        wayland? ( dev-libs/libinput )
        !wayland? (
                >=x11-drivers/xf86-input-libinput-0.19.0
@@ -147,7 +147,7 @@ src_configure() {
                $(use_enable cups) \
                $(usex debug --enable-debug=yes ' ') \
                $(use_enable gnome-online-accounts goa) \
-               $(use_enable i18n ibus) \
+               $(use_enable ibus) \
                $(use_enable kerberos) \
                $(use_enable networkmanager) \
                $(use_with v4l cheese) \

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
index ee95ef93b6792b6782c88c9f8130b945396d2ead..29048eb6189f3c6b230d630829547adeee525d35 100644 (file)
--- a/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 
 LICENSE="GPL-2+"
 SLOT="2"
-IUSE="+bluetooth +colord debug +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
+IUSE="+bluetooth +colord debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # False positives caused by nested configure scripts
@@ -63,7 +63,7 @@ COMMON_DEPEND="
        gnome-online-accounts? (
                >=media-libs/grilo-0.3.0:0.3=
                >=net-libs/gnome-online-accounts-3.21.5:= )
-       i18n? ( >=app-i18n/ibus-1.5.2 )
+       ibus? ( >=app-i18n/ibus-1.5.2 )
        kerberos? ( app-crypt/mit-krb5 )
        networkmanager? (
                >=gnome-extra/nm-applet-1.2.0
@@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
        x11-themes/adwaita-icon-theme
        colord? ( >=gnome-extra/gnome-color-manager-3 )
        input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-       i18n? ( >=gnome-base/libgnomekbd-3 )
+       ibus? ( >=gnome-base/libgnomekbd-3 )
        wayland? ( dev-libs/libinput )
        !wayland? (
                >=x11-drivers/xf86-input-libinput-0.19.0
@@ -145,7 +145,7 @@ src_configure() {
                $(use_enable colord color) \
                $(usex debug --enable-debug=yes ' ') \
                $(use_enable gnome-online-accounts goa) \
-               $(use_enable i18n ibus) \
+               $(use_enable ibus) \
                $(use_enable kerberos) \
                $(use_enable networkmanager) \
                $(use_with v4l cheese) \

diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index 89591e9915d6ea446e7a6f7c6a1db4add90913d1..e6e1c88689ecde4e7b309802ed03ffb0a641b830 100644 (file)
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -10,6 +10,8 @@
                        <pkg>x11-misc/colord</pkg></flag>
                <flag name="gnome-online-accounts">Enable configuration panel for
                        <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+               <flag name="ibus">Enable support for enhanced input methods through
+                       <pkg>app-i18n/ibus</pkg></flag>
                <flag name="i18n">Enable support for enhanced input methods through
                        <pkg>app-i18n/ibus</pkg></flag>
        </use>