dev-util/renderdoc:

Update PythonCompat, bump v1.25, update 9999 ebuild and remove old
versions.

Signed-off-by: Peter Asplund <peter.azp@gmail.com>

4 files changed, 43 insertions, 93 deletions

diff --git a/dev-util/renderdoc/Manifest b/dev-util/renderdoc/Manifest
index 6f33e1c..ecf54ce 100644
--- a/dev-util/renderdoc/Manifest
+++ b/dev-util/renderdoc/Manifest
@@ -1,8 +1,6 @@
-DIST renderdoc-1.17.tar.gz 46340895 SHA256 050abfa3f17edde2eae877c34e296e8b21d302a4dec509382715c9b96b5d9a5b SHA512 0f608f9bd5dfca58fd7d39529dcb49ef4df3af508cc1a90b9d327809cf47908731d0175f6b7510db6380f7e4041806d4d727005ff53ef4860f88db938ebc4c2d WHIRLPOOL 078c922cd65cad8f271410e5efa7c0e5a2f5f82427d2f3c43f28cc36cb56b8e0554211ed1ed7e59cbe87a8ad400aae7000cb5083c3f6a42e56af4c8bb1e240d8
-DIST renderdoc-1.19.tar.gz 46514201 SHA256 ec8031a238e7cbec4b84ed96971c7476293367847dedbb0380e94f4f8d6d3bc1 SHA512 d3a3d0ec9e5782dea27e00f8eb26e9fbcb764e9ccfca230846fad229ce7f2db48d442365d530ebb4e1f50eb44d596a5c18f269ef635c9d5ae4b9275e676a92eb WHIRLPOOL 48291ad08542c413845b8b1881152fa08386c4f155aef24f5d4f37f7e4047654962800519d5ca98e196ecc19cf9492a23048b8a5ceb5eb3e083367f57d7b9e25
-DIST renderdoc_swig_modified-7.zip 6015823 SHA256 9d7e5013ada6c42ec95ab167a34db52c1cc8c09b89c8e9373631b1f10596c648 SHA512 78e66e7da0a6632a0f1e6ca0b38b7331fac8921b0d82d42ec21b281f19ff1c9b1ea182c80c52585dceef2e7444777340eedcbda80ac05563da8b892b446f9596 WHIRLPOOL f76ed018f761ff13053c6e6045f9dde374761cd278b502a0b403b7024b17e39c32cb481fe366f90c0a7fc9114b7dc721278bdb5488f0fa4b2dede443dc5771b9
-EBUILD renderdoc-1.17.ebuild 1788 SHA256 f6c57938cb2fe3096a5862b6b7fe8fd2469ceb181341b4dcd5fb6e6cf363496c SHA512 75e88e8acb6dc7253ed0923799377f432c0f96f98c5c17e0ca543617cdd6fb8b4acea102e117684379c0b4deb9be004702cea212a6fdaca95370a4ddfe32e334 WHIRLPOOL b405488ac8ba2e90b3260a7e9042c15fca0024d374778fced44c20c2f625215d423ee529ea91d546ba53dde17e129cbe06414aba513fb21828b5cabf7c086f9d
-EBUILD renderdoc-1.19.ebuild 1788 SHA256 f6c57938cb2fe3096a5862b6b7fe8fd2469ceb181341b4dcd5fb6e6cf363496c SHA512 75e88e8acb6dc7253ed0923799377f432c0f96f98c5c17e0ca543617cdd6fb8b4acea102e117684379c0b4deb9be004702cea212a6fdaca95370a4ddfe32e334 WHIRLPOOL b405488ac8ba2e90b3260a7e9042c15fca0024d374778fced44c20c2f625215d423ee529ea91d546ba53dde17e129cbe06414aba513fb21828b5cabf7c086f9d
-EBUILD renderdoc-9999.ebuild 1143 SHA256 812b513a6295a0f231a47ce45a00f14e14c80b3b4d7c1c3b4fd88a5de11247ea SHA512 b429eb9061db1cd1ec6410068329bbdaeb4cdfc5e4ccef854e81443ca31859b6c9d5c860a4c3cfc93b23ea74e2928c5cb21e5fd953bcf440999875f4306f1f3d WHIRLPOOL c7693b0a9913e532ea50cccb02270d9802700eb2f6d87c0a4b7d308fe99ca2f0e751565833bfcc2eaa47ff2666c4b410851af145199f0bc8266749fd686cb90e
+DIST renderdoc-1.25.tar.gz 47285123 SHA256 eeb69775a169ffbf9dac85587b93d9a9347025b2bd31e794f4cbffb2d8818eb0 SHA512 0f7a672c4b44276c157b3d09b3bc487be0ab214cb62452fecf284fc5d3a075df1bb13ce801f47d16ebcbbe23ca1fe4e47238e7bd64544356d8c7ac1e4398968a WHIRLPOOL 68489ae20172af2cc68fee314e37ec5dcff96e66b3fd1351ea5397c4d19c21280b7eb85998b0294e4115ca5dd597b17c5fe8d31e99054a0e5e94879451aa1a9d
+DIST renderdoc_swig_modified-7.tar.gz 6015823 SHA256 9d7e5013ada6c42ec95ab167a34db52c1cc8c09b89c8e9373631b1f10596c648 SHA512 78e66e7da0a6632a0f1e6ca0b38b7331fac8921b0d82d42ec21b281f19ff1c9b1ea182c80c52585dceef2e7444777340eedcbda80ac05563da8b892b446f9596 WHIRLPOOL f76ed018f761ff13053c6e6045f9dde374761cd278b502a0b403b7024b17e39c32cb481fe366f90c0a7fc9114b7dc721278bdb5488f0fa4b2dede443dc5771b9
+EBUILD renderdoc-1.25.ebuild 1832 SHA256 c74b109188699f7364195f122b0f71b1f11e6706f099bc2af06b0dad032a8bec SHA512 9e6b1b12ce25664a0bea2f09947b04ea55553d53e7a8b2fc8291d5093a95f4386babd66bf6e409d1c803e5b0652ed4fcdba19d2849a61ae6bc0eeec6c1ae65e7 WHIRLPOOL 75487e508973c91970a12a59701daee172643308b3b5295c263321788cb0f93364c6c05e76d9fa96f6447d9e01df9eaa6b4271a51630aaa548ceb87466bf36d0
+EBUILD renderdoc-9999.ebuild 1714 SHA256 c8b46592fdd927b36adb9f0640adb2d7e87085d0eed62f68549c53690a6f8ead SHA512 1ede17e885e1102c61a120e2b666585ed209ae5bfc83323a3267a85d4132896bd3df989321aafd1ca500aaf3625ef29fc945999ddf0e37e68e7629a04abef366 WHIRLPOOL 731892465a66174e11344a16eac937bf87c28b17e23dd1c3913c8c12be72f22e0b2af3d741598983c1e989a60233c0c92fa8674ef41ea52eddabd9b1b3020df1
 MISC ChangeLog 3754 SHA256 1465522289538eed07bedef16bdfaca267c0c199f4fd44f5846e4bf8c0be8077 SHA512 d6e05c6e4c9a04103043e9d6941375e2f9f4aefa63e6b719708cecf1d4e5984652c7c7c0467b743ec7d944cdf0b50e804d1a47cf2d31ca291c0ce4b3d1f880be WHIRLPOOL 9276a58b84b67c82eb5e33d8833ea651def892660e566c8b0a73eb656ddd90ec5e3f56087c70ddfa17606988f7bd3b5eda4e627fd426bc55b4958b2a788cd530
 MISC metadata.xml 993 SHA256 696ae40a52811773eb07e14dfecfb5810a075c8e0c8da0faac7fe5c9d6f09d59 SHA512 c593076407b5e25e4d68c915d67640ba1cba0ac54a5697ce13373d9aecd9f6657681c51d9bbed14c0ed5ad7f894723f41a74e3eb9f067e66d1d4cbaf1e4197e9 WHIRLPOOL be00602985c02c25dfa59401face36432ee5049edf27e4fbc68f4f2e0fe567be9608e97a3e7d2baa47d58cbf1a392672ddf4ccccfe95900504d3c931a0c02502
diff --git a/dev-util/renderdoc/renderdoc-1.19.ebuild b/dev-util/renderdoc/renderdoc-1.19.ebuild
deleted file mode 100644
index a6bdb7e..0000000
--- a/dev-util/renderdoc/renderdoc-1.19.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-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() {
-	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
-		-DQMAKE_QT5_COMMAND="qmake5"
-		-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.25.ebuild
index a6bdb7e..72f5010 100644
--- a/dev-util/renderdoc/renderdoc-1.17.ebuild
+++ b/dev-util/renderdoc/renderdoc-1.25.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit qmake-utils cmake eutils python-single-r1
+PYTHON_COMPAT=( python3_{9,10,11} )
+inherit xdg-utils cmake python-single-r1
 
 SWIG_VERSION="7"
-SWIG_ZIP_FILENAME="${PN}_swig_modified-${SWIG_VERSION}.zip"
+SWIG_ZIP_FILENAME="${PN}_swig_modified-${SWIG_VERSION}.tar.gz"
 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} )"
+		qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-${SWIG_VERSION}.tar.gz -> ${SWIG_ZIP_FILENAME} )"
 CMAKE_BUILD_TYPE="Release"
 CMAKE_BUILD_GENERATOR="Ninja"
 
@@ -19,6 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+qt5 +python +egl +opengl +gles2 +vulkan +doc wayland +xcb"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/libpcre
 	x11-libs/libX11
diff --git a/dev-util/renderdoc/renderdoc-9999.ebuild b/dev-util/renderdoc/renderdoc-9999.ebuild
index 4bdd3bf..2f84ba1 100644
--- a/dev-util/renderdoc/renderdoc-9999.ebuild
+++ b/dev-util/renderdoc/renderdoc-9999.ebuild
@@ -1,28 +1,31 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 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 git-r3
+PYTHON_COMPAT=( python3_{9,10,11} )
+inherit xdg-utils cmake python-single-r1 git-r3
 
 SWIG_VERSION="7"
-SWIG_ZIP_FILENAME="${PN}_swig_modified-${SWIG_VERSION}.zip"
+SWIG_ZIP_FILENAME="${PN}_swig_modified-${SWIG_VERSION}.tar.gz"
 DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
 HOMEPAGE="https://github.com/baldurk/renderdoc"
 EGIT_REPO_URI="https://github.com/baldurk/renderdoc.git"
 EGIT_BRANCH="v1.x"
 CMAKE_BUILD_TYPE="Release"
+CMAKE_BUILD_GENERATOR="Ninja"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+qt5 +python"
+IUSE="+qt5 +python +egl +opengl +gles2 +vulkan +doc wayland +xcb"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/libpcre
 	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
+	xcb? (
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
 	python? (
 		${PYTHON_DEPS}
 	)
@@ -36,14 +39,34 @@ RDEPEND="${PYTHON_DEPS}
 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
+		-DQMAKE_QT5_COMMAND="qmake5"
 		-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
+}