gentoo auto-resync : 24:11:2024 - 03:02:54

6 files changed, 58 insertions, 473 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index a825feddf68c..1785371cb63b 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index bf144e3e5c6e..5c3329f01c34 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,12 +1,8 @@
 AUX prismlauncher-8.2-openjdk21.patch 1541 BLAKE2B 80f38e970dbe448e3251ea90ef77e780aaf85c9ebf579affbf06690cafdbe4581066eaef7c6551a13198ab9aa51bc9b2137ec8f02c2b6ee83fce0ae0299436df SHA512 f3ef51239de85052e4c47bf61132b36975309eeac4281a31a8f78e4b9aecb20dbb6a2dee262c0fe8f634b2e0a690ca73f6223e389f73532a5033f335d39cd7ab
 AUX prismlauncher-9.1-openjdk21.patch 1547 BLAKE2B 2f0354d9e7d700ba84095b72b4256c4f9d89810acd18f2c93531f13ca03d989f397d88607700e320cae4d0859c49b01c7cb19f2b977edc2d2335be784b55db44 SHA512 fbe65970549d4becae06ef1b1498e2dd7538403dc98fdf74777b9faa2aee27750299c39752fae82750332f7955bebb09be9108186969fce71b6bcc72b3f32be4
-DIST prismlauncher-8.2.tar.gz 8437675 BLAKE2B 3eee060dbc80ca690b344875caa20b27d8949b1e972602d1d383e1ae394404408d74dece11b47f940948ac2c437bd73fadf56d4e492daa34adef1c1eade66bc9 SHA512 6a0988a83e36df0da328fed0efe93171f8b4c565622f8eddf885e6e019214b15b8f64485ce1d9982dd441fad7c4aac8d1647e1b4dbf2cdb8ebadc46f664857ad
-DIST prismlauncher-8.3.tar.gz 8412178 BLAKE2B 47244a8ec09ad12bf902660d114835ef0c142dd7cf740e8fe3771c08dd39ff5ab5f9e043d17c03dce1986c0a37b421868d4d3d939b35bdb9c237b2f72925be79 SHA512 c4153fbfd5b6c09ecf2d78d95a629e78685a45a85ccbb5d7f8e4ec7bf7efb66d72f5eee0947ccb13090b4a8429b00cb92fdf96bb0dbe435b61a285d7517d37b2
 DIST prismlauncher-8.4.tar.gz 8444486 BLAKE2B c7950df3d843e370914e2a72c71847a71ab0446508a464ce04ded007b0b3170e8119bb30455d1022fda98cd49f16528a63f5589766561cfc15950c6823779b6f SHA512 24307e6f2a34c459153def5ee639c9a37d3ec3e54bf81dc7d7da8263ee58e16f2391101732889d3b00a1b923704aa21756fad4ee288665e45962032b1d9e8de9
 DIST prismlauncher-9.1.tar.gz 8460672 BLAKE2B 1bb31dab88d9ca4317e61b6938f9b5aeb0b76cab3407d69b62ecf9bfa1ade3308a8927f53e020b6531fbe0cce962c7e560727298a911f07b9fec1f51b1470cd9 SHA512 5a486bb0034464be873d80512ba164fab44eb60e3abda28771387f8bed471c5a323269a5f961a0950692915698b849bb4e7de7405c26e3ad29aa8732f140a66d
-EBUILD prismlauncher-8.2-r1.ebuild 4646 BLAKE2B 9b15b424cc9c36cd79ac75c874c39bc65160dd69499795a463196eed44bda2fdbec4a8975abc2690ff2a90d386cd5f93c910ee9b1e799c47be88f82d3432ddd5 SHA512 fa99861333ea8fbd18957c4fb373492e37546ed431d4a1b5e3184ca579db21c9eb20bf7d87e4583cfb99db4db6ffe9ea575ff1f9a45aa76e198af43f8dd50853
-EBUILD prismlauncher-8.3.ebuild 4622 BLAKE2B 0ba5af111c95e6f3cc679c1020fcfae33cb58fe690a51d1884ff696a4757077855a0cb659bc89ae5438d4ba8924f786d742f916ef6951d28cc0ca6161b95ccc4 SHA512 6de0ce1bcf1a34e16047951153c1d9b254b9c9e46a927aa56a2c79d42f88bef08ee898c5ce84a02af6a86db4de355c3fe37df18d2f6058fd34f5e3498e573708
 EBUILD prismlauncher-8.4.ebuild 4205 BLAKE2B 7bdc9fe2e5a879af2e60f2b06abbc8f07e372eb9d2b7885c72baa042a03f16ca91a94548ccf5f6163313495db67120a59c2c67925b46229bbc411c85c231400b SHA512 771d10635c09f39928d9bb762edef326a643c625bf50278b10c9caec209100a640337de59494bb9d8dbdcd6050d039baca8be9f8e208428ec24ce9f164b9082f
-EBUILD prismlauncher-9.1.ebuild 4300 BLAKE2B 4945d605616cea24074bfcdf7075b430ab444c3252842e29893a1ffc2a0a5ce179d659005149e2f5be6aaf2cac0c5b058d8a6def40f9b55811b9ec3cdf9f9a7b SHA512 730dc7ebb180747a1ba176587b56532ee2f480be503b78f3b01c5968543e5ec62d09b5d202cd6a663dcbfedb2d29b96e2938a636beca784819e33462339409e7
-EBUILD prismlauncher-9999.ebuild 4300 BLAKE2B 4945d605616cea24074bfcdf7075b430ab444c3252842e29893a1ffc2a0a5ce179d659005149e2f5be6aaf2cac0c5b058d8a6def40f9b55811b9ec3cdf9f9a7b SHA512 730dc7ebb180747a1ba176587b56532ee2f480be503b78f3b01c5968543e5ec62d09b5d202cd6a663dcbfedb2d29b96e2938a636beca784819e33462339409e7
+EBUILD prismlauncher-9.1-r1.ebuild 3561 BLAKE2B 24f6048d10dd2038ac6853931903c6bfa1bbee01a90fcacb6f2e0d017fffcda07ef609ff1cb1dc0005d326dd9bc4900ecb539d061307d344434a068a9bb1b2da SHA512 485c96ceee443256962f1d72d750cb0e4ecfdaa27114f2836f91ec0dfa15f1666c01816d78762ca51c4b82c6aa5a95036d62c6ab86951b3003e57b9039fb2557
+EBUILD prismlauncher-9999.ebuild 3561 BLAKE2B 24f6048d10dd2038ac6853931903c6bfa1bbee01a90fcacb6f2e0d017fffcda07ef609ff1cb1dc0005d326dd9bc4900ecb539d061307d344434a068a9bb1b2da SHA512 485c96ceee443256962f1d72d750cb0e4ecfdaa27114f2836f91ec0dfa15f1666c01816d78762ca51c4b82c6aa5a95036d62c6ab86951b3003e57b9039fb2557
 MISC metadata.xml 1013 BLAKE2B e9faf6e1acb07da776bddc7720fa3d1543c881abedfc2042593359b324042fd3d137d3676d6ede3409257cb99fb7cda972b9dadb16945c029e9a6cbce00576e1 SHA512 7211bf164e9f52e15e6517404efbba195b9ef25626dcd9cdbff1e7c966693619acd1d8d1efa10ab1c9388dc77edad06dce29e07eb7bfee6b7b0a9be4befd379b
diff --git a/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild b/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild
deleted file mode 100644
index 862c412bfab6..000000000000
--- a/games-action/prismlauncher/prismlauncher-8.2-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-DESCRIPTION="A custom, open source Minecraft launcher"
-HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="
-		https://github.com/PrismLauncher/PrismLauncher
-	"
-
-	# TODO: Add tomlplusplus as a system library, like quazip
-	EGIT_SUBMODULES=( '*' '-libraries/quazip' '-libraries/filesystem' '-libraries/zlib' '-libraries/extra-cmake-modules' '-libraries/cmark' )
-else
-	MY_PN="PrismLauncher"
-
-	# Let's use the vendored tarball to avoid dealing with the submodules directly
-	SRC_URI="
-		https://github.com/PrismLauncher/PrismLauncher/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
-	"
-
-	# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
-	S="${WORKDIR}/${MY_PN}-${PV}"
-
-	KEYWORDS="amd64 ~arm64"
-fi
-
-# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# LGPL-3+ for libnbtplusplus
-# MIT for tomlplusplus
-# See the rest of PrismLauncher's libraries at https://github.com/PrismLauncher/PrismLauncher/tree/develop/libraries
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT"
-
-SLOT="0"
-
-IUSE="debug lto qt6 test"
-REQUIRED_USE="
-	lto? ( !debug )
-"
-
-RESTRICT="!test? ( test )"
-
-MIN_QT_5_VERSION="5.12.0"
-MIN_QT_6_VERSION="6.0.0"
-
-QT_DEPS="
-	!qt6? (
-		>=dev-qt/qtconcurrent-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtcore-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtgui-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qttest-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtxml-${MIN_QT_5_VERSION}:5
-	)
-
-	qt6? (
-		>=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)]
-		>=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
-	)
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
-	${QT_DEPS}
-
-	!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
-	 qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
-
-	app-text/cmark
-	dev-cpp/tomlplusplus
-	sys-libs/zlib
-"
-
-# The gulrak-filesystem dependency is only needed at build time, because we don't actually use it on Linux,
-# only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this
-# makes it easier to maintain than patching the CMakeLists file directly.
-BDEPEND="
-	app-text/scdoc
-	dev-cpp/gulrak-filesystem
-	kde-frameworks/extra-cmake-modules:0
-"
-
-DEPEND="
-	${COMMON_DEPENDS}
-	media-libs/libglvnd
-	>=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
-	${COMMON_DEPENDS}
-
-	!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
-	 qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
-
-	>=virtual/jre-1.8.0:*
-	virtual/opengl
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	local java="$(java-config -f)"
-	local java_version=${java//[^0-9]/}
-	if [[ ${java_version} -ge 20 ]]; then
-		elog "Java 20 and up has dropped binary compatibility with java 7."
-		elog "${PN} is being compiled with java ${java_version}."
-		elog "The sources will be patched to build binary compatible with"
-		elog "java 8 instead of java 7. This may cause issues with very old"
-		elog "Minecraft versions and/or older forge versions."
-		elog
-		elog "If you experience any problems, install an older java compiler"
-		elog "and select it with \"eselect java\", then recompile ${PN}."
-		eapply "${FILESDIR}/${P}-openjdk21.patch"
-	fi
-
-	sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed'
-
-	# Prevent conflicting with the user's flags
-	# See https://bugs.gentoo.org/848765 and https://bugs.gentoo.org/911858 for more info
-	sed -i -e "/CMAKE_CXX_FLAGS_RELEASE/d" CMakeLists.txt || die 'Failed to remove "CMAKE_CXX_FLAGS_RELEASE" from CMakeLists via sed'
-}
-
-src_configure(){
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="/usr"
-		# Resulting binary is named prismlauncher
-		-DLauncher_APP_BINARY_NAME="${PN}"
-		-DLauncher_BUILD_PLATFORM="Gentoo"
-		-DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5)
-
-		-DENABLE_LTO=$(usex lto)
-		-DBUILD_TESTING=$(usex test)
-		-DDEBUG_ADDRESS_SANITIZER=0
-	)
-
-	if use debug; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		CMAKE_BUILD_TYPE=Release
-	fi
-
-	cmake_src_configure
-}
-
-src_compile(){
-	cmake_src_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Original issue: https://github.com/PolyMC/PolyMC/issues/227
-	optfeature "old Minecraft (<= 1.12.2) support" x11-apps/xrandr
-
-	optfeature "built-in MangoHud support" games-util/mangohud
-	optfeature "built-in Feral Gamemode support" games-util/gamemode
-}
diff --git a/games-action/prismlauncher/prismlauncher-8.3.ebuild b/games-action/prismlauncher/prismlauncher-8.3.ebuild
deleted file mode 100644
index 5e485a25b6f6..000000000000
--- a/games-action/prismlauncher/prismlauncher-8.3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-DESCRIPTION="A custom, open source Minecraft launcher"
-HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="
-		https://github.com/PrismLauncher/PrismLauncher
-	"
-
-	# TODO: Add tomlplusplus as a system library, like quazip
-	EGIT_SUBMODULES=( '*' '-libraries/quazip' '-libraries/filesystem' '-libraries/zlib' '-libraries/extra-cmake-modules' '-libraries/cmark' )
-else
-	MY_PN="PrismLauncher"
-
-	# Let's use the vendored tarball to avoid dealing with the submodules directly
-	SRC_URI="
-		https://github.com/PrismLauncher/PrismLauncher/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
-	"
-
-	# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
-	S="${WORKDIR}/${MY_PN}-${PV}"
-
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-# GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# LGPL-3+ for libnbtplusplus
-# MIT for tomlplusplus
-# See the rest of PrismLauncher's libraries at https://github.com/PrismLauncher/PrismLauncher/tree/develop/libraries
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT"
-
-SLOT="0"
-
-IUSE="debug lto qt6 test"
-REQUIRED_USE="
-	lto? ( !debug )
-"
-
-RESTRICT="!test? ( test )"
-
-MIN_QT_5_VERSION="5.12.0"
-MIN_QT_6_VERSION="6.0.0"
-
-QT_DEPS="
-	!qt6? (
-		>=dev-qt/qtconcurrent-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtcore-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtgui-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qttest-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtxml-${MIN_QT_5_VERSION}:5
-	)
-
-	qt6? (
-		>=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)]
-		>=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
-	)
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
-	${QT_DEPS}
-
-	!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
-	 qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
-
-	app-text/cmark
-	dev-cpp/tomlplusplus
-	sys-libs/zlib
-"
-
-# The gulrak-filesystem dependency is only needed at build time, because we don't actually use it on Linux,
-# only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this
-# makes it easier to maintain than patching the CMakeLists file directly.
-BDEPEND="
-	app-text/scdoc
-	dev-cpp/gulrak-filesystem
-	kde-frameworks/extra-cmake-modules:0
-"
-
-DEPEND="
-	${COMMON_DEPENDS}
-	media-libs/libglvnd
-	>=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
-	${COMMON_DEPENDS}
-
-	!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
-	 qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
-
-	>=virtual/jre-1.8.0:*
-	virtual/opengl
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	local java="$(java-config -f)"
-	local java_version=${java//[^0-9]/}
-	if [[ ${java_version} -ge 20 ]]; then
-		elog "Java 20 and up has dropped binary compatibility with java 7."
-		elog "${PN} is being compiled with java ${java_version}."
-		elog "The sources will be patched to build binary compatible with"
-		elog "java 8 instead of java 7. This may cause issues with very old"
-		elog "Minecraft versions and/or older forge versions."
-		elog
-		elog "If you experience any problems, install an older java compiler"
-		elog "and select it with \"eselect java\", then recompile ${PN}."
-		eapply "${FILESDIR}/${PN}-8.2-openjdk21.patch"
-	fi
-
-	sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed'
-
-	# Prevent conflicting with the user's flags
-	# See https://bugs.gentoo.org/848765 and https://bugs.gentoo.org/911858 for more info
-	sed -i -e "/CMAKE_CXX_FLAGS_RELEASE/d" CMakeLists.txt || die 'Failed to remove "CMAKE_CXX_FLAGS_RELEASE" from CMakeLists via sed'
-}
-
-src_configure(){
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="/usr"
-		# Resulting binary is named prismlauncher
-		-DLauncher_APP_BINARY_NAME="${PN}"
-		-DLauncher_BUILD_PLATFORM="Gentoo"
-		-DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5)
-
-		-DENABLE_LTO=$(usex lto)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	if use debug; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		CMAKE_BUILD_TYPE=Release
-	fi
-
-	cmake_src_configure
-}
-
-src_compile(){
-	cmake_src_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Original issue: https://github.com/PolyMC/PolyMC/issues/227
-	optfeature "old Minecraft (<= 1.12.2) support" x11-apps/xrandr
-
-	optfeature "built-in MangoHud support" games-util/mangohud
-	optfeature "built-in Feral Gamemode support" games-util/gamemode
-}
diff --git a/games-action/prismlauncher/prismlauncher-9.1.ebuild b/games-action/prismlauncher/prismlauncher-9.1-r1.ebuild
index a6d5a079ab1d..d3ea8f51ecdd 100644
--- a/games-action/prismlauncher/prismlauncher-9.1.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9.1-r1.ebuild
@@ -3,110 +3,71 @@
 
 EAPI=8
 
+QTMIN=6.0.0
 inherit cmake java-pkg-2 optfeature toolchain-funcs xdg
 
-DESCRIPTION="A custom, open source Minecraft launcher"
+DESCRIPTION="Custom, open source Minecraft launcher"
 HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-
-	EGIT_REPO_URI="
-		https://github.com/PrismLauncher/PrismLauncher
-	"
-
+	EGIT_REPO_URI="https://github.com/PrismLauncher/PrismLauncher"
 	EGIT_SUBMODULES=(
 		'*' '-libraries/cmark' '-libraries/extra-cmake-modules' '-libraries/filesystem' '-libraries/quazip'
 		'-libraries/tomlplusplus' '-libraries/zlib'
 	)
 else
 	MY_PN="PrismLauncher"
-
-	# Let's use the vendored tarball to avoid dealing with the submodules directly
+	# use vendored tarball to avoid dealing with submodules directly
 	SRC_URI="
 		https://github.com/PrismLauncher/PrismLauncher/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
 	"
-
-	# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
 	S="${WORKDIR}/${MY_PN}-${PV}"
-
 	KEYWORDS="~amd64 ~arm64"
 fi
 
 # GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
 # Apache-2.0 for MultiMC (PolyMC is forked from it)
 # LGPL-3+ for libnbtplusplus
-# See the rest of PrismLauncher's libraries at https://github.com/PrismLauncher/PrismLauncher/tree/develop/libraries
+# rest of its libs: https://github.com/PrismLauncher/PrismLauncher/tree/develop/libraries
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+"
-
 SLOT="0"
-
-IUSE="qt6 test"
+IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-MIN_QT_5_VERSION="5.12.0"
-MIN_QT_6_VERSION="6.0.0"
-
-QT_DEPS="
-	!qt6? (
-		>=dev-qt/qtconcurrent-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtcore-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtgui-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtnetworkauth-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qttest-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtxml-${MIN_QT_5_VERSION}:5
-	)
-
-	qt6? (
-		>=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)]
-		>=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
-		>=dev-qt/qtnetworkauth-${MIN_QT_6_VERSION}:6
-	)
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
-	${QT_DEPS}
-
-	!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
-	 qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
-
+# Required at both build time and runtime
+COMMON_DEPEND="
 	app-text/cmark:=
 	dev-cpp/tomlplusplus
+	>=dev-libs/quazip-1.3-r2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets,xml(+)]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
 	sys-libs/zlib
 "
-
-BDEPEND="
-	app-text/scdoc
-	kde-frameworks/extra-cmake-modules:0
-	virtual/pkgconfig
-"
-
-# The gulrak-filesystem dependency is only needed at build time, because we don't actually use it on Linux,
-# only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this
-# makes it easier to maintain than patching the CMakeLists file directly.
-DEPEND="
-	${COMMON_DEPENDS}
+# gulrak-filesystem dependency is only needed at build time, because we don't
+# actually use it on Linux, only on legacy macOS. Still, we need it present at
+# build time to appease CMake, and having it like this makes it easier to
+# maintain than patching the CMakeLists file directly.
+DEPEND="${COMMON_DEPEND}
 	dev-cpp/gulrak-filesystem
 	media-libs/libglvnd
 	>=virtual/jdk-1.8.0:*
 "
-
-# QtSvg imageplugin needed at runtime for svg icons. Its used via QIcon.
-# At run-time we don't depend on JDK, only JRE
+# QtSvg imageplugin needed at runtime for svg icons, via QIcon.
+# At runtime we don't depend on JDK, only JRE
 # And we need more than just the GL headers
-RDEPEND="
-	${COMMON_DEPENDS}
-
-	!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
-	 qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
-
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
 	>=virtual/jre-1.8.0:*
 	virtual/opengl
 "
+BDEPEND="
+	app-text/scdoc
+	>=kde-frameworks/extra-cmake-modules-6.0.0:*
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	cmake_src_prepare
@@ -132,7 +93,7 @@ src_configure() {
 		# Resulting binary is named prismlauncher
 		-DLauncher_APP_BINARY_NAME="${PN}"
 		-DLauncher_BUILD_PLATFORM="Gentoo"
-		-DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5)
+		-DLauncher_QT_VERSION_MAJOR=6
 
 		-DENABLE_LTO=$(tc-is-lto)
 		-DBUILD_TESTING=$(usex test)
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index a6d5a079ab1d..d3ea8f51ecdd 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -3,110 +3,71 @@
 
 EAPI=8
 
+QTMIN=6.0.0
 inherit cmake java-pkg-2 optfeature toolchain-funcs xdg
 
-DESCRIPTION="A custom, open source Minecraft launcher"
+DESCRIPTION="Custom, open source Minecraft launcher"
 HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-
-	EGIT_REPO_URI="
-		https://github.com/PrismLauncher/PrismLauncher
-	"
-
+	EGIT_REPO_URI="https://github.com/PrismLauncher/PrismLauncher"
 	EGIT_SUBMODULES=(
 		'*' '-libraries/cmark' '-libraries/extra-cmake-modules' '-libraries/filesystem' '-libraries/quazip'
 		'-libraries/tomlplusplus' '-libraries/zlib'
 	)
 else
 	MY_PN="PrismLauncher"
-
-	# Let's use the vendored tarball to avoid dealing with the submodules directly
+	# use vendored tarball to avoid dealing with submodules directly
 	SRC_URI="
 		https://github.com/PrismLauncher/PrismLauncher/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
 	"
-
-	# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
 	S="${WORKDIR}/${MY_PN}-${PV}"
-
 	KEYWORDS="~amd64 ~arm64"
 fi
 
 # GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
 # Apache-2.0 for MultiMC (PolyMC is forked from it)
 # LGPL-3+ for libnbtplusplus
-# See the rest of PrismLauncher's libraries at https://github.com/PrismLauncher/PrismLauncher/tree/develop/libraries
+# rest of its libs: https://github.com/PrismLauncher/PrismLauncher/tree/develop/libraries
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+"
-
 SLOT="0"
-
-IUSE="qt6 test"
+IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-MIN_QT_5_VERSION="5.12.0"
-MIN_QT_6_VERSION="6.0.0"
-
-QT_DEPS="
-	!qt6? (
-		>=dev-qt/qtconcurrent-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtcore-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtgui-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtnetworkauth-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qttest-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtxml-${MIN_QT_5_VERSION}:5
-	)
-
-	qt6? (
-		>=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)]
-		>=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
-		>=dev-qt/qtnetworkauth-${MIN_QT_6_VERSION}:6
-	)
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
-	${QT_DEPS}
-
-	!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
-	 qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
-
+# Required at both build time and runtime
+COMMON_DEPEND="
 	app-text/cmark:=
 	dev-cpp/tomlplusplus
+	>=dev-libs/quazip-1.3-r2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets,xml(+)]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
 	sys-libs/zlib
 "
-
-BDEPEND="
-	app-text/scdoc
-	kde-frameworks/extra-cmake-modules:0
-	virtual/pkgconfig
-"
-
-# The gulrak-filesystem dependency is only needed at build time, because we don't actually use it on Linux,
-# only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this
-# makes it easier to maintain than patching the CMakeLists file directly.
-DEPEND="
-	${COMMON_DEPENDS}
+# gulrak-filesystem dependency is only needed at build time, because we don't
+# actually use it on Linux, only on legacy macOS. Still, we need it present at
+# build time to appease CMake, and having it like this makes it easier to
+# maintain than patching the CMakeLists file directly.
+DEPEND="${COMMON_DEPEND}
 	dev-cpp/gulrak-filesystem
 	media-libs/libglvnd
 	>=virtual/jdk-1.8.0:*
 "
-
-# QtSvg imageplugin needed at runtime for svg icons. Its used via QIcon.
-# At run-time we don't depend on JDK, only JRE
+# QtSvg imageplugin needed at runtime for svg icons, via QIcon.
+# At runtime we don't depend on JDK, only JRE
 # And we need more than just the GL headers
-RDEPEND="
-	${COMMON_DEPENDS}
-
-	!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
-	 qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
-
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
 	>=virtual/jre-1.8.0:*
 	virtual/opengl
 "
+BDEPEND="
+	app-text/scdoc
+	>=kde-frameworks/extra-cmake-modules-6.0.0:*
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	cmake_src_prepare
@@ -132,7 +93,7 @@ src_configure() {
 		# Resulting binary is named prismlauncher
 		-DLauncher_APP_BINARY_NAME="${PN}"
 		-DLauncher_BUILD_PLATFORM="Gentoo"
-		-DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5)
+		-DLauncher_QT_VERSION_MAJOR=6
 
 		-DENABLE_LTO=$(tc-is-lto)
 		-DBUILD_TESTING=$(usex test)