Merge updates from master

7 files changed, 65 insertions, 7 deletions

diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index 3074115ad29a..aa3da3215f30 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -1 +1,2 @@
 DIST tree-sitter-typescript-0.20.0.tar.gz 769336 BLAKE2B 12f5ac1f29963eda7a34d08832ca263cf91fd6a8335c998d9d1795851bd30d4a43ade36d004ffcb287c73b63e691582a79d640e24050df4f778fa308f5b0665e SHA512 99cbcabf58717eb17346b2139320f0d13846f1f335a81ed01fee6e748cd0d867218a9cc8d216162c3b9b9da86487024bedbced67e91adadab207633c25dc7e1a
+DIST tree-sitter-typescript-0.20.1.tar.gz 767713 BLAKE2B 25921ef20ec82bacf9858fd2bdca5d79f19ee132a48ad523ce4ea9d5141c2d314ec76d81a7d1751a6fab3651c3b3a2e0e2a469fc5168a5961310ee412e22ad4f SHA512 4d57308e84964bbf136868285141c4cd28ae0bbddef7973849679f8b8b85f00cd1bb5a4db7fd7b5cbd6a090b56193c8120bfd134358d33597a60a9145c694de0
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
new file mode 100644
index 000000000000..3b2e19104ead
--- /dev/null
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="TypeScript grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
+S="${WORKDIR}"/${PN}-${PV}/typescript/src
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index 21433d25e443..29cd5dab156a 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -1,2 +1,4 @@
 DIST renderdoc-1.18.tar.gz 46372788 BLAKE2B 3f07e29770e033d96f202fa143c7dd2e422750b28f33d14736c43f667fd45ec1b899e66136e415a2b947fbba7cdf0f822fe1dc6978c5146ae5432b44ed497a75 SHA512 4f7baba39ee8e346d00c2d80b5bf7370adebe0200ea2a95a339b3d207fc58f42bff109ffe922604ad49bcd3b5ff8d1ef2a282dd4aa16f09fd6b57aba06aa493d
+DIST renderdoc-1.19.tar.gz 46514201 BLAKE2B 32027b743afd75797b393194f1c0a1864985ce4a7eb419d47bd3665000b77e3460d5501b555d4206f332db9894d2697a00bae79d831d7f7724737d889a85ff64 SHA512 d3a3d0ec9e5782dea27e00f8eb26e9fbcb764e9ccfca230846fad229ce7f2db48d442365d530ebb4e1f50eb44d596a5c18f269ef635c9d5ae4b9275e676a92eb
+DIST renderdoc-1.19.tar.gz.asc 833 BLAKE2B 809e1db20625ad26f2d4b1d13e1bce67133311072ca314a1f662f2fa46b28e5ced976513f1d7b112266cfe2dbe59cec82e1cc556116b1cb5f47d31e834df8073 SHA512 4897b041dbf697d3255986eb58d5142ead52afeff1761185d13fdfbbb0caee077bb7d485a0527a4d921e141ad8eaf414d9d2db38bdd157937620bb15da2320ec
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
diff --git a/media-gfx/renderdoc/renderdoc-1.18-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.19.ebuild
index f669767e6d38..000168350417 100644
--- a/media-gfx/renderdoc/renderdoc-1.18-r1.ebuild
+++ b/media-gfx/renderdoc/renderdoc-1.19.ebuild
@@ -13,13 +13,14 @@ AUTOTOOLS_AUTO_DEPEND="no"
 DOCS_BUILDER="sphinx"
 DOCS_DIR="docs"
 PYTHON_COMPAT=( python3_{9,10} )
-inherit autotools cmake optfeature python-single-r1 docs xdg
+inherit autotools cmake optfeature python-single-r1 docs qmake-utils verify-sig xdg
 
 DESCRIPTION="A stand-alone graphics debugging tool"
 HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
 SRC_URI="
 	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
+	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
 "
 
 # renderdoc: MIT
@@ -38,14 +39,14 @@ SRC_URI="
 # swig: GPL-3+ BSD BSD-2
 LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="pyside2 qt5"
 REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	app-arch/lz4:=
 	app-arch/zstd:=
-	dev-libs/miniz
+	dev-libs/miniz:=
 	dev-util/glslang
 	x11-libs/libX11
 	x11-libs/libxcb:=
@@ -78,6 +79,7 @@ BDEPEND="
 		dev-qt/qtcore:5
 		sys-devel/bison
 	)
+	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
 "
 
 PATCHES=(
@@ -99,19 +101,21 @@ PATCHES=(
 
 	"${FILESDIR}"/${PN}-1.18-system-glslang.patch
 	"${FILESDIR}"/${PN}-1.18-system-compress.patch
-
-	# Check physical device API version and supported extensions.  Fixes
-	# segfault on some GPU/driver combinations.  Will be in release 1.19
-	"${FILESDIR}"/${PN}-1.18-check-api-ver.patch
 )
 
 DOCS=( util/LINUX_DIST_README )
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
+
 pkg_setup() {
 	use qt5 && python-single-r1_pkg_setup
 }
 
 src_unpack() {
+	if use verify-sig; then
+	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
 	# Do not unpack the swig sources here.  CMake will do that if
 	# required.
 	unpack ${P}.tar.gz
@@ -130,6 +134,11 @@ src_prepare() {
 	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
 		"${S}"/docs/conf.py \
 		|| die 'sed patch doc sys.path failed'
+
+	# Bug #836235
+	sed -i '/#include <stdarg/i #include <time.h>' \
+		"${S}"/renderdoc/os/os_specific.h \
+		|| die 'sed include time.h failed'
 }
 
 src_configure() {
@@ -162,6 +171,10 @@ src_configure() {
 	use qt5 && mycmakeargs+=(
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
+
+		# Needed after qtchooser removal, bug #836474.
+		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
+
 		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
 	)
 
diff --git a/sec-keys/openpgp-keys-baldurkarlsson/Manifest b/sec-keys/openpgp-keys-baldurkarlsson/Manifest
new file mode 100644
index 000000000000..0748dab109bc
--- /dev/null
+++ b/sec-keys/openpgp-keys-baldurkarlsson/Manifest
@@ -0,0 +1 @@
+DIST baldurkarlsson.gpg 3113 BLAKE2B 3950914ab59286de1a90c09cd27355d46271d2737bfd872e9b98f8e5524383579f6ec39ff5129b6c9e74fe94064bef21ab2222fb63aa8684b972991ba3f430b6 SHA512 a6b18e23caf3fb5d64d2b70de31bd6a51dd30600a2ce195970ad8db9a580609ceeed97a675bc5be1d8bf97c0181a11751958f4d14ee2467a1a86e5d875072cfe
diff --git a/sec-keys/openpgp-keys-baldurkarlsson/metadata.xml b/sec-keys/openpgp-keys-baldurkarlsson/metadata.xml
new file mode 100644
index 000000000000..59fd6df34dc7
--- /dev/null
+++ b/sec-keys/openpgp-keys-baldurkarlsson/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>matthew@gentoo.org</email>
+  <name>Matthew Smith</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-baldurkarlsson/openpgp-keys-baldurkarlsson-20220415.ebuild b/sec-keys/openpgp-keys-baldurkarlsson/openpgp-keys-baldurkarlsson-20220415.ebuild
new file mode 100644
index 000000000000..2c4de49ace14
--- /dev/null
+++ b/sec-keys/openpgp-keys-baldurkarlsson/openpgp-keys-baldurkarlsson-20220415.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by Baldur Karlsson"
+HOMEPAGE="https://renderdoc.org/builds"
+SRC_URI="https://renderdoc.org/baldurk-pubkey.asc -> baldurkarlsson.gpg"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	doins "${DISTDIR}"/baldurkarlsson.gpg
+}