x11-terms/mlterm: add gtk2 USE flag

Package-Manager: Portage-2.3.6, Repoman-2.3.1

3 files changed, 33 insertions, 26 deletions

diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index 38d86b2d1e01..7123d0f08270 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -6,14 +6,17 @@
     <name>Cjk</name>
   </maintainer>
   <use>
-    <flag name="fcitx">Enable <pkg>app-i18n/fcitx</pkg> support</flag>
-    <flag name="ibus">Enable <pkg>app-i18n/ibus</pkg> support</flag>
-    <flag name="libssh2">Enable <pkg>net-libs/libssh2</pkg> support</flag>
-    <flag name="regis">Enable ReGIS support</flag>
-    <flag name="scim">Enable <pkg>app-i18n/scim</pkg> support</flag>
-    <flag name="uim">Enable <pkg>app-i18n/uim</pkg> support</flag>
-    <flag name="skk">Enable SKK support (<pkg>virtual/skkserv</pkg> or <pkg>app-i18n/skk-jisyo</pkg>)</flag>
-    <flag name="utempter">Enable <pkg>sys-libs/libutempter</pkg> support</flag>
+    <flag name="fcitx">Enable support for <pkg>app-i18n/fcitx</pkg></flag>
+    <flag name="gtk2">
+      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
+    </flag>
+    <flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
+    <flag name="libssh2">Enable support for <pkg>net-libs/libssh2</pkg></flag>
+    <flag name="regis">Enable support for ReGIS</flag>
+    <flag name="scim">Enable support for <pkg>app-i18n/scim</pkg></flag>
+    <flag name="skk">Enable support for SKK (<pkg>virtual/skkserv</pkg> or <pkg>app-i18n/skk-jisyo</pkg>)</flag>
+    <flag name="uim">Enable support for <pkg>app-i18n/uim</pkg></flag>
+    <flag name="utempter">Enable support for <pkg>sys-libs/libutempter</pkg></flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">mlterm</remote-id>
diff --git a/x11-terms/mlterm/mlterm-3.8.0.ebuild b/x11-terms/mlterm/mlterm-3.8.0.ebuild
index 863e8a78c5c2..90575a8cde77 100644
--- a/x11-terms/mlterm/mlterm-3.8.0.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.0.ebuild
@@ -7,12 +7,12 @@ inherit eutils
 
 DESCRIPTION="A multi-lingual terminal emulator"
 HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="bidi cairo canna debug fcitx freewnn gtk ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
+IUSE="bidi cairo canna debug fcitx freewnn gtk gtk2 ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
 
 RDEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -22,7 +22,10 @@ RDEPEND="x11-libs/libICE
 	canna? ( app-i18n/canna )
 	fcitx? ( app-i18n/fcitx )
 	freewnn? ( app-i18n/freewnn )
-	gtk? ( >=x11-libs/gtk+-2:= )
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
 	ibus? ( app-i18n/ibus )
 	libssh2? ( net-libs/libssh2 )
 	m17n-lib? ( dev-libs/m17n-lib )
@@ -46,6 +49,7 @@ RDEPEND="x11-libs/libICE
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
+REQUIRED_USE="gtk2? ( gtk )"
 
 DOCS=( doc/{en,ja} )
 
@@ -83,12 +87,10 @@ src_configure() {
 	local scrollbars="sample,extra"
 	local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom"
 	if use gtk; then
-		myconf+=( --with-imagelib=gdk-pixbuf )
-		if has_version x11-libs/gtk+:3; then
-			myconf+=( --with-gtk=3.0 )
-		else
-			myconf+=( --with-gtk=2.0 )
-		fi
+		myconf+=(
+			$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+			--with-imagelib=gdk-pixbuf
+		)
 		scrollbars+=",pixmap_engine"
 		tools+=",mlconfig,mlimgloader"
 	fi
diff --git a/x11-terms/mlterm/mlterm-3.8.1.ebuild b/x11-terms/mlterm/mlterm-3.8.1.ebuild
index a90ee67d69ce..8127c27a5b6f 100644
--- a/x11-terms/mlterm/mlterm-3.8.1.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.1.ebuild
@@ -7,12 +7,12 @@ inherit eutils
 
 DESCRIPTION="A multi-lingual terminal emulator"
 HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bidi cairo canna debug fbcon fcitx freewnn gtk ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
+IUSE="bidi cairo canna debug fbcon fcitx freewnn gtk gtk2 ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
 
 RDEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -23,7 +23,10 @@ RDEPEND="x11-libs/libICE
 	fbcon? ( media-fonts/unifont )
 	fcitx? ( app-i18n/fcitx )
 	freewnn? ( app-i18n/freewnn )
-	gtk? ( >=x11-libs/gtk+-2:= )
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
 	ibus? ( app-i18n/ibus )
 	libssh2? ( net-libs/libssh2 )
 	m17n-lib? ( dev-libs/m17n-lib )
@@ -47,6 +50,7 @@ RDEPEND="x11-libs/libICE
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
+REQUIRED_USE="gtk2? ( gtk )"
 
 PATCHES=( "${FILESDIR}"/${PN}-font.patch )
 DOCS=( doc/{en,ja} )
@@ -86,12 +90,10 @@ src_configure() {
 	local scrollbars="sample,extra"
 	local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom"
 	if use gtk; then
-		myconf+=( --with-imagelib=gdk-pixbuf )
-		if has_version x11-libs/gtk+:3; then
-			myconf+=( --with-gtk=3.0 )
-		else
-			myconf+=( --with-gtk=2.0 )
-		fi
+		myconf+=(
+			$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+			--with-imagelib=gdk-pixbuf
+		)
 		scrollbars+=",pixmap_engine"
 		tools+=",mlconfig,mlimgloader"
 	fi