gentoo resync : 31.05.2021

3 files changed, 2 insertions, 85 deletions

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index f9bc4f418ea8..faf6e9f2f88b 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -4,11 +4,8 @@ AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f2041519
 AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430
 AUX vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 1375 BLAKE2B 27ee298761155789aba19b77dcad97abbf2524a69de4540c38b814fa566e8f3e4003925570a12b75d85f56cb1b047c1895eb8c74df8c81f8334785dfc5055913 SHA512 983c7f4ab44417a5ca0e00f428882650b8a5c250aba328e8255bffb25cdff0505f0fa3a635d722a27467ac44e4e2880f8631b7ff3b20a35ea4e57db9537807ab
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
-DIST vte-0.62.1-command-notify.patch.xz 4844 BLAKE2B 22301fdc5f1969beb2ad9b316fea8972f696f0e54e1a24d5eceedec71162afc2991b7963a71ce8925a94f6c40e5303d3db760b872d0eebbdc6d05b22d3c59ecc SHA512 491e241b0f5aae50e59d25751e95579d40c47e7e4c7f2b279522347f7f2f7f00c92bdf5fa4a651e4146bcfa9439f03b6311b4061fb20c5679c09b97a4924dcf1
-DIST vte-0.62.3.tar.xz 447152 BLAKE2B 2c55430490af577cdbad8bbcbb53902ccc4ab8d9643d5e8b3279e96b4285347e652e761644c957961732eeb50d12e33fa3d3c735be9899ad14c1e2f35377f2a7 SHA512 0475e2813b305bf1b5d48ece5959f2feb10e89b589fa3b75032ae466fd5254bf5c2fc6085dc296d65c5df84790a38892534ff401109843bf964ae62a8c540a81
 DIST vte-0.64.1-command-notify.patch.xz 4880 BLAKE2B d6ff5f4acac161980c8c18245e65795c7f0ea3d0819748894b055306ecd731d698cac578eff2750795a9180a9b17d79f220e814083012d5a04f4f351ff2a0e36 SHA512 174397aeca00399b138286fd4cc88941add041a1f2596fd42222d44c886c2e35b2a33041b58a102ee3acbcddc0cc40fcfde39d72ec46b640ee1db22d8ae684c4
 DIST vte-0.64.1.tar.bz2 486720 BLAKE2B bd8fb1f471a43aadf015cce8ae38c646521ca66e37652b72f7e94cec15a2a0a844d67116e9123ede44ba1b6ee569d1ecd0ff5e83067f6231802f5a77a798e446 SHA512 38bbbb4ed3d86740091c9ddee83f97bf5cb5c69c48e8a78592dd46e8f9334859a6c523e7b16dce110de71cd4a9a3b8b99a11816b61eae6e251dfc20cdbee6716
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
-EBUILD vte-0.62.3.ebuild 2204 BLAKE2B ee1cb85213d97e873afc657737d7a2f59caa7e5d8a229709aee2e3ef2a262772274f776f1408a3a3cf41e7c6b9cb7457cfbb7cc5c1216d4f95d79dc6ef22f813 SHA512 5143976afee177477ddadbbae0136a2eba5c83640ca96691582b00bfcca35276708f1a5bd00bc2d0663c73e4b726dafa819756b79bc0fa6d4cc21ef3659c81fe
-EBUILD vte-0.64.1.ebuild 2519 BLAKE2B 5c0090c36ff061e3ff7a305d8de2ca5a4b6ba630283b32004fb3df01d6205dae02b1a026d2c5ea15e6c8fb0b42a8bb328983b50a4e0b007eb4cac670140a2bd1 SHA512 7554f9feb2b32bb69a2e28769a91870956e3b34bb9220127796b3ff44f7130563fe3d4d573f4917ad44cc318d9f30b931c9af897233b3a247f7461664b7050a1
+EBUILD vte-0.64.1.ebuild 2512 BLAKE2B b1936e89ea0e87b6d784ad4d19840cd42d44ae0bfbb825158ae460e6bb7f7e5016fd0264c519a2c48f3b4c697c150c8389ea6074f01fe3c86e496380dd177c71 SHA512 82245bf415556851b554aeba6c27edc26bdcfbc3127dd30f11bb57aea663f9658f324cd7c4449fdd3e8986c4789f7e434befcf4a150a5f0001a3300539fb25dd
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.62.3.ebuild b/x11-libs/vte/vte-0.62.3.ebuild
deleted file mode 100644
index 2d52a69a4dc3..000000000000
--- a/x11-libs/vte/vte-0.62.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-LICENSE="LGPL-3+ GPL-3+"
-SLOT="2.91"
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.24.14:3[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.52:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21
-	systemd? ( >=sys-apps/systemd-220:= )
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.13
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	if ! use vanilla; then
-		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.62.1-command-notify.patch
-	fi
-
-	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug debugg)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		$(meson_use crypt gnutls)
-		-Dgtk3=true
-		-Dgtk4=false
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
diff --git a/x11-libs/vte/vte-0.64.1.ebuild b/x11-libs/vte/vte-0.64.1.ebuild
index 5d3ccf349ace..88d64617c963 100644
--- a/x11-libs/vte/vte-0.64.1.ebuild
+++ b/x11-libs/vte/vte-0.64.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91"
 IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 # Upstream is hostile and refuses to upload tarballs.