From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C57B715808B for ; Fri, 15 Apr 2022 19:25:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9367CE097E; Fri, 15 Apr 2022 19:25:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10762E097E for ; Fri, 15 Apr 2022 19:25:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B213B34165F for ; Fri, 15 Apr 2022 19:25:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B694A3B3 for ; Fri, 15 Apr 2022 19:25:46 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1650050698.07a96c210de5fd735314c6af65764db5e3c16411.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/ibus/ibus-1.5.26.ebuild X-VCS-Directories: app-i18n/ibus/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 07a96c210de5fd735314c6af65764db5e3c16411 X-VCS-Branch: master Date: Fri, 15 Apr 2022 19:25:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 89014599-6ecf-4c7d-96c8-fe2bf6997264 X-Archives-Hash: 9d244135b5dfa091daaf01f5b9dc7d39 commit: 07a96c210de5fd735314c6af65764db5e3c16411 Author: Matt Turner gentoo org> AuthorDate: Thu Apr 14 17:17:53 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Apr 15 19:24:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a96c21 app-i18n/ibus: Replace IUSE=+gtk with IUSE=+gui Now that we have separated IUSE=gtk3 from IUSE=gtk, IUSE=gtk only enables the UI, so we rename it to IUSE=gui to be more in line with Gentoo policies. Additionally, move the gtk dependencies out of the gui? ( ... ) block, since the functionality they control (namely the IM modules) can be enabled independently of the UI. Signed-off-by: Matt Turner gentoo.org> app-i18n/ibus/ibus-1.5.26.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild index bcf13d3d4633..368857ac71b8 100644 --- a/app-i18n/ibus/ibus-1.5.26.ebuild +++ b/app-i18n/ibus/ibus-1.5.26.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="+X appindicator +emoji +gtk +gtk2 +gtk3 +gtk4 +introspection nls +python systemd test +unicode vala wayland" +IUSE="+X appindicator +emoji +gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland" RESTRICT="!test? ( test )" REQUIRED_USE=" appindicator? ( gtk3 ) @@ -41,12 +41,12 @@ DEPEND=" x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 ) - gtk? ( + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + gtk4? ( gui-libs/gtk:4 ) + gui? ( x11-libs/libX11 x11-libs/libXi - gtk2? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - gtk4? ( gui-libs/gtk:4 ) ) introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl ) @@ -60,7 +60,7 @@ DEPEND=" )" RDEPEND="${DEPEND} python? ( - gtk? ( + gui? ( x11-libs/gtk+:3[introspection] ) )" @@ -116,7 +116,7 @@ src_configure() { if use python; then python_setup python_conf+=( - $(use_enable gtk setup) + $(use_enable gui setup) --with-python=${EPYTHON} ) else @@ -141,10 +141,10 @@ src_configure() { $(use_enable emoji emoji-dict) $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) - $(use_enable gtk ui) $(use_enable gtk2) $(use_enable gtk3) $(use_enable gtk4) + $(use_enable gui ui) $(use_enable introspection) $(use_enable nls) $(use_enable systemd systemd-services)