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 B3E8E15808B for ; Fri, 15 Apr 2022 19:25:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED03BE097B; Fri, 15 Apr 2022 19:25:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 81CF3E0969 for ; Fri, 15 Apr 2022 19:25:50 +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 A3DF93415BB 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 A42DB3B2 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.aec6e5b6cd8285b05259432c20368d46d667d663.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: aec6e5b6cd8285b05259432c20368d46d667d663 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: a1794f68-c6dc-467a-911b-4e801316ee6b X-Archives-Hash: f66c44bcbc8a8afac451cc68ef814679 commit: aec6e5b6cd8285b05259432c20368d46d667d663 Author: Matt Turner gentoo org> AuthorDate: Thu Apr 14 05:13:01 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=aec6e5b6 app-i18n/ibus: Fix gtk-related REQUIRED_USE IUSE=gtk2 only controls the GTK+2 IM module; there's no need for it to depend on IUSE=gtk, which controls the UI. However client/x11/Makefile.am contains: if ENABLE_GTK3 GTK_CFLAGS = @GTK3_CFLAGS@ GTK_LIBS = @GTK3_LIBS@ else GTK_CFLAGS = @GTK2_CFLAGS@ GTK_LIBS = @GTK2_LIBS@ endif and configure.ac contains: if test x"$enable_xim" = x"yes"; then [...] # if we don't have gtk3 yet, check for gtk2 if test x"$enable_gtk3" != x"yes"; then # check for gtk2 PKG_CHECK_MODULES(GTK2, [ gtk+-2.0 ]) fi [...] fi so we do want REQUIRED_USE="xim? ( gtk3 )" to prevent any accidental gtk+2 usage. Signed-off-by: Matt Turner gentoo.org> app-i18n/ibus/ibus-1.5.26.ebuild | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app-i18n/ibus/ibus-1.5.26.ebuild b/app-i18n/ibus/ibus-1.5.26.ebuild index 3bba87ebd2c2..bcf13d3d4633 100644 --- a/app-i18n/ibus/ibus-1.5.26.ebuild +++ b/app-i18n/ibus/ibus-1.5.26.ebuild @@ -22,15 +22,15 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="+X appindicator +emoji +gtk +gtk2 +gtk3 +gtk4 +introspection nls +python systemd test +unicode vala wayland" RESTRICT="!test? ( test )" REQUIRED_USE=" - gtk2? ( gtk ) appindicator? ( gtk3 ) python? ( ${PYTHON_REQUIRED_USE} introspection ) test? ( gtk3 ) - vala? ( introspection )" - + vala? ( introspection ) + X? ( gtk3 ) +" DEPEND=" app-text/iso-codes >=dev-libs/glib-2.65.0:2 @@ -40,7 +40,6 @@ DEPEND=" X? ( x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 - !gtk? ( x11-libs/gtk+:2 ) ) gtk? ( x11-libs/libX11