gentoo resync : 31.05.2021

3 files changed, 2 insertions, 90 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 0bdbf5af87b3..f1454af5e2d1 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,8 +1,5 @@
 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
+EBUILD gnome-terminal-3.40.1.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.38.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.38.3.ebuild
deleted file mode 100644
index e70a5454db3b..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.38.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.38.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.62.1: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.38.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/gnome-terminal/gnome-terminal-3.40.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.40.1.ebuild
index b16c95d6f7e6..f134dbb1f61e 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.40.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.40.1.ebuild
@@ -13,7 +13,7 @@ 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"
+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="