gentoo resync : 10.02.2019

11 files changed, 77 insertions, 39 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 3767f7fa9500..4e4239378721 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 6bff77878f1e..e3739c53a9e7 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -8,7 +8,7 @@ DIST guake-3.4.0.tar.gz 1167667 BLAKE2B 66cb4ae07894e06b37a264a79c52ac7b97fdd8e3
 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 1355 BLAKE2B cc7e4a89920a56b095f22e7542acbba3aed0ae5ca4acb709ef278749f499f44f0448b0fccb7949c97726aa7a9e7c981c34878aac2259d38966501b9e3569f60a SHA512 cd4507485ee77ee61b7e51a75de238c6102d27b89e8871fb0c9f65fc86d6d2deb0f2a661cf2ada94cc0d05cb4d80124963bfaeedd29bb8c572a0ab02bb538280
-EBUILD guake-3.3.2.ebuild 1370 BLAKE2B 68a2db98b9ac8aaa959a513d06612c4d7738626faa652e924c4047f4f924d09eda1c21a35d765af43a739930016504afe2cc4d3a649205c997b5728472aa5e9c SHA512 ab139233814d4535ca36022377964182d009dfbd636e759cea0e89180a900e56418030e27456ae645a1b210b3d8c89f46581d4bd31009277f051bb2193204bd8
+EBUILD guake-3.3.2.ebuild 1369 BLAKE2B 642b467207f8c7e06e31cb8ff7a78253833572be5ff2fdc868ee1a6cd788f5fa713d73bfa549127b9d45ac721ae91755be1c658f4930308404d4aff949a87c48 SHA512 8ece4d1c9f8deae919c55d00609c0c850504a0f8305dd39751962ab11debb48f7344da3a06a48a462ca282a4e5b2e2a82a5dbcfd698f103f770d30f4b31b3fc3
 EBUILD guake-3.4.0-r1.ebuild 1471 BLAKE2B cc59b72a8adff828124411ce4cefb777ec5fa990fe549b60f36d5f406c777c3698fb7d5f785d061c742be4db504e644ec6bd27f64c8e93798eec674610770a83 SHA512 96db7b3cc5906166f8f2f463ffbf95e96d175af32ee865d57d90ec4ed9ce6397e454b84ddfaabcf506383d2b20461c84a51aaa3c943cbd05d045e70a834ef6fd
 EBUILD guake-9999.ebuild 1433 BLAKE2B fbb5bc1663b5b33ab401301457fad155209df4402b88eb4695c3b46b888c584073c1ee7b02c67570119e364e3c47856c0ac44a740d10134b7d6efe19eee184a0 SHA512 7f4d7330a5cb770c5a2a0e86e2630ff1b3088973f36981c9cde233ca57e6e2732abedaf33ecc035e89dcadfe6f2f8f104da05f527bdc4ded4b3d6c1e41e53316
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/guake-3.3.2.ebuild b/x11-terms/guake/guake-3.3.2.ebuild
index 58cb9477d9e3..78f906e92b2d 100644
--- a/x11-terms/guake/guake-3.3.2.ebuild
+++ b/x11-terms/guake/guake-3.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="utempter"
 
 RDEPEND="
diff --git a/x11-terms/lilyterm/Manifest b/x11-terms/lilyterm/Manifest
index 867b77b4c9ba..76a9b4b6b0b7 100644
--- a/x11-terms/lilyterm/Manifest
+++ b/x11-terms/lilyterm/Manifest
@@ -2,7 +2,6 @@ AUX lilyterm-0.9.9.4-autogen.patch 230 BLAKE2B e1fe8cfc6e7efb174910a716043fcb86b
 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-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/lilyterm-0.9.9.4-r1.ebuild b/x11-terms/lilyterm/lilyterm-0.9.9.4-r1.ebuild
deleted file mode 100644
index 61340f581bf2..000000000000
--- a/x11-terms/lilyterm/lilyterm-0.9.9.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight"
-HOMEPAGE="https://lilyterm.luna.com.tw"
-LICENSE="GPL-3"
-SRC_URI="https://${PN}.luna.com.tw/file/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/vte:0
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.9.4-gettext.patch
-
-	./autogen.sh
-}
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index e65afa53a3dd..174b557bb556 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,4 +1,6 @@
 DIST st-0.8.1.tar.gz 45423 BLAKE2B e7f5d731ba86f37db4cda1f612a8f191f955d7ea8fd57c3fb142c695c41fda4d3b82a483bb3c1fff2d4ff66d9277ed22339c026bca4f4af740fc80cbbc7f3620 SHA512 787d35b0cc8b1435dad7809e9995bed3c7f781e012a4a43dd5ae3d670ebc0e4bc03a56ba3872ff8a3bdba316a41ba771c626adc8de0559296457a59170756c6b
+DIST st-0.8.2.tar.gz 44788 BLAKE2B cc7fc9040c6db1c903d0f7290e5cfd1c636b2d17b42645956583cc8fa883bc1f0631ffbd683e735a834ff96f90171d9d423801d84ce4c0686564498baa97bbc6 SHA512 eaaf5f2fe050ee768d16a9c8c295ba13315775b3a8a3201e020237a3dd217bfb811832d58477249000596289a6cb3287fbb39d6327fc90986af1c363e4b5bf8d
 EBUILD st-0.8.1.ebuild 1390 BLAKE2B 301dfe3f377667dda33de383b9bdf896c1e349a47f743fa782e7a56b26ba149a80c403638a0bee8cfd7dc66469755158766911e84c0b60efb8a7d5fc7123b673 SHA512 9e3eea67968406faa141fb7b60377899903650aa3e1918270ce19ab9bf88ee4faca352fa2b95d33969428649f87e014776a5b8e5ae004591e1b80a4fbf9cb456
+EBUILD st-0.8.2.ebuild 1391 BLAKE2B 737c46847c40502d93d42a75834ebe8f87f8c87ed754c3103261abf103199d3b7e8b7a6c3bdb7aa0bdceb5ee801ccd58c3c7007a7b4c3b96e3592145e71a2711 SHA512 ec66f840ee5e48faca45659194a2298b38f22bbdb0fd66ab7d0e408e4f67637d20fbce13d88afb0e5c82e39d0686b20425b77b70a8ce86fd33434dc1770e351e
 EBUILD st-9999.ebuild 1354 BLAKE2B 34d87affb824b194f43186063a2a9666c011e5c513f14ffc71b973357abfc7b317c47e6360ca6d251a24caf33f3540e21462739859250fa88db5ca70e45d799f SHA512 70f645d48ded672f8231ccf7cea587a350122f80b3bec5f0f7707ebb8f9cb2cc650b55418383512665beafd842f2cca01b3c6d4517efb658123d2c22db50d0ae
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/x11-terms/st/st-0.8.2.ebuild b/x11-terms/st/st-0.8.2.ebuild
new file mode 100644
index 000000000000..185bb03fd8f3
--- /dev/null
+++ b/x11-terms/st/st-0.8.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE="savedconfig"
+
+RDEPEND="
+	>=sys-libs/ncurses-6.0:0=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^STLDFLAGS/s|= .*|= $(LDFLAGS) $(LIBS)|g' \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		config.mk || die
+	sed -i \
+		-e '/tic/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_configure() {
+	sed -i \
+		-e "s|pkg-config|$(tc-getPKG_CONFIG)|g" \
+		config.mk || die
+
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc TODO
+
+	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		elog "Please ensure a usable font is installed, like"
+		elog "    media-fonts/corefonts"
+		elog "    media-fonts/dejavu"
+		elog "    media-fonts/urw-fonts"
+	fi
+}
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index bf75abb7f91a..60015b0c66e6 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,3 +1,3 @@
 DIST terminology-1.3.2.tar.xz 4849832 BLAKE2B db03ab8d40a432e42d645a53a02b96afa37a6d238cb26bea55de6153969164e53986d70091239235ba724556feaa32bc8de68aba5fb766543f1719791f0c5ab6 SHA512 e41e413348451e0df90634af06fb49ec830f9b1454eec2601977e6e35385bd1a62a385a9ab7fc02fc6c3750f5b73785e4f40f14bb36acd58d4c296074b5f32c8
-EBUILD terminology-1.3.2.ebuild 704 BLAKE2B d370de399a89c60309f5297b96782b1a42555d3748d2abe88bd0cd421c60d03564028e28b52804f724af70190cf3680ffbaf1291f22a56094aa560d15a13cd79 SHA512 b0d3ce06d7f88c2b84faebd0e11e7fa17bb41ecc761b0649c7b8473db9050b78b87ba7e0af7bc3e4c8088e23fad2cb3179b291e1912077d530ec95bb2a30eb5e
+EBUILD terminology-1.3.2-r1.ebuild 706 BLAKE2B 5c8e1d9926a9018003cd57e63a1e7a544c65233ad34733cae78c9162cdfcc5429b919b23cc3c4ea69f54a104155eaec4227ea8006c20129fb456870d73e54563 SHA512 49174f019ddc25cc1a7d64e1035d5ac304e9be4788339516eec94628f7ea3dd0199125b39c5c49c1094dcd9301b5f29b8a431044fa9f6e7b7bc729a425f97149
 MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/x11-terms/terminology/terminology-1.3.2.ebuild b/x11-terms/terminology/terminology-1.3.2-r1.ebuild
index 813c81c47cd3..3f81250defd3 100644
--- a/x11-terms/terminology/terminology-1.3.2.ebuild
+++ b/x11-terms/terminology/terminology-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="nls"
 
 RDEPEND="
-	|| ( dev-libs/efl[egl] dev-libs/efl[opengl] )
+	|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )
 	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
 	app-arch/lz4
 	dev-libs/efl[eet,fontconfig]
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index e319981aaa0c..5e1c02f10372 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,5 +1,5 @@
 DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 EBUILD xterm-327.ebuild 2602 BLAKE2B 3a890f115ef21ec8a0efcf6a7860895e5dee80631f5f9d82741be07cdd99622f945bd6c268b5095424b6db2b32028166867f3f9da49b76c6c8493809fe0b7c4a SHA512 6ffa30d6d1d640e8d5dad853c73a37b61350dce24baff2a380914f3b6e81d4b30d7b6adc96cd7f24bb5fdb9b5d843c1fe490308503fd20da2e12eef11f7bef05
-EBUILD xterm-337.ebuild 2647 BLAKE2B 30cf426283cd664c59334146377927a44dd97972f4e78dcfcba5bc14a4e2cb0b658c56ff1d02ab77d81e3c5587f0fe699e0951afb8d9c581934e4a0c02678589 SHA512 b80dbca618e72b40e4725b441e36e919c01d653afe6e6da111e92d1ecf235c8aab12c1aad3cc62a67199cdd5f78bff41218fa968c763ec71ab39de87dd78052e
+EBUILD xterm-337.ebuild 2645 BLAKE2B 677ada66838e6543d96737302421fee010c5d58360f37e420d1f9350fd24e1102f805b673144fcfec9dce15845a3aa7f519b9d9a6a7f3139e6245953637874f4 SHA512 4cf2e13d654ecd92dd74ca7b017d16606a89ec22588bce037e9c988a56e50a9bce1824ef20682bcc669d3e9245bb59d69e3b6550b2a8d73c479cf14f6357f717
 MISC metadata.xml 403 BLAKE2B 7b0420abb55d7db9c383ae340cd74e518b4dd857fae33aa3a51bee1093261f0542a81f2b1c3250ff2b4701750201701e40fa4e24d9520961482c05bd181a7918 SHA512 a42b014499c03fb890ecd8e4f799ebd928d7a8d6db1ccd05236772faf8aca39a060fd590fbf4e5f7bb21dccf4b17cafa957d628c06db20650e6a87fd1ebef788
diff --git a/x11-terms/xterm/xterm-337.ebuild b/x11-terms/xterm/xterm-337.ebuild
index 18febf91663d..0c77e3a7f0bd 100644
--- a/x11-terms/xterm/xterm-337.ebuild
+++ b/x11-terms/xterm/xterm-337.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig