From c98eb096c37a4252dc388920f0b0f8b2441c9b5d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Nov 2022 12:54:47 +0000 Subject: gentoo auto-resync : 16:11:2022 - 12:54:47 --- games-action/Manifest.gz | Bin 14557 -> 14551 bytes games-action/prismlauncher/Manifest | 4 +- .../prismlauncher/prismlauncher-5.0.ebuild | 149 --------------------- .../prismlauncher/prismlauncher-5.2.ebuild | 147 ++++++++++++++++++++ 4 files changed, 149 insertions(+), 151 deletions(-) delete mode 100644 games-action/prismlauncher/prismlauncher-5.0.ebuild create mode 100644 games-action/prismlauncher/prismlauncher-5.2.ebuild (limited to 'games-action') diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index 9e740d70c078..a8269f90a0be 100644 Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest index d04a9bedc692..1c65a35711b5 100644 --- a/games-action/prismlauncher/Manifest +++ b/games-action/prismlauncher/Manifest @@ -1,6 +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 +DIST prismlauncher-5.2.tar.gz 8772931 BLAKE2B 95c5be2a177086ba15a1d14a85f8a0edb349bcfbe4e9adff9dcca5c4a8dbf00d3ec49e30a2c99cfbeca2a7617ccaba6cf1f86bd396c1bf9b306c0ad5c1f4a3c7 SHA512 96a5fbf7c5d80da72377a4d8e9df16d4f9597a5764386f5b60d520d84fe319f8b6fbb3f89715214a037a70c440e418eb72e933a911d253fad93fbda9213d16e5 EBUILD prismlauncher-5.1.ebuild 3725 BLAKE2B 4d700eed137ef309b44e07c84743d22d67da69598717a03b4753844959f2a5a4c840fb8d72ea1b0b693e20970683793b517b14202483431afbf1c73f29cd72e9 SHA512 d7faf9bd18f9cac15b632e96171db09cf1a8eb40369955b44576cdb51c07285bbdeaa93f2f0560fd4935763a32f54b2edf49f96462121da54c36095207b1357f +EBUILD prismlauncher-5.2.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.0.ebuild b/games-action/prismlauncher/prismlauncher-5.0.ebuild deleted file mode 100644 index cfd7ead1c78c..000000000000 --- a/games-action/prismlauncher/prismlauncher-5.0.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# 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} - - !games-action/polymc - - !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-5.2.ebuild b/games-action/prismlauncher/prismlauncher-5.2.ebuild new file mode 100644 index 000000000000..ad60b690649f --- /dev/null +++ b/games-action/prismlauncher/prismlauncher-5.2.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 +} -- cgit v1.2.3