gentoo resync : 04.08.2018

5 files changed, 28 insertions, 159 deletions

diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 00e89112a0da..be8c878bc355 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,8 +1,6 @@
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
 DIST mlterm-3.8.4.tar.gz 3881872 BLAKE2B 647810585b0143d0f680c99032cf478e02047acc80086b4c9cbadc59df49e09ba1626ee2ff2c8a1842c68047632c61001d31f7282d9eb8619f0260de7f0bb976 SHA512 6afe0a60001f180df18f2d2ad5e2954a1d9423313d7784eb0cf6a9736c6a62545f461d8e3d079aa1f43eb5f27f4b0c060a7da54e08bf758b283005b16aa1e5cd
-DIST mlterm-3.8.5.tar.gz 3928532 BLAKE2B e5d13ea0e67d4bce1470f585b419cb073552d68115f08b5051f66a90a9887ffba2794829be52d852ef2ed36502a3ef8ea8235b2b668804599efb74f65392b4e6 SHA512 c43a121ed6572bdd4501a6b27f54df65ff2c09682485c7902c5cbd6b4be64f35efcf8cce3923d77afc412d681a390edc240a6a2503478ea97e0c4953e0b807a7
 DIST mlterm-3.8.6.tar.gz 3952815 BLAKE2B e862bf449c801c260c50391af2e4c7cd541b945b3e77186b3d1a8b9395833613c98603084bfd199773e22dca1299cc3b669325a036dd4e827baa435b91d86e42 SHA512 da87a72fd31dbb1e0a4779ec070a5ef2a62a0861a114b61d57d564069c15eb927f26fb47d4973ac6f6c06d99abc2899502e8210f5f3e1c6d97d0b8b52414dfb1
-EBUILD mlterm-3.8.4.ebuild 2769 BLAKE2B 96c6758249db820b7d5a7cd23a311eace5b540541fc573504a2b1943b12743929608b1e367b1e05fc778a9ad71f88844dd90eda03cf7bb9f861ae54feed54970 SHA512 d9a4ea4c95e6e43644452eae9798b00d073ef16bd85694e7c604dd580e240ca9474022625f4ab9e767b4f47e07c782e1b851aae15d0786658dc112335f995c27
-EBUILD mlterm-3.8.5.ebuild 2866 BLAKE2B 9a00f9be967a56cd37c1b623cab1fd8ece845ccf12ba0ba6025a1ab8858c374fb0346d7478db4a49f405c6c19fb78eb3d854aa053590e4511b1be2f56473b90d SHA512 bb73cb7ed62204ccc00c4c72d08eae54e4860135b2af951645cc9e74736ef40472587b26d3cf97cdbf9147a4e8e611f18ab8fd3c9c322e6998f65b8d5b31c950
-EBUILD mlterm-3.8.6.ebuild 2916 BLAKE2B d527d3df07a4aef919cfe1caf123f23214cbdec501d1420542dc8f2969fb27655c963d671c27ccb2bc8e29f050e422fbcdef219001f064f70339425212b98fb7 SHA512 cb65aa1170b59c7039b35ff3e87055f584bf89f00c3555627581d932b3329d53503a9e6f060a1b64a30598137d86351a4bb318face8f6894762ee088124144e4
-MISC metadata.xml 1323 BLAKE2B 6b727593f0977b9f9137e21e161de2b027977426370c22fc22911c41277fd4fde20d8db941e88faf2f290c01f1bbe51a86ca3fffa95142a15d8a1cd1aa4e8d38 SHA512 39daba3b97c8be425edf7767215619662c5bf286be546d6027af96ca790801ab0c54e95179e4a63041806df8c7d18a4e6f979c2f7ff8d6bc480f7c9d9be2ef9e
+EBUILD mlterm-3.8.4.ebuild 2790 BLAKE2B 1ad156a3f9087a1e3b82236d74b0ddb3de2b015e3aa8ebd19902eebcecdbe4c382d5ebc0307057d0f38e990c1d210449dcd3e82ca3748686d0beea43b9584deb SHA512 2259b955336ddd5738aae25b2bc12703cb0f7af5d35accbd24915a79b43cf7eef2ecdc9f1ea017986617ba19c19b1747b834fb370cc34da8c27d87196066418d
+EBUILD mlterm-3.8.6.ebuild 2937 BLAKE2B 60c8d01f8a7a55f1260ba1bc2bf9bc5be3754928ed10abaa53c1af90a2636cc681f985a6ecad587e62821963597d8e97c16e65e728fc63fb730e7a5ca273665b SHA512 0814e091bd74e3f01037932df49cac7aec48ad0bc3adea571c097333b7b8c4aca53af6bbe11b458550fb259a212fa194d3f217f52f0ed9576b9dce1ccfbf0ba9
+MISC metadata.xml 1275 BLAKE2B ac27b2774e55492d3c8de46ea71c7773496bea774afe07d5f4625fe2820c68ac548179ff165ed47f7104dbb4805400b8b7618896dfb9b37046d5b8e045342d69 SHA512 1148852573a1e427842c6b37e3575b3b28949460eef1bdfa538834be5ae77d2354facde28d94a75d519211404a0eac591512bea49f65e9ce8f52cb80a2dc42d9
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.5.ebuild b/x11-terms/mlterm/mlterm-3.8.5.ebuild
deleted file mode 100644
index b196e452cc99..000000000000
--- a/x11-terms/mlterm/mlterm-3.8.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-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 gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
-
-RDEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	bidi? ( dev-libs/fribidi )
-	cairo? ( x11-libs/cairo[X(+)] )
-	canna? ( app-i18n/canna )
-	fbcon? ( media-fonts/unifont )
-	fcitx? ( app-i18n/fcitx )
-	freewnn? ( app-i18n/freewnn )
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
-	harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
-	ibus? ( app-i18n/ibus )
-	libssh2? ( net-libs/libssh2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	nls? ( virtual/libintl )
-	regis? (
-		|| (
-			media-libs/sdl-ttf
-			media-libs/sdl2-ttf
-		)
-	)
-	scim? ( app-i18n/scim )
-	skk? (
-		|| (
-			virtual/skkserv
-			app-i18n/skk-jisyo
-		)
-	)
-	uim? ( app-i18n/uim )
-	utempter? ( sys-libs/libutempter )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-REQUIRED_USE="gtk2? ( gtk )"
-
-PATCHES=( "${FILESDIR}"/${PN}-font.patch )
-DOCS=( doc/{en,ja} )
-
-src_prepare() {
-	# workaround for USE=fb
-	sed -i "/^[[:space:]]*main /s/\(main man\)/libvterm \1/" configure
-	# default config
-	sed -i \
-		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
-		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
-		etc/main
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bidi fribidi)
-		$(use_enable canna)
-		$(use_enable debug)
-		$(use_enable fcitx)
-		$(use_enable freewnn wnn)
-		$(use_enable harfbuzz otl)
-		$(use_enable ibus)
-		$(use_enable libssh2 ssh2)
-		$(use_enable m17n-lib m17nlib)
-		$(use_enable nls)
-		$(use_enable scim)
-		$(use_enable skk)
-		$(use_enable uim)
-		$(use_enable utempter utmp)
-		--with-gui=xlib$(usex fbcon ",fb" "")
-		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
-		--enable-optimize-redrawing
-		--enable-vt52
-		--disable-static
-	)
-
-	local scrollbars="sample,extra"
-	local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom"
-	if use gtk; then
-		myconf+=(
-			$(use_with gtk gtk $(usex gtk2 2.0 3.0))
-			--with-imagelib=gdk-pixbuf
-		)
-		scrollbars+=",pixmap_engine"
-		tools+=",mlconfig,mlimgloader"
-	fi
-	if use regis; then
-		tools+=",registobmp"
-	fi
-	myconf+=( --with-scrollbars="${scrollbars}" )
-	myconf+=( --with-tools="${tools}" )
-
-	addpredict /dev/ptmx
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	:
-}
-
-src_install () {
-	default
-	prune_libtool_files
-
-	docinto contrib/icon
-	dodoc contrib/icon/README
-
-	doicon contrib/icon/${PN}*
-	make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator"
-}
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