8 files changed, 219 insertions, 7 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index acd4e6f1e8eb..b6494a575b2f 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 f542536c1c3f..bf8116006cbb 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -5,7 +5,9 @@ DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c04
 DIST gnome-terminal-3.48.1-cntr-ntfy-autottl-ts.patch.xz 37796 BLAKE2B 91a4d50a0b4bd412e9528ec165e173c22df11749d6a59a46b0e364b4d7f403f8fdd835c29585ab12a8a9a81da42e816fe3dacb3d9cb0c2739e123404d4b57792 SHA512 69e26b0795de566d425c5b4fd389a865aedf28d64d4ad1cced926eefd3177379bdc365cf9ef76773f21d32df24067e1966302ebcab235c63c191219705eb498e
 DIST gnome-terminal-3.48.2.tar.bz2 1701232 BLAKE2B f076af2dbdd1afbdbb2c4ed9c63c8c65bf8e7346034f4c364a4c395439cf95040140380bc77735c326d17a6f7d68d031aaa608ca6e9e11daf2d5d308e19c3169 SHA512 e08dc462390a566dde215939a4a7a50a6f4b3a0d4b3749e6ba0f8de0d1da57e9761c8eb655ef86836b87e8f1da00735ed9b38afef85d766cbe6224ff2f243123
 DIST gnome-terminal-3.50.0.tar.bz2 1702629 BLAKE2B e8b1c7da15fb3b63ce4cc25f7aa76e656c588294fd5801aca108d84a08d981756ef832aa1673a9894a14fa564c664dd163dceec341bbbceba8052ca316bd0037 SHA512 cbbd5d3ff101603c2350bc04648ebf7a60e6365f2d4f6286acdcfb9ba1b4312b9bb779649ed3a403194de3a8febd9ab59fe77ee805e24434c48d8761c1ccae94
-EBUILD gnome-terminal-3.44.1.ebuild 2940 BLAKE2B c720d055c6d4d77125d83719af97aa97efc2b9bb09f0582818aba70bbeab3fc5c2baca0aa9a449b2d7739089dba69d51cf10031ade802c82f2f218f43a0ca240 SHA512 f36ff8d48d48380614c937926e76dff5be16bac4a5bb2277962a30af4acfc5a53be9d17c10440740c1eaf125f599cb9efd856a91f7fa7064531262d49d63f687
-EBUILD gnome-terminal-3.48.2.ebuild 2976 BLAKE2B 124a6c96341411c1f5f008f872148de8c4b78865bb2e5a7cf230280de304f6161ced130232863675991a697b25dbde4bf8611fe6d7c8800de5081d3761e62c17 SHA512 13ad36757e233eef2a19224955f5482d2087995bd48465c97c99adcf20a95ee281b9e15260d8ca675979aa2dd88163c7c923406526e4bda426d912aa307d12c5
-EBUILD gnome-terminal-3.50.0.ebuild 3004 BLAKE2B e9c8652183816b60923c8d224bba1b2a0369263fd352af3447740e96abcf1ae4b893dde16190c2d16155291c71167327528bfa27244a1b4b52ba40713e4d1dc3 SHA512 75eec370ae123f4f7aae2e88c03299579c3d4bdf32d8ea0cb6df9f2bff7309186b5a7f83ce3ee7e0f9ecfd811158725130de8c575136a0ef1ae216b61fb52def
+DIST gnome-terminal-3.50.1.tar.bz2 1702613 BLAKE2B e592114126dd5639169cd1cdfdc06ba10a2fd386b28d47372cdd0e2aed1a39252c660e0edb6cb946a88810a94640b6e40d7e2878c34740638b75049f6395471e SHA512 adff88f3afc3b68c1f17cf493c2ee032a9ccc35af89903c045c61fdddbf8b71c7d1c40a66e87def9dbdbdeb7e3bf5c1e8d5988e810476c5b2ad38ef9f0064eb5
+EBUILD gnome-terminal-3.44.1.ebuild 2967 BLAKE2B 400d61456da7f4d3680e8e8a1e7961db6cadf7edca656f610ce96f1281805d299f9fe0d88c2e1b3ac6e018de63b8088ae20763b60eb7b5d0647dc9b510ed55bb SHA512 d25f4e056d2f5f2119b1548e00a3c70e68ca445cadd0d8ccae28f2fe220823298240766b3a88ef3f8a3e43659d8e68ff12b8a5e1d04b1d59db76002cd8a93440
+EBUILD gnome-terminal-3.48.2.ebuild 3003 BLAKE2B a3d578618ec40db037fa4bd92eca8d973ae2922acb2061c6461e3ee5db3b247f7df3f0700d8dc844b62d1709a306ec2236cefac6de9645de7c5a26fccdee660b SHA512 fcb03b65191d620c65adcbe6bd7403350b601cca3b1b4200877b4a669981e0554a5e99f5cf14c155527cc9bb4399c453ac295898a5bceb12318ec4e052334496
+EBUILD gnome-terminal-3.50.0.ebuild 3033 BLAKE2B f41cc762316a7afce2ca882cebc87fab3fd1830ca9a739edba271bda71dd6e4cda3ef24179ec859002d16fbd7a9b396eb597ea69d6b99790bfc9c71d50c34057 SHA512 8f9a36e1a351ad45b9075930a9fb96d8445677b72ba7f3d855db3d2f647b2d02a3a13093461720f77e8c9c84239ce443d465df94920f11dacefd5b5cae87eb90
+EBUILD gnome-terminal-3.50.1.ebuild 3033 BLAKE2B 52dc46974c2989aec451abd3d4530d7a71001512f6647e5844ef5563c51252e3d63a6b1e72cef800591626ddf5ce10885cbf57737108278e488923a7d67411d3 SHA512 fa041123e45f7e934e5a6194724c5d2c69f4df14ab89166cf42edaa002073738b76986da3c36f71144ad2bc4a7faf5a0d5ca96d79e991e8cc98422294c8f459b
 MISC metadata.xml 544 BLAKE2B 9e4dda0925c1f09a6109a01a522965c0bd2d811d91e19054fecf09e2d732f6f03245410e7472c3accf83bc015e2747cf96dcf3ededb62cf4733ece3241e51389 SHA512 e53acf30ece7ccb0307f9bb750ccfb3e90bf5d468098fe42112f4efa0fd1823d10124d8f50bf1ac56fbe4ad188bb7446e1627f1a05188f602e6e11a33496b75d
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
index de74066bc3b5..b5e9a78ba721 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
@@ -8,7 +8,7 @@ inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
 DESCRIPTION="A terminal emulator for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
 
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ GPL-3 CC-BY-SA-3.0 FDL-1.3"
 SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz )"
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.48.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.48.2.ebuild
index acec9596eba4..6dcc37c28aaa 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.48.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.48.2.ebuild
@@ -8,7 +8,7 @@ inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
 DESCRIPTION="A terminal emulator for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Terminal"
 
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ GPL-3 CC-BY-SA-3.0 FDL-1.3"
 SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
 
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.50.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.50.0.ebuild
index 5e72d34082c9..9e6d4ec07158 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.50.0.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.50.0.ebuild
@@ -8,7 +8,7 @@ inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
 DESCRIPTION="A terminal emulator for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Terminal"
 
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ GPL-3 CC-BY-SA-3.0 FDL-1.3"
 SLOT="0"
 IUSE="debug gnome-shell nautilus vanilla"
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 RDEPEND="
 	>=dev-libs/glib-2.52:2
 	>=x11-libs/gtk+-3.22.27:3
-	>=gui-libs/libhandy-1.6.0
+	>=gui-libs/libhandy-1.6.0:1
 	>=x11-libs/vte-0.72.2:2.91[!vanilla?]
 	>=dev-libs/libpcre2-10
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.50.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.50.1.ebuild
new file mode 100644
index 000000000000..ed5a954e1419
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.50.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="A terminal emulator for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal"
+
+LICENSE="GPL-3+ GPL-3 CC-BY-SA-3.0 FDL-1.3"
+SLOT="0"
+IUSE="debug gnome-shell nautilus vanilla"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.48.1-cntr-ntfy-autottl-ts.patch.xz )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+# 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
+	>=gui-libs/libhandy-1.6.0:1
+	>=x11-libs/vte-0.74.0:2.91[!vanilla?]
+	>=dev-libs/libpcre2-10
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-43.0 )
+"
+DEPEND="${RDEPEND}"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+BDEPEND="
+	${PYTHON_DEPS}
+	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() {
+	eapply "${FILESDIR}"/${PN}-3.44.1-fix-missing-wexitcode.patch
+	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.48.1-cntr-ntfy-autottl-ts.patch
+	fi
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use debug dbg)
+		-Ddocs=false
+		$(meson_use nautilus nautilus_extension)
+		$(meson_use gnome-shell search_provider)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index ea9772e72f69..09185f5af02c 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -3,7 +3,10 @@ DIST xterm-384.tgz 1539955 BLAKE2B aef38aa61da46c29eacd15c239975cf8fecf140968c72
 DIST xterm-384.tgz.asc 729 BLAKE2B 604ec0856dfdf06994f89d2725f3fa61d472c85cbc1a31075272d65ec8dedaef6040133ff9d03c4d0b866c66be98dbdab9c8716d3dad75578f37e5f437872911 SHA512 91eec76c3a0a2359275aad40b1df32035cf73c2d461cebfbcf7c3af1bee4274b66364e29c07b4bef24db9627a944d8c81ac76f6cf3cea193b28edbf411080d60
 DIST xterm-386.tgz 1545960 BLAKE2B afcd7f991d0f915c3317bb449359b122360018e22c37d36c257c3fcf6a08ca75b84da16ceb8f594c64760b5c746513a79cf9a8f1217bbf4ee59a5b96fb0c8d9b SHA512 b0508d8e2d440e347d467201c9e8eb528756c9e693a506d0be8996e3050451f4f535b5d70d68994cc2af38e10f175105889b879e55ef7b37180e71255f3db741
 DIST xterm-386.tgz.asc 729 BLAKE2B 37097533aa8e92e4162fc37e073085f14e3b3b1dd1823e61eade197638baa8bf4b55fd3e26fdbb25ce0df9dc22bd4803f3d05ec79aa0bb1a7ba223f7047c9c22 SHA512 2ddb0f2dedc0f032990d16daac449e7f03a281728a775b2f0412e1242a0becd4a5a44c0768b86ecc697aa96bc92cdc23756ef83988f1ade74ebc007701a152b3
+DIST xterm-388.tgz 1548336 BLAKE2B fe003ee6a234bf978a3b85ab840f59470239b3584e20e379a62ee45fd70d8e1083cc04f2f2194697cd900a74e3a0c17d67cab07b3b9b32addf23d093464d3ec1 SHA512 7ded1c32b18e629222c9109dc9eb206511762447f07a1043fb63802f036d6d685d332697edd46556c07e6fb5ca95f9bcf836c48d05bd72d626bb90dfa1bfc21a
+DIST xterm-388.tgz.asc 729 BLAKE2B 22c15b4ee2aec490bf793ab6893b50a7d4fd48f182066012528df53df9684040664177df07aa1d798e5992e6969f11cd0f6fcf3f1cb666f50c4e68d18cfb690c SHA512 60d45780deba965b11bfe63a173d7413a76c05f043666aa41973296745976fd51380bebb6b6a120983c206889d550fb35895233492c674bc04555957829e4563
 EBUILD xterm-384-r1.ebuild 2988 BLAKE2B cca264e0e4168af218a25bd01006d3704a4fb93a972082702de2670e446fcd86d519d1b678114d9b65b893ce7b875d6e2c4e05f2fdba302a1660f9916d895df8 SHA512 27d545d6145d8973e54db137cb8385f3b15c0d69429c3004221c19140b30fc939973076728a986f570b0921caa2debdde2f900d40239e2c8f5ff59002b5a537d
 EBUILD xterm-384.ebuild 2913 BLAKE2B 159f66dee586ff3e397cbe27ec7c7d746e19b2e6fa2ff27088fb69f3146b80829a3768b3a72faa5071b666a831543a9ea01d07a573318b26168cd5bcddf1d251 SHA512 aee03a9e98b7b082c761c90bfc0f002ae7c538d683cd8e7b1cd30141fe4e55e38d5b456e0cd2cfb26f4e86ee0487f3f8bd2a147490bee0911abd2e02e7c9e55b
 EBUILD xterm-386.ebuild 2988 BLAKE2B cca264e0e4168af218a25bd01006d3704a4fb93a972082702de2670e446fcd86d519d1b678114d9b65b893ce7b875d6e2c4e05f2fdba302a1660f9916d895df8 SHA512 27d545d6145d8973e54db137cb8385f3b15c0d69429c3004221c19140b30fc939973076728a986f570b0921caa2debdde2f900d40239e2c8f5ff59002b5a537d
+EBUILD xterm-388.ebuild 2988 BLAKE2B cca264e0e4168af218a25bd01006d3704a4fb93a972082702de2670e446fcd86d519d1b678114d9b65b893ce7b875d6e2c4e05f2fdba302a1660f9916d895df8 SHA512 27d545d6145d8973e54db137cb8385f3b15c0d69429c3004221c19140b30fc939973076728a986f570b0921caa2debdde2f900d40239e2c8f5ff59002b5a537d
 MISC metadata.xml 552 BLAKE2B 1de52230aa9b681cee30dd4ee4651521bf9474cb2a99168fd6c8f13e0918cf185dbddd3dc6f97e0c81118680294e9c4d74137378763b021a07d8ce0a1430e18c SHA512 019a08f2f03a270da7a33bf1b0e9bb42864b806990884b9f2c19110238ad5d5fd18bc896e9fa7cde130b4ccf3f7003db43f6b485caf5b021f5d5e36f279f9d36
diff --git a/x11-terms/xterm/xterm-388.ebuild b/x11-terms/xterm/xterm-388.ebuild
new file mode 100644
index 000000000000..24958735469f
--- /dev/null
+++ b/x11-terms/xterm/xterm-388.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
+inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
+
+DEPEND="
+	kernel_linux? ( sys-libs/libutempter )
+	media-libs/fontconfig:1.0
+	>=sys-libs/ncurses-5.7-r7:=
+	x11-apps/xmessage
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND+=" x11-base/xorg-proto"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-384-unconditional-gnusource.patch
+)
+
+src_configure() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+
+	# bug #454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+
+	local myeconfargs=(
+		--disable-full-tgetent
+		--disable-imake
+		--disable-setgid
+		--disable-setuid
+		--enable-256-color
+		--enable-broken-osc
+		--enable-broken-st
+		--enable-dabbrev
+		--enable-exec-xterm
+		--enable-i18n
+		--enable-load-vt-fonts
+		--enable-logging
+		--enable-screen-dumps
+		--enable-warnings
+		--enable-wide-chars
+		--libdir="${EPREFIX}"/etc
+		--with-app-defaults="${DEFAULTS_DIR}"
+		--with-icon-theme=hicolor
+		--with-icondir="${EPREFIX}"/usr/share/icons
+		--with-utempter
+		--with-x
+		$(use_enable openpty)
+		$(use_enable sixel sixel-graphics)
+		$(use_enable toolbar)
+		$(use_enable truetype freetype)
+		$(use_enable unicode luit)
+		$(use_enable unicode mini-luit)
+		$(use_with Xaw3d)
+		$(use_with xinerama)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc xterm.log.html
+	sed -i -e 's/_48x48//g' *.desktop || die
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}