gentoo resync : 14.05.2020

4 files changed, 4 insertions, 134 deletions

diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index da2c8e2551d1..ff303aee28de 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.7.tar.gz 3994292 BLAKE2B c30991a7bb3a9f0a36d9f898087bda5b86e8282bc811e60430dc61ddd04c8c4cb6b9284ab178d8a6610aca2dcac785326e69e2088b2a7dee786451aa7c6a794c SHA512 6d2087d1433918f476e35dbde8d79940170fa6f133b9122e1db19006afc5081dbad7ed487bfa939b3d92ea29f3843a2b7c5540dc05e54b3c568bbe76ceb66ad2
-DIST mlterm-3.8.8.tar.gz 4035215 BLAKE2B 4ef85822915a1a15119ed771e0d2da0158e469b60cc8eafa9a118ba0ee0e4d4191fb0b5e371320978ff83b79907a42c9065d374dff8774bbac73f7ddb57be0af SHA512 4db7de441300d30eadc85d1c780bb10c81d2555225fe163280508180ccc2114eeacf0e5772f9d69c1b59ef6f3ffb3444b75fe3e5ea508dd9e18e5850e78f78a5
 DIST mlterm-3.8.9.tar.gz 4101898 BLAKE2B 81ce300f16dcf6bc1f3e0467fc4646aa263a222965f10d87a8010a70af9f675965f184a5f1a7909b43d6375fc951e98854ee41af10c2cebfd03697560fb5856b SHA512 0bd5468dc58095fd9432922490178fe14335724cee08d2f509e8f72a4d5f9aea9ff2f0672706e5290219575f47a1ff15dccb4e21e318c89dd5718fe6ef694c0c
-EBUILD mlterm-3.8.7.ebuild 2929 BLAKE2B ef432a502e9999e1867453fed1d1f35c4394391ba8cbd8d77845549c9eab3c3b5e874c57d24410dcca8d084b38fb8dfc64d10a98bf796b3de57c2206fec4d2ff SHA512 fcb2c789b954494e9a9df21b762b77291ba12d98b1070d26babf45232168c47a0a212cdbcb29be0919985fd867abe171317fcf0d5ae5a9549a73151c90dccf46
-EBUILD mlterm-3.8.8-r1.ebuild 2934 BLAKE2B f9d241aee6afe49186f8dcac901c49861a7d1e59838391cdd9a777df684b71f492962c4c24a5636819e2b4210a66219680f9e5dcf28dfc0c784d32d4e3a91930 SHA512 6d2906ff84073736ea5a83f5d91acfa2abbf8118cdf64963efce18e6854ca506975a7c750e43fb7af6ae988ca766439987582a4db6eb0f773a3d3dce605b2f3a
-EBUILD mlterm-3.8.9.ebuild 2934 BLAKE2B f9d241aee6afe49186f8dcac901c49861a7d1e59838391cdd9a777df684b71f492962c4c24a5636819e2b4210a66219680f9e5dcf28dfc0c784d32d4e3a91930 SHA512 6d2906ff84073736ea5a83f5d91acfa2abbf8118cdf64963efce18e6854ca506975a7c750e43fb7af6ae988ca766439987582a4db6eb0f773a3d3dce605b2f3a
+DIST mlterm-3.9.0.tar.gz 4143644 BLAKE2B 01e95b0319526e03a009e6b2f1467287a6ecc2ec29c4808c486a779896f183cf9f1732baba38c02150db89ef9e6754760df308ba477cca916f60d167062ea13c SHA512 d89340eb460904ca36c6ed063b356625d9c9b4ad129dc51640d50a04e166f8239124d0003db778376c47daa6311c869f9fe7e337c90937fed5ae4151f5af57c4
+EBUILD mlterm-3.8.9.ebuild 2930 BLAKE2B aa5f219cc82299d111503383e1b859102bcb67d0ddacfcf9097226ec325537624d31eafe758f13ff184188611381287b25dd26a08c1fc04953930ef4ef341386 SHA512 d7d55696f4e566b37a04950cee433089e7927535ad4aa723a236735e9b6cceaec72f381756c5956292e172ddc10cec5aa1dceb4bda86ddf1f2369191b0bf4dae
+EBUILD mlterm-3.9.0.ebuild 2934 BLAKE2B f9d241aee6afe49186f8dcac901c49861a7d1e59838391cdd9a777df684b71f492962c4c24a5636819e2b4210a66219680f9e5dcf28dfc0c784d32d4e3a91930 SHA512 6d2906ff84073736ea5a83f5d91acfa2abbf8118cdf64963efce18e6854ca506975a7c750e43fb7af6ae988ca766439987582a4db6eb0f773a3d3dce605b2f3a
 MISC metadata.xml 1275 BLAKE2B ac27b2774e55492d3c8de46ea71c7773496bea774afe07d5f4625fe2820c68ac548179ff165ed47f7104dbb4805400b8b7618896dfb9b37046d5b8e045342d69 SHA512 1148852573a1e427842c6b37e3575b3b28949460eef1bdfa538834be5ae77d2354facde28d94a75d519211404a0eac591512bea49f65e9ce8f52cb80a2dc42d9
diff --git a/x11-terms/mlterm/mlterm-3.8.7.ebuild b/x11-terms/mlterm/mlterm-3.8.7.ebuild
deleted file mode 100644
index 5c4771382088..000000000000
--- a/x11-terms/mlterm/mlterm-3.8.7.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 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
-	x11-libs/libX11
-	bidi? ( dev-libs/fribidi )
-	brltty? ( app-accessibility/brltty )
-	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 )
-	wayland? ( dev-libs/wayland )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-font.patch )
-DOCS=( doc/{en,ja} )
-
-src_prepare() {
-	# 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 brltty brlapi)
-		$(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" "")$(usex wayland ",wayland" "")
-		--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
-	find "${ED}" -name '*.la' -delete || die
-
-	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.9.ebuild b/x11-terms/mlterm/mlterm-3.8.9.ebuild
index 915523df803a..81617541d78a 100644
--- a/x11-terms/mlterm/mlterm-3.8.9.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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 )"
 
diff --git a/x11-terms/mlterm/mlterm-3.8.8-r1.ebuild b/x11-terms/mlterm/mlterm-3.9.0.ebuild
index 915523df803a..915523df803a 100644
--- a/x11-terms/mlterm/mlterm-3.8.8-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.0.ebuild