[gentoo-commits] repo/proj/guru:master commit in: x11-terms/mlterm-canna/

[Florian Schmaus]

commit:     04983033307881b3ce86f6f632bad2042da465d1
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jun 30 03:36:07 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 10:26:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=04983033

x11-terms/mlterm-canna: also install fb and wl modules

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 ...a-3.9.2.ebuild => mlterm-canna-3.9.2-r1.ebuild} | 48 +++++++++++++++++++---
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/x11-terms/mlterm-canna/mlterm-canna-3.9.2.ebuild b/x11-terms/mlterm-canna/mlterm-canna-3.9.2-r1.ebuild
similarity index 55%
rename from x11-terms/mlterm-canna/mlterm-canna-3.9.2.ebuild
rename to x11-terms/mlterm-canna/mlterm-canna-3.9.2-r1.ebuild
index 8f05bab49..59c02f644 100644
--- a/x11-terms/mlterm-canna/mlterm-canna-3.9.2.ebuild
+++ b/x11-terms/mlterm-canna/mlterm-canna-3.9.2-r1.ebuild
@@ -14,13 +14,29 @@ S="${WORKDIR}/${MYP}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="cairo fbcon wayland X xft"
 
-DEPEND="app-i18n/canna"
+DEPEND="
+	app-i18n/canna
+	cairo? ( x11-libs/cairo[X(+)] )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+	xft? ( x11-libs/libXft )
+"
 RDEPEND="
 	${DEPEND}
-	~x11-terms/mlterm-${PV}
+	~x11-terms/mlterm-${PV}[cairo=,fbcon=,wayland=,X=,xft=]
 "
 
+REQUIRED_USE="|| ( X fbcon wayland )"
+
 src_configure() {
 	local myconf=(
 		--disable-brlapi
@@ -40,11 +56,12 @@ src_configure() {
 		--disable-vt52
 		--disable-wnn
 		--enable-canna
-		--with-gui=console
+		--with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
+		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
 		--without-gtk
-		--without-type-engines
 		--without-utmp
-		--without-x
+
+		$(use_with X x)
 	)
 
 	addpredict /dev/ptmx
@@ -60,6 +77,16 @@ src_compile() {
 	popd || die
 	pushd inputmethod/canna || die
 	emake
+	popd || die
+	pushd gui/fb/inputmethod/canna/ || die
+	emake
+	popd || die
+
+	if use wayland; then
+		pushd gui/wayland/inputmethod/canna/ || die
+		emake
+		popd || die
+	fi
 }
 
 src_test() {
@@ -69,5 +96,16 @@ src_test() {
 src_install() {
 	pushd inputmethod/canna || die
 	DESTDIR="${D}" emake install
+	popd || die
+	pushd gui/fb/inputmethod/canna/ || die
+	DESTDIR="${D}" emake install
+	popd || die
+
+	if use wayland; then
+		pushd gui/wayland/inputmethod/canna/ || die
+		DESTDIR="${D}" emake install
+		popd || die
+	fi
+
 	find "${ED}" -name '*.la' -delete || die
 }