8 files changed, 92 insertions, 120 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 7ce4a87169e7..86ec68d7529b 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 3836dbeae766..0bdbf5af87b3 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.38.1-cntr-ntfy-autottl-ts.patch.xz 34100 BLAKE2B 7ae126b93e63bc40ec4b0482c66d1b9be77939553df42948ce92b62cd42e8bf12a453540d90176f00cc545ce3a42ec5fc2e10fa248be641c64fc02611c61ee64 SHA512 6fe4fb80d968ecb036dd24c06e869b754b6634e25168d84a509ad91a510170fc8da368f37f7dec78ef1d11bb9f08ddd2a97c7407275116687639fb00f218553d
 DIST gnome-terminal-3.38.3.tar.xz 2574916 BLAKE2B c7bc17da2be607d15437b5f2965901f034e13fe5e5a7db03a3af6aaa67643e52a13a23aa3cc379c11387d158815a09a2edd09cbe6a983f243394746f3ada66ca SHA512 1dc418faaafce019be75173ad035f2536bfec7fea179ecf76f054a62651137339a018198cd6a0cfd63a7a15a1dcf803b62d19a48545a06a133fde186bfbf88ca
+DIST gnome-terminal-3.40.1-cntr-ntfy-autottl-ts.patch.xz 33548 BLAKE2B 50952d21a6a5758b500665aed21b95d8b4295240e24ea69dd806321a32338aeb904c60cd7dbb713d3d456bdc9199c7c4b4e2d65bc7078fa9bbf6a7d94c227265 SHA512 0efc106b35c25199ed8d4edc5c36a10a1013e62100c0b3397a5bb04386d7d2f548e811451c8577bc123ffbe935cea2a8f10d08473de5fadc4d07db0f301ab3bc
+DIST gnome-terminal-3.40.1.tar.xz 2596912 BLAKE2B 6b199941a2d30a8bd06d779d8d5a1fc9096b7183718705b74842566033ddd36c18a32a68014b5c7ab545bf0bb4f780fa950c7d6d04149f89f640f0db6f105b59 SHA512 8e16b3c8513cf3c503a4a35e2c238ea41b087d426787402e0db5ef7e4bc5303d5a34a6455f651760327560f73edf3256177bbe3633e8a5b8abe8edab2bda7698
 EBUILD gnome-terminal-3.38.3.ebuild 2709 BLAKE2B 2ac2eac6d0ef446c70e24498371b783a2453b0f5df346f96aa6285e902ce4c0cae30de2ee36768e032bc49126e32e0e1b5d268f9d4c7eeb1966dd1d7d6d28a66 SHA512 40c0400c4de5bbd83cbb8b5f4087c1c4bdff74b76c890c80c02865860e94f13a903465ad03987c66a50afc440a5ddc359925ce0c9a0cc97bc9718301c936360d
+EBUILD gnome-terminal-3.40.1.ebuild 2711 BLAKE2B 762e695dfbac737ef21648c7081dc6b3800f356ed6a9cf5574dd8ab1afc08b0a53871dfe693d0e17625e3571b557c9268b05d91aa3a362693e621a14049bf013 SHA512 65924ea97931d3760555e63862b6b27bbfbf5e2d4182c0eaa1a96e315ed42fd76664aeed88d27947dcb2f897d3d50d5e84868cd7231f22578498f6053348b1b5
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.40.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.40.1.ebuild
new file mode 100644
index 000000000000..b16c95d6f7e6
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.40.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.40.1-cntr-ntfy-autottl-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.52:2
+	>=x11-libs/gtk+-3.22.27:3
+	>=x11-libs/vte-0.64.0: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.28.0 )
+"
+DEPEND="${RDEPEND}"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	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
+		# Automatic title updating based on currently running foreground process
+		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
+		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
+		eapply "${WORKDIR}"/${PN}-3.40.1-cntr-ntfy-autottl-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 7f5b4fc6f9be..3ac31abb20db 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -5,7 +5,6 @@ AUX rxvt-unicode-9.22-sgr-mouse-mode-flag.patch 5613 BLAKE2B 28cf8af70841027ba25
 AUX urxvtd.service 145 BLAKE2B 9199c81f02ff161caf6f72bac95808d4ba584bf09fb68cf7fef1bdf883873fe360816d8736835987a61c1cf0ac1be469aa47f2b74e96d8215a3ac17de896d6a5 SHA512 a77606d11e80c8d117917ab34a6d2ca430c667372ee713cf8519e49df4d972f289399d49bd808a9d31fa343d11c2fd2eb761b813be3f2892784d1dd9c281fc38
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
 DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540
-EBUILD rxvt-unicode-9.22-r7.ebuild 3140 BLAKE2B de179cfae6299e8caa55965a355dca2ee3aacb97b6b2b1ebfd2b74bc15621bde8ae5ca3b0b39aa74373b742bc634d2d61fabda32ebcbe83beb12e88df5058748 SHA512 bd6e25d607d34d7eed8c7fa53074ab0b60a996109ac290477fda8796156bd68b2d938a41f92cbc7c9c89bde4a73621e96d9446f5494946b23794665f7b76c945
-EBUILD rxvt-unicode-9.22-r8.ebuild 3200 BLAKE2B ff07b91d87b7fe29b56193541cdfd9cd81c005b644e3127bbd4fd915e8e756cd7f706a303deb84ee09af937cfbc044a3ea4285c192bb26e75cd8bd2ec890392b SHA512 cce50f0cddd3539e517e5cd68d56d4accbf61de61e7e6626067a1635cc21a7b229526a71aa82bd03955e510173326a79350ad17c96a58b95c46b050b12032577
+EBUILD rxvt-unicode-9.22-r8.ebuild 3194 BLAKE2B b4cb37274748b3c14baa29f1497f1ce7613944e720b3cdadaff845b1e52e687f167d48bd64061d58bd624ad3dd105efa74c9f82f632fd62c4f67e918fad68b32 SHA512 bcf98a95d38128681da5491de031ab08d49fa44fe15be380b9864e70e1f84daeb57a38d878d81818fbb5259d523dba1311b8f4feff4d0320664d6d767295f6ce
 EBUILD rxvt-unicode-9999.ebuild 2163 BLAKE2B bbad76d956512288ef1284526f8ea4d1c039df62868e74078a93640dae7e95361f05d0062e2cf7dcf74e6b5f799e99cf6bd0712263290d9caef92dfd058507e5 SHA512 0b8d154abbc49368df6cbe4efa50e482f7b4226507f2babcc7932ed7ff39dc7d666e544e8f80d797de0f1a1a0047e1763c81254005ca319009a568b87ce84a89
 MISC metadata.xml 1789 BLAKE2B c39987eb81fcc288562d729cd49f6dadbc17229e0b486960ca28a8ab8b039b2486cb0c5c3ded5748340f2d21448f98c836b1d62a3445f9942f1a69a9c9e3c365 SHA512 1e3670faa96a27ae4bb7ec9ad41b475c39e17756c1f53786a172af68c157a774788fee75c22685d03be70b9450664b441408b4ead18e1e267ce69770f2e5afe4
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
deleted file mode 100644
index d72cdf336d7b..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop systemd prefix
-
-COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch"
-
-DESCRIPTION="rxvt clone with xft and unicode support"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
-	https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl -sgrmouse startup-notification unicode3 +utmp +wtmp xft"
-
-RESTRICT="test"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r6:=
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXrender
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
-	perl? ( dev-lang/perl:= )
-	startup-notification? ( x11-libs/startup-notification )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
-	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-	"${FILESDIR}"/${PN}-9.22-sgr-mouse-mode-flag.patch
-	"${WORKDIR}"/${COLOUR_PATCH_NAME}
-)
-DOCS=(
-	Changes
-	README.FAQ
-	doc/README.xvt
-	doc/changes.txt
-	doc/etc/${PN}.term{cap,info}
-	doc/rxvt-tabbed
-)
-
-src_prepare() {
-	default
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
-	# use xsubpp from Prefix - #506500
-	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-everything goes first: the order of the arguments matters
-	econf --enable-everything \
-		$(use_enable 24-bit-color) \
-		$(use_enable 256-color) \
-		$(use_enable blink text-blink) \
-		$(use_enable fading-colors fading) \
-		$(use_enable font-styles) \
-		$(use_enable gdk-pixbuf pixbuf) \
-		$(use_enable iso14755) \
-		$(use_enable mousewheel) \
-		$(use_enable perl) \
-		$(use_enable sgrmouse) \
-		$(use_enable startup-notification) \
-		$(use_enable unicode3) \
-		$(use_enable utmp) \
-		$(use_enable wtmp) \
-		$(use_enable xft)
-}
-
-src_compile() {
-	default
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die
-}
-
-src_install() {
-	default
-
-	systemd_douserunit "${FILESDIR}"/urxvtd.service
-
-	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
-		"System;TerminalEmulator"
-}
-
-pkg_postinst() {
-	if use 24-bit-color; then
-		ewarn
-		ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE."
-		ewarn "You may or may not encounter visual glitches or stability issues. When in doubt,"
-		ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)."
-		ewarn
-	fi
-
-	if use sgrmouse; then
-		ewarn
-		ewarn "Support for the SGR 1006 mouse extension in ${PN} is UNOFFICIAL and provided as-is."
-		ewarn "When in doubt, rebuild =${CATEGORY}/${PF} with USE=-sgrmouse (the default setting)."
-		ewarn
-	fi
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild
index c689716a01b3..e523d4cf0e3b 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r8.ebuild
@@ -14,7 +14,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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	+perl -sgrmouse startup-notification unicode3 +utmp +wtmp xft"
 
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 39f2543f2b6e..d9f0bff98f34 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,5 +1,5 @@
 DIST xterm-366.tgz 1445992 BLAKE2B 4724851b84ae0682b39e5f1b070ba9f04c627511aa20a5b1c76e740666e14436a0095d8a1be4f6ad54eb1e5d841ef766b0bf4d840ebddcaea0889285f1377900 SHA512 ffab7e0970b92a25488bd57da2dfe2856279208c489a632e0e92788deec2a4f99510f76e1c88e55f389dfe984c323add0fab31b04d2a1d774ce6d3b2c9c642ef
 DIST xterm-367.tgz 1448562 BLAKE2B 29b38ba3b48c843ecbf22d209a05afb4e9a6d52cf8f14efa18ed5dd02b26cc11c107bfb17260cb62f68fc318cb08e5147b5f12e8779ca63151c7b712ada60b7e SHA512 86fd6ed4e4aa0201349edd67d8bf00d3b93a19640307372011f9bdcd26fdb453267d1ab092a0639902e419b00c175d793b196884b6e65e546650e1b83a4461c4
 EBUILD xterm-366.ebuild 2640 BLAKE2B b9422e9dc2c57d90ab5a5ae47d54feeea8db2e01efb3e81e7e898205724de7991e5d46342acfbcb68cdfb758aa285674707cc0965eff58734065620eb989e40f SHA512 ccaa7c345810608208a5d72414598c9bfe03ce6e4a2b34667dcac977288f1c651ef5f89d96466f8ad0529038177090be0fcf1687416d5e4ddf2b8089f247929b
-EBUILD xterm-367.ebuild 2641 BLAKE2B 47f7d85a6f61bdcb447cbc450ca4ae7a63b4da9c8e13c9d8210ae76a518a378a9e1ccb870941f465ade5092bb6eed6000d1abb4433a71d4d1dd08c76c0351f32 SHA512 6615d65531fe6ed77796f3de5eb0f3bdd90f03193f935557d78634c243d022fbbdb62c9aecbf5a9576b7df5d29793cdb13781a9fbb431d5918e09f323e5b8624
+EBUILD xterm-367.ebuild 2640 BLAKE2B b9422e9dc2c57d90ab5a5ae47d54feeea8db2e01efb3e81e7e898205724de7991e5d46342acfbcb68cdfb758aa285674707cc0965eff58734065620eb989e40f SHA512 ccaa7c345810608208a5d72414598c9bfe03ce6e4a2b34667dcac977288f1c651ef5f89d96466f8ad0529038177090be0fcf1687416d5e4ddf2b8089f247929b
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-367.ebuild b/x11-terms/xterm/xterm-367.ebuild
index 7dcc4b83336a..ea017d32b723 100644
--- a/x11-terms/xterm/xterm-367.ebuild
+++ b/x11-terms/xterm/xterm-367.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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig