commit:     8a6efc775f44c503de62817f96e7f08186b91446
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 29 14:33:28 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Jul 29 14:33:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a6efc77

app-i18n/ibus-m17n: drop gtk2 USE flag

Closes: https://bugs.gentoo.org/769116
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild | 10 +++-------
 app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild | 10 +++-------
 app-i18n/ibus-m17n/metadata.xml           |  5 -----
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild 
b/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
index 79d7891abe8..8ec1183befa 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
@@ -12,15 +12,11 @@ 
SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz";
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="gtk gtk2 nls"
-REQUIRED_USE="gtk2? ( gtk )"
+IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus
        dev-libs/m17n-lib
-       gtk? (
-               gtk2? ( x11-libs/gtk+:2 )
-               !gtk2? ( x11-libs/gtk+:3 )
-       )
+       gtk? ( x11-libs/gtk+:3 )
        nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
        >=dev-db/m17n-db-1.7"
@@ -30,7 +26,7 @@ BDEPEND="sys-devel/gettext
 src_configure() {
        econf \
                $(use_enable nls) \
-               $(use_with gtk gtk $(usex gtk2 2.0 3.0))
+               $(use_with gtk gtk 3.0)
 }
 
 pkg_preinst() {

diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild 
b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
index c8aebffadc3..1fabfb50607 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
@@ -12,15 +12,11 @@ 
SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz";
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk2 nls"
-REQUIRED_USE="gtk2? ( gtk )"
+IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus
        dev-libs/m17n-lib
-       gtk? (
-               gtk2? ( x11-libs/gtk+:2 )
-               !gtk2? ( x11-libs/gtk+:3 )
-       )
+       gtk? ( x11-libs/gtk+:3 )
        nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
        >=dev-db/m17n-db-1.7"
@@ -30,7 +26,7 @@ BDEPEND="sys-devel/gettext
 src_configure() {
        econf \
                $(use_enable nls) \
-               $(use_with gtk gtk $(usex gtk2 2.0 3.0))
+               $(use_with gtk gtk 3.0)
 }
 
 pkg_preinst() {

diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index 481dbcd8c9d..b120c362d92 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -9,11 +9,6 @@
                The M17N engine for IBus. It allows input of many languages 
using the input
                table maps from <pkg>dev-libs/m17n-lib</pkg>.
        </longdescription>
-       <use>
-               <flag name="gtk2">
-                       Build with <pkg>x11-libs/gtk+</pkg>:2 instead of 
<pkg>x11-libs/gtk+</pkg>:3
-               </flag>
-       </use>
        <upstream>
                <remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
                <remote-id type="github">ibus/ibus-m17n</remote-id>

Reply via email to