gentoo resync : 03.07.2021

4 files changed, 15 insertions, 141 deletions

diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index b17994e2ca1c..705e68e48796 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,6 +1,4 @@
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
-DIST mlterm-3.9.0.tar.gz 4143644 BLAKE2B 01e95b0319526e03a009e6b2f1467287a6ecc2ec29c4808c486a779896f183cf9f1732baba38c02150db89ef9e6754760df308ba477cca916f60d167062ea13c SHA512 d89340eb460904ca36c6ed063b356625d9c9b4ad129dc51640d50a04e166f8239124d0003db778376c47daa6311c869f9fe7e337c90937fed5ae4151f5af57c4
 DIST mlterm-3.9.1.tar.gz 4175186 BLAKE2B 030d9144e7c835c895269fd19f89ece7c0dae9ca3f1d4425a1d409b9ac78a530431a4e05ef685d178748a35f9fae77414286a38a412a0496433b8324a22a73dd SHA512 1337b884971b2c4c2c3140388f07927101a947b0268f547611f4f4ece49c8d0954c068789ee7c92c82db114021c77c08416db30233149c8964e827ab901cc870
-EBUILD mlterm-3.9.0-r1.ebuild 2950 BLAKE2B b7f0ad726a048c184ca9c870873ff2b8ee92760ec9034d9a454b6d245a253a3ec5f2b0e9ee3ee14a372720e1cdfd1bedacee3d1dfa9ccdc05f51761418eeb894 SHA512 fed1a9ec8e0bb946224d8c896af9bb75cfb057b4c4d77c1f795f5154833229a054b46d70a9be35c54be37ad72b407a59073d50dc5b124ea1d4a7eb6fcc8d0fd7
-EBUILD mlterm-3.9.1-r1.ebuild 2920 BLAKE2B a36fab0c9150b0c6a37bf3455763802e7a9002384eac65cc0278e3cb785703c9c3c3710cacc632dd74ec57822faf6d36e58d5d881c31e77d4a6bddcf34f43f7a SHA512 ab2a62757a49e4928b922648b2b9aea442d04b1ebdb313a8c7611b5649d88621981307f7134b3f1afdbe54d52238656d4b31be51c5fb0c41c11f7311db651518
-MISC metadata.xml 1275 BLAKE2B ac27b2774e55492d3c8de46ea71c7773496bea774afe07d5f4625fe2820c68ac548179ff165ed47f7104dbb4805400b8b7618896dfb9b37046d5b8e045342d69 SHA512 1148852573a1e427842c6b37e3575b3b28949460eef1bdfa538834be5ae77d2354facde28d94a75d519211404a0eac591512bea49f65e9ce8f52cb80a2dc42d9
+EBUILD mlterm-3.9.1-r1.ebuild 3010 BLAKE2B 474dc231171b58e349a2cc64ecaedd72cea37b4e529e2e9a4443df18742759c1856012c3e480804c1ac0918df8d7cbee038ccc2b0c6417636e4e9cc1a04e39a1 SHA512 b9569fdfce2efe0a3871871868ef84d977d247c7a7e71b8817503eabd09768eb481b07ed34a039907e8397a88ddfa609441f262ee83892daa49d603be6ab471e
+MISC metadata.xml 1172 BLAKE2B dc41afdd4c3092178dc5ff06da8bd06f992ee362c08c068a4b7b1dba7c45ea4874a12506d4737f2189686f2fc1ca5a6ba969a27750a8a62ba28472bab1cc1f66 SHA512 8113ba6d80d5bcb62c71f49bda2cb1febb32cba21387377765b0fa640d00d476e8422b4e1bf2ee5a04d197308f0f4d3871e495fd4b2d43dbea3c59582c9e1453
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index f589575813a3..92dccb1f1ee9 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -8,7 +8,6 @@
 	<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>
diff --git a/x11-terms/mlterm/mlterm-3.9.0-r1.ebuild b/x11-terms/mlterm/mlterm-3.9.0-r1.ebuild
deleted file mode 100644
index 1eeaf9f5fa26..000000000000
--- a/x11-terms/mlterm/mlterm-3.9.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop
-
-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="virtual/libcrypt:=
-	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.9.1-r1.ebuild b/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild
index 9a1c8d6abe42..540972d7eb7f 100644
--- a/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.1-r1.ebuild
@@ -12,13 +12,15 @@ 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 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
+IUSE="+X bidi brltty cairo canna debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
+REQUIRED_USE="|| ( X fbcon wayland )"
 
 RDEPEND="virtual/libcrypt:=
-	x11-libs/libICE
-	x11-libs/libxkbcommon
-	x11-libs/libSM
-	x11-libs/libX11
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
 	bidi? ( dev-libs/fribidi )
 	brltty? ( app-accessibility/brltty )
 	cairo? ( x11-libs/cairo[X(+)] )
@@ -47,7 +49,10 @@ RDEPEND="virtual/libcrypt:=
 	)
 	uim? ( app-i18n/uim )
 	utempter? ( sys-libs/libutempter )
-	wayland? ( dev-libs/wayland )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
 	xft? ( x11-libs/libXft )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -82,7 +87,8 @@ src_configure() {
 		$(use_enable scim)
 		$(use_enable skk)
 		$(use_enable uim)
-		--with-gui=xlib$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
+		$(use_with X x)
+		--with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
 		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
 		--with-utmp=$(usex utempter utempter none)
 		--enable-optimize-redrawing