dev-util/renderdoc:

Set QMAKE_QT5_COMMAND to qmake5
Remove older versions.

Signed-off-by: Peter Asplund <peter.azp@gmail.com>
Package-Manager: Portage-3.0.30, Repoman-3.0.3

4 files changed, 9 insertions, 81 deletions

diff --git a/dev-util/renderdoc/ChangeLog b/dev-util/renderdoc/ChangeLog
index 1bf2de4..5b60bab 100644
--- a/dev-util/renderdoc/ChangeLog
+++ b/dev-util/renderdoc/ChangeLog
@@ -1,3 +1,7 @@
+  13 Apr 2022; AzP <peterasplund@gentoo.se> -renderdoc-1.16.ebuild,
+  renderdoc-1.17.ebuild:
+  dev-util/renderdoc:
+
 *renderdoc-1.17 (30 Nov 2021)
 
   30 Nov 2021; AzP <peterasplund@gentoo.se> +renderdoc-1.17.ebuild,
diff --git a/dev-util/renderdoc/Manifest b/dev-util/renderdoc/Manifest
index ea9f8e3..80d810f 100644
--- a/dev-util/renderdoc/Manifest
+++ b/dev-util/renderdoc/Manifest
@@ -1,8 +1,6 @@
-DIST renderdoc-1.16.tar.gz 46203412 SHA256 67fff71b7e58538482a3ed3edb297d3bcca854ffd92b47142e77f191763e9735 SHA512 05338b9a7ebc159d94f6164449fc8fe3f659119552fb665b71a32a9aec2b6b0b31705fd39178bb44a0e721a7dbc5425b6abf4822471ae5802f734031003443ad WHIRLPOOL cf63a03112c0ccdf4eeeb06d9faeb635bf6499b560128fc1b1213073889f02a88a9fd0bf2714454f2e583e24fb002cb8131bb92a632b80adc9715f4e3552cbd9
 DIST renderdoc-1.17.tar.gz 46340895 SHA256 050abfa3f17edde2eae877c34e296e8b21d302a4dec509382715c9b96b5d9a5b SHA512 0f608f9bd5dfca58fd7d39529dcb49ef4df3af508cc1a90b9d327809cf47908731d0175f6b7510db6380f7e4041806d4d727005ff53ef4860f88db938ebc4c2d WHIRLPOOL 078c922cd65cad8f271410e5efa7c0e5a2f5f82427d2f3c43f28cc36cb56b8e0554211ed1ed7e59cbe87a8ad400aae7000cb5083c3f6a42e56af4c8bb1e240d8
 DIST renderdoc_swig_modified-7.zip 6015823 SHA256 9d7e5013ada6c42ec95ab167a34db52c1cc8c09b89c8e9373631b1f10596c648 SHA512 78e66e7da0a6632a0f1e6ca0b38b7331fac8921b0d82d42ec21b281f19ff1c9b1ea182c80c52585dceef2e7444777340eedcbda80ac05563da8b892b446f9596 WHIRLPOOL f76ed018f761ff13053c6e6045f9dde374761cd278b502a0b403b7024b17e39c32cb481fe366f90c0a7fc9114b7dc721278bdb5488f0fa4b2dede443dc5771b9
-EBUILD renderdoc-1.16.ebuild 1824 SHA256 4bb0e121d48f0ab16cfa36b12e551e31b7084c99ac36f10accbeab886161456a SHA512 b937bf8c87df11fda8fe84e70261ebd10bf91028e53570364f941098dded41887e7177f3bab890e7fe4db1a96d74e25e2403667b2fce2be33a122fd96937705d WHIRLPOOL 7f18c2bf6003b579e96da5ac42188137a2d55fa51589e465c3c8f03c57cc262b73b4de21ee70df2625e590e9d17d99ce87d8ddf2f3aa74c64196a045a6abab20
-EBUILD renderdoc-1.17.ebuild 1824 SHA256 4bb0e121d48f0ab16cfa36b12e551e31b7084c99ac36f10accbeab886161456a SHA512 b937bf8c87df11fda8fe84e70261ebd10bf91028e53570364f941098dded41887e7177f3bab890e7fe4db1a96d74e25e2403667b2fce2be33a122fd96937705d WHIRLPOOL 7f18c2bf6003b579e96da5ac42188137a2d55fa51589e465c3c8f03c57cc262b73b4de21ee70df2625e590e9d17d99ce87d8ddf2f3aa74c64196a045a6abab20
+EBUILD renderdoc-1.17.ebuild 1788 SHA256 f6c57938cb2fe3096a5862b6b7fe8fd2469ceb181341b4dcd5fb6e6cf363496c SHA512 75e88e8acb6dc7253ed0923799377f432c0f96f98c5c17e0ca543617cdd6fb8b4acea102e117684379c0b4deb9be004702cea212a6fdaca95370a4ddfe32e334 WHIRLPOOL b405488ac8ba2e90b3260a7e9042c15fca0024d374778fced44c20c2f625215d423ee529ea91d546ba53dde17e129cbe06414aba513fb21828b5cabf7c086f9d
 EBUILD renderdoc-9999.ebuild 1143 SHA256 812b513a6295a0f231a47ce45a00f14e14c80b3b4d7c1c3b4fd88a5de11247ea SHA512 b429eb9061db1cd1ec6410068329bbdaeb4cdfc5e4ccef854e81443ca31859b6c9d5c860a4c3cfc93b23ea74e2928c5cb21e5fd953bcf440999875f4306f1f3d WHIRLPOOL c7693b0a9913e532ea50cccb02270d9802700eb2f6d87c0a4b7d308fe99ca2f0e751565833bfcc2eaa47ff2666c4b410851af145199f0bc8266749fd686cb90e
-MISC ChangeLog 3439 SHA256 d41843389cc00457c1a31f9a71b438be69183503dc4596a94df4919a1f870791 SHA512 c0a9abf67e75fa4c86167e98ce09ac1aec868ab46ca85d423fed41026aca1c65eb124813b5ce391dc7e736b569a104709384877046f485186f8b3151944b8ebb WHIRLPOOL 9d5418c0da1072b64a48377847cebc2d451fea49e166b8488c04877810319aece67c454903a09aca037229f9e00f5bd1df913055860d5938586b2dd03f7930e0
+MISC ChangeLog 3555 SHA256 f7ea7c5e20e65fe6a6194b7f0b85041531e51524dce5bda5e39877166a2109c3 SHA512 bd35ed2507d33fa9187ff9f09fd67a453e50f86fdb282c516172e817fdb5fd5e0f3521efac695cffcb0b45cc67eb7655e0eafd913c648a568a1cf381c38a634e WHIRLPOOL 38493727b4cb1ee04dddbe410dfbfa76fb96883a51bc81e29c1442737bff6a4775af4cbb7857c0d132d082d60dfa9338e46bfe56ea9c5a915a05d6787fee5253
 MISC metadata.xml 993 SHA256 696ae40a52811773eb07e14dfecfb5810a075c8e0c8da0faac7fe5c9d6f09d59 SHA512 c593076407b5e25e4d68c915d67640ba1cba0ac54a5697ce13373d9aecd9f6657681c51d9bbed14c0ed5ad7f894723f41a74e3eb9f067e66d1d4cbaf1e4197e9 WHIRLPOOL be00602985c02c25dfa59401face36432ee5049edf27e4fbc68f4f2e0fe567be9608e97a3e7d2baa47d58cbf1a392672ddf4ccccfe95900504d3c931a0c02502
diff --git a/dev-util/renderdoc/renderdoc-1.16.ebuild b/dev-util/renderdoc/renderdoc-1.16.ebuild
deleted file mode 100644
index daf8e3e..0000000
--- a/dev-util/renderdoc/renderdoc-1.16.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
-inherit qmake-utils cmake eutils python-single-r1
-
-SWIG_VERSION="7"
-SWIG_ZIP_FILENAME="${PN}_swig_modified-${SWIG_VERSION}.zip"
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/baldurk/renderdoc"
-SRC_URI="https://github.com/baldurk/renderdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-${SWIG_VERSION}.zip -> ${SWIG_ZIP_FILENAME} )"
-CMAKE_BUILD_TYPE="Release"
-CMAKE_BUILD_GENERATOR="Ninja"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+qt5 +python +egl +opengl +gles2 +vulkan +doc wayland +xcb"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libpcre
-	x11-libs/libX11
-	xcb? (
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	python? (
-		${PYTHON_DEPS}
-	)
-	qt5? (
-		>=dev-qt/qtcore-5.6:5
-		>=dev-qt/qtgui-5.6:5
-		>=dev-qt/qtwidgets-5.6:5
-		>=dev-qt/qtsvg-5.6:5
-		>=dev-qt/qtx11extras-5.6:5
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-6.0:*
-	dev-util/cmake
-	dev-util/ninja
-	sys-devel/bison
-	app-arch/unzip"
-
-src_configure() {
-	export QT_SELECT=qt5
-	export QMAKE_QT5_COMMAND=qmake-qt5
-	local mycmakeargs=(
-		-DENABLE_EGL="$(usex egl)"
-		-DENABLE_GL="$(usex opengl)"
-		-DENABLE_GLES="$(usex gles2)"
-		-DENABLE_RENDERDOCCMD="$(usex doc)"
-		-DENABLE_VULKAN="$(usex vulkan)"
-		-DENABLE_WAYLAND="$(usex wayland)"
-		-DENABLE_XCB="$(usex xcb)"
-		-DBUILD_VERSION_STABLE=ON
-		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}/${SWIG_ZIP_FILENAME}"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-util/renderdoc/renderdoc-1.17.ebuild b/dev-util/renderdoc/renderdoc-1.17.ebuild
index daf8e3e..a6bdb7e 100644
--- a/dev-util/renderdoc/renderdoc-1.17.ebuild
+++ b/dev-util/renderdoc/renderdoc-1.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit qmake-utils cmake eutils python-single-r1
 
 SWIG_VERSION="7"
@@ -44,8 +44,6 @@ DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 src_configure() {
-	export QT_SELECT=qt5
-	export QMAKE_QT5_COMMAND=qmake-qt5
 	local mycmakeargs=(
 		-DENABLE_EGL="$(usex egl)"
 		-DENABLE_GL="$(usex opengl)"
@@ -55,6 +53,7 @@ src_configure() {
 		-DENABLE_WAYLAND="$(usex wayland)"
 		-DENABLE_XCB="$(usex xcb)"
 		-DBUILD_VERSION_STABLE=ON
+		-DQMAKE_QT5_COMMAND="qmake5"
 		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}/${SWIG_ZIP_FILENAME}"
 	)
 	cmake_src_configure