gentoo resync : 04.08.2018

16 files changed, 247 insertions, 206 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 35ffc292ac2e..168d725b8152 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 83d437c4317e..667f448893f4 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,8 +1,11 @@
+AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275
 DIST guake-0.8.13.tar.gz 410816 BLAKE2B 37240d5f86cee596243a23ce47c3d3502cc889dc90d98e8a073325bd8c7fb74929308b5f91756100b2bd641134992e61ec833581380b3733613cf83526e26e92 SHA512 89c21bab2b1e5fc17c16349e4a4a4e8d089b084ddffedcf7a20aa059d4269a2a1c5754ec7b343f4f0e2ffae135b78a6128b8c14642f50645ddd52f700fd82a38
 DIST guake-0.8.8.tar.gz 395143 BLAKE2B 34b47948fd03e3187ca5cad4697b0bffd81f5c1add3951a42904837075768bc9f39a278a0e0e3bd555e1d3a9814efd5aefae3c1baa9fac98108eb6dfc81f6035 SHA512 cbff208ea985669c5063793aaa74504a0de92127b52af23499b7c95df7c3841558ae61586e56771ce8e0d444bbe95a95e12e1af41f8a4ac9c74c13b3e9df8dc2
 DIST guake-3.3.0.tar.gz 1006849 BLAKE2B 387ca17a881beebb84c81fda29a3f44ab3f297841010128bc4c5c4eded83d3325562bc88858fd1a8824a7c26d3bb9050bbe17399934f6e6cdcf8b4bf3c15d8a6 SHA512 1558e34f29060e449d676077c90df92ea9bc3a57857094be8d98cd283010de1125b7eeb3fbc3b3fcd08cacac9cf8ee461adb28cc29c491e8d2c3ad32fa39754b
+DIST guake-3.3.2.tar.gz 1084094 BLAKE2B b534ed18a6b9ad686fbe41fe1aa6e522429a50725103455cc5ccc5c4c7b67df6ce9eeac3c769ef3cb44bcc2e60305df80b6aa6af83c89a27b290e5ea48d19f8e SHA512 4d5585178d1e70d5b954071c4b68af22c459518df7af5930bd9a44f1f63afaff7b89bcab43422f9ae178c1dccf1268e5555d5776adb01fc8f11666dae2c3e766
 EBUILD guake-0.8.13.ebuild 1061 BLAKE2B 612ed58bcfddcb870c16fdf09cf6c76c55af652c2fba08a6fb9453ef090c3f8b08e326c278fe84d4fa6537c594ea3651dd29dd1ccece14e36a747a828f2dde6e SHA512 aaaa86875a7895377e99d06a4aa5fe2c0a62cdc058eb6aab9827370f79db9f3a16f967318f5daeff322cb005333fd30392b286652da00fc529cd7ca12f0fd039
 EBUILD guake-0.8.8.ebuild 1058 BLAKE2B 5dbb934d346f0278b921a6a25d28d1dee40460ca122d7e4594a78f1f6a4043afa576d6813f2231ef9747667141ca9c3deb182aef00bb7b30bf89d14ad6b2c0db SHA512 c54fcbf25a5c05632fac0d8d63c3ac1b65a55e9eb8e5e33a0130f6f2622514da25b3d0af6d8231040dc6a2e362cc34f1b7b2a88484f29503d3566c103d173135
-EBUILD guake-3.3.0.ebuild 1408 BLAKE2B fd7e60a807ae41598ddae780ea0c7de5ac4e235ef4428621d42b9a24c3b5a52c69ee749d7e54ce63070b69427bff9333b2066970fa5f66f65d6a5196e8946f94 SHA512 41a7855e52f76031de624945e79d6e51f0abe17c6e1370efb1151df1e18e914a345e30e5d1962fd4caf6201a22533acf48e5b48ea0f1b5c2c4e8eba62e1d138b
-EBUILD guake-9999.ebuild 1084 BLAKE2B 2acc98de63dc489fa76d969dbeb91c6363c5c624e6052327dee8b143f60729cad5a6fad414e9bae2774c16a34314812f5d5237789a6898693aa042587d6641e8 SHA512 fd45ce1f2b51ca645e7a68b58d3a8483b530e8f99033a7e756375512481e4087f89f9f72fc6845b84882fdf79c9cba8c7b447935d64df0fdba5058dcfa90a8a2
+EBUILD guake-3.3.0.ebuild 1355 BLAKE2B cc7e4a89920a56b095f22e7542acbba3aed0ae5ca4acb709ef278749f499f44f0448b0fccb7949c97726aa7a9e7c981c34878aac2259d38966501b9e3569f60a SHA512 cd4507485ee77ee61b7e51a75de238c6102d27b89e8871fb0c9f65fc86d6d2deb0f2a661cf2ada94cc0d05cb4d80124963bfaeedd29bb8c572a0ab02bb538280
+EBUILD guake-3.3.2.ebuild 1375 BLAKE2B 7a6bdb335f6e183f794e50276be61f0f3910f4a626e4fd1e45e5e7443968bc6e9b29492f65f8b7a5032a9a59044a2b7cda3617a098b8b84d7aaa0769b6adbb6a SHA512 50846354bb23ca4799d506afdda2ae4aafd26029dff318862d230decd7ebc59e85e02526bdb88b771a4e3cc3bbca6b36c55ce8b91a0263a5ddfbc681bee99471
+EBUILD guake-9999.ebuild 1337 BLAKE2B ed4774014d089d3d1cab77ec1a942a753a0f29d4889614261896d695b97fb6dbd6da0de0e931f0ab4f0ff87fe3992f50f64234c2f6ac1fd3234b580710903700 SHA512 214191f9ba92e65b38d0b0813c274c80d2fb0ce834001f9141ab752f0b62470d9738fa21ac16c213728649e5945c7586fee5d3c65c63a9ae975c20ed2e50f5bf
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/files/guake-3.3.2-paths.patch b/x11-terms/guake/files/guake-3.3.2-paths.patch
new file mode 100644
index 000000000000..d2d94daa4b1a
--- /dev/null
+++ b/x11-terms/guake/files/guake-3.3.2-paths.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -81,7 +81,7 @@
+ 
+ 	@if [ -f guake/paths.py.dev ]; then rm -f guake/paths.py.dev; fi
+ 	@if [ -f guake/paths.py ]; then mv guake/paths.py guake/paths.py.dev; fi
+-	@cp -f guake/paths.py.in guake/paths.py
++	-@cp -f guake/paths.py.in guake/paths.py
+ 	@sed -i -e 's|{{ LOCALE_DIR }}|"$(localedir)"|g' guake/paths.py
+ 	@sed -i -e 's|{{ IMAGE_DIR }}|"$(IMAGE_DIR)"|g' guake/paths.py
+ 	@sed -i -e 's|{{ GLADE_DIR }}|"$(GLADE_DIR)"|g' guake/paths.py
+@@ -368,7 +368,7 @@
+ 
+ generate-paths:
+ 	@echo "Generating path.py..."
+-	@cp -f guake/paths.py.in guake/paths.py
++	-@cp -f guake/paths.py.in guake/paths.py
+ 	@# Generic
+ 	@sed -i -e 's|{{ LOGIN_DESTOP_PATH }}|""|g' guake/paths.py
+ 	@sed -i -e 's|{{ AUTOSTART_FOLDER }}|""|g' guake/paths.py
diff --git a/x11-terms/guake/guake-3.3.0.ebuild b/x11-terms/guake/guake-3.3.0.ebuild
index 06cadd17185a..2fb100b8ed4b 100644
--- a/x11-terms/guake/guake-3.3.0.ebuild
+++ b/x11-terms/guake/guake-3.3.0.ebuild
@@ -7,12 +7,9 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
-MY_PN="Guake"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Drop-down terminal for GTK+ desktops"
 HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,14 +24,16 @@ RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/libnotify
 	x11-libs/vte:2.91
-	utempter? ( sys-libs/libutempter )"
-DEPEND="${RDEPEND}
+	utempter? ( sys-libs/libutempter )
+"
+DEPEND="
+	${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	gnome-base/gsettings-desktop-schemas
 	sys-devel/gettext
-	sys-devel/make"
-
-S="${WORKDIR}/${MY_P}"
+	sys-devel/make
+"
+S=${WORKDIR}/${P^}
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
diff --git a/x11-terms/guake/guake-3.3.2.ebuild b/x11-terms/guake/guake-3.3.2.ebuild
new file mode 100644
index 000000000000..05bbf86cd8e2
--- /dev/null
+++ b/x11-terms/guake/guake-3.3.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="Drop-down terminal for GNOME"
+HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake"
+SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="utempter"
+
+RDEPEND="
+	dev-libs/keybinder:3
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/libnotify
+	x11-libs/vte:2.91
+	utempter? ( sys-libs/libutempter )
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	sys-devel/gettext
+	sys-devel/make
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.2-paths.patch
+)
+S=${WORKDIR}/${P^}
+
+python_compile_all() {
+	emake prepare-install prefix=/usr
+	emake generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
+	default
+}
+
+python_install_all() {
+	emake install-schemas install-locale prefix=/usr DESTDIR="${D}"
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index 5f3f7f992452..46f3706e7f3d 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -1,60 +1,60 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=1
 
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 git-r3 gnome2-utils xdg-utils
 
-inherit autotools git-r3 gnome2 python-single-r1
-
-DESCRIPTION="Drop-down terminal for GTK+ desktops"
-HOMEPAGE="https://github.com/Guake/guake"
-# override gnome.org.eclass SRC_URI
-SRC_URI=''
+DESCRIPTION="Drop-down terminal for GNOME"
+HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake"
 EGIT_REPO_URI="https://github.com/Guake/guake.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="utempter"
 
 RDEPEND="
-	${PYTHON_DEPS}
+	dev-libs/keybinder:3
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/vte:0[python]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/libnotify
+	x11-libs/vte:2.91
+	utempter? ( sys-libs/libutempter )
 "
 DEPEND="
 	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	sys-devel/gettext
+	sys-devel/make
 "
 
-DOCS=( AUTHORS ChangeLog NEWS README.rst )
-
-src_unpack() {
-	# override gnome2_src_unpack()
-	git-r3_src_unpack
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.2-paths.patch
+)
 
-src_prepare() {
+python_compile_all() {
+	emake prepare-install prefix=/usr
+	emake generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
 	default
+}
 
-	eautoreconf
-
-	gnome2_src_prepare
+python_install_all() {
+	emake install-schemas install-locale prefix=/usr DESTDIR="${D}"
+	distutils-r1_python_install_all
 }
 
 pkg_postinst() {
-	gnome2_pkg_postinst
+	gnome2_schemas_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_pkg_postrm
+	gnome2_schemas_update
+	xdg_desktop_database_update
 }
diff --git a/x11-terms/lilyterm/Manifest b/x11-terms/lilyterm/Manifest
index b8ec9f96bf1e..867b77b4c9ba 100644
--- a/x11-terms/lilyterm/Manifest
+++ b/x11-terms/lilyterm/Manifest
@@ -1,5 +1,8 @@
+AUX lilyterm-0.9.9.4-autogen.patch 230 BLAKE2B e1fe8cfc6e7efb174910a716043fcb86b4d954114c019e7080f6911a5e3290a44f95cb347ea771f10d45a25e46c06a2eb9bcc4fd163cd3365043ad9e9feff8c0 SHA512 a098b314ead6e60930f7009ba346da026b21c8efcb68c4d0ede57755afd8bd2bab1b2c22ed4f0b65e343e253efc42f3458ebe07d88b4512251db04f759a26164
 AUX lilyterm-0.9.9.4-gettext.patch 246 BLAKE2B 2061244d1e51659e78a55880111463a7fb54b121fca4a32a6e1b56ea2a1a74d8c0c158554a0ef6dea6f4d020cfc584e87b028d09631ec193b58a266583a66cf6 SHA512 94308160a63482d3c07f5baac819111958e7d3e6ddb10318671a30db866a18756b59ccc79e7ea866864c520865c24dd0f3e3920aa3e4259e2accf2dce05219f1
+AUX lilyterm-99999-autogen.patch 927 BLAKE2B 3b057a1b2d0445bba467fb4ef227fc2d9969d82a7e05b64d56a133b5991d78b17d2a2abdac4bd805d85a46aeea534af057daf5293af0f571b26acd543afcf74b SHA512 310de428a085f9307f69ba1f23e4bf0fc72886ff9351527da8bee61293f2cbacd61ce7e866b4fa22b5153e7f13456d597382df66fd66e2b5ca087741da556e29
 DIST lilyterm-0.9.9.4.tar.gz 346180 BLAKE2B 8e9a728760aa1435a3a4247659443e0a29c6ab5f129b2eaeb3c070c4ec8807024f35ee22d028d2400c110143b52ee008496fbd10e67052e73046d6cb6e130b3d SHA512 2fcd9d31a28d6bf9d953cd77b38cb3c67591dd04157f0efd418ce3ac9eab0f8090156435207c8bc18e619dda45e726f3346b1344f2d37fd308fa802476d3b5da
 EBUILD lilyterm-0.9.9.4-r1.ebuild 597 BLAKE2B 8c3a6a5da5fa5fce40ee66c09b54386bfc95c2eb483b6d3bfd997802b228f1fde5bfd48881262fd1a69eac03d2dca27ce9fadc923b5a7a7afb738b0eebbeb56c SHA512 0b1bc581184438ec5bccfd3283f7a4116c17bd096fc290a5226b6338663b99aa64a9004a0fed602daa001e143e501068bfda5d70df73a48bcf265ca305778bbb
-EBUILD lilyterm-0.9.9.4.ebuild 539 BLAKE2B 407fedbfc39f9d156047dec19dd853c20f61107f760ee4f3ec61ead19bfa7927447ea7b8de7929cbee746f1a2a72dfbe5b3a304eb06fa32cf1fb133d4320bae0 SHA512 dfa0f09a396309beaaf731a237ccd8459cd610e355ee591c6071b7dc1a507e27e408870662e2e141312e662c05395e4df7440dc93a2c2f6091296ecd034579f3
+EBUILD lilyterm-0.9.9.4-r2.ebuild 677 BLAKE2B e17e40173218a922c725d6f79d720726db579648db1806fff513aa4e687695d71f96fcc2fec1b65d20efcdbc5f89197bf850c8780116887038e15dd3f39ecbc9 SHA512 a2fb76923975b71e22a911c0fe0bb2f5338745b835131393f9ef9ea35cf039f101d81608abf81f3f520de937c183f1321c8c50ec44b7a19dea023f7e69ff845f
+EBUILD lilyterm-99999.ebuild 631 BLAKE2B 4ec61a17eb74756ae7946fa1d234db20104a8df37cfda6ae7c1f4fffe6f4edbccb72fec8fd969499ad334e83adcafeb2668daf5962a03fcd1bc90fc9866d7213 SHA512 a62bf2229dc006baf17e4da35254224dc6d81a31b7fc386efb73b5a2cd9caae9dae9dd19d51e9881fbb33e51fb7193eeae76c5ccb27168bb2ecfdf619dd4e149
 MISC metadata.xml 341 BLAKE2B 2123a85d5442a8465b393d5f2a2f560359c90023a0c447781ee60b6a28fc3c71c075efe02df7425051fc9f16505a5e2e453ebd9f961eefee8bcc2d8008bd74a5 SHA512 ca3133afa9d86a0fbc7517036679d00bd1b6d657c85e393038ff445c2d4946aa053abbee66f72f35486bf20d5c278782e805a1a7f02318f1d4413f79f942719b
diff --git a/x11-terms/lilyterm/files/lilyterm-0.9.9.4-autogen.patch b/x11-terms/lilyterm/files/lilyterm-0.9.9.4-autogen.patch
new file mode 100644
index 000000000000..a4f367484171
--- /dev/null
+++ b/x11-terms/lilyterm/files/lilyterm-0.9.9.4-autogen.patch
@@ -0,0 +1,15 @@
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -43,12 +43,3 @@
+ AC_FILE='src/Makefile.am'
+ Replace_Parameter BINARY
+ echo ""
+-
+-set -x
+-
+-aclocal
+-autoheader
+-intltoolize --automake --copy --force
+-automake --add-missing --copy
+-autoconf
+-
diff --git a/x11-terms/lilyterm/files/lilyterm-99999-autogen.patch b/x11-terms/lilyterm/files/lilyterm-99999-autogen.patch
new file mode 100644
index 000000000000..8485d56ed75c
--- /dev/null
+++ b/x11-terms/lilyterm/files/lilyterm-99999-autogen.patch
@@ -0,0 +1,29 @@
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -44,11 +44,10 @@
+ Replace_Parameter BINARY
+ echo ""
+ 
+-# for GTK3+
+-pkg-config --cflags gtk+-2.0 > /dev/null 2>&1
++false
+ if [ $? != 0 ]; then
+   sed -i 's/^AM_PATH_GTK_2_0.*/PKG_CHECK_MODULES([GTK], [gtk+-3.0])/g' configure.ac
+-  pkg-config --cflags vte-2.91 > /dev/null 2>&1
++true
+   if [ $? = 0 ]; then
+     sed -i 's/^PKG_CHECK_MODULES(vte, \[vte >= .*/PKG_CHECK_MODULES(vte, [vte-2.91 >= 0.38.0],, AC_MSG_ERROR([You need libvte-2.91 >= 0.38.0 to build $_PACKAGE]))/g' configure.ac
+     sed -i 's/^lilyterm_LDADD\(.*\)$/lilyterm_LDADD\1 -lX11/g' src/Makefile.am
+@@ -56,12 +55,3 @@
+     sed -i 's/^PKG_CHECK_MODULES(vte, \[vte >= .*/PKG_CHECK_MODULES(vte, [vte-2.90 >= 0.30.0],, AC_MSG_ERROR([You need libvte-2.90 >= 0.30.0 to build $_PACKAGE]))/g' configure.ac
+   fi
+ fi
+-
+-set -x
+-
+-aclocal
+-autoheader
+-intltoolize --automake --copy --force
+-automake --add-missing --copy
+-autoconf
+-
diff --git a/x11-terms/lilyterm/lilyterm-0.9.9.4.ebuild b/x11-terms/lilyterm/lilyterm-0.9.9.4-r2.ebuild
index 1cf81a312581..8221d88b0e3c 100644
--- a/x11-terms/lilyterm/lilyterm-0.9.9.4.ebuild
+++ b/x11-terms/lilyterm/lilyterm-0.9.9.4-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+inherit autotools
 
 DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight"
 HOMEPAGE="https://lilyterm.luna.com.tw"
@@ -10,7 +11,6 @@ SRC_URI="https://${PN}.luna.com.tw/file/${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/vte:0
@@ -23,7 +23,14 @@ DEPEND="
 "
 
 DOCS=( AUTHORS ChangeLog README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9.4-autogen.patch
+	"${FILESDIR}"/${PN}-0.9.9.4-gettext.patch
+)
 
 src_prepare() {
-	./autogen.sh
+	default
+
+	./autogen.sh || die
+	eautoreconf
 }
diff --git a/x11-terms/lilyterm/lilyterm-99999.ebuild b/x11-terms/lilyterm/lilyterm-99999.ebuild
new file mode 100644
index 000000000000..21280cce5b43
--- /dev/null
+++ b/x11-terms/lilyterm/lilyterm-99999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools git-r3
+
+DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight"
+HOMEPAGE="https://lilyterm.luna.com.tw"
+EGIT_REPO_URI="https://github.com/Tetralet/LilyTerm"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS=""
+
+RDEPEND="
+	x11-libs/vte:2.91
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999-autogen.patch
+)
+
+src_prepare() {
+	default
+
+	./autogen.sh || die
+	eautoreconf
+}
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 00e89112a0da..be8c878bc355 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.5.tar.gz 3928532 BLAKE2B e5d13ea0e67d4bce1470f585b419cb073552d68115f08b5051f66a90a9887ffba2794829be52d852ef2ed36502a3ef8ea8235b2b668804599efb74f65392b4e6 SHA512 c43a121ed6572bdd4501a6b27f54df65ff2c09682485c7902c5cbd6b4be64f35efcf8cce3923d77afc412d681a390edc240a6a2503478ea97e0c4953e0b807a7
 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
-EBUILD mlterm-3.8.6.ebuild 2916 BLAKE2B d527d3df07a4aef919cfe1caf123f23214cbdec501d1420542dc8f2969fb27655c963d671c27ccb2bc8e29f050e422fbcdef219001f064f70339425212b98fb7 SHA512 cb65aa1170b59c7039b35ff3e87055f584bf89f00c3555627581d932b3329d53503a9e6f060a1b64a30598137d86351a4bb318face8f6894762ee088124144e4
-MISC metadata.xml 1323 BLAKE2B 6b727593f0977b9f9137e21e161de2b027977426370c22fc22911c41277fd4fde20d8db941e88faf2f290c01f1bbe51a86ca3fffa95142a15d8a1cd1aa4e8d38 SHA512 39daba3b97c8be425edf7767215619662c5bf286be546d6027af96ca790801ab0c54e95179e4a63041806df8c7d18a4e6f979c2f7ff8d6bc480f7c9d9be2ef9e
+EBUILD mlterm-3.8.4.ebuild 2790 BLAKE2B 1ad156a3f9087a1e3b82236d74b0ddb3de2b015e3aa8ebd19902eebcecdbe4c382d5ebc0307057d0f38e990c1d210449dcd3e82ca3748686d0beea43b9584deb SHA512 2259b955336ddd5738aae25b2bc12703cb0f7af5d35accbd24915a79b43cf7eef2ecdc9f1ea017986617ba19c19b1747b834fb370cc34da8c27d87196066418d
+EBUILD mlterm-3.8.6.ebuild 2937 BLAKE2B 60c8d01f8a7a55f1260ba1bc2bf9bc5be3754928ed10abaa53c1af90a2636cc681f985a6ecad587e62821963597d8e97c16e65e728fc63fb730e7a5ca273665b SHA512 0814e091bd74e3f01037932df49cac7aec48ad0bc3adea571c097333b7b8c4aca53af6bbe11b458550fb259a212fa194d3f217f52f0ed9576b9dce1ccfbf0ba9
+MISC metadata.xml 1275 BLAKE2B ac27b2774e55492d3c8de46ea71c7773496bea774afe07d5f4625fe2820c68ac548179ff165ed47f7104dbb4805400b8b7618896dfb9b37046d5b8e045342d69 SHA512 1148852573a1e427842c6b37e3575b3b28949460eef1bdfa538834be5ae77d2354facde28d94a75d519211404a0eac591512bea49f65e9ce8f52cb80a2dc42d9
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index 738f332896f6..f589575813a3 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -1,27 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <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
-    </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>
-    <flag name="regis">Enable support for ReGIS</flag>
-    <flag name="scim">Enable support for <pkg>app-i18n/scim</pkg></flag>
-    <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>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<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</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>
+		<flag name="regis">Enable support for ReGIS</flag>
+		<flag name="scim">Enable support for <pkg>app-i18n/scim</pkg></flag>
+		<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>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/mlterm/mlterm-3.8.4.ebuild b/x11-terms/mlterm/mlterm-3.8.4.ebuild
index ca0f59caf162..767bac6854f7 100644
--- a/x11-terms/mlterm/mlterm-3.8.4.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.4.ebuild
@@ -13,6 +13,7 @@ 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
@@ -51,7 +52,6 @@ RDEPEND="x11-libs/libICE
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
-REQUIRED_USE="gtk2? ( gtk )"
 
 PATCHES=( "${FILESDIR}"/${PN}-font.patch )
 DOCS=( doc/{en,ja} )
@@ -115,7 +115,7 @@ src_test() {
 
 src_install () {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	docinto contrib/icon
 	dodoc contrib/icon/README
diff --git a/x11-terms/mlterm/mlterm-3.8.5.ebuild b/x11-terms/mlterm/mlterm-3.8.5.ebuild
deleted file mode 100644
index b196e452cc99..000000000000
--- a/x11-terms/mlterm/mlterm-3.8.5.ebuild
+++ /dev/null
@@ -1,127 +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"
-
-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 )"
-REQUIRED_USE="gtk2? ( gtk )"
-
-PATCHES=( "${FILESDIR}"/${PN}-font.patch )
-DOCS=( doc/{en,ja} )
-
-src_prepare() {
-	# workaround for USE=fb
-	sed -i "/^[[:space:]]*main /s/\(main man\)/libvterm \1/" configure
-	# 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
-	prune_libtool_files
-
-	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.6.ebuild b/x11-terms/mlterm/mlterm-3.8.6.ebuild
index a2d6780884a5..509a70d12617 100644
--- a/x11-terms/mlterm/mlterm-3.8.6.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.6.ebuild
@@ -13,6 +13,7 @@ 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
@@ -53,7 +54,6 @@ RDEPEND="x11-libs/libICE
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
-REQUIRED_USE="gtk2? ( gtk )"
 
 PATCHES=( "${FILESDIR}"/${PN}-font.patch )
 DOCS=( doc/{en,ja} )
@@ -118,7 +118,7 @@ src_test() {
 
 src_install () {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	docinto contrib/icon
 	dodoc contrib/icon/README