gentoo auto-resync : 12:03:2024 - 00:45:59

5 files changed, 230 insertions, 3 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 41a855d9ae66..1bcbf41658c1 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index e78d6c7214ed..1f72136f7043 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,6 +1,9 @@
+AUX prismlauncher-8.2-openjdk21.patch 1541 BLAKE2B 80f38e970dbe448e3251ea90ef77e780aaf85c9ebf579affbf06690cafdbe4581066eaef7c6551a13198ab9aa51bc9b2137ec8f02c2b6ee83fce0ae0299436df SHA512 f3ef51239de85052e4c47bf61132b36975309eeac4281a31a8f78e4b9aecb20dbb6a2dee262c0fe8f634b2e0a690ca73f6223e389f73532a5033f335d39cd7ab
 DIST prismlauncher-7.2.tar.gz 8321071 BLAKE2B 393737d1f53d82986430ea8d77e65cd7f191a0ba73548ec4ff72ca62fe8bd8beae5b3718806e1c62c0f4339e02343e9f30aa851b0617685e3309bcb902d265a8 SHA512 f809434ff57b8bb10368c5a2e1c82f0082816fc8d45d8431f723fce1ea6b942e62fbb75be792c8ead8fc0828178330237ed0a1d2a24196e3afadc2678ba170ed
 DIST prismlauncher-8.0.tar.gz 8430953 BLAKE2B 74fcc2d8105976cbba774ff8c727b3a57f36f6bd21ab7b3d8be98b26c0b456f78f941af192a76e170ad70fde3567358d0d8e7f47a402052503da19858bbab948 SHA512 a080d7262e2b284a1bab18c99f33e4bea7854fd946aff3f74d0a2e5c896bbf9ad90a3c4700c83162918f5269aa90b3f41e88fe94a89e197243ab3b38f8a7995c
+DIST prismlauncher-8.2.tar.gz 8437675 BLAKE2B 3eee060dbc80ca690b344875caa20b27d8949b1e972602d1d383e1ae394404408d74dece11b47f940948ac2c437bd73fadf56d4e492daa34adef1c1eade66bc9 SHA512 6a0988a83e36df0da328fed0efe93171f8b4c565622f8eddf885e6e019214b15b8f64485ce1d9982dd441fad7c4aac8d1647e1b4dbf2cdb8ebadc46f664857ad
 EBUILD prismlauncher-7.2-r1.ebuild 3993 BLAKE2B 72a8489bb050bf1a79b7b5cc9c070ed81ac0b560dc8717762fbe30260d8cca30a34dd5a83c3156c4eeb4429f5a23b9459d7b2cde9499e56b113359981f8e81f2 SHA512 496127966aa54f17ebf15b5824558fd79ab8d7f17841b3134d1521a1bea50f46a0d919cb7ba25d57e47675cf4ba0311969f045906558646d7e3f2b7838308682
 EBUILD prismlauncher-8.0.ebuild 3994 BLAKE2B 49209e59084e8c7245a892b54a72210a455a156ba8b501266ec1d28ff49bac3b454f0f2e2485e65ca42ceaedf37499485034e21022f5305cc6cf198d84425dea SHA512 929c2458a74e48434827cecfbe0263acbfa5a7590737ea85e10ec9ab5999fe5334298668598d84dddb1cf00df0180fd92971e6e33685ba78be382986f391e548
-EBUILD prismlauncher-9999.ebuild 3964 BLAKE2B bf9a2d0872ab891cf5c6c278220e777d9d48cfc4ab0027f3ee6d33f3a4eb6b122fb4ff558517b50f34918291466de188590a272cd4ac32de6c903ff2509b0a47 SHA512 584910665cd1475c70b073e1e32c5baf74f93656755bbdb72a773ebfbbd79f8ef961323f53921ca57b171fca9f9fd0c44a7e4bd5309dbfaed46c7254b1649f37
+EBUILD prismlauncher-8.2.ebuild 4625 BLAKE2B da947029ae36daf053b3b5b317253f81347aba1151439bcde022c2a548fd457e9898adc75711d3344200d08b15cfa89850cc5d34651c32aa40390bd636a5a028 SHA512 952e5726d86e2af81c6c2e8fae4e8626a0613085a96db352793076e5bb752cb709d9010b573cb50a61a6e954a5fbe12fc0933d78ee293c685adc83e4ebddf6b3
+EBUILD prismlauncher-9999.ebuild 4595 BLAKE2B 857b89f846237d573baf724ccd411e24c0db0e3822bdb42cdc6a95072a9f3323d5d166796cd4e259a5248f4ca2b2b2310c0c2245325405ca2afb0bd36877e6d9 SHA512 bf1b31cc6707d715060635fb9ec0958802e9312c98e05727fcf15708f58c2fac6cec6d978edc4fd91c1fefde5946aae1eacabb0aefa39d2d783bb39f3c4fab9a
 MISC metadata.xml 1026 BLAKE2B 645b49b0a9848a1c8b48184bc3df7f1049b0292a90b19b391feda2f9f036af10adf6be79af266dfac0e032fa9524fdd39fd54cfdd71d9e63d5e221b5abd1ee7c SHA512 506f5cf43fc44bf192c17b52fab92a3e57bd87dff3226bbe5a7376040a23be5903a0c009a42dc71604d316f897e8d98f5fe53a04abe0758284b9e1b2b0e66a72
diff --git a/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch b/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch
new file mode 100644
index 000000000000..371be5000f29
--- /dev/null
+++ b/games-action/prismlauncher/files/prismlauncher-8.2-openjdk21.patch
@@ -0,0 +1,44 @@
+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/prismlauncher-8.2.ebuild b/games-action/prismlauncher/prismlauncher-8.2.ebuild
new file mode 100644
index 000000000000..f8db7eaa5260
--- /dev/null
+++ b/games-action/prismlauncher/prismlauncher-8.2.ebuild
@@ -0,0 +1,166 @@
+# 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
+	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-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 0390171faefa..efba041135b9 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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
 
-HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"
 DESCRIPTION="A custom, open source Minecraft launcher"
+HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -108,6 +108,20 @@ RDEPEND="
 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