From d79ab35b7ac170babebe8bc151fe5d037c16285c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Sep 2022 17:28:08 +0100 Subject: gentoo auto-resync : 22:09:2022 - 17:28:08 --- games-action/Manifest.gz | Bin 14552 -> 14552 bytes games-action/beathazardultra/Manifest | 2 +- .../beathazardultra-20130308-r2.ebuild | 4 +- games-action/polymc/Manifest | 8 +- games-action/polymc/metadata.xml | 1 + games-action/polymc/polymc-1.4.1-r2.ebuild | 133 -------------------- games-action/polymc/polymc-1.4.2-r1.ebuild | 133 -------------------- games-action/polymc/polymc-1.4.2-r2.ebuild | 136 +++++++++++++++++++++ games-action/polymc/polymc-9999.ebuild | 39 ++++-- 9 files changed, 169 insertions(+), 287 deletions(-) delete mode 100644 games-action/polymc/polymc-1.4.1-r2.ebuild delete mode 100644 games-action/polymc/polymc-1.4.2-r1.ebuild create mode 100644 games-action/polymc/polymc-1.4.2-r2.ebuild (limited to 'games-action') diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index 906d1ffbb763..773ed9bc8ded 100644 Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ diff --git a/games-action/beathazardultra/Manifest b/games-action/beathazardultra/Manifest index 08682dd2958c..f73ad4376173 100644 --- a/games-action/beathazardultra/Manifest +++ b/games-action/beathazardultra/Manifest @@ -1,3 +1,3 @@ DIST beathazard-installer_03-08-13 183569201 BLAKE2B 769fffbfc752d9c924c26a0fab347297087787d4eb665440fd3aed1c315a6f93f8e0526dbe62219b6aff2bb6ad1b7d7a5ccdc16663e9ea32671ec5c28fc12ebb SHA512 273f550034473d43ac4ceb41018b540f6518393606249de490642a4e6f0dfb5f0b860d3a633db0f90f3b9fce1dc156cf4bd80d383f7e6eae91a5e7bd9e9427d4 -EBUILD beathazardultra-20130308-r2.ebuild 1802 BLAKE2B c90bee8a3036ad08e4eb4d147199275aeb9d703e1a5559886cd9535eb89c974b12fc11d15615cf03f8b265a6e15ce989a008186ffbe8af524d52a7176756a19f SHA512 b01e154e294547fd43fb2de680a251e5166c4e49efa85d7cde0d19d9e8285ae58b4503b8a02bd28f20a2b148e84d5b0d78db3d03910fcb3b08cc52337ace5bf2 +EBUILD beathazardultra-20130308-r2.ebuild 1823 BLAKE2B f13184337e535891f25723778392cd7300439703d93918fa33d6ed1e12e0658becce327dd8c992f7bb33a92c86a4375c075c58210f30f620ffd0f1862ca1cb71 SHA512 3d646cfaab9c737e3c48f3b9f872435f082c03a3b56d668310ee6b2550b89708ee30a3c75f4ad8e0a964d575eb2140ec1b9e9e97259610440009eae0cb2a2874 MISC metadata.xml 356 BLAKE2B e0eb752d23e3b6837a3572de3f6bd9a9df05ef82faf203f0841f5f328b873a6bd6da34cac155a7c3baf75750bf2823aa7f11cc9d9cb6a3dda55acd7b94d09f56 SHA512 83d86688e66005d0f07ee07c04abd173a7f5870199805214f69d2325a0f0340227259fbc32e0b50859b6062f0eb3e61c73422510dbf61809e9e02df10a98b232 diff --git a/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild b/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild index 0e9ccb93a7b9..ebc38cdf81e3 100644 --- a/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild +++ b/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # TODO: unbundle allegro[gtk...] (no multilib on amd64 and 5.0.9 soname) @@ -9,7 +9,7 @@ inherit desktop unpacker wrapper DESCRIPTION="Intense music-driven arcade shooter powered by your music" HOMEPAGE="http://www.coldbeamgames.com/" -SRC_URI="beathazard-installer_03-08-13" +SRC_URI="beathazard-installer_${PV:4:2}-${PV:6:2}-${PV:2:2}" S="${WORKDIR}"/data LICENSE="all-rights-reserved" diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest index 6d80772534ce..c4e295ee4522 100644 --- a/games-action/polymc/Manifest +++ b/games-action/polymc/Manifest @@ -1,7 +1,5 @@ AUX polymc-1.4.1-include_QDebug.patch 338 BLAKE2B f9a16cc8c4e6c9c6b4cacaf7aaee66d2230a89f4c18b79677f3f25efdf430cb8f3125a6018ed6fa82f5e8c7d5e840012d260b4dad9a0a924c67abb8c009727e1 SHA512 17107c35811afd7c3f2e654451e9b0acda8234e032d62c22d9f13b5def659f25f367f980aaadb67e91309e67998f94513f15971a348e2da6b0f749cf4e2069ab -DIST polymc-1.4.1.tar.gz 5771113 BLAKE2B d55907770d913c814015c4337c0442cb3fdaf92815f3e2f1f496b7869b6da8ee2295260efc3df67e7407ee27d300c4e89900603281e69163c07df216193c05d9 SHA512 170d03b61d3e9edbe1a0b27812e52fb90963d09769327f2d95eab6c4b7c88291136f47a44b7c206808fcc2e0e9ddf4aeb3a3f267ccbdc6b70b44d91c4642bf75 DIST polymc-1.4.2.tar.gz 5766773 BLAKE2B 0d40f2b1fc6df28089d874a2de949b24a719936b0961fa08a0e909a82931b411926464328ada8ec05c148ba39e405ff9f4d336fc4ade316725756e235231eb60 SHA512 6212752a176e0d3414f66b013b46adc500c5d9e7fa250646aaf9b6bd42b9cbaa7c23282c7da6105e37d6ae77f790cd0036ad4e07b8aa50b611d41045035bc533 -EBUILD polymc-1.4.1-r2.ebuild 2973 BLAKE2B 1148e46babe0f01f660276d17cbe5f3c0d211e95d9e70fcbc29d82741eba0df0cee8dedad158a91e20277a0f3901345b7eddf5ace5df2a159954ccec4dfc837f SHA512 9e221ef06ee99a397f34dcfe5fa5e9c1bdebfb72ffea5e83c64cd116683895bb1cf5bf3d25d00bf8fef6cfe4314c5241ef3db1adaeb798343f6777add191d2a9 -EBUILD polymc-1.4.2-r1.ebuild 2978 BLAKE2B 94a90500f3bff1239946887ecab570fddbb8755e035d8b1f0a9a2ad6ebee31bb13f89e9243532fde1220fa841970134240f834771f30e5ef4863066532aa7bd1 SHA512 0f796ce2379c076aea537395527e313203d2243bb667fa958b6035741c8a72dda2beecf854a8b5b4dee09f4edcd15d1cc0ba91e7bd3ba1bb40421444b6225ad8 -EBUILD polymc-9999.ebuild 2978 BLAKE2B 94a90500f3bff1239946887ecab570fddbb8755e035d8b1f0a9a2ad6ebee31bb13f89e9243532fde1220fa841970134240f834771f30e5ef4863066532aa7bd1 SHA512 0f796ce2379c076aea537395527e313203d2243bb667fa958b6035741c8a72dda2beecf854a8b5b4dee09f4edcd15d1cc0ba91e7bd3ba1bb40421444b6225ad8 -MISC metadata.xml 1088 BLAKE2B 5a9d980fb174d942db61bacb4e5b7d65b59f2ecbc91e4e4a5b15b91fc1abb1d6ab9e8acd3a9db6e526df1321e25120ba89f0802f859daae86a2269542b51db3a SHA512 1c2657370e99a198fc2dea81e9829509e0a49a0a87230cf51b6c695ea1f46a85c0a9a4c001c793b733eef2134db8966ba54d6188e4241095a330604dccc91f4b +EBUILD polymc-1.4.2-r2.ebuild 3017 BLAKE2B 87620e1b8cb1f7d267f94b52e82464ac546773ddf43d4fa437334a50298c3c132759a7418c16f39e3c5947d53b33ea765e40c76f9e2d05392f48b2c2f757628d SHA512 7a378e78d2b3160c5d09729aa6951e70c7878895027801077283ed6a4f364ade2a54d3c856de1ed1a7da470aa0b6085ffa637ead69869bd8b457d5158dd1d02d +EBUILD polymc-9999.ebuild 3245 BLAKE2B 223f7c6d9553ffa60ad1cab40ad586907737def2f21fe2aa8abe9a4907611317fa030b82f3fca09680e90316a71b0783fd22adab910b77afe1cc0fdc0c2859f4 SHA512 8d077d9fedc461293d385431ba75db6987c1a3cbcfa7a1f097db3dfab1248b39724df5c20792b6f100ac2341325f8c753ab637e9791b13bec10b037194e8afa0 +MISC metadata.xml 1166 BLAKE2B 90d798eeae66595a665d2d694e6b4acecfc1236316ec6b254efddda7048593ee5c0045ae007498e759e9166560edc66b2c99283c3254af0a985689dcc2817dc1 SHA512 e312aaf618a920779c007beae2bc323d7bb184140e14eb0d7eacbfa1e8c182dc2d931e84fd8d0e4e36d7e513bf4b490b450fb15a87ab7728ea8f5c710edab262 diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml index f704149126f6..7ba4aabb75f4 100644 --- a/games-action/polymc/metadata.xml +++ b/games-action/polymc/metadata.xml @@ -25,5 +25,6 @@ PolyMC is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity. Enable link-time optimization + Build with Qt6 support instead of the default Qt5 diff --git a/games-action/polymc/polymc-1.4.1-r2.ebuild b/games-action/polymc/polymc-1.4.1-r2.ebuild deleted file mode 100644 index 826e2e11a7aa..000000000000 --- a/games-action/polymc/polymc-1.4.1-r2.ebuild +++ /dev/null @@ -1,133 +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://polymc.org/ https://github.com/PolyMC/PolyMC" -DESCRIPTION="A custom, open source Minecraft launcher" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI=" - https://github.com/PolyMC/PolyMC - https://github.com/PolyMC/libnbtplusplus - " - - EGIT_SUBMODULES=( 'depends/libnbtplusplus' ) -else - MY_PN="PolyMC" - - # Let's use the vendored tarball to avoid dealing with the submodules directly - SRC_URI=" - https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz - " - - # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV} - S="${WORKDIR}/${MY_PN}-${PV}" - - KEYWORDS="~amd64" -fi - -# Apache-2.0 for MultiMC (PolyMC is forked from it) -# GPL-3 for PolyMC -# LGPL-3 for libnbtplusplus -# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries -LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT" - -SLOT="0" - -IUSE="debug lto test" -REQUIRED_USE=" - lto? ( !debug ) -" - -RESTRICT="!test? ( test )" - -MIN_QT="5.12.0" -QT_SLOT=5 - -QT_DEPS=" - >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT} - >=dev-qt/qttest-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT} -" - -# Required at both build-time and run-time -COMMON_DEPENDS=" - ${QT_DEPS} - >=dev-libs/quazip-1.3:=[qt5(+)] - sys-libs/zlib -" - -BDEPEND=" - app-text/scdoc - 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} - >=virtual/jre-1.8.0:* - virtual/opengl -" - -PATCHES=( - "${FILESDIR}"/${P}-include_QDebug.patch -) - -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 polymc - -DLauncher_APP_BINARY_NAME="${PN}" - # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things - -DLauncher_QT_VERSION_MAJOR=${QT_SLOT} - - -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 - - # 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/polymc/polymc-1.4.2-r1.ebuild b/games-action/polymc/polymc-1.4.2-r1.ebuild deleted file mode 100644 index 0f99fa720844..000000000000 --- a/games-action/polymc/polymc-1.4.2-r1.ebuild +++ /dev/null @@ -1,133 +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://polymc.org/ https://github.com/PolyMC/PolyMC" -DESCRIPTION="A custom, open source Minecraft launcher" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI=" - https://github.com/PolyMC/PolyMC - https://github.com/PolyMC/libnbtplusplus - " - - EGIT_SUBMODULES=( 'depends/libnbtplusplus' ) -else - MY_PN="PolyMC" - - # Let's use the vendored tarball to avoid dealing with the submodules directly - SRC_URI=" - https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz - " - - # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV} - S="${WORKDIR}/${MY_PN}-${PV}" - - KEYWORDS="~amd64" -fi - -# Apache-2.0 for MultiMC (PolyMC is forked from it) -# GPL-3 for PolyMC -# LGPL-3+ for libnbtplusplus -# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/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 test" -REQUIRED_USE=" - lto? ( !debug ) -" - -RESTRICT="!test? ( test )" - -MIN_QT="5.12.0" -QT_SLOT=5 - -QT_DEPS=" - >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT} - >=dev-qt/qttest-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT} -" - -# Required at both build-time and run-time -COMMON_DEPENDS=" - ${QT_DEPS} - >=dev-libs/quazip-1.3:=[qt5(+)] - sys-libs/zlib -" - -BDEPEND=" - app-text/scdoc - 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} - >=virtual/jre-1.8.0:* - virtual/opengl -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.1-include_QDebug.patch -) - -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 polymc - -DLauncher_APP_BINARY_NAME="${PN}" - # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things - -DLauncher_QT_VERSION_MAJOR=${QT_SLOT} - - -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 - - # 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/polymc/polymc-1.4.2-r2.ebuild b/games-action/polymc/polymc-1.4.2-r2.ebuild new file mode 100644 index 000000000000..cfd8180bf564 --- /dev/null +++ b/games-action/polymc/polymc-1.4.2-r2.ebuild @@ -0,0 +1,136 @@ +# 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://polymc.org/ https://github.com/PolyMC/PolyMC" +DESCRIPTION="A custom, open source Minecraft launcher" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI=" + https://github.com/PolyMC/PolyMC + https://github.com/PolyMC/libnbtplusplus + " + + EGIT_SUBMODULES=( 'depends/libnbtplusplus' ) +else + MY_PN="PolyMC" + + # Let's use the vendored tarball to avoid dealing with the submodules directly + SRC_URI=" + https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz + " + + # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV} + S="${WORKDIR}/${MY_PN}-${PV}" + + KEYWORDS="~amd64" +fi + +# Apache-2.0 for MultiMC (PolyMC is forked from it) +# GPL-3 for PolyMC +# LGPL-3+ for libnbtplusplus +# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/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 test" +REQUIRED_USE=" + lto? ( !debug ) +" + +RESTRICT="!test? ( test )" + +MIN_QT="5.12.0" +QT_SLOT=5 + +QT_DEPS=" + >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT} + >=dev-qt/qttest-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT} + >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT} +" + +# Required at both build-time and run-time +COMMON_DEPENDS=" + ${QT_DEPS} + >=dev-libs/quazip-1.3:=[qt5(+)] + sys-libs/zlib +" + +BDEPEND=" + app-text/scdoc + 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} + + >=dev-qt/qtsvg-${MIN_QT}:${QT_SLOT} + + >=virtual/jre-1.8.0:* + virtual/opengl +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.1-include_QDebug.patch +) + +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 polymc + -DLauncher_APP_BINARY_NAME="${PN}" + # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things + -DLauncher_QT_VERSION_MAJOR=${QT_SLOT} + + -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 + + # 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/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild index 0f99fa720844..5f9c909ad33a 100644 --- a/games-action/polymc/polymc-9999.ebuild +++ b/games-action/polymc/polymc-9999.ebuild @@ -39,30 +39,40 @@ LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT" SLOT="0" -IUSE="debug lto test" +IUSE="debug lto qt6 test" REQUIRED_USE=" lto? ( !debug ) " RESTRICT="!test? ( test )" -MIN_QT="5.12.0" -QT_SLOT=5 +MIN_QT_5_VERSION="5.12.0" +MIN_QT_6_VERSION="6.0.0" QT_DEPS=" - >=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtcore-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtgui-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT} - >=dev-qt/qttest-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT} - >=dev-qt/qtxml-${MIN_QT}:${QT_SLOT} + !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} - >=dev-libs/quazip-1.3:=[qt5(+)] + + !qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] ) + qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] ) + sys-libs/zlib " @@ -81,6 +91,10 @@ DEPEND=" # 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 " @@ -102,8 +116,7 @@ src_configure(){ -DCMAKE_INSTALL_PREFIX="/usr" # Resulting binary is named polymc -DLauncher_APP_BINARY_NAME="${PN}" - # Force Qt5 to avoid accidentaly building the Qt6 version and breaking things - -DLauncher_QT_VERSION_MAJOR=${QT_SLOT} + -DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5) -DENABLE_LTO=$(usex lto) -DBUILD_TESTING=$(usex test) -- cgit v1.2.3