From: Akinori Hattori <hattya@gentoo.org>
Date: Sun, 22 Jul 2018 12:39:45 +0000 (+0900)
Subject: x11-terms/mlterm: tidy
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9169b5d267ba8b05c481f9ac0ef5382fa5eaff79;p=gentoo.git

x11-terms/mlterm: tidy

Package-Manager: Portage-2.3.40, Repoman-2.3.9
---

diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index 738f332896f6..f589575813a3 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -1,27 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="brltty">Enable support for <pkg>app-accessibility/brltty</pkg></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="harfbuzz">Enable support for OpenType Layout (<pkg>media-libs/harfbuzz</pkg>)</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>
-    <flag name="wayland">Enable support for Wayland</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">mlterm</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="brltty">Enable support for <pkg>app-accessibility/brltty</pkg></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="harfbuzz">Enable support for OpenType Layout (<pkg>media-libs/harfbuzz</pkg>)</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>
+		<flag name="wayland">Enable support for Wayland</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mlterm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/mlterm/mlterm-3.8.4.ebuild b/x11-terms/mlterm/mlterm-3.8.4.ebuild
index ca0f59caf162..767bac6854f7 100644
--- a/x11-terms/mlterm/mlterm-3.8.4.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.4.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="bidi cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
+REQUIRED_USE="gtk2? ( gtk )"
 
 RDEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -51,7 +52,6 @@ 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} )
@@ -115,7 +115,7 @@ src_test() {
 
 src_install () {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	docinto contrib/icon
 	dodoc contrib/icon/README
diff --git a/x11-terms/mlterm/mlterm-3.8.6.ebuild b/x11-terms/mlterm/mlterm-3.8.6.ebuild
index a2d6780884a5..509a70d12617 100644
--- a/x11-terms/mlterm/mlterm-3.8.6.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.6.ebuild
@@ -13,6 +13,7 @@ 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 )"
 
 RDEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -53,7 +54,6 @@ 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} )
@@ -118,7 +118,7 @@ src_test() {
 
 src_install () {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	docinto contrib/icon
 	dodoc contrib/icon/README