6 files changed, 3 insertions, 207 deletions
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 1785371cb63b..4d0c80235fd4 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 5c3329f01c34..aca34d3d5fdd 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,8 +1,5 @@
-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.4.tar.gz 8444486 BLAKE2B c7950df3d843e370914e2a72c71847a71ab0446508a464ce04ded007b0b3170e8119bb30455d1022fda98cd49f16528a63f5589766561cfc15950c6823779b6f SHA512 24307e6f2a34c459153def5ee639c9a37d3ec3e54bf81dc7d7da8263ee58e16f2391101732889d3b00a1b923704aa21756fad4ee288665e45962032b1d9e8de9
 DIST prismlauncher-9.1.tar.gz 8460672 BLAKE2B 1bb31dab88d9ca4317e61b6938f9b5aeb0b76cab3407d69b62ecf9bfa1ade3308a8927f53e020b6531fbe0cce962c7e560727298a911f07b9fec1f51b1470cd9 SHA512 5a486bb0034464be873d80512ba164fab44eb60e3abda28771387f8bed471c5a323269a5f961a0950692915698b849bb4e7de7405c26e3ad29aa8732f140a66d
-EBUILD prismlauncher-8.4.ebuild 4205 BLAKE2B 7bdc9fe2e5a879af2e60f2b06abbc8f07e372eb9d2b7885c72baa042a03f16ca91a94548ccf5f6163313495db67120a59c2c67925b46229bbc411c85c231400b SHA512 771d10635c09f39928d9bb762edef326a643c625bf50278b10c9caec209100a640337de59494bb9d8dbdcd6050d039baca8be9f8e208428ec24ce9f164b9082f
-EBUILD prismlauncher-9.1-r1.ebuild 3561 BLAKE2B 24f6048d10dd2038ac6853931903c6bfa1bbee01a90fcacb6f2e0d017fffcda07ef609ff1cb1dc0005d326dd9bc4900ecb539d061307d344434a068a9bb1b2da SHA512 485c96ceee443256962f1d72d750cb0e4ecfdaa27114f2836f91ec0dfa15f1666c01816d78762ca51c4b82c6aa5a95036d62c6ab86951b3003e57b9039fb2557
+EBUILD prismlauncher-9.1-r1.ebuild 3560 BLAKE2B 8d4df02b8299d9c51c4c586fe7ec18f5faa4510f161aec94eaafa5c42d6c520409bbaff2fcaa5d587391081b9c5c124fd69b4da56ab943de58a58e36c978b3af SHA512 ccb5425fa3e653e6998db97b140728efef92fc9331f9e083e8bb5babe755f342c532c674762199d5e90fb2b8eaab50c53751e229a714e35ac126e3ea9f52697f
 EBUILD prismlauncher-9999.ebuild 3561 BLAKE2B 24f6048d10dd2038ac6853931903c6bfa1bbee01a90fcacb6f2e0d017fffcda07ef609ff1cb1dc0005d326dd9bc4900ecb539d061307d344434a068a9bb1b2da SHA512 485c96ceee443256962f1d72d750cb0e4ecfdaa27114f2836f91ec0dfa15f1666c01816d78762ca51c4b82c6aa5a95036d62c6ab86951b3003e57b9039fb2557
-MISC metadata.xml 1013 BLAKE2B e9faf6e1acb07da776bddc7720fa3d1543c881abedfc2042593359b324042fd3d137d3676d6ede3409257cb99fb7cda972b9dadb16945c029e9a6cbce00576e1 SHA512 7211bf164e9f52e15e6517404efbba195b9ef25626dcd9cdbff1e7c966693619acd1d8d1efa10ab1c9388dc77edad06dce29e07eb7bfee6b7b0a9be4befd379b
+MISC metadata.xml 918 BLAKE2B 53ec62a5f7c7e0c8bc4dcd91412ca0758f43cdde1e3a86462141fee856b2f29445e125d1c4ae3c78c603d11bb6e9d5186ea3ad574220ad95a7d2a277bef1c8d9 SHA512 57b3063d3b8feb6ebae17bc6125505bf2d33207a1fedeb98e39e49d06021f79f72c30b16dc70a7718192abc5127e7cb9903c5103d3d6ae67a24224dcd4825ba8
diff --git a/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch b/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch
deleted file mode 100644
index 371be5000f29..000000000000
--- a/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://bugs.gentoo.org/917072
---- a/libraries/launcher/CMakeLists.txt
-+++ b/libraries/launcher/CMakeLists.txt
-@@ -1,10 +1,10 @@
- cmake_minimum_required(VERSION 3.9.4)
- project(launcher Java)
--find_package(Java 1.7 REQUIRED COMPONENTS Development)
-+find_package(Java 1.8 REQUIRED COMPONENTS Development)
-
- include(UseJava)
- set(CMAKE_JAVA_JAR_ENTRY_POINT org.prismlauncher.EntryPoint)
--set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7)
-+set(CMAKE_JAVA_COMPILE_FLAGS -target 8 -source 8)
-
- set(SRC
-     org/prismlauncher/EntryPoint.java
---- a/flatpak/org.prismlauncher.PrismLauncher.yml
-+++ b/flatpak/org.prismlauncher.PrismLauncher.yml
-@@ -40,8 +40,8 @@ modules:
-       - -DLauncher_QT_VERSION_MAJOR=5
-     build-options:
-       env:
--        JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17
--        JAVA_COMPILER: /usr/lib/sdk/openjdk17/jvm/openjdk-17/bin/javac
-+        JAVA_HOME: "$(java-config -O)"
-+        JAVA_COMPILER: "$(java-config -c)"
-     sources:
-       - type: dir
-         path: ../
---- a/libraries/javacheck/CMakeLists.txt
-+++ b/libraries/javacheck/CMakeLists.txt
-@@ -1,10 +1,10 @@
- cmake_minimum_required(VERSION 3.9.4)
- project(launcher Java)
--find_package(Java 1.7 REQUIRED COMPONENTS Development)
-+find_package(Java 1.8 REQUIRED COMPONENTS Development)
-
- include(UseJava)
- set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck)
--set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
-+set(CMAKE_JAVA_COMPILE_FLAGS -target 8 -source 8 -Xlint:deprecation -Xlint:unchecked)
-
- set(SRC
-     JavaCheck.java
diff --git a/games-action/prismlauncher/metadata.xml b/games-action/prismlauncher/metadata.xml
index 9122a28179da..782183dddd27 100644
--- a/games-action/prismlauncher/metadata.xml
+++ b/games-action/prismlauncher/metadata.xml
@@ -19,7 +19,4 @@
     <remote-id type="github">PrismLauncher/PrismLauncher</remote-id>
   </upstream>
   <longdescription>Prism Launcher is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity.</longdescription>
-  <use>
-    <flag name="qt6">Build with Qt6 support instead of the default Qt5</flag>
-  </use>
 </pkgmetadata>
diff --git a/games-action/prismlauncher/prismlauncher-8.4.ebuild b/games-action/prismlauncher/prismlauncher-8.4.ebuild
deleted file mode 100644
index 5042793057fb..000000000000
--- a/games-action/prismlauncher/prismlauncher-8.4.ebuild
+++ /dev/null
@@ -1,154 +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 toolchain-funcs 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
-	"
-
-	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
-	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
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+"
-
-SLOT="0"
-
-IUSE="qt6 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/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
-"
-
-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}
-	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
-# 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
-}
-
-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=$(tc-is-lto)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	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-r1.ebuild b/games-action/prismlauncher/prismlauncher-9.1-r1.ebuild
index d3ea8f51ecdd..f6386a971f3c 100644
--- a/games-action/prismlauncher/prismlauncher-9.1-r1.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9.1-r1.ebuild
@@ -23,7 +23,7 @@ else
 		https://github.com/PrismLauncher/PrismLauncher/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
 	"
 	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 # GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself