From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/
Date: Sat, 23 Nov 2024 17:43:25 +0000 (UTC) [thread overview]
Message-ID: <1732383791.c8978f478e0b3455601371f57342364a2b169cca.asturm@gentoo> (raw)
commit: c8978f478e0b3455601371f57342364a2b169cca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 21:31:23 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 17:43:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8978f47
games-action/prismlauncher: Drop 8.2-r1 and 8.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
games-action/prismlauncher/Manifest | 2 -
.../prismlauncher/prismlauncher-8.2-r1.ebuild | 167 ---------------------
.../prismlauncher/prismlauncher-8.3.ebuild | 166 --------------------
3 files changed, 335 deletions(-)
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index bf0b9c40d9f8..66742e3a14b3 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,4 +1,2 @@
-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
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
-}
next reply other threads:[~2024-11-23 17:43 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-23 17:43 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-31 12:47 [gentoo-commits] repo/gentoo:master commit in: games-action/prismlauncher/ Sam James
2024-11-23 17:43 Andreas Sturmlechner
2024-11-23 17:43 Andreas Sturmlechner
2024-11-21 13:47 Jakov Smolić
2024-08-31 13:31 Andrew Ammerlaan
2024-07-20 13:12 Andrew Ammerlaan
2024-07-20 13:12 Andrew Ammerlaan
2024-05-17 14:13 Andrew Ammerlaan
2024-04-16 16:33 Andrew Ammerlaan
2024-04-16 16:31 Arthur Zamarin
2024-04-16 13:49 Andrew Ammerlaan
2024-04-11 9:14 Andrew Ammerlaan
2024-04-11 9:00 Arthur Zamarin
2024-03-14 19:34 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-11-09 7:47 Andrew Ammerlaan
2023-09-12 6:44 Joonas Niilola
2023-07-29 12:17 Andrew Ammerlaan
2023-07-29 12:17 Andrew Ammerlaan
2023-07-29 12:17 Andrew Ammerlaan
2023-06-18 19:37 Andrew Ammerlaan
2023-06-18 19:37 Andrew Ammerlaan
2023-06-13 19:51 Andrew Ammerlaan
2023-06-13 19:51 Andrew Ammerlaan
2023-06-13 19:51 Andrew Ammerlaan
2023-02-03 19:33 Andrew Ammerlaan
2023-02-03 19:33 Andrew Ammerlaan
2022-12-20 9:54 Andrew Ammerlaan
2022-12-20 9:54 Andrew Ammerlaan
2022-12-12 17:56 Andrew Ammerlaan
2022-12-12 17:56 Andrew Ammerlaan
2022-12-12 17:56 Andrew Ammerlaan
2022-11-16 9:26 Andrew Ammerlaan
2022-11-16 9:26 Andrew Ammerlaan
2022-11-15 22:24 Sam James
2022-11-15 22:24 Sam James
2022-11-15 21:03 Andrew Ammerlaan
2022-11-15 21:03 Andrew Ammerlaan
2022-11-02 11:49 Andrew Ammerlaan
2022-11-02 11:49 Andrew Ammerlaan
2022-11-02 11:49 Andrew Ammerlaan
2022-10-20 12:23 Jakov Smolić
2022-10-20 4:25 Sam James
2022-10-20 4:25 Sam James
2022-10-20 4:25 Sam James
2022-10-20 4:25 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1732383791.c8978f478e0b3455601371f57342364a2b169cca.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox