gentoo resync : 16.04.2022

2 files changed, 23 insertions, 8 deletions

diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index f3ead259b9cf..3db43d41ebf2 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -6,7 +6,9 @@ AUX renderdoc-1.18-system-compress.patch 4699 BLAKE2B 4f37058deef1773a4a35b64415
 AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
 AUX renderdoc-1.18-system-glslang.patch 9100 BLAKE2B a033377083705bbbccaa56657eccf632bcc5093bc86f319d3d30e94eed41bf849fe8e983dd9085b1628ecaed9ab0b358a487b40c8672239d4b32ee83e24ab1df SHA512 a0eea5b3c24092f30b2ec5c9fde327b4683839a34a5f11a64fb85b54d645f50b8e87f8fc59cb87450566caa3ad87aadc6baa7c8843256726cb8bd71fb0444dd0
 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
-EBUILD renderdoc-1.18-r1.ebuild 4806 BLAKE2B 37bafc11732e9930f1477ae614eb4e8be68394df82240cf2cdf68194aee393fe446a98d8e06578f7315205d07b2d39460e16541d5870b15dd657eee40bf05a88 SHA512 12813b7e5636f9c7b86f3022361a1c5fd44e075d633af4903f21b95cf0e74f169b1f7a2a2f316d24544f8d214f1d673cf8106dfd4cdeeb3cbd998d119519fce2
 EBUILD renderdoc-1.18-r2.ebuild 5060 BLAKE2B ae86523a747f334c2167f82dd79edbd379b324f2575126243d1f5d282a8f147eb8a8c58413ce066965bf697bf6b1abf19607ca643cd45227dd4b16d4e5dce803 SHA512 747b1ca95cdeb3f7c93b3a3e488ba964fcf215d1bad15c36cf94442f00697dbca527fc5b31936f8d0432b213f1985490e7e650d7e84e88658e96f5950bcd5f73
+EBUILD renderdoc-1.19.ebuild 5230 BLAKE2B 49ab8ae3173f623eef60b9b0b488f7f8827771b865fbbb9c56a4acbb43c8ffd2bc684311240a698e05c3ee1779086b50e94a95f9c3ae08c82c788c72fa67ef09 SHA512 d0d600f5814553a0fb62cc15f1f75825d6286bb5ddcfcb3a0f9e5bf2334efdbca04e8ca142b30742aedfec7dc880fb8adbb8fbd2d87b271436f01737c55316a5
 MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
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)
 	)