gentoo resync : 30.06.2018

3 files changed, 17 insertions, 9 deletions

diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 8687a4521c21..00e89112a0da 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,8 +1,8 @@
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
-DIST mlterm-3.8.0.tar.gz 3756779 BLAKE2B 401695dceb90357f0822346e3d4e00360faded3729fb091b217ed232909f1e2e60bfb554e50d162f38115e77b425041f711f136756fbb2a349512c98dc538be4 SHA512 86d163aaf24668dea77e54ff775cb448c6c699bcc82e1d84fe9a9fbed90d9c834ee3e61348de77713b2dbd229b37b76d2be817d788710f224cd5c53e7f93049f
 DIST mlterm-3.8.4.tar.gz 3881872 BLAKE2B 647810585b0143d0f680c99032cf478e02047acc80086b4c9cbadc59df49e09ba1626ee2ff2c8a1842c68047632c61001d31f7282d9eb8619f0260de7f0bb976 SHA512 6afe0a60001f180df18f2d2ad5e2954a1d9423313d7784eb0cf6a9736c6a62545f461d8e3d079aa1f43eb5f27f4b0c060a7da54e08bf758b283005b16aa1e5cd
 DIST mlterm-3.8.5.tar.gz 3928532 BLAKE2B e5d13ea0e67d4bce1470f585b419cb073552d68115f08b5051f66a90a9887ffba2794829be52d852ef2ed36502a3ef8ea8235b2b668804599efb74f65392b4e6 SHA512 c43a121ed6572bdd4501a6b27f54df65ff2c09682485c7902c5cbd6b4be64f35efcf8cce3923d77afc412d681a390edc240a6a2503478ea97e0c4953e0b807a7
-EBUILD mlterm-3.8.0.ebuild 2654 BLAKE2B ca450110bc84496959c47d31a499ef67e2da95470aab705a9f62efb8a5734e9a177f631b932ff85e64c87e7badcf5fe7c6ce2a620a9e5c3b392db29fa8793977 SHA512 d5c5a6315b0000f0e3cc2b73f176ef34007116de8acfbc070e0eab1d24b3bafcfdef86e45c6e74984b9d5ee7b76c6cec0bed5efea9e5dd049942baf31d23ccf9
+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
-MISC metadata.xml 1178 BLAKE2B ab3f2d3d8940de1bf6d1444095230d7dbfd9567d4349dea99fe3c73dec68d077c9c360876210cb17c62a0c41d8b50a24569449ede58554dc300396c2bb68d3a4 SHA512 358608208d6ce16bfa3e9e792ca85921b4368d6a6c5c0934aaeb5819f985e276cd4de8a35a54ea5699d1e988cd1c08aab669eab1939ff78753b29c3668425a6f
+EBUILD mlterm-3.8.6.ebuild 2916 BLAKE2B d527d3df07a4aef919cfe1caf123f23214cbdec501d1420542dc8f2969fb27655c963d671c27ccb2bc8e29f050e422fbcdef219001f064f70339425212b98fb7 SHA512 cb65aa1170b59c7039b35ff3e87055f584bf89f00c3555627581d932b3329d53503a9e6f060a1b64a30598137d86351a4bb318face8f6894762ee088124144e4
+MISC metadata.xml 1323 BLAKE2B 6b727593f0977b9f9137e21e161de2b027977426370c22fc22911c41277fd4fde20d8db941e88faf2f290c01f1bbe51a86ca3fffa95142a15d8a1cd1aa4e8d38 SHA512 39daba3b97c8be425edf7767215619662c5bf286be546d6027af96ca790801ab0c54e95179e4a63041806df8c7d18a4e6f979c2f7ff8d6bc480f7c9d9be2ef9e
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index f995734984c6..738f332896f6 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -6,6 +6,7 @@
     <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
@@ -18,6 +19,7 @@
     <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>
diff --git a/x11-terms/mlterm/mlterm-3.8.0.ebuild b/x11-terms/mlterm/mlterm-3.8.6.ebuild
index 97cb0a380419..a2d6780884a5 100644
--- a/x11-terms/mlterm/mlterm-3.8.0.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.6.ebuild
@@ -11,15 +11,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="bidi cairo canna debug fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
+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"
 
 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? (
@@ -46,18 +48,20 @@ RDEPEND="x11-libs/libICE
 	)
 	uim? ( app-i18n/uim )
 	utempter? ( sys-libs/libutempter )
+	wayland? ( dev-libs/wayland )
 	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() {
 	# default config
 	sed -i \
-		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/mlterm-icon.svg" \
+		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
 		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
 		etc/main
 
@@ -67,6 +71,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		$(use_enable bidi fribidi)
+		$(use_enable brltty brlapi)
 		$(use_enable canna)
 		$(use_enable debug)
 		$(use_enable fcitx)
@@ -80,6 +85,7 @@ src_configure() {
 		$(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
@@ -87,7 +93,7 @@ src_configure() {
 	)
 
 	local scrollbars="sample,extra"
-	local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom"
+	local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom"
 	if use gtk; then
 		myconf+=(
 			$(use_with gtk gtk $(usex gtk2 2.0 3.0))
@@ -117,6 +123,6 @@ src_install () {
 	docinto contrib/icon
 	dodoc contrib/icon/README
 
-	doicon contrib/icon/mlterm*
-	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
+	doicon contrib/icon/${PN}*
+	make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator"
 }