commit: 0bdbc494bfd7c380dd729f3c76eb40c56dab8b4c Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Sat Feb 6 19:39:43 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat May 22 12:00:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bdbc494
x11-terms/mlterm: drop optional gtk2 support Bug: https://bugs.gentoo.org/769029 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> Closes: https://github.com/gentoo/gentoo/pull/19353 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-terms/mlterm/mlterm-3.9.1.ebuild | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/x11-terms/mlterm/mlterm-3.9.1.ebuild b/x11-terms/mlterm/mlterm-3.9.1.ebuild index e92e036f1ff..b9a346d7cc1 100644 --- a/x11-terms/mlterm/mlterm-3.9.1.ebuild +++ b/x11-terms/mlterm/mlterm-3.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -12,8 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="bidi brltty cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft" -REQUIRED_USE="gtk2? ( gtk )" +IUSE="bidi brltty cairo canna debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft" RDEPEND="x11-libs/libICE x11-libs/libSM @@ -25,10 +24,7 @@ RDEPEND="x11-libs/libICE fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) - gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) - ) + gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) @@ -96,11 +92,13 @@ src_configure() { local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom" if use gtk; then myconf+=( - $(use_with gtk gtk $(usex gtk2 2.0 3.0)) + --with-gtk=3.0 --with-imagelib=gdk-pixbuf ) scrollbars+=",pixmap_engine" tools+=",mlconfig,mlimgloader" + else + myconf+=( --without-gtk ) fi if use regis; then tools+=",registobmp"
