gentoo resync : 13.06.2020

19 files changed, 14 insertions, 383 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index e00c96fa8d49..1c152d573983 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index c3bccb364471..c3e36a8ad24e 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -2,7 +2,7 @@ DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea438
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.9.crate 110785 BLAKE2B 69d067ea399b462f76bddd74e9dac0bd70e35189b1242e775957df84cba24d39699904aedaec6dca1398c05fc3e758ebc15ad49cc59cae2f345d2939facc57c6 SHA512 aaeac70a63967ccf40ce1de0e862406c46fbd8e4a1f6aa6e1f547ff8f076b572e29de58960e17a7b5266aa14566a2d99fcca1940158da82ff3a11ce5caf0cd27
 DIST alacritty-0.4.2.tar.gz 1486725 BLAKE2B 77ed5d12722c7a8cae819c10f11dc46a1d7c53c1e8800f927267401cdc819a70bfd518b728be1e275696095d06a6ebef4ca87d0c12813553a93d4fad0ea01694 SHA512 0cf23114f97242497da5232a660465855ffd7d65c976d5cdfa3b876bdddc8a590eb840d4fcf8841945a6325a3655b20c6e5f3991925667e1b7d441d07e5906c8
-DIST alacritty-0.4.3_rc1.tar.gz 1488605 BLAKE2B b1ac18b4cf0b7cb6a200df8088ac9f5ab806c1966acfbd2758b83de9e7815cb7ff518e5c5d9ced907616ca31c2e69d0f1d4b23bf9fbe7b1331bb55fc23aa6154 SHA512 2fb4932f9eec81bb85bda910dd40a8422bee1a0dd2748329300ff6f7c77c1a1ee17d2a2d78c8c105fe5f874d261fe2b4ba353bdc78df65a964414a87c1ca8c59
+DIST alacritty-0.4.3.tar.gz 1488401 BLAKE2B 0c4b622ec2dfbd45d4e3e99f6c83b0c0cc798cdac1b72d828e14f06242cdc796c29d78317c11e41126cad0e81677e1be8c7ae0ef911cfd3afe99445b4a1c73ce SHA512 1c1a50098fe7c2dfa5fc75e5fd2632de0c60d8ceba5316de15910a9ece7d5385ead765075b87c5154171a908e5d7c78f519d3a2991eccb313aae766208007402
 DIST andrew-0.2.1.crate 9595 BLAKE2B d2cf73285889aaf702fb994fd1d5a1011e0f78011a612937ad9f06f506ef75c86fb82ee1069a8f520b926325a4363d83863234e1fd2a2fcd08ead5ff66b638c5 SHA512 06ba5a756e0d84953dcb1cd1714d1639e67e836dcdd92f5f77c2b35a2afdf0b0babcdf598e2c5cf2dc8661c8326bc27b1ac3c9963a5fcbc2e0c753da6ac730ea
 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b
 DIST android_log-sys-0.1.2.crate 5806 BLAKE2B 354e1a8fd046a0a0931752876560bc7fa720524d20715f5ddb49b80589dc0cf6a23fb13a9cbfbb3a7a823de90f76f6bdc336304d028d8857da2a4348e8483cf7 SHA512 36bd43f2aa244ab085a8addc972753897c7dbc66a648981cd20301f3e67f097713f2397d3bb7011dfac1f60742804697ebab4070346351380fbd653b4b56cbce
@@ -326,6 +326,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.5.crate 33064 BLAKE2B b10857e79c0548ce0aec9d1d7689e4b9c9d78756c7eaa97462dd201e05877f60fd1bb6f88e9a219bf96063f0716d2246629dac15f802305ea9188d02e61634e5 SHA512 d7f32cba1de57b62546316f3ce81f24dcdf47287555294ca61470d14b61c11f1347c22f2d51df55d351e910720c0b12d1196164964232c9c5fb349ab2630a6ff
 EBUILD alacritty-0.4.2-r1.ebuild 6701 BLAKE2B df9c5ea72ce0dfc5364cfe8a70bffc29b721a54f66d481166689985039e51c0ce200d3f9fb31fb1432b116a6042e64c0ac23cde1acab5071d639db8cc0468512 SHA512 336f717471d752d717f0c048fc98386f822dfe3ab28623cc39e256a46da70f70f7d1b77fd0158a37d3e8e13de19372ba9ccc9c64fd094cbd4f55c1dc927ed9e6
-EBUILD alacritty-0.4.3_rc1.ebuild 6865 BLAKE2B 617310d98a9eabe627ad98c91118c502c80683ed6483dd00cd23db39183bff2034eb372340d054895d206936a80d1251d0a89664aff20f2025dc337b4c6e6a6f SHA512 95720b65c09f661b2b547d5cde5adfe60eeccaa4243a03c2071399d71c3af9888e292d2710849f9dbaf10584c270c112c2bd3229ba178b140ecfb6c9a75c357a
+EBUILD alacritty-0.4.3.ebuild 6865 BLAKE2B 617310d98a9eabe627ad98c91118c502c80683ed6483dd00cd23db39183bff2034eb372340d054895d206936a80d1251d0a89664aff20f2025dc337b4c6e6a6f SHA512 95720b65c09f661b2b547d5cde5adfe60eeccaa4243a03c2071399d71c3af9888e292d2710849f9dbaf10584c270c112c2bd3229ba178b140ecfb6c9a75c357a
 EBUILD alacritty-9999.ebuild 2424 BLAKE2B 6ecfbc6d41303e3e60f3c8a29a73675bbbfa8cf86cada1ad72b973fd93608fcaf40f5326e6b6c13ee64ca88291b142ef93f9453c5e5881f9a697550cff0f08fc SHA512 5e6e5ef8d5bb894f1266b73510662a63e272b8aa49160d27b4c6f7a820b25f62c7124303cb1889007ed91fef1b554edd17bd2c38e076d26cd25496ded1daa3a7
 MISC metadata.xml 818 BLAKE2B c62fb819b5572cc2cfb89ed412cf4edd5c527180997b4cc0a288c413e2f5c04e16f23e72ae6c30ca216bcf33feb20b0b9a762aa4823412b0faa5f2cc7b9fbdbc SHA512 9073045732d5dc09b58766d3c546344216370ca161c9f25bf7f0679913e6fd3816d07de92773df4b5fe3a13b67522f02f2d3cda5b456ddb498e7ca902fe286d1
diff --git a/x11-terms/alacritty/alacritty-0.4.3_rc1.ebuild b/x11-terms/alacritty/alacritty-0.4.3.ebuild
index ac4d768d09b5..ac4d768d09b5 100644
--- a/x11-terms/alacritty/alacritty-0.4.3_rc1.ebuild
+++ b/x11-terms/alacritty/alacritty-0.4.3.ebuild
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 9dec9c133108..a057dbfae28f 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,9 +1,6 @@
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
-DIST gnome-terminal-3.32.2-cntr-ntfy-ttl-ts.patch.xz 31684 BLAKE2B 34c3473632d82983aec98a867e7353829521527f8f570e62e5fd7a1bd638b470c6f1ce7fde33d4604a2ca40e4b93be02a22dbdd4d1559a03bf230060310e81bf SHA512 76732fd57644431936b78a3ea3e8010b3f14fb0af52fa9c79540ed5ec5a0a45e6b31c9ace2b67a02559ec4e294927bf2033730d074727c3fe05054f39d1a8b42
-DIST gnome-terminal-3.32.2.tar.xz 2039236 BLAKE2B 967f87a362cf893c8d743caefc9b857d6c8092e59c3ce77a76dea5d50f503bea9c9e066e447724b6c7781bec808a4cccf8c3d646ecccb1800da9a0bdd7f28e4d SHA512 1be1e26b62b9364361982a34455fb5c818a2114edadb1146985f9e418ce5d51387d12b443c12022b8eec9c61c2137a1a780f390672406a1940f8b352b782e3cc
 DIST gnome-terminal-3.34.2-cntr-ntfy-autottl-ts.patch.xz 33896 BLAKE2B 3f52a9ca3223abde8df3ecb97129d4d9078384353f187703ea27b3c2797432fae8edf85a442578c75ca26e8ff61b5b444e69c92a7fa6f61229c3bf1f8cfeef2c SHA512 bd48b85ea87863a077333493f4b2146c383d2a137d32cf535fc35a2fc76c738b6aaf56da23a7dae469545af9fac75fa756a18e946e39cbb6eba0bc41707f869a
 DIST gnome-terminal-3.34.2-patchset.tar.xz 33120 BLAKE2B d052dc1b425b298d0eca6664d43b0a3fb32e362852f93fb4c736b68f0f0be785cb8d4da3d341fef5abeb881fe6adf7acf1c716166241ecbe60513ac7d4fabe2b SHA512 3a6f9e2a2b04368dd6b3098bd0399cb784f8702b4d23415dc8efe828aa12591a327ff31d0739a19deed0736a6d0a70cbc643c2f3cd0a767c67bb1b009d33969e
 DIST gnome-terminal-3.34.2.tar.xz 2045872 BLAKE2B 390235a1674d1ea7c0398f94ccc9e7baa301e9acef42170d512766d2bcd53a9669c3100a9590702234b456a6d33de5cf825cbe9733d6e89422211049187bb86b SHA512 36df7483c2b56df1d9e66729826b1bb65755590498295615befdb89e25d69464ebf4b77928ccd88f069513cb58da2856dca748dbf6372ca145b4535609d76595
-EBUILD gnome-terminal-3.32.2.ebuild 2602 BLAKE2B 0e47990e557666f0ef9502f760696a6676949da5844c3f63e49e5bf48a1c37e6270603e6694ebf88904dcf3749698c03ae0fb922e82b6636ced3ea9dfa6ff52c SHA512 a03760f0cf4cd5f26e7712f16026013a8dd767f27e76b46472826f9356509df0db6eb0d6dd86a69af9705286d156d87f98b9dab4aa3e3a9e431f8406cecb03e3
 EBUILD gnome-terminal-3.34.2.ebuild 2855 BLAKE2B 0ef1c4ce3b17fbbbeac174d403e9c74e27742d1cba0ac5d920e51f0bf45b8b7aa65f176d1ceb67a68a0ba989914822d55a0541e65b9b60254659df43a9587ce5 SHA512 32043b11253d91237541e137dbf7accd6ec43e60c622fd25105aa658b5f66d7275abd2ce2151f69f51297f473eb3627e406ffca45d549da6760a0628eb711826
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild
deleted file mode 100644
index 8e7f3ec13364..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-cntr-ntfy-ttl-ts.patch.xz )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
-RDEPEND="
-	>=dev-libs/glib-2.42:2
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/vte-0.56.2:2.91[!vanilla?]
-	>=dev-libs/libpcre2-10
-	>=gnome-base/dconf-0.14
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
-	notifications of long-running commands finishing, you will need
-	to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte-2.91.sh"
-
-src_prepare() {
-	if ! use vanilla; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
-		# Fedora patches:
-		# Restore transparency support (with compositing WMs only)
-		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
-		# Restore "Set title" support
-		# http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
-		# Depends on vte[-vanilla] for OSC 777 patch in VTE
-		eapply "${WORKDIR}"/${P}-cntr-ntfy-ttl-ts.patch
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable gnome-shell search-provider) \
-		$(use_with nautilus nautilus-extension)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS"
-	gnome2_src_install
-	if ! use vanilla; then
-		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
-		insinto /usr/share/glib-2.0/schemas
-		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 37ea882ad8bc..e1957b9e64fd 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,10 +1,5 @@
 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.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.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
+EBUILD guake-3.7.0.ebuild 1684 BLAKE2B 881da9288378855c973b79b273efd22af7eae33d1f517df8a0da160ba9d0a6678e9b7e9a7ec6a8d6f8c0464f7abed8e4b54488b255a74261f155fdd43e4c4407 SHA512 ff107919cb0b36ba4ba9b639f9132c215a8b67adcb534a40df6372c62644ada67fb549b17c17bf96eddd561eb0ed4e0d19e5eb724472c6d5c6b9f58a294f0f22
+EBUILD guake-9999.ebuild 1445 BLAKE2B 21be5f4d247ac9adc7a1a00387d57c63dc6f12553a0dd4dadd6b7508cf3f7281a80aceede48bbcf683ca7a395c4a2a27fa1f995228b03a0ecc22b8bde44605b5 SHA512 d83179ecd59f9685ab1acd0eedef20d6acd2a5a2f03f93c8e50130965335b086830a1d4a7058506dcd15ebdbaf81d1023841688f289ae840a5152aa1a68eb37f
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/files/guake-3.4.0-paths.patch b/x11-terms/guake/files/guake-3.4.0-paths.patch
deleted file mode 100644
index 30a47294d5ec..000000000000
--- a/x11-terms/guake/files/guake-3.4.0-paths.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/667878
-https://github.com/Guake/guake/issues/1436
-
---- a/guake/paths.py
-+++ b/guake/paths.py
-@@ -35,7 +35,7 @@
- 
- 
- def get_data_files_dir():
--    d = os.path.dirname(os.path.dirname(sys.modules["guake"].__file__))
-+    d = os.path.dirname(sys.modules["guake"].__file__)
-     p = os.path.basename(os.path.abspath(os.path.join(d, "..")))
-     if p in ["site-packages", "dist-packages"]:
-         # current "guake" package has been installed in a prefix structure (/usr, /usr/local or
diff --git a/x11-terms/guake/guake-3.3.2-r1.ebuild b/x11-terms/guake/guake-3.3.2-r1.ebuild
deleted file mode 100644
index 1426b793e688..000000000000
--- a/x11-terms/guake/guake-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,62 +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/keybinder:3
-	$(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
-	x11-libs/vte:2.91
-	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
-)
-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.3-r1.ebuild b/x11-terms/guake/guake-3.6.3-r1.ebuild
deleted file mode 100644
index ccfa02f3d129..000000000000
--- a/x11-terms/guake/guake-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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/libwnck:3[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
-)
-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)'
-	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.7.0.ebuild b/x11-terms/guake/guake-3.7.0.ebuild
index ec327169929e..b10718f1fbae 100644
--- a/x11-terms/guake/guake-3.7.0.ebuild
+++ b/x11-terms/guake/guake-3.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 gnome2-utils xdg-utils
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="utempter"
 
 RDEPEND="
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
index d062cfbe9bb9..7c92f743a64b 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 git-r3 gnome2-utils xdg-utils
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 216a585e3676..d64c665bd3fe 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,10 +1,7 @@
-AUX 0.90-without-icon-cache.patch 305 BLAKE2B 9160854ac4e681b91e3e780400ff6132257d27ddb7e29f9bc16733805c3cf1b8707dd4320bde8fd47636aa6e71161847cdcbb06759762674fcd81fa1717bf2d4 SHA512 fbe50c186f67610b084d3a02e7d398c2bca668c63107203af0b59f49fd0491efd4922824fd0a78263b433877d1736d187deb2ab9f29c243d913fc3908d3076ca
 AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
 AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
 AUX terminator-1.92-make-tests-fail.patch 734 BLAKE2B c42414858614cda0480d69563ffc8ce2fef182eab5022a9b243203b1c663e191b7d66e7a09dbcf6d85bf7f302f3d25b8e182b7a3bd4af89697668fa6e0571e6a SHA512 594b5f9f4c9f7debe5cc8c343a0ba35429f1230595eefa1b343fbdd9b9c5931760658cd62736d0c2c6684182a4881e087ae9673ede6b63b86c9eba49ba849c40
 AUX terminator-1.92-metainfo.patch 1490 BLAKE2B 4d041053c3dd166a9ed2ea7cb53c64df6f3539dd94f00f560d30c7609b513e40abd5073b43a1f27d594661c21e1bb26699ea1dfefdcb99708774de9213a57c76 SHA512 de55463c02d6f7a63a17c12379ac145ed447d201bc2fdb066abe01763d50da92bfaf466ee945b8046eca3b69954282a9154a1455ae452c65cfebeda98e39481d
-DIST terminator-1.91.tar.gz 910536 BLAKE2B 887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9 SHA512 6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d
 DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1
-EBUILD terminator-1.91.ebuild 1331 BLAKE2B 2a078e0162e7461b313d5f2fd3e99e101378141c6f888b21dfc81a7173abea0dd127014c2e981383d15d3d752d034b879aea5a9a2dd2ae2e9b824aa469aef7c0 SHA512 5fe0c87d9ede370c12063f2c899c63f4a0d8cb19c675e113c7536fed496610fa82479b1b24e4c6d61edb149f655d16f3c432945447578ec27deca700dd949d18
-EBUILD terminator-1.92.ebuild 1395 BLAKE2B 21053c113d0e410507491dade77bf46605e5d44f50341e35de277a140d59d039c10379978abdafdbd19921335f8d2171ed7bf6a0d70936d764ea9e3b384516de SHA512 6465a1cc9cdbe2b448fbd852f416b30f7d05cc96a5f4c2a3f7c14c60fa563a76000b0a1639e72098b5188156a4c65a3d41362555393194fb5e62c1c512872771
-MISC metadata.xml 944 BLAKE2B 3194719b108a2320e92ea5287f6c8f873bc68b50c151e344fe90ae4c717440de73411fe732c7314b32bcd584bf75ff7ffde4b4b712947f5bf2367ae79c01546b SHA512 8f8f58ffef9623ffbe30740020cd5dff027281f3c5ec0cdd8a57c138e79e331f76e791e1d3a938de5072c93bca19951ceec862ff6971bfe26c3218057c0787a8
+EBUILD terminator-1.92-r1.ebuild 1420 BLAKE2B 827d5ad4eac2daff26c5d2d332fa2c81041e64fc4493d916f0c9a02325782260646b3e7c366f16164c62470193225bd55929fc1a3abf5db40901f7c9b303eef1 SHA512 026c09e3cc734279d61ecf362b76ed8e60b2f18d4d0ecc9c844c95ec7d9b5ba55abeafce60de7957409e55782ad6af1f6057f23eac63fc80ae6b7205eab4f886
+MISC metadata.xml 939 BLAKE2B 0dec2029cc408e41758176cbd24d54ab9d729e6d362e51eb4c853f58d42be8122806ce940322938c9da996bcfe14552aea6840c923e74da55603147b10f9c36c SHA512 d676119cf2e888e24e53ec42c9027ea3ed27b67abf73a3b483345f15578f9afb19ff65ec4ce59a53bfb6d7429764e3f0450ff219bb61e2b21ed0e680c3418dd3
diff --git a/x11-terms/terminator/files/0.90-without-icon-cache.patch b/x11-terms/terminator/files/0.90-without-icon-cache.patch
deleted file mode 100644
index c7862def3eaa..000000000000
--- a/x11-terms/terminator/files/0.90-without-icon-cache.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2009-08-12 22:22:53.000000000 -0400
-+++ setup.py	2009-08-12 22:22:57.000000000 -0400
-@@ -25,7 +25,7 @@
- 
-   def __init__ (self, *args):
-     self.without_gettext = False
--    self.without_icon_cache = False
-+    self.without_icon_cache = True
-     Distribution.__init__(self, *args)
- 
- 
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index d11068fa01fd..bc4c0c962e21 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -17,7 +17,7 @@
 		wishlist bugs! (see below for the address)
 	</longdescription>
 	<use>
-		<flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag>
+		<flag name="libnotify">Enables desktop notifications via <pkg>x11-libs/libnotify</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">gnome-terminator/terminator</remote-id>
diff --git a/x11-terms/terminator/terminator-1.91.ebuild b/x11-terms/terminator/terminator-1.91.ebuild
deleted file mode 100644
index 835d3640e109..000000000000
--- a/x11-terms/terminator/terminator-1.91.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils gnome2 distutils-r1 virtualx
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="https://launchpad.net/terminator/"
-SRC_URI="https://launchpad.net/${PN}/gtk3/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbus +libnotify"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.16:3
-	>=dev-libs/glib-2.32:2
-	dev-libs/keybinder:3[introspection]
-	dev-python/psutil
-	x11-libs/vte:2.91[introspection]
-	dbus? ( sys-apps/dbus )
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	libnotify? (
-		dev-python/notify-python[${PYTHON_USEDEP}]
-		x11-libs/libnotify[introspection]
-	)
-"
-DEPEND="
-	dev-util/intltool
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0.90-without-icon-cache.patch
-		"${FILESDIR}"/${P}-desktop.patch
-	)
-
-	local i p
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		pushd "${S}"/po > /dev/null
-		strip-linguas -i .
-		for i in *.po; do
-			if ! has ${i%.po} ${LINGUAS} ; then
-				rm ${i} || die
-			fi
-		done
-		popd > /dev/null
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	VIRTUALX_COMMAND="esetup.py"
-	virtualmake test
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92-r1.ebuild
index 5891577d909c..f93f12e81492 100644
--- a/x11-terms/terminator/terminator-1.92.ebuild
+++ b/x11-terms/terminator/terminator-1.92-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dbus +libnotify"
 
 RDEPEND="
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=x11-libs/gtk+-3.16:3
 	x11-libs/vte:2.91[introspection]
-	dbus? ( sys-apps/dbus )
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
 	libnotify? ( x11-libs/libnotify[introspection] )
 "
 BDEPEND="
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 9ca65843f42c..937ea8f62c60 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,5 +1,3 @@
-DIST terminology-1.6.0.tar.xz 4893348 BLAKE2B 20c9b8a916a4cd48055839266a157d5d8fca70557f7fb8b61696ceeaf4bc0fd93ea5abc0930d1c552a816e3fa3e455624f62d4adbad7feacc9cd0e874a91feec SHA512 ef95a5d128736a2e6b3b9e48a3f32a8e3a1f19ccabcb9fa429ed777ee201ba16fa431a61edafaebc018567f4a3657d81551407cf0449f58b416aa1e6077afec1
 DIST terminology-1.7.0.tar.xz 4922616 BLAKE2B 40ca7bfff534e773b4c188970ecd82e44c2eee7a75eb2a6d4fc6a8635c57857e2037a319818a437843271faa42995f25b613091a4463c02427d835c6ae572722 SHA512 9635da6a51344fbbafd333592252c2539daa795600b4a1d5ea5710e294f18ff9f5667706c789a3c91378b493ae631df47faec2bc43b4cc48d0266506ab3f2e78
-EBUILD terminology-1.6.0.ebuild 869 BLAKE2B e7329ccfab1942c6387dd366a3d201ed4e1cff240ab9545f4ab1c393d6f3ba18d1380792a281f3400a243ea1882b4b44a899c34492ef077a6b4531faedb9d070 SHA512 651367c30110d89c2c7d0285787747d9756949b61bb0b5afa6f61290d87f1f51f79d4f70f840cb7ebcdbf59b93ca54ddcad4a81b6634a01d1622dfd67d545ac7
-EBUILD terminology-1.7.0.ebuild 865 BLAKE2B 5920556e9e8824b6e0cb7f5c27717ed7aefc9c0a66f2b61dc039b62bf794d94f06647ea57307e554edea8efdb7513453ae2b949ccb18511fe9e10f241b0f528b SHA512 9d11298aed9e010a0ba4a55094144d16047269f9d514e82e7cf7779e87c94e2e2b11a97f2cc50677e0432e468c4ace975c4fafdc2918364fabb1f887f435cb1f
+EBUILD terminology-1.7.0.ebuild 863 BLAKE2B be914264f24ea3409404756bc6e47c706993acd1fa709acadf805e3a4ef09aea314985e8d0e4e47f54419d435e8f0cf3d2249f641eec6ab7cd8d7bf5a9dac54c SHA512 cd6dda2aadea2a97386771914a161443c2379936ff2eff3bfc47ab40605994d54e5e9f981cedc23bcca5a4c296e3eb309088f1fbe854e42087dae7aed9e91c6e
 MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/terminology-1.6.0.ebuild b/x11-terms/terminology/terminology-1.6.0.ebuild
deleted file mode 100644
index bdbffee66726..000000000000
--- a/x11-terms/terminology/terminology-1.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
-HOMEPAGE="https://www.enlightenment.org/about-terminology"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="extras nls"
-
-RDEPEND="
-	|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )
-	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
-	app-arch/lz4
-	dev-libs/efl[eet,fontconfig]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use nls)
-		$(meson_use extras tests)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/terminology/terminology-1.7.0.ebuild b/x11-terms/terminology/terminology-1.7.0.ebuild
index 1e62124d474c..fd7f3fd7458a 100644
--- a/x11-terms/terminology/terminology-1.7.0.ebuild
+++ b/x11-terms/terminology/terminology-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="extras nls"
 
 RDEPEND="|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )