6 files changed, 151 insertions, 40 deletions
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 70743d3a5783..61d6ea2b5119 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest
index cd90fed005ac..c9e29eb7ed97 100644
--- a/games-action/minecraft-launcher/Manifest
+++ b/games-action/minecraft-launcher/Manifest
@@ -1,6 +1,4 @@
 DIST minecraft-launcher-1.0.1221 1623472 BLAKE2B 4c34f591a1bc98e4a49d1fa15cc0b7e60737452eb22a6b11e6843a02a9f0160348250c046a2c154d7deb5087a1b283bb5b4109b14dc7b1121e68f212d899e82c SHA512 a175572c23219bb9bd8de3b072864544a1316a64d71bd8f5a0f8951c69fc7e2590d75fc509cf595d4b36a3a0c6d9aea46801d4030b48051b0e00dbe8ef4d8b1a
-DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125
 DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
 EBUILD minecraft-launcher-1.0.1221.ebuild 1408 BLAKE2B 36ed51f28dd7b38c3c16afc6650b42025ae2798141b6f0e735b7bac46fda441e5fbc37e1a286edf1e61f71731c17370f40ffa93ea5b86ea625a459295d435a12 SHA512 00bd14dac29b1cb2c7aba4a979de291ac7d45b65b46ae9ccafb448ceb3bdba766efafa35a769991b8174aecf704e62f70099eb38e1db769a68675f1053451a65
-EBUILD minecraft-launcher-1.6.93.ebuild 917 BLAKE2B 2d9bdc8209022a0bf140dd38cc0c7afbe063596d9d62f17207f37fce79d3ac8ebf5b30ddec9f7f98695bfe8376d5ba9e21b9522b26e8b19647d30e11c1c55e99 SHA512 c219bdc9fa912a9ddf30da207dd9fcdd998a0c16fe93d88a759298a5541693246fd8ebfd6a34c52d5a88b98b84abc1ec1ff2e53284888579c192ed8ff41f03dc
 MISC metadata.xml 259 BLAKE2B 3bd5fecaefa4296413fd08aac88185d04771439afd26b516016a83ad674ca42d886412f99424be93e997431c64d5601ae89ae6478784cffb44e400d3fa4889b8 SHA512 d73de9f4636e5d93e57d9a781e5292e8d3bc270f8fb3b90c246cf3a2ba4a9ac9f36a9aea5a7f08aa6c608e61c836275bb1eb4b5c079b3db0da938efd10cdff9f
diff --git a/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild b/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
deleted file mode 100644
index 5a590a02ca45..000000000000
--- a/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-pkg-2 xdg
-
-DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/eabbff5ff8e21250e33670924a0c5e38f47c840b/launcher.jar -> ${P}.jar
-	https://launcher.mojang.com/download/minecraft-launcher.svg"
-
-KEYWORDS="~amd64"
-LICENSE="Mojang"
-SLOT="legacy"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="virtual/jre:1.8"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	# do not unpack jar file
-	true
-}
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}/${P}.jar" ${PN}-legacy.jar
-	java-pkg_dolauncher ${PN}-legacy --jar ${PN}-legacy.jar --java_args "\${JAVA_OPTS}"
-
-	newicon -s scalable "${DISTDIR}/${PN}.svg" "${PN}-legacy.svg"
-	make_desktop_entry ${PN}-legacy "Minecraft (legacy)" ${PN}-legacy Game
-}
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 62846676a401..d04a9bedc692 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,4 +1,6 @@
 DIST prismlauncher-5.0.tar.gz 9379431 BLAKE2B 0406b0e706068d32eaed427c5475b1388144b6155a69cf29674e7b45de84c86ca872615b6ec64602e942f155061630c7a866800e24ccb7546c2a32bf298380cf SHA512 71f19603a2e09d581ed80bbef6a3cd4a2c3081ba820fad8d73ebab155075d7a84e17ce9f70490a8984e7cb6a5d35089efb77bb5c364c4580fe4a8759fa79313d
+DIST prismlauncher-5.1.tar.gz 9401315 BLAKE2B 22a0508efc042a78099d0458d305c623465533d9770b111e584f4591cbd9372b354501fb3edf941f4c9f744f3540bd793c00f1ca428705bd2ca140be87056575 SHA512 2e0de23040b26c3bf9d3758b3c8ee0db6516edab9d25d64beca6ddde4c039d88655349895a1ab15b63c8c2e26f3fedbf2ef9f9c14ce5a86149aa75374c24cd5f
 EBUILD prismlauncher-5.0.ebuild 3748 BLAKE2B 2095fce9e13b6880692a0afcc4b3ad03c0c2fa5a007db7d243bd2a7bc0657a43e7b24078953c0a931992ce923f3b1e7020775b1cdd1d8fccded1259c866f6d3a SHA512 27d9c94f3aaf3bd5d3783514891565e091de94c70a7ddb85f204edb565846393bc49ca400ccfa28a97b1cfbe8d378f28bf456204a511114411702e66a6c18572
-EBUILD prismlauncher-9999.ebuild 3741 BLAKE2B 4facddb38ff1f040831322895a45c18fb07f0da96040e041a7875345d696026cb480c74708e78c28c46d7f4bc3f536ea492769d5359b3eb95cc26d94feeaa801 SHA512 9f4a54647663cdeddd6d98846d507a39c2cd63f52758e83031cd5785ebd2b2242ba98dd7f72f7c0a2e9b2d714a9cea8787dd856c7cc4d0ce42d63d9e8590d148
+EBUILD prismlauncher-5.1.ebuild 3725 BLAKE2B 4d700eed137ef309b44e07c84743d22d67da69598717a03b4753844959f2a5a4c840fb8d72ea1b0b693e20970683793b517b14202483431afbf1c73f29cd72e9 SHA512 d7faf9bd18f9cac15b632e96171db09cf1a8eb40369955b44576cdb51c07285bbdeaa93f2f0560fd4935763a32f54b2edf49f96462121da54c36095207b1357f
+EBUILD prismlauncher-9999.ebuild 3725 BLAKE2B 4d700eed137ef309b44e07c84743d22d67da69598717a03b4753844959f2a5a4c840fb8d72ea1b0b693e20970683793b517b14202483431afbf1c73f29cd72e9 SHA512 d7faf9bd18f9cac15b632e96171db09cf1a8eb40369955b44576cdb51c07285bbdeaa93f2f0560fd4935763a32f54b2edf49f96462121da54c36095207b1357f
 MISC metadata.xml 1084 BLAKE2B 7def85b6f71b9b18fc987e89c3c2c3e32eaef060183e05a1be179eefe322258c7f83c84066e7300df87c62857e66c2499943db960f45e6532d803b671aa028b9 SHA512 0f893adce9d7b7b259226da5047b594774930afbf25d5a933dbfc9d7247380ae255b97d765ef0b07814101cd017c3c4852131d2f38b57acae0961b4b4606da0e
diff --git a/games-action/prismlauncher/prismlauncher-5.1.ebuild b/games-action/prismlauncher/prismlauncher-5.1.ebuild
new file mode 100644
index 000000000000..ad60b690649f
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-5.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+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' )
+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(-)] )
+
+	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:5
+"
+
+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
+
+	# Prevent conflicting with the user's flags
+	# See https://bugs.gentoo.org/848765 for more info
+	sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+		# Resulting binary is named prismlauncher
+		-DLauncher_APP_BINARY_NAME="${PN}"
+		-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-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 1de25bc2a4f4..ad60b690649f 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -28,7 +28,7 @@ else
 	# The Prism's files are unpacked to ${WORKDIR}/PrismLauncher-${PV}
 	S="${WORKDIR}/${MY_PN}-${PV}"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 # GPL-3 for PolyMC (PrismLauncher is forked from it) and Prism itself
@@ -97,8 +97,6 @@ DEPEND="
 RDEPEND="
 	${COMMON_DEPENDS}
 
-	!games-action/polymc
-
 	!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
 	 qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )