gentoo resync : 02.03.2018

12 files changed, 246 insertions, 22 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index eb33961a627a..fc8aada4cc53 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 687c66650558..407d660c0cf1 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -3,7 +3,7 @@ DIST Eterm-0.9.5.tar.gz 796872 BLAKE2B 9b1fbe3d1b0345f41db6c2e4421c042f19b4932b2
 DIST Eterm-0.9.6.tar.gz 831756 BLAKE2B cd309f2bd74c44066d5811845c2cfe7407064186ce445246af352e3dfe47c5a6a58730069f653bb15891b2fdde7d6e84eaf1b92e64978552aab36bd20dee10a1 SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe
 DIST Eterm-bg-0.9.5.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
 DIST Eterm-bg-0.9.6.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
-EBUILD eterm-0.9.5.ebuild 1804 BLAKE2B cfaa87cdfe43815db868b084359560b61ea3351804e7bbfb0236be64a027bd2d4170290b71836169f0ee1a2242ff10234cc7c1821c6b6f4eeba3c58453bec1f3 SHA512 f8fab71fe59b0484af42542d78d0b0ff915360df85a8f668064b78c7e80b1cc296480c93b67252cd85565f448a9b1e793daec1c50858daadaa115eb7070ee1dc
-EBUILD eterm-0.9.6-r1.ebuild 1535 BLAKE2B 98fff46b47dce70e0d2844937ae4a9431b35a8664365adaded8573bb9ce8eb60d8c44ee495e78683b90f32f7c5fda27104aabf209084f7f9aa8c6e4dd3ce85a7 SHA512 f2c6461e49def3a17767a09f68e0d50cd1ba515f8b2c72d10996c435e28a431e17d10e13a2ccc83e7ffcb09fbe351de98a9d85e4319da532c2cc911d703e4edf
+EBUILD eterm-0.9.5.ebuild 1794 BLAKE2B 09c5d2701044052c9464253380d2e017369589bdde628cf1f745bbef25dac1f300e2aebf4e22881212384b68d180597c1d30bb77563ae8b0e68123bf8ede3864 SHA512 168196e0f14619982ca99e63bca7d697d7893189513a3974b6c903fb8f942e42a2eeb58cc172c512acd52a31094c1152359947995c695473f50d9d393f00076a
+EBUILD eterm-0.9.6-r1.ebuild 1510 BLAKE2B 4f1f26bd856e61218a47da61a673aa004b204aef2bfa53bf3f90d4ac7c42b95678fe9676109fd7733f963fa513fcb5434547d4d3311f991a61d4e61937c75ffd SHA512 ff62ccdffc770cfe444702336a2c9011f2f88ee1d8c90701fe4cd5f035c36047d9c0a6b72441320176e3a200f5e490d5cd1366abeefd0e96a90b06ed83ceb335
 EBUILD eterm-9999.ebuild 1234 BLAKE2B 9d3f80e2a63823451b8ead0cba5340d02fbf5136fd01afd7aaee62a9afadf6fe0368bc5397161be77a6ca3315286ffbdb63010b7fa3363c320abfe7fd7eee573 SHA512 7a497ea960be119407540fc0a0f95ccee51135cf625b78c674e1045a056f8ae93543653084221f82d1531bdb0b0a58263706dcee9a957a9435ca882b3a1163ce
 MISC metadata.xml 812 BLAKE2B c3f47ef367d27e0ad69c54e22fdbda24d3673208561b9a7827f612d1d487e4ab2ffd05c02832b112ef8c599921bc3a59c3296b50874a2bf52218fc5dbf76f960 SHA512 86f0b751166e5ccf7de8e65a8acc6c74a189be1d692b9e470c9142a351de2f436a7e62237dea218d1e143b0a2e5423e419d194cbbc911a5e1f5787bf570aba7a
diff --git a/x11-terms/eterm/eterm-0.9.5.ebuild b/x11-terms/eterm/eterm-0.9.5.ebuild
index 58632914f707..ecc9dfddd896 100644
--- a/x11-terms/eterm/eterm-0.9.5.ebuild
+++ b/x11-terms/eterm/eterm-0.9.5.ebuild
@@ -16,7 +16,7 @@ else
 		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )
 		mirror://sourceforge/eterm/${MY_P}.tar.gz
 		!minimal? ( mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz )"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 fi
 
 DESCRIPTION="A vt102 terminal emulator for X"
diff --git a/x11-terms/eterm/eterm-0.9.6-r1.ebuild b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
index f7c451c110ee..1d1aa6af78cb 100644
--- a/x11-terms/eterm/eterm-0.9.6-r1.ebuild
+++ b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
 
 RDEPEND="
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index a5f5570d0a89..df97510ec874 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,5 +1,8 @@
 AUX kitty-0.7.1-flags.patch 1514 BLAKE2B 1df4313bd4436200e114f9d9abadd6e160c34f20f6acbfcf77976fe9d8cb34b7340faf399c3aed2878f725336cb23bfad8789932804a76ec01bd1b6976450785 SHA512 e6611277df94ee51981b8b111281683c58f06271fc1252f1bcb50a3441d531aaee52e54b09cecb781a8173af83d9c6a63f68526b0deb4d1818e5f8e6b349b4f5
 AUX kitty-0.7.1-svg-icon.patch 710 BLAKE2B 6377fe8ed9e344ba61881041d9eea72304f605ad633ac2d4ee68aebe363368c9a2b93c48297aca2e4edca14b7535c1a40c81f2dce4189bbeee563d7e6c23d6b7 SHA512 9f449cbc26cc8446425be0f5945e69cef49b4602f7578559d8ddc7456e4adb3afe1edf2c580eb009d1f2e3daa3f3b087c49b3e35a35e8a0a8fb7be584d5256af
 DIST kitty-0.7.1.tar.gz 2535007 BLAKE2B 13c5506b30e54b190d1cec2c2bb5b3b8c76ba3492a065fccae84c84606842b717dc33f74a7b3abf4c0ffec8564c5dd9be4b6ed3972c24cf95662aec594359bc9 SHA512 595e64e49ac940b37ff88d6152006ebfe2722682a8ff6c8bc2514c150a5b51934b9de5b8c99130910e5638f9c1db566abf4adb65f3fdce893708787d1ded59c1
+DIST kitty-0.8.0.tar.gz 3265837 BLAKE2B 2bd623a1f7024e3d6fe11132516a5c165d890faaa80cf2bc23f0a35852c331eede1fbeb0ab0e3588da6d41e7700d8643cd82bbb45bee4c8f359ff4b9f00fb081 SHA512 909faf13bd27c03eed463400d157f453363142fd31b4aaf49be37ed85bcd417077667fc02a8c78c6dccf4c1d326cfe3cff4996f591e16eda8335cf165abb42fd
 EBUILD kitty-0.7.1-r3.ebuild 1694 BLAKE2B 0cdae2a8466b8c1c18dec4674f8ae8a233ee37110fdc21923583367597325ac58474200a55de1dc2209ae531e8b74363de6dd2bfd69919ad9c316cbaf3dae1a2 SHA512 3dac472aad8f578544324261d430f7289eb477ef97526b8d443ede91412335a800bc12ab3377d8882ef738d84116aaedccbed76bb9d1b225cad2e7d9a2c983cb
+EBUILD kitty-0.8.0.ebuild 1824 BLAKE2B db4103d37bb5e8f8e6dfe74e7bed14b93fa4c06cef692be626f2b4733511c879d1a87b2030d62700186fa4270619bb47a11b9d45c085a79ff5e0d2ee4beee79f SHA512 78c2ae64bc97e52dcef020723c14158a4791b3a337d518c94384616737dad303024c6ef92b6ebe5e0df96d058c38e9c5b54358897a8d684888ce454d4b8c32eb
+EBUILD kitty-9999.ebuild 1824 BLAKE2B db4103d37bb5e8f8e6dfe74e7bed14b93fa4c06cef692be626f2b4733511c879d1a87b2030d62700186fa4270619bb47a11b9d45c085a79ff5e0d2ee4beee79f SHA512 78c2ae64bc97e52dcef020723c14158a4791b3a337d518c94384616737dad303024c6ef92b6ebe5e0df96d058c38e9c5b54358897a8d684888ce454d4b8c32eb
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/kitty-0.8.0.ebuild b/x11-terms/kitty/kitty-0.8.0.ebuild
new file mode 100644
index 000000000000..e92bab9de3b4
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.8.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug imagemagick wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPS="
+	${PYTHON_DEPS}
+	>=media-libs/harfbuzz-1.5.0:=
+	sys-libs/zlib
+	media-libs/libpng:0=
+	media-libs/freetype:2
+	media-libs/fontconfig
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+	)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.1-flags.patch
+	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+)
+
+src_prepare() {
+	default
+
+	# respect libdir
+	sed -i "/libdir =/s/'lib'/'$(get_libdir)'/" setup.py || die
+	sed -i "s#/../lib/kitty#/../$(get_libdir)/kitty#" linux-launcher.c || die
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+	fi
+
+	tc-export CC
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") linux-package
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	mkdir -p "${ED}"usr || die
+	cp -r linux-package/* "${ED}usr" || die
+	python_fix_shebang "${ED}"
+
+	dodoc CHANGELOG.rst *.asciidoc
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
new file mode 100644
index 000000000000..e92bab9de3b4
--- /dev/null
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug imagemagick wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPS="
+	${PYTHON_DEPS}
+	>=media-libs/harfbuzz-1.5.0:=
+	sys-libs/zlib
+	media-libs/libpng:0=
+	media-libs/freetype:2
+	media-libs/fontconfig
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+	)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.1-flags.patch
+	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+)
+
+src_prepare() {
+	default
+
+	# respect libdir
+	sed -i "/libdir =/s/'lib'/'$(get_libdir)'/" setup.py || die
+	sed -i "s#/../lib/kitty#/../$(get_libdir)/kitty#" linux-launcher.c || die
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+	fi
+
+	tc-export CC
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") linux-package
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	mkdir -p "${ED}"usr || die
+	cp -r linux-package/* "${ED}usr" || die
+	python_fix_shebang "${ED}"
+
+	dodoc CHANGELOG.rst *.asciidoc
+}
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 07881b5f654f..c7b60f5905b9 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,7 +1,9 @@
 DIST xfce4-terminal-0.6.3.tar.bz2 815207 BLAKE2B 5c68d1efb14ef1a4fe0d9377909cceb39b92519eba73d89e08c004ef38b96cc14f6ecacfe41169839fec9573e21422074fdbf43f65db002aa1fbb8e606f3eb1f SHA512 805390b75178b3a2fbff4f8dfe972474e5575ad5a80aaf775f7b4086f975cf5b444a335b1ec1a9a39bc89642c71e1d0cb1bbc14d96b913980bd231d32a081c49
 DIST xfce4-terminal-0.8.5.1.tar.bz2 942117 BLAKE2B b72f1f51837778a90b4f3299ed2d4d04ae7658f52399da9bf5d44b4e41a87a8382486172384604e8782dfa754f411f4436ae756ce4c1e966465c10c0ba2da22d SHA512 bf64877985d75c4d6b7a9da741c1f71486dacf2bf203de4555ceb6f45eee109938e29bdbb70487a67f40aa51a6a10fca7ee04b89d87e3e4f11a0a99cfbe1be9f
 DIST xfce4-terminal-0.8.6.tar.bz2 952859 BLAKE2B 7f6ed679eb53196d2665003cc2af7543c42c73679f91581ee241c4c1d3d4d34dfd8b78e2a8f3038514727d585b51a2ae11fe20a48a55e9d0b869c6baeb4ecf18 SHA512 96d9c3fab56ad9cd267bd7b33f4d8fb3831200b9507653a69e6872b673ca5e30adffc73ef2f73de6eb858a2817a98b781188a39a4c0d79298699711c49f8be97
+DIST xfce4-terminal-0.8.7.1.tar.bz2 889692 BLAKE2B 2e8fdda67ba631caabfc184e501fed014c10a2a9982ca57a4900030519d7acfb34289fc507bf0e62dbde1714b3b0e3f1cf7cf29c50dd0dc8d0562831e8f2854d SHA512 e34d0eaa32a7088c83091de321a95cccbd4d6122e9df562af3f1e15d64b224bc9c289302c73874ff88d72f74fe679a42623f078386b0affa962a930801f3bdd2
 EBUILD xfce4-terminal-0.6.3.ebuild 797 BLAKE2B 3c6ac612d2a64b1073a1c0cc8c7a6ed5a6765695858ec76a8e96c4d8a38cf98d86778f90b7681eede18b4586c53c15c3c2ecae7623b33703c76ed88b11ebf819 SHA512 8f4e7bd5b0bf6a633dcb3de46cf428d6b300072a90e6b96dbae51bf3efa19a77a29b927b08f742f74ede0a0355804ed991e8d72c769f4ba0cfef5b7d31298ff0
 EBUILD xfce4-terminal-0.8.5.1.ebuild 747 BLAKE2B 7b1b10843d7a62af551b255cc9ee3be18b13f6adea9557a8906439da9199face5d944351da7aedbff02faf203159c35b31d28b8b235bc07dd9ddc0faf2515328 SHA512 7516c226517cfa1b55c447b259712c855f413ddaee16d252e101f9d793309fad42af7b1a731988f088db4236c916c21963c67aa06b425910fd088ff10a78009d
 EBUILD xfce4-terminal-0.8.6.ebuild 747 BLAKE2B e9458d691ee9330ede3ab90a5541b687d5c6867269025f2da567d0c6df972bbff69ed5e8f1bfd6eed329a5a912fd33c1e0f175528a8e1e7879201b0142fe2c0a SHA512 e2409a99dc92814ad7aa7463d0565a412bfdafcaf830d6b592820bea2898dd76fab14478f80fca8a7925080981da6edf732794e425877642275b4403e46ab343
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
+EBUILD xfce4-terminal-0.8.7.1.ebuild 912 BLAKE2B fb255ac1f93ffca698951b9078b4ff8f4a38bcd5cb00c9c0175a5ebe14cebecfe6cc2cca52e5d9c5939e63318946952d085e37b3db390e0e6f6afa7b9f61c20e SHA512 475ae086d375d86199d799544245d92bcc57c880f5e9f46504baee4f302061743cd88775ea662df47f2f63ed7fd34b2593a88515198bf233f0cb9a917f030581
+MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
diff --git a/x11-terms/xfce4-terminal/metadata.xml b/x11-terms/xfce4-terminal/metadata.xml
index 359901b31db4..27885f2335d7 100644
--- a/x11-terms/xfce4-terminal/metadata.xml
+++ b/x11-terms/xfce4-terminal/metadata.xml
@@ -5,4 +5,8 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
+  <use>
+    <flag name='utempter'>Include utmp management support
+      via <pkg>sys-libs/libutempter</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.1.ebuild
new file mode 100644
index 000000000000..4ed3b8ddca72
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+DESCRIPTION="A terminal emulator for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
+SRC_URI="mirror://xfce/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="utempter"
+
+RDEPEND=">=dev-libs/glib-2.32:2=
+	>=x11-libs/gtk+-3.20.8:3=
+	x11-libs/libX11:=
+	>=x11-libs/vte-0.38:2.91=
+	>=xfce-base/libxfce4ui-4.10:=[gtk3(+)]
+	utempter? ( sys-libs/libutempter:= )"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
+
+src_configure() {
+	local myconf=(
+		$(use_with utempter)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/x11-terms/yeahconsole/Manifest b/x11-terms/yeahconsole/Manifest
index 34e68dbaabc1..713cdf7edfd1 100644
--- a/x11-terms/yeahconsole/Manifest
+++ b/x11-terms/yeahconsole/Manifest
@@ -1,4 +1,4 @@
 AUX yeahconsole-0.3.4-make.patch 769 BLAKE2B 23f6aed2c70340e4d007f5ffc8ff986c3063f51d851fc42f8605fefc9d735bf39eb8ce8d3ad87dd1d5d8fbf30d077f0c944c903790df76f9ad41a50c5931ab6a SHA512 e78ace16e451fabe508ff9e6b691ae215b626a1b16868d44f958801c01278b15921cd8a187d454dd685a75eea8b798cd00e71ae024d83c43918104c43cf1a58f
 DIST yeahconsole-0.3.4.tar.gz 12281 BLAKE2B d53ca2a5000a0b166f23195a6d4febcae96a0b91c03ea2d60c9a2a82bfef65222431bcdf717e10e3b83d3ed2387d3ea5ce746b22d3af209fcfb8939935d00996 SHA512 cba74d988b3cb991d95de1796e9e79b881fe011d4fc8d6aa1f863f4c465aadfd31250e57d36ce0118dfc367225c2861cf8e80ac47996c2718d83756a8e638ead
-EBUILD yeahconsole-0.3.4-r1.ebuild 854 BLAKE2B ed40cb000721941c0ebdd3665c67c13022f4eb11bc15efe3e7dd76f3c805c4611e5776580662b727cdf0e081b37248232acb90588e1f894e1c3872063c7fa0df SHA512 18f3e98027f3daf5ab144e3f6a811721c67f7fa2e9f6185133312c7be7eb40d4fe709c26898e93508254e8d470df6021debe3f43640d84b58895a9a8514d4e79
+EBUILD yeahconsole-0.3.4-r1.ebuild 776 BLAKE2B 0817e66a959118ccc1b21378decd535f4b212c8486044dc74da32bcbbc5ed8508a876461f152cf5d5dd487132955505bc2768f84dedcd6b55676aaa548a8b4c1 SHA512 ee08ee9169adbbf697b1a0b1f4c1898a3f00dd2a39e6aee74d78d235eeff3092b730a1a9c1f80c926b4f636f495f5ee33780064dc0bfb6c851abe516ba514870
 MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
diff --git a/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild b/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
index 08c40f4f0d49..5cbb5121559f 100644
--- a/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
+++ b/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
 
 DESCRIPTION="yeahconsole turns an xterm or rxvt-unicode into a game-like console"
 HOMEPAGE="http://phrat.de/yeahtools.html"
@@ -12,24 +11,25 @@ SRC_URI="http://phrat.de/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa x86"
-
-IUSE=""
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
-}
+RDEPEND="
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xproto
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-make.patch
+)
 
 src_compile() {
 	tc-export CC
-	emake || die "make failed"
+	emake
 }
 
 src_install() {
 	dodir /usr/bin
-	emake PREFIX="${D}"/usr install || die "emake install failed"
+	emake PREFIX="${D}"/usr install
 	dodoc README
 }