gentoo resync : 17.02.2020

29 files changed, 86 insertions, 213 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index c0a1c6e7152d..07041e4a9a84 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index cd5d6b1d4bea..2cc249d7dc2e 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -319,6 +319,6 @@ DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 DIST zip-0.5.3.crate 30076 BLAKE2B 4e335838989577b9caab8a3a7bb27a82e64dad4eb43461b447170207d30217765d5fc70f5b3a87a8182b8a03e724dd1a7fa49136c002f25a710dea0f18ee915e SHA512 104611b40eec6925033e68981a46502122b4b22f601caa08437273b0004c79679828bc9945bd4d177921988f878703c1032f4db420890a5849fb18cc8950122e
 EBUILD alacritty-0.4.0.ebuild 6811 BLAKE2B 86d06596b2ffbcdd4a47c9087efc5dc6b5250150f12c791935469eeee3fe063763174831754e818a742f2ce8062edfdd5a0f14e7723cfc08a5331a118c41a685 SHA512 25b28676528d0a24b353f40b647a048b4beef578d5dd48cb322afcf125c6d51df029025e1f2883e566901760d91708e48d08d2e1a66dd913b64476adceb24ff8
-EBUILD alacritty-0.4.1.ebuild 6648 BLAKE2B cbbab61bd60a2a1381a7bb63a1d59f481d87020d5096bb3f1b314b40acb962a3c08e688a729df3907a79808c2215020b38802288706424a470bbfd5ecb7a182f SHA512 02d031e6f9b7e5a77573872322eaffa16cf8748c9952f8358f1ca89fc842d705f9f0e659f742640a7b37c5578f448ce346d35d9fea01111b1582e1111588540b
-EBUILD alacritty-9999.ebuild 1844 BLAKE2B f15c86a337f8233a393b112d21d46a38b15bfbd2f37a2ca8cead609e7d3fb48baea6242c371cea7e56eaf59efc6ba29910308ebecdbc489638e0097a1c1c9f87 SHA512 7fe54facfb6a7295a7aca84a73ef592a60c139d02aaa16399d5fbf49464c116225d64a94c4c2a4fcf2a166de5861d0236161950d79c798e8b74ba02fcb2329eb
-MISC metadata.xml 539 BLAKE2B c0a28bc8f4b41ab9ddce4600ad92883ec00a8a9eeff8372dc49f1a69e96d87baaee67b361b8b52a259ca5294b4cb609872561829abc5a96deb720e9636a92015 SHA512 aa33a410483c86613a032850c40f33f73d2a5c580cc47abff1e6c98d28b29a9ed5bdde94d38e1946fdb02ad8f035bc31186a4655b37baccf3b41cc2b6201247c
+EBUILD alacritty-0.4.1.ebuild 6582 BLAKE2B a4dcf4884021b8f169fb409f943a7c03e0a485f6fe4e9b3f688a74b5753f44098427e989a60bcf0df5a9ee3796040e35e194544566145150d7f9be66c5384362 SHA512 060be5409a28742921f832f2e0aec0f09f4dc5ef1afc61f33651f95223badcd1d1b4a9edf24f53b4c7fe9e7903b49221c85319bb875e80453e79a9343ea80dbe
+EBUILD alacritty-9999.ebuild 1936 BLAKE2B cd5e65da11a7d7b4fbb932866741daea44fc99c34d975b2f9e789d67b60cd135178e8faa171cc51e61fc3f8a77a6c6de605828e8d28dd2cbf87dddfc7baa76f1 SHA512 98e99ef33e14b715515db7a07c3e3c359326e7b10598843ff6d7f3dea2b01a34b0654caa12cf7e4b121f822d6889e5074244751e581cd255001310145f57f960
+MISC metadata.xml 818 BLAKE2B c62fb819b5572cc2cfb89ed412cf4edd5c527180997b4cc0a288c413e2f5c04e16f23e72ae6c30ca216bcf33feb20b0b9a762aa4823412b0faa5f2cc7b9fbdbc SHA512 9073045732d5dc09b58766d3c546344216370ca161c9f25bf7f0679913e6fd3816d07de92773df4b5fe3a13b67522f02f2d3cda5b456ddb498e7ca902fe286d1
diff --git a/x11-terms/alacritty/alacritty-0.4.1.ebuild b/x11-terms/alacritty/alacritty-0.4.1.ebuild
index 9143e767abf6..a82d4117abce 100644
--- a/x11-terms/alacritty/alacritty-0.4.1.ebuild
+++ b/x11-terms/alacritty/alacritty-0.4.1.ebuild
@@ -314,9 +314,7 @@ RDEPEND="${DEPEND}
 	virtual/opengl
 "
 
-BDEPEND="dev-util/cmake
-	>=virtual/rust-1.37.0
-"
+BDEPEND="dev-util/cmake"
 
 DOCS=( CHANGELOG.md docs/ansicode.txt INSTALL.md README.md alacritty.yml )
 
@@ -362,10 +360,6 @@ src_install() {
 	einstalldocs
 }
 
-src_test() {
-	cargo_src_test --offline
-}
-
 pkg_postinst() {
 	optfeature "wayland support" dev-libs/wayland
 	optfeature "apply-tilix-colorscheme script dependency" dev-python/pyyaml
diff --git a/x11-terms/alacritty/alacritty-9999.ebuild b/x11-terms/alacritty/alacritty-9999.ebuild
index a00da8d42383..4fef8d1175de 100644
--- a/x11-terms/alacritty/alacritty-9999.ebuild
+++ b/x11-terms/alacritty/alacritty-9999.ebuild
@@ -10,13 +10,13 @@ MY_PV="${PV//_rc/-rc}"
 inherit bash-completion-r1 cargo desktop eutils
 
 DESCRIPTION="GPU-accelerated terminal emulator"
-HOMEPAGE="https://github.com/jwilm/alacritty"
+HOMEPAGE="https://github.com/alacritty/alacritty"
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jwilm/alacritty"
 else
-	SRC_URI="https://github.com/jwilm/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 	KEYWORDS="~amd64 ~ppc64"
 fi
@@ -75,6 +75,9 @@ src_install() {
 
 	newman extra/alacritty.man alacritty.1
 
+	insinto /usr/share/metainfo
+	doins extra/linux/io.alacritty.Alacritty.appdata.xml
+
 	insinto /usr/share/alacritty/scripts
 	doins -r scripts/*
 
diff --git a/x11-terms/alacritty/metadata.xml b/x11-terms/alacritty/metadata.xml
index 6f012feb97f9..78650497a481 100644
--- a/x11-terms/alacritty/metadata.xml
+++ b/x11-terms/alacritty/metadata.xml
@@ -6,10 +6,13 @@
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<longdescription lang="en">
-		Alacritty is the fastest terminal emulator in existence.
-		Using the GPU for rendering enables optimizations that simply aren't possible in other emulators.
+		Alacritty is a terminal emulator with a strong focus on simplicity and performance.
+		With such a strong focus on performance, included features are carefully considered and you can always expect Alacritty to be blazingly fast.
+		By making sane choices for defaults, Alacritty requires no additional setup.
+		However, it does allow configuration of many aspects of the terminal.
 	</longdescription>
 	<upstream>
+		<doc>https://github.com/alacritty/alacritty/wiki</doc>
 		<remote-id type="github">jwilm/alacritty</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 55d9fc89ae1c..df00f401e094 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -2,5 +2,5 @@ AUX aterm-1.0.1-deadkeys.patch 1358 BLAKE2B f692e190a33e50877da050cce3e7a3c8ab36
 AUX aterm-1.0.1-display-security-issue.patch 797 BLAKE2B 2f3d4bcc2c7e705106c6c1e81526e7575514e9a83e064158bcc3dc5a554db5f5592c3af2c33eea78864ff0d8d16770dadf1ef20aea52fa131c5c75ace20991d2 SHA512 23e088f188b2d454f5a3c1f863439426c80524f71c1d8484e451f301aa7b4007ba54988a86b4fe49fc8f3401e0af7ff9b725c5d3e8c08ba2eef007b7ada13e4d
 AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e4578d14a8bd960c754a5a3cce4646dc40e266f4e32a4fdffa2cddb395fd0af404405ac75d9578f61f8e061 SHA512 5d4040cf5c5933e91348531a271cf9687387a740312b12f5185f41877e91f58a0c216e5ad67be19bf47607b23eb9e1b31ca577ceed2a0239a01118073716c2bc
 DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b
-EBUILD aterm-1.0.1-r3.ebuild 2042 BLAKE2B 0765344ffd957b20b87962175d985f3d0debff6e41069d4614a2b4b5166d2190025ff94f72ead0c050f1431ab103228fb36c32c8b8c268d79efda2c709482b55 SHA512 7bab005922e3d52f6fb0e5ea1f858d2635e36feff6791c4480399b3903ec7323c0d5982c696abad80f8ca7cd02c947e6dacccf1dd5233fd92a8a7fbffadabe38
+EBUILD aterm-1.0.1-r3.ebuild 2039 BLAKE2B fa2901bab96ca63775c675b96fc80946b0ca518ad95f6acf491ab626c37b897b141778a1066e29f795d197d34851aeb1df44beb85579fead3ced8cdb8291dbf5 SHA512 c8ba7d70213084a7e5b045d5cfe34953abff5fa00de34fc1e1e33a0bbbb70de0d6d34942eb2b9f70e0dc3b8e8d4f59a13d0ea04a229189b54bc8d96a1d526d67
 MISC metadata.xml 456 BLAKE2B 268ce12677cb3678b091d810094c33905df594b0956e4103b132d6c5bc01bb234dffff4f65e34d8331a4ee76f2b893bf5fecbf4bc403b2c0690a357929a0a2cd SHA512 664fece05ae3d5cf3fcf713f83ec9756c1248dbde0fdbb6dd4cc5174ba54aa3238fb2ad1ec060cd9e665a83d83c0eacecddd1422ea44cc95850fe680198806cf
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
index e9368e714ee8..f5d4a84fc378 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-terms/cool-retro-term/Manifest b/x11-terms/cool-retro-term/Manifest
index 8ccc000b47f3..1ebb9dde14c5 100644
--- a/x11-terms/cool-retro-term/Manifest
+++ b/x11-terms/cool-retro-term/Manifest
@@ -2,5 +2,4 @@ AUX qmltermwidget-0.2.0-gcc-10.patch 1398 BLAKE2B a06fd644c64fd0b5cf549b410c2847
 DIST cool-retro-term-1.1.1.tar.gz 1975853 BLAKE2B 54c9e5adb0879380215c390659da59266c323f12a046dafa2981d9c5e5ccbc6369e553427014e0347afcb6a1a64e188fb51f202d7c870a544fd2ecd5980f4c0c SHA512 59da4b5d18ad64b917caebbc63ea9e3d562ed2a2dc9eae00f36cf434df44d17adca084b448f860f24a74ee6b59cd083d6a81e2217df1fb5e9f2731eaf1752148
 DIST qmltermwidget-0.2.0.tar.gz 219516 BLAKE2B 452fe72f01773d3307d5f4dca4ef38ea8e35b6ee4e3255d660e94baafc83949fca943807fd4ea76e0b985032952c387b5911a65891488b399d0cb41e6be06d87 SHA512 544d57296de6999b86bf2b921d1d93ac5d7eddd02eea436df4ecea0966c82389e716310fd7e4d13dd918bc1b3fd2d02f953c713dc5b4abcfc56d3f3f617adf43
 EBUILD cool-retro-term-1.1.1-r2.ebuild 1322 BLAKE2B ae84eac46711396499980104c02099b746fba41846bf3dbb805966aa81d067e89a5ea59df8cc66bb099a994f1272f6137fa53c40d4bf0a7e4aff7606c537ba0a SHA512 d95a30e5c37ad0199c379960ed981d3d05f352da2dbe16152f67f2f0df1e0e1c033d78e2a4dc485da1b29f350da3efadaf2e097acf7cde38bcad3a3318135015
-EBUILD cool-retro-term-1.1.1.ebuild 1209 BLAKE2B 997d91692ba3d191c82eae17df1c54e0d65595d438cf4968ed1f106319a2941ac37be59686e74228cd1699da9000ce7a83927ef9f204cebf2fa56b682e869111 SHA512 ada8aa91ea4a817e432f9370a28c2a557d72fd02721bb07a4e8780eb41b971f3b28936b6d4e5fc23b602ed1f90f8154cc4f882fcbac3187ec5774425045e37a2
 MISC metadata.xml 343 BLAKE2B 4c576b8928fb82994206d310506a0b790c14108c235e9815750cddd3f9becc747fdec7f2bab7aae92c2d52b648f25b9b82dfdccea77953b6f694514977efd7a5 SHA512 5e102d64e39f274ce62e25739adc52ae998b830a38e7f292b33ccceccd5b262aa62fcf04a4372561aed54760ef9624e1f7335e4198cadb582b152f128be60466
diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.1.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.1.ebuild
deleted file mode 100644
index d1ed07a10486..000000000000
--- a/x11-terms/cool-retro-term/cool-retro-term-1.1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils
-
-QTW_PN=qmltermwidget
-QTW_PV=0.2.0
-QTW_P=${QTW_PN}-${QTW_PV}
-
-DESCRIPTION="terminal emulator which mimics the look and feel of the old cathode tube screens"
-HOMEPAGE="https://github.com/Swordfish90/cool-retro-term"
-SRC_URI="https://github.com/Swordfish90/cool-retro-term/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/Swordfish90/qmltermwidget/archive/${QTW_PV}.tar.gz -> ${QTW_P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtdeclarative:5[localstorage]
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	rmdir qmltermwidget || die
-	mv "${WORKDIR}/${QTW_P}" qmltermwidget || die
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	# default attempts to install directly to /usr
-	emake INSTALL_ROOT="${D}" install
-	doman packaging/debian/cool-retro-term.1
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 7a2e509562b9..52eb26d308ca 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,6 +1,6 @@
 AUX eterm-0.9.6-asm-gnu-stack.patch 292 BLAKE2B 4d4e90c0a68119ccd1f41132b7dd77f8fe388c503f5ff6e04faa08c6bee50de5d389f1e40e40396cda027748d25f0f2c28bbeec7175220ef3e861702420d6721 SHA512 cb4a1d3910fcf23bba51069b0639a1725b375a09d1bd9ae43985c1dfdd29737291888cabcb2ce03961fbd3a219437567509eaea8b3072a297774bf4cdf534baf
 DIST Eterm-0.9.6.tar.gz 831756 BLAKE2B cd309f2bd74c44066d5811845c2cfe7407064186ce445246af352e3dfe47c5a6a58730069f653bb15891b2fdde7d6e84eaf1b92e64978552aab36bd20dee10a1 SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe
 DIST Eterm-bg-0.9.6.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
-EBUILD eterm-0.9.6-r2.ebuild 1466 BLAKE2B ff9594a9ece2a9b749dd6daf8c70b6915f4a9b14bb48f528b5ba8b8691dc8a0b9bd85f8b66cfbd9b81d7866e7cac82ce662a73cef41e7a7b585ba973e0c469eb SHA512 38596c4d20c0d3163d455f8f12b9333d82aa5eaa0d520ecc72af9889fb7d0072d9ae8cf3e6a1d2415277ea09f873408421ee810c56ea8e4d831075f8db12aedd
+EBUILD eterm-0.9.6-r2.ebuild 1463 BLAKE2B a27825af52d7f871b76b5475bf20406297544358f89cdcb5101de7544950caadc7216fdbb43278242a582ede006bd840585332c7133ed8e24e688a854efaec8c SHA512 09cb34ee2ad7b2261770e0e04eab130e03c3418f181fa9b6c8ee7679f6ae9d3d269f599478b3c105ac0c5100e2d67d58a0b1b96403e009e01c85414946e1f2b8
 EBUILD eterm-9999.ebuild 1195 BLAKE2B 083dd092a63b1df6585353fd7e6dc71190ee9cd4dbc979e1c5e75ed9317495c18250039af9e599171e27c4b841fc35ae81b1607429eeaae22593d2d1208ba328 SHA512 ef1d09e3a7c3a54571c6a460b548dde075eeca921899fe54f11d6263106c1a7f87b4ec6d1ddd989739c6c3c0869bccd55236c5ce6dc5d186d0a5b0a231e8a652
 MISC metadata.xml 812 BLAKE2B c3f47ef367d27e0ad69c54e22fdbda24d3673208561b9a7827f612d1d487e4ab2ffd05c02832b112ef8c599921bc3a59c3296b50874a2bf52218fc5dbf76f960 SHA512 86f0b751166e5ccf7de8e65a8acc6c74a189be1d692b9e470c9142a351de2f436a7e62237dea218d1e143b0a2e5423e419d194cbbc911a5e1f5787bf570aba7a
diff --git a/x11-terms/eterm/eterm-0.9.6-r2.ebuild b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
index 0d9cd254c9ec..b102f4241004 100644
--- a/x11-terms/eterm/eterm-0.9.6-r2.ebuild
+++ b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 4cf0d7a6f0c3..37ea882ad8bc 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,12 +1,10 @@
 AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275
 AUX guake-3.4.0-paths.patch 507 BLAKE2B b314a96a6a3f3795046a1d19dffc2037d8cfbba7028f83cfd30a913ada76b1d6073c9439857de1a4a5ee293ef7e9d7b8d0ad90eb01613ef61d099dc26ac32d23 SHA512 509ed5717eeb39330fa8f2fbb5653b8065e31ae2a5cbd36eb8b3ce768cff39f5ec42819cfff7ef7f12e114b242febb69af068d0be7f18b70ebce83eebdbda159
 DIST guake-3.3.2.tar.gz 1084094 BLAKE2B b534ed18a6b9ad686fbe41fe1aa6e522429a50725103455cc5ccc5c4c7b67df6ce9eeac3c769ef3cb44bcc2e60305df80b6aa6af83c89a27b290e5ea48d19f8e SHA512 4d5585178d1e70d5b954071c4b68af22c459518df7af5930bd9a44f1f63afaff7b89bcab43422f9ae178c1dccf1268e5555d5776adb01fc8f11666dae2c3e766
-DIST guake-3.4.0.tar.gz 1167667 BLAKE2B 66cb4ae07894e06b37a264a79c52ac7b97fdd8e31f753a9e30f1609eba34b1f09bb133bd5413436e375eda39bb2716c1ad8ef8e0baf6641b540f03efc95e9406 SHA512 94053383a28c60fefbed70f166669a9a1528e9505c3bbfc1688312ef896e1c25c006536c755f01dca4868a97b30d857b044715f59f7a345fa4dc6075fac72ab6
-DIST guake-3.6.1.tar.gz 1181556 BLAKE2B 62b47a5a00a6e90d28afd8a74e747b8d77e36d450d4349687bf341ec1d338a01c5c46dddd1cca2bd507ea7a1056a5fbb5870b15c70e91347c4c8692577eb0573 SHA512 12e005e413bfa37f368caa7995c3b8d6c40bdca3ccdc7e3795c26d977981629971f75ae5d024b5c5c205c2d5a1bf6a80e49dbef95a1e8dd6511694da079865b6
 DIST guake-3.6.3.tar.gz 1192394 BLAKE2B 18aeee4151b9d88dc5eab089de404e0c61a3baa9ce09d579af048805125ce239574e6f7e154da6fcca3b24b9e630f7ba037f8a988ce43ce8f7e57c42e3e772ae SHA512 11515f3645eb4c8cac05d50a1bec0a14582cf94ac4bdaae85cf6fd3da0e428e044410f18893dd50f073eede042ac447983e233ba3742b113c03385a44058d401
+DIST guake-3.7.0.tar.gz 1215186 BLAKE2B ff60f83fce5fbdd3712e261bbb72247cdcb311b8208af75007183bced88fcc2d2ebe3c49b76e2264786246444e9d07a41f884de949112c249277717070d64c11 SHA512 578c42ed41049acd253e0c409a9ecb103c7f71679fc5efdd94c60461b952ac77c836e59439361e1cd70e5fe6785ab4c15e7bf73b9f4c7d23b47c77468fa05f62
 EBUILD guake-3.3.2-r1.ebuild 1381 BLAKE2B 51d408bd31231a9018b789e93df1ae50230bad1522edee417103833f4bb74c81780983e1a978529ccbc33030678b73779aa303b95ad4811c508e4007494acd4c SHA512 24da5fc65cb004908c2b879799fa5a92316d82178a448f858b3f13547728653e70e40aba58f4c2df22e6b47887bbc0746ad8462d18e4df95ea8809bbdb95fa71
-EBUILD guake-3.4.0-r1.ebuild 1483 BLAKE2B 8ff6bbaa70a1210acb0ae05430a28bace5aa15655e32b42cff36cc43b6576d9fe7810038f645df492cfc09ca9a34b709fea2351b8daa68df5062eb6dc4b7f8b1 SHA512 82e7be2dfb86a3af9c8dfbbc9b13c6c9cf74429c5b307e3c8a51064495ae90f5ac89f18163cfd4d37fb761f6cab2914c3305079e888cebfb8848f3cfc732d68c
-EBUILD guake-3.6.1-r1.ebuild 1518 BLAKE2B 7cd244af1897a456306332f9b1184029532dc521892628129922ddb8f3a46a426b813e9f04ed154f09b85ab204608ff3885e51eb6a9d3a17d4685f131f9c8c93 SHA512 08e877da128e63623758d58793a375932cd2a52342e6969613bafbf95c4a07bff4db7aed5a7ca78dd280cbdd00e8dcd1046b8a349e498d6712a289d5794a95b4
 EBUILD guake-3.6.3-r1.ebuild 1711 BLAKE2B def9646520fb8b6db390879c82d583a608cacb0e63a300bb5cbc3110793164cd0cebe7e89589f1ed54d838744b8f958460f8982116bc7904ab5b4b7e140b918d SHA512 df38bb59ac80f5f0e44dd8e19f86eae56f2059bd06583eca7df542a9446c13eaef3b6faa316002f9458e756fc5b876847956e1c00f1cc19bb53981bd65f498a2
+EBUILD guake-3.7.0.ebuild 1683 BLAKE2B fee53fd8986d02cc3e06e50229f43db116db70b2a9fc811e46ac7ec9ce2e8ede7fab0036cec2f14c1b7d22a8b71b4031495e5749922ab0dd841d030dba2b18dd SHA512 1d22e28840b1703dcb90da7876ff8535e3fec5dff3d26855b4ea88745e973fa424bbc27003d7212d2f810af2c2825af479895fe2464dd7fa4d4f92e7569aeded
 EBUILD guake-9999.ebuild 1441 BLAKE2B ba71bca4472e7097c22d714f52837136acb6d2f46f3b8f9a043fadb163346daeb32ee57a23e1b2d74d13aeaadbabf6885cacc2ff7d116e72b6e7ffe716a1bdc7 SHA512 dc63dfb8f74f918d74f223ac628451d6bd2184d4e961b3f7ec5e6f17a3ff47a64ea4faaf4aa82adffb714df506c5504e2274296b100fb057e8dcf509ddd2ea3f
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/guake-3.4.0-r1.ebuild b/x11-terms/guake/guake-3.4.0-r1.ebuild
deleted file mode 100644
index 204a40fe8f3b..000000000000
--- a/x11-terms/guake/guake-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_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/glib
-	dev-libs/keybinder:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	x11-libs/libnotify[introspection]
-	x11-libs/vte:2.91[introspection]
-	utempter? ( sys-libs/libutempter )
-"
-DEPEND="
-	${RDEPEND}
-	gnome-base/gsettings-desktop-schemas
-	sys-devel/gettext
-	sys-devel/make
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.2-paths.patch
-	"${FILESDIR}"/${PN}-3.4.0-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-3.6.1-r1.ebuild b/x11-terms/guake/guake-3.7.0.ebuild
index 9b8a60187706..ec327169929e 100644
--- a/x11-terms/guake/guake-3.6.1-r1.ebuild
+++ b/x11-terms/guake/guake-3.7.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
@@ -9,7 +9,7 @@ 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"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -39,18 +39,26 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.2-paths.patch
-	"${FILESDIR}"/${PN}-3.4.0-paths.patch
 )
-S=${WORKDIR}/${P^}
+
+pkg_setup() {
+	GUAKE_SCHEMA_DIR="${EROOT}"/usr/share/glib-2.0/schemas
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' ${PN}/paths.py || die
+}
 
 python_compile_all() {
-	emake prepare-install prefix=/usr
-	emake generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
+	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}"
+	emake install-schemas install-locale PREFIX=/usr DESTDIR="${D}"
 	distutils-r1_python_install_all
 }
 
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index 55fe9dd23633..6ac9ea30b0ea 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,5 +1,5 @@
 AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 384 BLAKE2B ce0573ff1da58ce35c887d3ccc7291231acd0cd57232e0af95404b7ca2100d05db780a1a85878f2b082ef33582b6c202d99a72cafef2e9b247397eb0358e3bd9 SHA512 f2fc886135eb2267d3cdf45d34d151146e473b5b46697e10b44649dde3a05d9ddebbe469d2d7c0b042a26c3986e7a0f88caef049d908517c9cbcf7115688c9b4
 AUX mrxvt-0.5.4-libpng14.patch 849 BLAKE2B d12e4a2e14d0073b28c0fb3c8a834fc4f1f3684a1d98fd432f058dce2bd2b0e0b86b47d5b1b41c612ea7983596709dda1e180665913d760c587bc1ed1d4f4fa2 SHA512 a5f4c3c2c80e1ffbf55d98b5dc563616e924c5286610308041649c21b883354061eca58e058d000ad6e1ad0e845e86bba5a7327fd96def28cf823f1c80f01495
 DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
-EBUILD mrxvt-0.5.4.ebuild 3446 BLAKE2B 7220a94953490f88da6c6dabe86a284c345ae98df42acfe75b8a520b1a3efa4a1d834272a210fe8d6b0aebdae9f775ca9d48cf930ec545339a1bd651c31c8322 SHA512 a3dce3b8087503924b4086f9b4ce437f9ec081c720717229598437292572b785fb495e72ec4e50240ad3aef98af78aea1f3b37f2b2d276da5d337ecb47b32d7a
+EBUILD mrxvt-0.5.4.ebuild 3446 BLAKE2B 69cc0c6315c786ad9e7a37d2c0a2ad931f8e9368e9eb9716cc4d3dac26b82f95fe86d2013637574fc105b582997a432eb428d537988fddcb7c76020afdb4b094 SHA512 db6cee269225c95e82fe900a20c78f69ae3923c17f3d8919833b620ffca5106d06081f93f863b397af2771c0ca23d2772fd479ce3353f763e146ed668bb8064a
 MISC metadata.xml 478 BLAKE2B a0f3413f95c5926e2fa4294967283d32f94081447f5d37d0f57b81a54cd50f3bd1ba8790eaf23fcbf7e5bdeeff21da5e392030f5869100dffa6478201bf2954b SHA512 fb26a82c0a26b3e23e9307ab811cc05fc6affce3bdf705d9417d8f10de7c8448b506414da9134888f4fc3c6fbf4d261646b77916730df711a0e86952a352ce72
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index cf71052941d7..280d75d82357 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index b9a22983d1af..cfdb0c4e5f44 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,6 +1,4 @@
 DIST qterminal-0.14.1.tar.xz 167520 BLAKE2B e496e53b1855f94c49ef5fe699d7c88ca8ad4da40eb24f87701e72c50982bc98a16f060b075597a99d105d32dd38790e6599cd5b36d2901ffe1f72d0114f0fba SHA512 bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf
-DIST qterminal-0.9.0.tar.xz 107072 BLAKE2B 08673e6cde08d9b95a1197d8125a2997e3f28be4e2825bb7b3a757f01ba7a29808c71eb22d80ba1b3c92885230c275414b501120316be91af9f623f3ff05b4e0 SHA512 42553a847873e71543161855b6f07b521ebf7db8091a1753dfc4ad4bbdf7f074f74b7e7195e56ee482b5b9ff3ea3037250ba74fb64a8137fb3959fceaa2baa6e
-EBUILD qterminal-0.14.1.ebuild 766 BLAKE2B ade27885e6c0bc4d3d8a46f287e204bbd4f8915b52fff93d6444a477717f1aa6b4a5c101c3057640caed3bbf5f1bc8df05a1a2494ed1fcbe9792b15eabbeb2e2 SHA512 6ecc6c79fce17020a855d9482173edd15adc0d9a453701277f2cd437a9299a878f23723842c0bd400f4d6f8f2ba6c524c5bcf2b69cb870c19a49f3e373a49fe5
-EBUILD qterminal-0.9.0.ebuild 961 BLAKE2B 3d7b9fbf831626982355f2f846e084c94df3892367a9a2f5f66b806b0e38d3f4eec1f29ae32d2c8f02ea38c26039bc432d60e0227fad3ea2551423a48b591aa2 SHA512 99a5680f1361379eeb942109c3acbbf7ced70ab9bc3388d0b094a2a715be969a6d79694c0239b6a963137fa02a7efb0897c1a93e6eb2426b4769c0f8d8c54165
-EBUILD qterminal-9999.ebuild 738 BLAKE2B 1e03dcf6d848e9ed4cf116d0cb9992da8918359a60ac22859e5ffeb1b886b9d50c64f9e7b7f647b8cb15694b93273a3fb32429dfa83916b57ad43477d3d57003 SHA512 a2e42145fa9142275b1226ad4955cc219dc00928cb5b3f85e3e5393568e6e35e743584cf7b64fee406bdf22cf1f139340b4c216d18f3c808d1d1aee35118c410
+EBUILD qterminal-0.14.1-r1.ebuild 783 BLAKE2B f3c798d648aa88c8132635452260b1bd55f47a7e167ea94001ac897c95105dcbfeaba8b5f68fc2a1f682a0265f4023f605d717f19a6ed4dfe31f74280bccd431 SHA512 4d755543c8d749ad2a60e4f264070fe8095d2c021e8537bd8e600ac52838571d91db27da181888371f60c977a72e8150a8496a6174b0d47095fc0e3bf5cea88d
+EBUILD qterminal-9999.ebuild 755 BLAKE2B 20886bd26bd5e7de712b314edf1fea592f18a815802f244ed7b4c1116b42c89e9b2792d855166d4de6f4a648cde873a5a27d0f4287e06e0647805d4407e9e7be SHA512 233e2035ce38e2365434e72b9dba6f3749e2d6b11722d433c35a11aacf2ddb1cf490937b94ebb3c5b6e1bec17c2b8526463e85a127fbb3cdebd68170533ca14c
 MISC metadata.xml 331 BLAKE2B 58ccd837daad6307e17695fe2ef3bc12680e0d146ed5a7d38bbc386a9f8f354549d337d7b5b6beb4b6f5e68d35d457a9beff1f2af58a3e358f56d3ad65f89f1e SHA512 6093916b3ba5afc8249b5b0444f021719336ab71c8749827c8c629ceb2b6b1edc0aeed5eae3f098f0e3fc120e80f691669ccf85a195386dd17bf6f343121bdd5
diff --git a/x11-terms/qterminal/qterminal-0.14.1.ebuild b/x11-terms/qterminal/qterminal-0.14.1-r1.ebuild
index aef92c45a4ab..ac64f790b8ba 100644
--- a/x11-terms/qterminal/qterminal-0.14.1.ebuild
+++ b/x11-terms/qterminal/qterminal-0.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ SLOT="0"
 BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
 DEPEND="
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
diff --git a/x11-terms/qterminal/qterminal-0.9.0.ebuild b/x11-terms/qterminal/qterminal-0.9.0.ebuild
deleted file mode 100644
index c6eda839fea3..000000000000
--- a/x11-terms/qterminal/qterminal-0.9.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eapi7-ver gnome2-utils xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://lxqt.org/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	=x11-libs/qtermwidget-$(ver_cut 1-2)*:*
-"
-DEPEND="${RDEPEND}
-	>=dev-util/lxqt-build-tools-0.5.0
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=OFF
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
index d95e1018d60a..90a2ee44c5eb 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -22,6 +22,7 @@ SLOT="0"
 BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
 DEPEND="
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index ff0be39f6cb6..a260d3ffae38 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,5 +1,5 @@
 AUX 0.90-without-icon-cache.patch 305 BLAKE2B 9160854ac4e681b91e3e780400ff6132257d27ddb7e29f9bc16733805c3cf1b8707dd4320bde8fd47636aa6e71161847cdcbb06759762674fcd81fa1717bf2d4 SHA512 fbe50c186f67610b084d3a02e7d398c2bca668c63107203af0b59f49fd0491efd4922824fd0a78263b433877d1736d187deb2ab9f29c243d913fc3908d3076ca
 AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
 DIST terminator-1.91.tar.gz 910536 BLAKE2B 887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9 SHA512 6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d
-EBUILD terminator-1.91.ebuild 1327 BLAKE2B 645a31806a4789664435cbbb84bdfc694ee4c3e3850422d2b2f2d6559b978a42d22283703f881d9829e4e5f9acde5b4d4c1d5a091a978b578aefa0feb48225e7 SHA512 fe954cc161f53bf81f30016b82daf63af850fab44a15b24f20a7e070cb1462a7cdb3b0560015d2889937fa0816ff36420580444756afe877528e5321416dd809
+EBUILD terminator-1.91.ebuild 1331 BLAKE2B 2a078e0162e7461b313d5f2fd3e99e101378141c6f888b21dfc81a7173abea0dd127014c2e981383d15d3d752d034b879aea5a9a2dd2ae2e9b824aa469aef7c0 SHA512 5fe0c87d9ede370c12063f2c899c63f4a0d8cb19c675e113c7536fed496610fa82479b1b24e4c6d61edb149f655d16f3c432945447578ec27deca700dd949d18
 MISC metadata.xml 806 BLAKE2B 00acbe3d15886807ce00ca6485a6581a8c95b170e409c48e436eb618b23fe9dac541ab1ce0ace5639ec9fc4cc2a3a23801cf869b84fc7b7f260881983cee63fa SHA512 85da667a4abbc7442e8bc92697f316e19ccb281f49d1985a31cefcb1154462c4cddfc2a380c01de4c40cd3b1ab8516850d6257720e182b77bc4b721ad4ddc99b
diff --git a/x11-terms/terminator/terminator-1.91.ebuild b/x11-terms/terminator/terminator-1.91.ebuild
index ee1a1f1e0218..835d3640e109 100644
--- a/x11-terms/terminator/terminator-1.91.ebuild
+++ b/x11-terms/terminator/terminator-1.91.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit gnome2 distutils-r1 virtualx
+inherit eutils gnome2 distutils-r1 virtualx
 
 DESCRIPTION="Multiple GNOME terminals in one window"
 HOMEPAGE="https://launchpad.net/terminator/"
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index 5ce2fbf5c4f8..970ee58a1a15 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,3 +1,5 @@
 DIST tilda-1.4.1.tar.gz 471340 BLAKE2B a84d125bf81e384706347401ebbf7b11813bf5ed422e6b374e918ed564b9bfe168ebf3fef163b91a15350b49166b0040e90afdef716cc1762ecc410710f72c29 SHA512 d16878e762d94f94c219e8e711223a771a2ab816f02573f693cfbcfa0eee5aafff8a274898a65df168c0bf78258aa16e5a3be6b0c3dee418af61c68f43ed74c6
-EBUILD tilda-1.4.1.ebuild 704 BLAKE2B 5d922374b048c3fb18fe99126ef5fa73c98d435e4dc441711923f28641cf5c0a974afebc2ecca7dc813f0339c79dafe8b4f604d86087be9888488811903dd5f0 SHA512 88e9b3cd099535b2f942f62a956159be2a64762245d9e5d73b06bc1a30da59d1a10bcd2ad8a47c9e3f9fc25792c218ab594767f9660040b225f0915344d6d09d
+DIST tilda-1.5.0.tar.gz 484754 BLAKE2B 8f04a5046b642e0cd67d375817d046920bbefd9b499458c2dab90f9801b0a4009b7b06cfe29af01095f1627581e4577ba5a7405948b29d21e233db288da48efd SHA512 2876b3ffbc5dd663b10c2f5fc7e6b838d6e3e18f30eb62afe07d9615b4567b04fba0b1efb2449204f4a5b78a90198092e397a24a41b978862d4fc6fab0b8de81
+EBUILD tilda-1.4.1.ebuild 695 BLAKE2B 33d4ffd0915fcbc42591161eba09ec2a36ad63c45ca31f85b9d471afb9ad5cad1fbe7277b1714153d12c43b1dfcee0cea2764dc08c401727b2ccbf97dfa241a5 SHA512 440c50ad4f9c5e738d948951848f25bfbd9a167374bbbb1cc264594d09911759fa5c5df9d35013db1a4f6411c2ed218252fce532563df42a9a10f51cba2edda6
+EBUILD tilda-1.5.0.ebuild 698 BLAKE2B 339df837f44a5c428b6b13639f5a55c5d34734daf59accff528f769e73187955a2a098ba1069eacdc3d8b3330130be71538e5c810aa11a09b395edb5b01a8308 SHA512 e577adb64da6f0be2635d0c1761d3d63099aaae0721cd62f05e1117224f9165af851e88987682ca1345c1d21f13d8e3e14b15059c2c98dac25b747164659a181
 MISC metadata.xml 319 BLAKE2B 69510b8b8d8658d9cc6884a960bd6b2511da1ae40e771c1edcfa836b0f1033bd4b66d5cbdb3d664108d90d0afa77de6caacb42f8f0bed5d9f8c88abeb34463d4 SHA512 013ac97bba6505168215a97c531a4fcac607b678aaf804ffdfb44611b61e930709621bedd71f7fbea06b25f8bd7000530f878cf57c419c9938afd61155ff060a
diff --git a/x11-terms/tilda/tilda-1.4.1.ebuild b/x11-terms/tilda/tilda-1.4.1.ebuild
index b3440c219be7..075ba71876f2 100644
--- a/x11-terms/tilda/tilda-1.4.1.ebuild
+++ b/x11-terms/tilda/tilda-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="x11-libs/vte:2.91
 	>=dev-libs/glib-2.8.4:2
-	dev-libs/confuse
+	dev-libs/confuse:=
 	gnome-base/libglade
 	x11-libs/gtk+:3
 	x11-libs/libX11"
diff --git a/x11-terms/tilda/tilda-1.5.0.ebuild b/x11-terms/tilda/tilda-1.5.0.ebuild
new file mode 100644
index 000000000000..b7827af4144d
--- /dev/null
+++ b/x11-terms/tilda/tilda-1.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
+HOMEPAGE="https://github.com/lanoxx/tilda"
+SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="x11-libs/vte:2.91
+	>=dev-libs/glib-2.8.4:2
+	dev-libs/confuse:=
+	gnome-base/libglade
+	x11-libs/gtk+:3
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	append-cflags -std=c99
+	eautoreconf
+}
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 83101d371b9e..4e7f537b9422 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-terminal-0.8.8.tar.bz2 938843 BLAKE2B ae7beb611744d7f2cc168cf1c938f5c49add4fb4691f95cfd8f88959f380aa1e3ff11181f08529a9825273a5da7fd9ab5f45de6e3f78eb5b7f224d8044592c5b SHA512 0ceb130f0a0ceaa0a30a808fb7ff5070f75a84ef460c99799b267e5ecb1e0c15ef29558f78949d9a8968bfc50efebabc0f32dfc426a1db7ee6d225c6fdbf7645
 DIST xfce4-terminal-0.8.9.1.tar.bz2 943603 BLAKE2B ba8521c2e80e8979f1585eb5d9696c31c057a6ae1a9f468c8fe2e97f3a4fa5d494648b349b6c75a115918492d1b46177cf23d712d92345cab74551d68e054ea4 SHA512 c1a68300604d1db205ac52b51dfea38031dfd92b31f7530705ac6bc875c9b4f9819bdf05bca23cbfddd87f7899488ee4dab4c897ceb96efc41a44acfc298ed22
-EBUILD xfce4-terminal-0.8.8.ebuild 904 BLAKE2B 00d67e5c679bb6ddc0b89d09146a4303156048bb828882496059b2a980deba971a642eb0b701646f01ad1fad2084defc0ef5aa1932a60ad57e4d784fee3bfc1e SHA512 3481d4449e9251d82501c062bbd472d305550d9de2033e347fd7cbc62e7acbd83c4b55314b0013d675fbd1175f72a29e0d919b443514d0e657021e3c06721f31
+EBUILD xfce4-terminal-0.8.8.ebuild 904 BLAKE2B d51aad5592a1e9d0e47700b5515c6082305374150c644de1847372370fd5ba804dbe2c1953b62b89bc7eefa63b47daec493fb1ee33fc31a5d91a4b87e4d63fbd SHA512 8e0788209b08d5e83e08cc35cdac498d214a3666f7a87e8b6a49b68cb10681ac53f603046ba049859f4359e52de8b7d912b83db0e3301fff1fb275bcfe307d21
 EBUILD xfce4-terminal-0.8.9.1.ebuild 911 BLAKE2B 71213c7a52898c619ded9492a8ce5c227feee2cedc174c981364d7ee4d68b4b5dc042635f44244cd1f363cbfc2b769a3d11a7ce7784e054893fd4fe55a5af312 SHA512 486288b84a62db1330ee9a520aa6c1272c369db848684d7b02d8bd2114630acca6edd2f953f50c4587eeeaa0ee8a7965ff211e708794a192cea4954d7ff20642
 MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
index 92c6446d86fd..a7e8566e9cd4 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest
index 55ccebde02a4..598797937199 100644
--- a/x11-terms/xvt/Manifest
+++ b/x11-terms/xvt/Manifest
@@ -4,5 +4,5 @@ AUX xvt-pts.patch 211 BLAKE2B e2ed767f2b2e0e690e694e8dca0c4b7773bea3be1c945bf23e
 AUX xvt-ttyinit-svr4pty.diff 1308 BLAKE2B 0ac8e7b40d23870f8e925b326261618942cf23f71677424c09180d8050e2f4e27d3ff8a2f62e90325e34a1377b5da419509ae4bf30dc1d0565928b205dc77745 SHA512 6039acfed6dc8effb99e9dc633472387db7ccadb842d52b32e9bc9d21a30e54419c1dc1a796834353412c72e5024944b0c7aa995083a5b931ecb16d63d0a3b9f
 DIST xvt-1.0.tar.Z 59445 BLAKE2B 9b50b7c2c9832621960249f9b04eff9b2be04b90766865bc2cd55d67ca348bf41b539906125c8a51a3e08e13d6fc3402a57ef5f31d781e675061910ce53198dc SHA512 671fdc931526821e9228c327d2231e0f241997c632b0f084b2be02b99296ececa64f2de2769e92c3682c0aa2e9cf8dc61ac561ffd1d10136256029d24f872a1b
 DIST xvt-2.1.diff.gz 39941 BLAKE2B cbb491f0f65ac6ae8f8a801e68f6f08805c886c16a000d7e54fb24ac08d17133958eb376306b2b30dfc4def447ec62259cebd43854433405c0aee080a79addf7 SHA512 c229cb98ef3de7b4ab76b81ae888fc3a59ff9fcf5807ecdc58f8e5b634f9c2e618d2b3c17b4cd6410903004a712aac1c1d329751a48f05d605a7eb23dd58d612
-EBUILD xvt-2.1-r3.ebuild 904 BLAKE2B 45895f008ec948b5f3e5c4c06bb2785006efb03747e0e9a25d0f345431cc5a56d2c0b52ab8e7be8862db311ea02f6dda0403d88cb03c782a93a6dde3e9140675 SHA512 18b6e7a0b73439fecc69980ac3fa842299b1ba5410f443bb068016ed261b162d73191b7e35a627cd4da76e0d53035217511131c7cd0f458fa39569ae63d82ae4
+EBUILD xvt-2.1-r3.ebuild 901 BLAKE2B 081451cd6bc861d852e1e51d2c78b3e91d78db7dce9573daad8854e256777ba985f4ad773710a3d0e671c6e29d2845ce48c7876abfe0119849a66ad3779e55d9 SHA512 dae39c9c01cd41cb3bfd7f43f2b60fcfd622155b734ef8971dbe75f383b7185fe7ff7f711005908f9b0caaa69b8b0593c6c5ba429764951325b65f4082cae9e9
 MISC metadata.xml 256 BLAKE2B d8cfa88bc259cee95291c384760fad2dfd13f0973776fa55889f61befec06d0bea7953e0d6f3122eda6278272f217b8d94b536982db23815285d66074ab69089 SHA512 954fbecba4916b2b5e4b353a55a7c4ae6bd9be7190f6550ae4eb003f4037698a4576aee03847d4def6a5ca6dfbb9d145749a6fdb44b8a77477f726c92968643b
diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild
index 12699505cf33..196cc98c56a1 100644
--- a/x11-terms/xvt/xvt-2.1-r3.ebuild
+++ b/x11-terms/xvt/xvt-2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6