commit: f2307c368c138f7c021e7a35d5a6eb81e9c686a7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Nov 22 21:34:36 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Nov 23 17:43:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2307c36
games-action/prismlauncher: Drop IUSE qt6 Style fixes, cleanup filler words, empty lines Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...her-9999.ebuild => prismlauncher-9.1-r1.ebuild} | 95 +++++++--------------- .../prismlauncher/prismlauncher-9999.ebuild | 95 +++++++--------------- 2 files changed, 56 insertions(+), 134 deletions(-) diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9.1-r1.ebuild similarity index 57% copy from games-action/prismlauncher/prismlauncher-9999.ebuild copy to games-action/prismlauncher/prismlauncher-9.1-r1.ebuild index a6d5a079ab1d..d3ea8f51ecdd 100644 --- a/games-action/prismlauncher/prismlauncher-9999.ebuild +++ b/games-action/prismlauncher/prismlauncher-9.1-r1.ebuild @@ -3,110 +3,71 @@ EAPI=8 +QTMIN=6.0.0 inherit cmake java-pkg-2 optfeature toolchain-funcs xdg -DESCRIPTION="A custom, open source Minecraft launcher" +DESCRIPTION="Custom, open source Minecraft launcher" HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"; -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 - - EGIT_REPO_URI=" - https://github.com/PrismLauncher/PrismLauncher - " - + 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 + # use vendored tarball to avoid dealing with 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 +# rest of its libs: 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" +IUSE="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/qtnetworkauth-${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 - >=dev-qt/qtnetworkauth-${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(-)] ) - +# Required at both build time and runtime +COMMON_DEPEND=" app-text/cmark:= dev-cpp/tomlplusplus + >=dev-libs/quazip-1.3-r2:=[qt6(+)] + >=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets,xml(+)] + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtnetworkauth-${QTMIN}:6 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} +# 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_DEPEND} 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 +# QtSvg imageplugin needed at runtime for svg icons, via QIcon. +# At runtime 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 ) - +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtsvg-${QTMIN}:6 >=virtual/jre-1.8.0:* virtual/opengl " +BDEPEND=" + app-text/scdoc + >=kde-frameworks/extra-cmake-modules-6.0.0:* + virtual/pkgconfig +" src_prepare() { cmake_src_prepare @@ -132,7 +93,7 @@ src_configure() { # Resulting binary is named prismlauncher -DLauncher_APP_BINARY_NAME="${PN}" -DLauncher_BUILD_PLATFORM="Gentoo" - -DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5) + -DLauncher_QT_VERSION_MAJOR=6 -DENABLE_LTO=$(tc-is-lto) -DBUILD_TESTING=$(usex test) diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild index a6d5a079ab1d..d3ea8f51ecdd 100644 --- a/games-action/prismlauncher/prismlauncher-9999.ebuild +++ b/games-action/prismlauncher/prismlauncher-9999.ebuild @@ -3,110 +3,71 @@ EAPI=8 +QTMIN=6.0.0 inherit cmake java-pkg-2 optfeature toolchain-funcs xdg -DESCRIPTION="A custom, open source Minecraft launcher" +DESCRIPTION="Custom, open source Minecraft launcher" HOMEPAGE="https://prismlauncher.org/ https://github.com/PrismLauncher/PrismLauncher"; -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 - - EGIT_REPO_URI=" - https://github.com/PrismLauncher/PrismLauncher - " - + 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 + # use vendored tarball to avoid dealing with 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 +# rest of its libs: 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" +IUSE="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/qtnetworkauth-${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 - >=dev-qt/qtnetworkauth-${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(-)] ) - +# Required at both build time and runtime +COMMON_DEPEND=" app-text/cmark:= dev-cpp/tomlplusplus + >=dev-libs/quazip-1.3-r2:=[qt6(+)] + >=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets,xml(+)] + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtnetworkauth-${QTMIN}:6 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} +# 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_DEPEND} 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 +# QtSvg imageplugin needed at runtime for svg icons, via QIcon. +# At runtime 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 ) - +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtsvg-${QTMIN}:6 >=virtual/jre-1.8.0:* virtual/opengl " +BDEPEND=" + app-text/scdoc + >=kde-frameworks/extra-cmake-modules-6.0.0:* + virtual/pkgconfig +" src_prepare() { cmake_src_prepare @@ -132,7 +93,7 @@ src_configure() { # Resulting binary is named prismlauncher -DLauncher_APP_BINARY_NAME="${PN}" -DLauncher_BUILD_PLATFORM="Gentoo" - -DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5) + -DLauncher_QT_VERSION_MAJOR=6 -DENABLE_LTO=$(tc-is-lto) -DBUILD_TESTING=$(usex test)
