gentoo resync : 13.10.2019

18 files changed, 107 insertions, 20 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 1781b5f9bfc2..e5e70163d68b 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index e10fb75c4931..dda6db11047b 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 2051 BLAKE2B 4cbafc717b5fa00f3d070fd64a5038d60616d99ee0e102c5ef9aa4743f45e42bdf6349ffc45f09ddf0f194df95856f7e0baf302a4d3e3cbc8fb90bcc90fc70ad SHA512 8dc8dc1b1af1f7f0b1dd9ea95c20909ab67d6ab5e01b59c6a41b5b70a1457c2030490c0a593bfb88db29fedbccb03fdd10f8c6fea2a006cda3450bc296b4e08b
+EBUILD aterm-1.0.1-r3.ebuild 2041 BLAKE2B d09c5fd5e0bf6426013ffe82ce406b39246dc7acd4f8e79d9aa186b27d1a166d63353b8502fc1ce87f36aac1c8be85ae77473a88ee3f19e9481e5c7dccf19c50 SHA512 620d7bb0361a3ba518ad5c1ce6032e5c98cc046826a781de164de4249b587302ea1b2e84b5058a4e9634d685e09dbf503d672de625d6389edc7a55042133d969
 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 43a38027bfe8..7ebd09a48499 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="background cjk xgetdefault"
 
 RDEPEND="
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 89335715574b..794a1d78cace 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,5 +1,8 @@
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
 DIST gnome-terminal-3.30.2-notify-open-title-transparency.patch.xz 31748 BLAKE2B 6a25547fcdd387ea90c3ba13e53f31a118cc01c50c72f1f597162452ea65509e2fc8adaa2f6487859d8a53e828173d77a6f952d172f5a685e2b51864a82cce7f SHA512 51f32879c93a5ca489db9a604b28585787c9ec1a444c5e8c76bf26edeaa68e35fe9f76f94f32e99716a0d01643ac859475be13232c62675c703b5503781cb8d0
 DIST gnome-terminal-3.30.3.tar.xz 2102108 BLAKE2B 1930bc97c8d77d0107dbb7e56d849e3941c6821863d25103d8d17135d334b6ceda5b5ef1cad81d02011fb7190fd5b39ce4176083af0af6bebb71f52e30cd2c7b SHA512 54d3b345a23905f65ccc7d238b2f9ebcfebc4ccccf504c41bdb3dc388ceee8e6f2dfbba7c0060ea6bcba8bb541a031fe619d462e024aef277f66b5c49792c291
-EBUILD gnome-terminal-3.30.3.ebuild 2720 BLAKE2B d3ef307307bd48a358e50f5b90c140350ed7fe7839f20a87d19f04be73c0503b7dafed36b2ed6f93702699e2d90f174e64303272b37867aeed7e041f5c90c3bb SHA512 5d5f0a457fa3bb31fd36e15561af7f985a423a265209a9255109e1bf1bfd27920e167ac19ec114624f67777d3d03505e41ff627b64134f7ef37b0a314c6e17ca
+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
+EBUILD gnome-terminal-3.30.3.ebuild 2710 BLAKE2B 2559a1cd1ce35558e70751b6c1acd2d308f2fc7321e7290d40adbc6d9d7bbf62052e92680baacb17eeac01ca109a9064ee286a8080c3fc068ad3359d7da97e6a SHA512 51634f8bbe60d8f0a5fe54871cf5648b384784039031fc9ef99267cb735141d1fbab7d6c6fa44eb5a3a3e00c245bd357ef40f29a2fe9a96e0dab3cba42a18301
+EBUILD gnome-terminal-3.32.2.ebuild 2608 BLAKE2B 34bad6dc9896a427defca1935d8c9b8791be71d2fb5ed2292b661546aa95e989e67693f607b20c1c384aca9d0b61947a9379502a375d183a696adebb425aa19a SHA512 7fa340ac25b342cac8c643d10a633b1586b5ff9b69ae6dd4d72d5648278878de51748268f89d9f538304292015744b4aa1248d0cb08dc7e89e70568e95fe62dd
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.30.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.30.3.ebuild
index 28a2d4c1b43d..5f93f85d5610 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.30.3.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.30.3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-3.30.2-notify-open-title-transparency.patch.xz )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 RDEPEND="
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild
new file mode 100644
index 000000000000..bf89fcbc58c2
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.32.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 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 ~sh ~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/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index e727a47d56e1..ee2974ce6d4d 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,7 +1,7 @@
 AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 BLAKE2B 887eec8ec419900765ede1a8b75ea0acde945275af0e524e4382610a40d1e42b2f0be9879bf7c25cb00da6ae410e554567efdcc2f43ceff52e37c44060e6c4a7 SHA512 5257b1d33e25a6a390da2f23100fc3a2b8dcc4787205273933c2ba64ecf72e663cdc0cb86273a1ffa1a87b04bbeeff9edbc8c028c521ae612722f21cf6c40762
 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
-EBUILD rxvt-unicode-9.22-r1.ebuild 2068 BLAKE2B b0c75e86c9f86309cef3b6fa80a5469c837a8427eb4a23be7b9b78f6931703a1c48c618fe3948910d481e49d4f0fef150cfb3f52f29bd2befb6ca9fdcbcabe33 SHA512 0a0a415d6c1a641d2ff04dd89e30447c60404e6151cd433e8d0b85c0282e89799d3d9bece18c8f1e736ee1cd1a274c34c6b1b4e273f0f4bbb4915dfb180de062
-EBUILD rxvt-unicode-9.22-r3.ebuild 2141 BLAKE2B 18dbc7c36fe7ef2fd0690e836faf0a2af99c172d7b511978ea96565a8ab363c4cd82a5e6890be278c40999c67c37b513345bd8857460d567a1f79359fbd03de2 SHA512 bd065411153db259b93814ab20a92e88f1d4c32de5389b4dd9f7b5dab594c98add45799ef270d3dca5973a541c8417c960d6c6f895d7b5ca932134b0b4c77885
+EBUILD rxvt-unicode-9.22-r1.ebuild 2058 BLAKE2B 317c845af7a1cf2bf43ce0a69e37b01f10c3319b3afd7729ff574a9688200d9c61d212fa0c6ae147842d86e47da469b2096cb8da6eafb63ce82c90f59dfdfcbf SHA512 bd0fa0b07136cbc23f14ae48f704ff5adbad960eddb83c82ccc96820e8ada104cf09796574650f893ef2c6e2f376ed014a029bd4ab752bd640c4d60062ed2245
+EBUILD rxvt-unicode-9.22-r3.ebuild 2131 BLAKE2B a2b63654c2c983ae159923d5683bd00902206dfbf25de1d01eb1728fa8416e7626e3657251cc4faa32150bedf57a44de6c3b4ed8eabc8e494315d2d5f45c96c9 SHA512 cd7b3ca4384906a863a172df692ed4f174a436a8b66f4ab765493508ca3ea676af50bef70fba17d06445507450c4ec1a06f47bd6d24bbd75c4e0b1b2190c69ff
 EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
 MISC metadata.xml 1099 BLAKE2B f30d8fc667246ab2e113f8e9356941f0e7cd40aad88ed578cece7e5cba1622aa2c8ea0b5918d239b994483fb171f8c1fcc03ae6e2d5204f0c2d09a2b22819be1 SHA512 bbd5ec950a1a14975ba50860a0ee924e6a736890dd3bbf7add4b001d164cab6ddc8bebc94c71cb855524b5006c29c3176dbcb489817afad54de1dabaa0410978
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
index 71ec302ddbee..d29cbf35d61b 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
 	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	+perl startup-notification unicode3 xft
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
index e82d0d90ff4d..e075d7a655bd 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
 	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	+perl startup-notification unicode3 +utmp +wtmp xft
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index 8e95a9fd2af7..5ce2fbf5c4f8 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,3 +1,3 @@
 DIST tilda-1.4.1.tar.gz 471340 BLAKE2B a84d125bf81e384706347401ebbf7b11813bf5ed422e6b374e918ed564b9bfe168ebf3fef163b91a15350b49166b0040e90afdef716cc1762ecc410710f72c29 SHA512 d16878e762d94f94c219e8e711223a771a2ab816f02573f693cfbcfa0eee5aafff8a274898a65df168c0bf78258aa16e5a3be6b0c3dee418af61c68f43ed74c6
-EBUILD tilda-1.4.1.ebuild 714 BLAKE2B 63c725245a1b3339e6a22a6c4d392c94e34790fcc1422063c5f713325a8a0c020807ae22aa15ca5b21dd55abafbd886bb6987ffbf3bc8614e4f3048a7c4849ac SHA512 255bd3a860655654fe925f366001b3137e0410ba2ae2080cc7d97678ee3b00a148221a0881754a58d10ffb04892cef3abc41968082c0ebfe6d853664d226feaf
+EBUILD tilda-1.4.1.ebuild 704 BLAKE2B 5d922374b048c3fb18fe99126ef5fa73c98d435e4dc441711923f28641cf5c0a974afebc2ecca7dc813f0339c79dafe8b4f604d86087be9888488811903dd5f0 SHA512 88e9b3cd099535b2f942f62a956159be2a64762245d9e5d73b06bc1a30da59d1a10bcd2ad8a47c9e3f9fc25792c218ab594767f9660040b225f0915344d6d09d
 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 3e84244d59a7..b3440c219be7 100644
--- a/x11-terms/tilda/tilda-1.4.1.ebuild
+++ b/x11-terms/tilda/tilda-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/vte:2.91
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 3f8b382aae94..681835a9cc06 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-terminal-0.8.7.4.tar.bz2 884272 BLAKE2B 563223180cf781fa1723821c3851e60e15fc59473bf8608f781b8dffac052b90fbe4be672d4d878ffd00686ad992e2d5c53dbfdc80539e7197dcb631314f3370 SHA512 de56c08d5be47583484acf9aa5b3c0a0f14b1ac2790e0f6b59db61f80d71f871ff87e94f9353a0cc187cf1d9dff643e40ce15ed60a24d550843d898eee3d62dd
 DIST xfce4-terminal-0.8.8.tar.bz2 938843 BLAKE2B ae7beb611744d7f2cc168cf1c938f5c49add4fb4691f95cfd8f88959f380aa1e3ff11181f08529a9825273a5da7fd9ab5f45de6e3f78eb5b7f224d8044592c5b SHA512 0ceb130f0a0ceaa0a30a808fb7ff5070f75a84ef460c99799b267e5ecb1e0c15ef29558f78949d9a8968bfc50efebabc0f32dfc426a1db7ee6d225c6fdbf7645
 EBUILD xfce4-terminal-0.8.7.4.ebuild 903 BLAKE2B b79a9a51b81435fce696ca8a12f9f3da76ce9581998de9667d0e193f87b951320b17f563de78d2ddc02a7f1a7ebab82aecb1df25f392b5eff16467cb3410be1f SHA512 5b1f994d468cb2882746f291b9a673bb59ecd059e8e2bc91e76482c8eb2ce6514e8eebc2c0b2aed8bc1cfe68a77239a946ffdb81844ed38e991d3099df7a75ae
-EBUILD xfce4-terminal-0.8.8.ebuild 910 BLAKE2B abc1fd9056eb92e1152c69351a5d27e0a716e46eaae51fb7fa0ab51cf10835f22937bb618e652ae970b92d5313b0df2801023841b36ea221e48076354bbfdca1 SHA512 5c5c1a4828c587245d85a8e477ab085db8b7e88599f7abe4852787f5c3c8e229e112c04bf6a25e5b351df06aed5a05debbf451b68253a98ddb888373b9643a8a
+EBUILD xfce4-terminal-0.8.8.ebuild 903 BLAKE2B b79a9a51b81435fce696ca8a12f9f3da76ce9581998de9667d0e193f87b951320b17f563de78d2ddc02a7f1a7ebab82aecb1df25f392b5eff16467cb3410be1f SHA512 5b1f994d468cb2882746f291b9a673bb59ecd059e8e2bc91e76482c8eb2ce6514e8eebc2c0b2aed8bc1cfe68a77239a946ffdb81844ed38e991d3099df7a75ae
 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 1b4bb59dedef..7241f3f1a41b 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/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 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="utempter"
 
 RDEPEND=">=dev-libs/glib-2.32:2=
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 9b207b29f5f2..5ed637e91581 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -2,8 +2,8 @@ DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 DIST xterm-347.tgz 1371955 BLAKE2B 8144afe48fac33ed7fec50dc8863af992440ca045fd5bef0db15176aa0b550daa26cda8f6a06fd4e340ec5aaf562a1cbdb7e9da21d0f42c0ef1966b5b2c91d93 SHA512 4b90094c21b7af3042591939308538dc767d42718e9a6112115e6df12a974f8e3b7fba8d791d7c9557863fd07d08f2365fa7f759f7797f859a6fe5fe0852ab4e
 DIST xterm-348.tgz 1375431 BLAKE2B 29313e5a9ae0f92faa1faa4fb641244716fabcdaf9b17b8898c75cf2d4ad2e19bc44702cc4510c4a9413e1a8b811ed61deb5934b93c3cd0eb101c998b1bbc9e4 SHA512 852896c0aba885bafc80baad899fc56910dce66bf5df6b3fef3f998efc33af9d30b68cfb0c92c7028365ac4944af3d3c198bc0e408ca09e949b993a79c1e6dd9
-EBUILD xterm-327.ebuild 2602 BLAKE2B 3a890f115ef21ec8a0efcf6a7860895e5dee80631f5f9d82741be07cdd99622f945bd6c268b5095424b6db2b32028166867f3f9da49b76c6c8493809fe0b7c4a SHA512 6ffa30d6d1d640e8d5dad853c73a37b61350dce24baff2a380914f3b6e81d4b30d7b6adc96cd7f24bb5fdb9b5d843c1fe490308503fd20da2e12eef11f7bef05
-EBUILD xterm-337.ebuild 2645 BLAKE2B 677ada66838e6543d96737302421fee010c5d58360f37e420d1f9350fd24e1102f805b673144fcfec9dce15845a3aa7f519b9d9a6a7f3139e6245953637874f4 SHA512 4cf2e13d654ecd92dd74ca7b017d16606a89ec22588bce037e9c988a56e50a9bce1824ef20682bcc669d3e9245bb59d69e3b6550b2a8d73c479cf14f6357f717
-EBUILD xterm-347.ebuild 2698 BLAKE2B 66c6f6965cdfe73ac490dc691f42428fa8c0b325ae78a4ef93be54ffc7c3cdbed1a3f95562752ce3a994a88defce27422702088028b32d1259f6c0f62e66991b SHA512 5b48cbf16afe390a76a9ab449805c1de304a683063e2e57b9926cd5d2c832c737f0692a947bf937f120a578f252eee39d882f38562ed9302b01155540890fdb6
-EBUILD xterm-348.ebuild 2698 BLAKE2B 66c6f6965cdfe73ac490dc691f42428fa8c0b325ae78a4ef93be54ffc7c3cdbed1a3f95562752ce3a994a88defce27422702088028b32d1259f6c0f62e66991b SHA512 5b48cbf16afe390a76a9ab449805c1de304a683063e2e57b9926cd5d2c832c737f0692a947bf937f120a578f252eee39d882f38562ed9302b01155540890fdb6
+EBUILD xterm-327.ebuild 2580 BLAKE2B b8a798fa217765573354bc440d634357abbb8a253c25d61c2ac3ef01bb866ea490bc388ccf088c05dd12eb7b037160ab54d90b251f9075e85e7ed9d491da8387 SHA512 c0012a958c60088d148d50f38fe16a29e49ab1630ae2946f97083bb5e68943877eff31f3fba0bd94b9dc9afea477abef7469513dce9107eff12ef54a4661a183
+EBUILD xterm-337.ebuild 2623 BLAKE2B 17d463f661c556a5a95883c534738ee044c5923cfbf1276eff2e6110236c20b3f7eb98bd7ed9ee99a8f82305d91277b57de976dff9f0c29efe8f1496787e8876 SHA512 a90462462c7dbc7c375a14c1d3ccc7843510a0dffa688ef4017a3d4cb87e142a7477c8a7a312e56ff8e5e67fd40092a905aab9a9e4dcfe496a4cff399c5b7531
+EBUILD xterm-347.ebuild 2676 BLAKE2B 0972363f9da131fbc9e739422275eab0593813c052727fe1ed4aade41da67f3f42526386d6a872d7ef824e0e15ae4e083f3bfba59a3cfaf8dcd30df990c5e885 SHA512 4f9a183901c1c0b059ff85fdea79e25243fce8b134300067b1278bb061d3044099ce5d52b428e18378f7d32e2e51fdd4431f999630fb2e833725422a7d9482dc
+EBUILD xterm-348.ebuild 2676 BLAKE2B 0972363f9da131fbc9e739422275eab0593813c052727fe1ed4aade41da67f3f42526386d6a872d7ef824e0e15ae4e083f3bfba59a3cfaf8dcd30df990c5e885 SHA512 4f9a183901c1c0b059ff85fdea79e25243fce8b134300067b1278bb061d3044099ce5d52b428e18378f7d32e2e51fdd4431f999630fb2e833725422a7d9482dc
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-327.ebuild b/x11-terms/xterm/xterm-327.ebuild
index c8622f07ebc2..66ebfa773add 100644
--- a/x11-terms/xterm/xterm-327.ebuild
+++ b/x11-terms/xterm/xterm-327.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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
 
 COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
diff --git a/x11-terms/xterm/xterm-337.ebuild b/x11-terms/xterm/xterm-337.ebuild
index 0c77e3a7f0bd..dde8c5aa3e43 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-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
diff --git a/x11-terms/xterm/xterm-347.ebuild b/x11-terms/xterm/xterm-347.ebuild
index f915dffe05fc..2055f8804100 100644
--- a/x11-terms/xterm/xterm-347.ebuild
+++ b/x11-terms/xterm/xterm-347.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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
diff --git a/x11-terms/xterm/xterm-348.ebuild b/x11-terms/xterm/xterm-348.ebuild
index f915dffe05fc..2055f8804100 100644
--- a/x11-terms/xterm/xterm-348.ebuild
+++ b/x11-terms/xterm/xterm-348.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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig