gentoo resync : 03.07.2021

10 files changed, 20 insertions, 191 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index a809acbb69a5..64d5e3e56684 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index 3be8b28e55e8..b1386bd5680b 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,5 +1,3 @@
-DIST mate-terminal-1.24.0.tar.xz 2084772 BLAKE2B 82909eb210bf5f0848e35b06b8569b22ba35ff515b2f90bc20e1766564997c7a44080597ac2efa825a8f9793f64c56136dd977b86e4d88e0886bb0e70c772e79 SHA512 2ad25411a8e720d3ef43964dc9f80732e215b1b5154e904069d25e73910c0c8f0e1b100d21f85b9a1eec06f6b17f891791445f7830bb52fc44b67fa3f8cebf76
 DIST mate-terminal-1.24.1.tar.xz 2032824 BLAKE2B d5c6e97fbb22550f8caf0042422ea9104b947f04e3dacb42bee4e6d1dcdbd59c8cb6765889ac86ea5850ac5ca293a9f796aa5c41d5e1707df2bb37670b3832f3 SHA512 83090667f823605ef0681efeff66c30729df83e7335c100171017ee5f2e819ec0bb219fdc71ed54a27c4a846fcc8db01c4462ef5b9c1e3f31d9c5838427566dc
-EBUILD mate-terminal-1.24.0.ebuild 751 BLAKE2B 851756536ba0a9e0ef4a5c7f5047df8bc989c18b03a7d7565d8d5b230e35abf4f57bd0a52f5f5e4f3032eaa940adb5fec8faacd2d8df7ab3f1e0fb1652cecbcf SHA512 83b620c03d4e8c63724807855d49dafd6c32ceea94a0cab623a6bdee811c4f7191315705e27f435d106dc2d7f4b99a3efe439e0a864d3257b846b662aa620388
-EBUILD mate-terminal-1.24.1.ebuild 751 BLAKE2B 6c692044bcbeefe6090054311fa3689d40c94b98305e6e3df6dfc5b6ae8d6d0c5770a1a3535ccf7f112f2964a3a92209fa5f008c6232dbb4d9dcbfeed0881349 SHA512 ef4d0a6c00379d8621e66ff9bade901a63952e6f904752ac8966d83a994f5a24aabb691942cc31f7446852cec0c35495ab5122f5ac302bc0f7cb93c29bef2f90
+EBUILD mate-terminal-1.24.1.ebuild 749 BLAKE2B a315f999ea9f7fcb20efe5392bd7bea96f9aa3a6ae5a5b5b0211aeb3a058a271b5cf31e1d77ff8fc141df2eb6d3bb39def4a4b5e681dc6ae9bada46569602357 SHA512 0c22e8a9a0b279af282ed50e71389fc85c25e603f3c59fc011aeab5e11c100f80900b79faaa0d09740551e239922c8e0d47543e1b28c3bd80c0a3197e618f964
 MISC metadata.xml 342 BLAKE2B 811cbd769e0b0c1b5766cde7b50689d7c921289cf776132d66c79203373555c83d9059505da2a441030c4aa576179130aa985c7deee4f75c8bb6c56f4968cc13 SHA512 9edc7ffa3bbd772e794786c786eeca99dc500d9f22632a54bc700ce648084f096d9fc7c1786af446711293bf0e294078abe5ce94073de091b9d48248875e7cb9
diff --git a/x11-terms/mate-terminal/mate-terminal-1.24.0.ebuild b/x11-terms/mate-terminal/mate-terminal-1.24.0.ebuild
deleted file mode 100644
index 3a1096ac59aa..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.24.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="FDL-1.1+ GPL-3+ LGPL-3+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=gnome-base/dconf-0.13.4
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/pango
-	>=x11-libs/gtk+-3.22:3[X]
-	>=x11-libs/vte-0.48:2.91
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.6
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig
-"
diff --git a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
index 6582117e42a9..d93afe70cb32 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE Terminal"
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
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 5eceb910bbb8..6aa7809655e8 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,4 +1,4 @@
 AUX sakura-3.7.0-gentoo.patch 866 BLAKE2B a75ff98fc9b13c2d73e1f03930beae00e6260ffdb9b3e91b62386bbd90b2379c88fd00dd45ec1956eac9e08134c428b6c5616b50af7c83a3a1856d9fc46be96b SHA512 a7c9c49218180a5ce59ea4e1e27b662cf1897a15079e642d8c9cc97accfc9cb3cf03926edb91684f87e25e44542fcfbabeeb336dde8a869721f8364111a87532
 DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df
-EBUILD sakura-3.7.1.ebuild 1302 BLAKE2B 03a1829427e11081656d2a3c3f6ae7e3b41d25598f1640c55f86548f585905533cbc9a4bdd03db8acb4d0214b62864e0af53e87ee3dafa215567946d88f3a954 SHA512 3ef8444f54ccb7b6b4d90d3e356bd79979ee81d5b4e3a776c3542d10f503b64d7cee3bd2e75101b9e200471b8f79327efb1111c0a8a0bb3d9862b02db1465115
+EBUILD sakura-3.7.1.ebuild 1311 BLAKE2B 1eb93b0859ff54d1fae7fd017d4ff0a88e8cccaf65c1292cb7eb27b2223619954828705c0a62ef0c902aecaced3fcda8e9e4c0dfc06e44b06f5f51e8292a8fd9 SHA512 0d92b1ea14ddb4a441d3ce89309d01b0cdd262cf3e22a8df2e0590064ca1fc0bf48f2ab599ede7ccb27bab3482194788547b1b3f712c17872c72d9741b0463b0
 MISC metadata.xml 779 BLAKE2B cc8a0feadbc92e64a47c0d7c1b80c1211fc9f0cfed2d7e386d2225143b51e1d03d32eaef68ddf67525cec3ba409cd86cd652af1fdb4bb733e03b278eccad3c92 SHA512 c091185594b457e8e803b65d5a85cad5e9454fba6ce762350d7156fc8ab2b8e1168d21583e7093534f414a4cf5607b1355d4dae6ee7c353d6b90edbe4f036ca1
diff --git a/x11-terms/sakura/sakura-3.7.1.ebuild b/x11-terms/sakura/sakura-3.7.1.ebuild
index 104d146b9851..25cba9388867 100644
--- a/x11-terms/sakura/sakura-3.7.1.ebuild
+++ b/x11-terms/sakura/sakura-3.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic l10n xdg-utils
+inherit cmake flag-o-matic strip-linguas xdg-utils
 
 DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
 HOMEPAGE="https://www.pleyades.net/david/projects/sakura"