Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/mlterm/
Date: Wed, 30 Jun 2021 13:36:33
Message-Id: 1625060100.fa90ec98febd5311603b99f94ca4ce5b74b89bb0.hattya@gentoo
1 commit: fa90ec98febd5311603b99f94ca4ce5b74b89bb0
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 30 13:35:00 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 30 13:35:00 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa90ec98
7
8 x11-terms/mlterm: add X USE flag
9
10 Reported-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
11 Closes: https://github.com/gentoo/gentoo/pull/19242
12 Package-Manager: Portage-3.0.20, Repoman-3.0.2
13 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
14
15 x11-terms/mlterm/mlterm-3.9.1-r1.ebuild | 20 +++++++++++++-------
16 1 file changed, 13 insertions(+), 7 deletions(-)
17
18 diff --git a/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild b/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild
19 index 9a1c8d6abe4..540972d7eb7 100644
20 --- a/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild
21 +++ b/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild
22 @@ -12,13 +12,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
23 LICENSE="BSD"
24 SLOT="0"
25 KEYWORDS="amd64 ppc ppc64 x86"
26 -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"
27 +IUSE="+X bidi brltty cairo canna debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
28 +REQUIRED_USE="|| ( X fbcon wayland )"
29
30 RDEPEND="virtual/libcrypt:=
31 - x11-libs/libICE
32 - x11-libs/libxkbcommon
33 - x11-libs/libSM
34 - x11-libs/libX11
35 + X? (
36 + x11-libs/libICE
37 + x11-libs/libSM
38 + x11-libs/libX11
39 + )
40 bidi? ( dev-libs/fribidi )
41 brltty? ( app-accessibility/brltty )
42 cairo? ( x11-libs/cairo[X(+)] )
43 @@ -47,7 +49,10 @@ RDEPEND="virtual/libcrypt:=
44 )
45 uim? ( app-i18n/uim )
46 utempter? ( sys-libs/libutempter )
47 - wayland? ( dev-libs/wayland )
48 + wayland? (
49 + dev-libs/wayland
50 + x11-libs/libxkbcommon
51 + )
52 xft? ( x11-libs/libXft )"
53 DEPEND="${RDEPEND}
54 virtual/pkgconfig
55 @@ -82,7 +87,8 @@ src_configure() {
56 $(use_enable scim)
57 $(use_enable skk)
58 $(use_enable uim)
59 - --with-gui=xlib$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
60 + $(use_with X x)
61 + --with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
62 --with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
63 --with-utmp=$(usex utempter utempter none)
64 --enable-optimize-redrawing