gentoo resync : 25.09.2019

4 files changed, 5 insertions, 132 deletions

diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index beb63af47129..0148a3bddd67 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.7.tar.gz 3994292 BLAKE2B c30991a7bb3a9f0a36d9f898087bda5b86e8282bc811e60430dc61ddd04c8c4cb6b9284ab178d8a6610aca2dcac785326e69e2088b2a7dee786451aa7c6a794c SHA512 6d2087d1433918f476e35dbde8d79940170fa6f133b9122e1db19006afc5081dbad7ed487bfa939b3d92ea29f3843a2b7c5540dc05e54b3c568bbe76ceb66ad2
 DIST mlterm-3.8.8.tar.gz 4035215 BLAKE2B 4ef85822915a1a15119ed771e0d2da0158e469b60cc8eafa9a118ba0ee0e4d4191fb0b5e371320978ff83b79907a42c9065d374dff8774bbac73f7ddb57be0af SHA512 4db7de441300d30eadc85d1c780bb10c81d2555225fe163280508180ccc2114eeacf0e5772f9d69c1b59ef6f3ffb3444b75fe3e5ea508dd9e18e5850e78f78a5
-EBUILD mlterm-3.8.4.ebuild 2790 BLAKE2B 1ad156a3f9087a1e3b82236d74b0ddb3de2b015e3aa8ebd19902eebcecdbe4c382d5ebc0307057d0f38e990c1d210449dcd3e82ca3748686d0beea43b9584deb SHA512 2259b955336ddd5738aae25b2bc12703cb0f7af5d35accbd24915a79b43cf7eef2ecdc9f1ea017986617ba19c19b1747b834fb370cc34da8c27d87196066418d
-EBUILD mlterm-3.8.7.ebuild 2934 BLAKE2B 9b4bc6e79c41cc8f347885392cdb460ee72d59d69cf65553171831130946b51edd5556c59461e984515f713890b1b8706b67d279d634c43baa94b4292de56260 SHA512 062904649fb2a08f8069564d31189dd9724ef966437c95c9992ea35e78d2726d40f2337d350afe41774c066f848c4ca9ef9a788a0bd022c4e2df2982e10f9a41
-EBUILD mlterm-3.8.8.ebuild 2934 BLAKE2B 9bd043854703cfcdf42ce171e71856201a72aa4506d6f486109e8eb1749613c77f76365205723e6dda6f9f6f18744a98e3d4b1d0f333fd6652267678921464ff SHA512 af7578d8d2275f6efcb03de2dbaf9bce698a94120597b6127f66da9c1e5bd683b164d4df226707b1c14daf098c4aaad3e3e8bfa4fb6e12c61bae3daa64f8341f
+EBUILD mlterm-3.8.7.ebuild 2930 BLAKE2B d7c5c33d58573f5996d05f2588e192dade655258edbfaace6a4637425daad3be580d12af12b12b12f3ec8eb9114e99af35a8fd0fd8c2d5f9041a020e1bf7797c SHA512 d5a570d20e1ae3c33aef1dc6613f38480cede621787ef2f5175c8aa5572a23c59d507e12b387a55b5bde5d6bdbc01c6dfbc18bfb66ce84f31f22a313a399954c
+EBUILD mlterm-3.8.8-r1.ebuild 2935 BLAKE2B 6e58a3187da83cf50773a3a06749aa1a32cc26168093e4b98490865bf614e7935eca6d37cc674d488ffc37e6310c89cd6a89d33713d35ec3bc1fe6c98a586f23 SHA512 ce34eb949693e71c36d6e095f0e918976ff5e7795113fdfabe7b13e414d31c8bf637ce8aaae69b4b03a302ec57ab65234f1e7e05385d85cb3c3e5ded72c24466
 MISC metadata.xml 1275 BLAKE2B ac27b2774e55492d3c8de46ea71c7773496bea774afe07d5f4625fe2820c68ac548179ff165ed47f7104dbb4805400b8b7618896dfb9b37046d5b8e045342d69 SHA512 1148852573a1e427842c6b37e3575b3b28949460eef1bdfa538834be5ae77d2354facde28d94a75d519211404a0eac591512bea49f65e9ce8f52cb80a2dc42d9
diff --git a/x11-terms/mlterm/mlterm-3.8.4.ebuild b/x11-terms/mlterm/mlterm-3.8.4.ebuild
deleted file mode 100644
index 767bac6854f7..000000000000
--- a/x11-terms/mlterm/mlterm-3.8.4.ebuild
+++ /dev/null
@@ -1,125 +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"
-REQUIRED_USE="gtk2? ( gtk )"
-
-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 )"
-
-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 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
-	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.7.ebuild b/x11-terms/mlterm/mlterm-3.8.7.ebuild
index 3f86294dbd12..43a3031174f4 100644
--- a/x11-terms/mlterm/mlterm-3.8.7.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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.ebuild b/x11-terms/mlterm/mlterm-3.8.8-r1.ebuild
index c39aa4291b28..79c15d229592 100644
--- a/x11-terms/mlterm/mlterm-3.8.8.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils
+inherit desktop
 
 DESCRIPTION="A multi-lingual terminal emulator"
 HOMEPAGE="http://mlterm.sourceforge.net/"