gentoo resync : 28.07.2021

5 files changed, 2 insertions, 89 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 892f42d977e8..7c18cbb8f484 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 c501e12a4019..9a47e87f15cf 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,9 +1,7 @@
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
 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
 DIST gnome-terminal-3.40.2.tar.xz 2608032 BLAKE2B 8d7a355623d6eee9f4e3d4ff219dbd12c34987ea1ab1b7dc960c5bf19772d57de3bd81f63ceae61e87e932f05d47208390738dd8df30cbca71d8d0ad5d4b7887 SHA512 d3c75dcf46775492149f98c0c1a9739ac8c8e816487160c1e859034bc8cbcaeb0ff81f7e87e577e248f662db64ee914974bda0cb3e548ab12fb4b431d82af100
 DIST gnome-terminal-3.40.3.tar.xz 2609060 BLAKE2B cc0ef61b2ffbe7dd93117acad6ad2b1f737fb74417c2c84a98cdf3c28d29a7aaeaae4461a0160549eaac8bf9fdc1852e67ffb2e2570b456132bc1726a7033486 SHA512 a4de627f88069f3a1cc69a53dfe4c29ebdd22ee604b0e0b1702dd1c7a14a5fb877968c020bece7f0d5d7dc496019ffef0f9b2d15cb17c80c0a99b331a64f8346
-EBUILD gnome-terminal-3.40.1.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
 EBUILD gnome-terminal-3.40.2.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
 EBUILD gnome-terminal-3.40.3.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
deleted file mode 100644
index f134dbb1f61e..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.40.1.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.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/qterminal/Manifest b/x11-terms/qterminal/Manifest
index de76db22c1f2..66c4a1be8b0f 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -2,6 +2,6 @@ AUX qterminal-0.16.1-appdata.patch 309 BLAKE2B 3aef2327582b603056ea7061fc1f5103e
 DIST qterminal-0.16.1.tar.xz 185144 BLAKE2B f775aae132e88c5074e009436da15989a2ff047359ad7d79b9ec2b9b0927d72323eb5d04885012bf68280218c16900d03af1d295a49f6434229274130fe39e27 SHA512 0d9736cb6e220a019e6a8df9507604c144a9be6cb8702719e489c6868858a4e0ab362f713f697ba7a6f9e8cd9c9a94aa8e6daba1adcd698a52729ca6e8096def
 DIST qterminal-0.17.0.tar.xz 194332 BLAKE2B bf972608601cd3b4412a95dc4930183655a74d93963f20aadde289eb79d1967737e69d1e25983edc587fb097e1c65c5580dbcdbe79a71aa7f37d62b04819450b SHA512 c5d4ead74feeaec19b917389e7ff6fc4630671deb3442335b8e8c96ec6022c3460343475c95cd40cbaab4c0f813236c23557508b10e26e82ddf1546662f1de57
 EBUILD qterminal-0.16.1-r1.ebuild 847 BLAKE2B 9faed689aaacd5b3b2ddbbedb78bc77e909b9ba64c6769cd9e733b05c69c16fd054652bc15e70638fb7cac4336bf6813041af53457a7317b567765531016d8db SHA512 7a6f1da4a57685fef6d659f8921898a832fd943b5a5794c7439a8ccbf84f06024cc1a32283031bc5dfdbbc8eab408b0738dcab2798c8cd7810cd5e4f9af22d2c
-EBUILD qterminal-0.17.0.ebuild 836 BLAKE2B fc511f752f9d6f389576f83c619c68952d0421fea458aee0303a342f46fc58f42ed5ba854e299cb309169cbf5ca04f521662345177a9084c30caa4f26ae08e48 SHA512 ed1ceb320c6059dabb359b4cab37ac164a4b3e420997f9240e483ba5e2ebb943966525c01d5082115f7b22dcbd6e724cb436d9bdc89cd1cb854010b923c4af31
+EBUILD qterminal-0.17.0.ebuild 843 BLAKE2B e3ebbd0ddef4d7288cf24702325ae411c8e76e6247b4a94823e830b09c60b32e6fa14ec778f0084a9639349e200bd8af09f8c19b16e950605cecbf5b7b44fc43 SHA512 01fdff5baf310fd829ba096513ac42185b86d460a518db3e4be7c77c80c0795174221f21a696b824edda94b0496a507bb9f274e8eda4bd228d0cde79236fca9a
 EBUILD qterminal-9999.ebuild 834 BLAKE2B 7d083ad025507a0c640d684046b9e6fe7c3dde4afa713cb7304db6602e2de8b5498e4f5a2eed85db450f6d11b4a8c208f28a20ae01e4161c505b064e4a38abd7 SHA512 662116f94c3132d4a94e4d3f9544fc43ed5f2baef0fe5399f7e3b59f71a51e22e9a1e14618feb629a34a61d6b2e0f56d87f7c361681fbe911eb1f623b68b12c0
 MISC metadata.xml 331 BLAKE2B 58ccd837daad6307e17695fe2ef3bc12680e0d146ed5a7d38bbc386a9f8f354549d337d7b5b6beb4b6f5e68d35d457a9beff1f2af58a3e358f56d3ad65f89f1e SHA512 6093916b3ba5afc8249b5b0444f021719336ab71c8749827c8c629ceb2b6b1edc0aeed5eae3f098f0e3fc120e80f691669ccf85a195386dd17bf6f343121bdd5
diff --git a/x11-terms/qterminal/qterminal-0.17.0.ebuild b/x11-terms/qterminal/qterminal-0.17.0.ebuild
index 6bc637216f8f..5e8592563aaf 100644
--- a/x11-terms/qterminal/qterminal-0.17.0.ebuild
+++ b/x11-terms/qterminal/qterminal-0.17.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"