From 95461df035e3867364495f065e5e805bf629b2d7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 26 Oct 2021 00:10:07 +0100 Subject: gentoo resync : 25.10.2021 --- .../EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild | 69 ++++++++++++++++++++++ .../EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild | 68 --------------------- games-simulation/EmptyEpsilon/Manifest | 3 +- ...EmptyEpsilon-Install-EmptyEpsilon.desktop.patch | 45 ++++++++++++++ 4 files changed, 116 insertions(+), 69 deletions(-) create mode 100644 games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild delete mode 100644 games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild create mode 100644 games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch (limited to 'games-simulation/EmptyEpsilon') diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild new file mode 100644 index 000000000000..046224a20d14 --- /dev/null +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="A spaceship bridge simulator game." +HOMEPAGE="https://daid.github.io/EmptyEpsilon/" +# This bundles SeriousProton as the build system does not support using +# a separate SeriousProton instance (and currently EmptyEpsilon seems to +# be the only consumer). +SRC_URI="https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz + https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz" + +# EmptyEpsilon is mostly licensed under GPL, however the art ressources +# use Creative Commons and the bundled SeriousProton is MIT-licensed. +LICENSE="GPL-2 CC-BY-SA-3.0 MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-cpp/json11-1.0.0 + media-libs/libglvnd + media-libs/libsfml + >=media-libs/glm-0.9.9.8 +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/EmptyEpsilon-EE-${PV}" + +pkg_pretend() { + if [[ ${MERGE_TYPE} == "binary" ]]; then + return + fi + + if tc-is-gcc; then + if [[ $(gcc-major-version) -lt 11 ]]; then + # ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29' + eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler." + die "Need at least GCC >= 11" + fi + fi +} + +src_prepare() { + eapply "${FILESDIR}/${PN}-Install-EmptyEpsilon.desktop.patch" + eapply "${FILESDIR}/${PN}-Make-CMake-call-find_package-glm.patch" + eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ + "${FILESDIR}/SeriousProton-Unbundle-json11.patch" + + eapply_user + + cmake_src_prepare +} + +src_configure() { + local version=( $(ver_rs 1- ' ') ) + local mycmakeargs=( + -DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/" + -DOpenGL_GL_PREFERENCE=GLVND + -DCPACK_PACKAGE_VERSION="${PV}" + -DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}" + -DCPACK_PACKAGE_VERSION_MINOR="${version[1]}" + -DCPACK_PACKAGE_VERSION_PATCH="${version[2]}" + ) + + cmake_src_configure +} diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild deleted file mode 100644 index 5d9e67d4a9fb..000000000000 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="A spaceship bridge simulator game." -HOMEPAGE="https://daid.github.io/EmptyEpsilon/" -# This bundles SeriousProton as the build system does not support using -# a separate SeriousProton instance (and currently EmptyEpsilon seems to -# be the only consumer). -SRC_URI="https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz - https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz" - -# EmptyEpsilon is mostly licensed under GPL, however the art ressources -# use Creative Commons and the bundled SeriousProton is MIT-licensed. -LICENSE="GPL-2 CC-BY-SA-3.0 MIT" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - >=dev-cpp/json11-1.0.0 - media-libs/libglvnd - media-libs/libsfml - >=media-libs/glm-0.9.9.8 -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/EmptyEpsilon-EE-${PV}" - -pkg_pretend() { - if [[ ${MERGE_TYPE} == "binary" ]]; then - return - fi - - if tc-is-gcc; then - if [[ $(gcc-major-version) -lt 11 ]]; then - # ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29' - eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler." - die "Need at least GCC >= 11" - fi - fi -} - -src_prepare() { - eapply "${FILESDIR}/${PN}-Make-CMake-call-find_package-glm.patch" - eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ - "${FILESDIR}/SeriousProton-Unbundle-json11.patch" - - eapply_user - - cmake_src_prepare -} - -src_configure() { - local version=( $(ver_rs 1- ' ') ) - local mycmakeargs=( - -DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/" - -DOpenGL_GL_PREFERENCE=GLVND - -DCPACK_PACKAGE_VERSION="${PV}" - -DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}" - -DCPACK_PACKAGE_VERSION_MINOR="${version[1]}" - -DCPACK_PACKAGE_VERSION_PATCH="${version[2]}" - ) - - cmake_src_configure -} diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest index 1cd180e3724e..eeface646e30 100644 --- a/games-simulation/EmptyEpsilon/Manifest +++ b/games-simulation/EmptyEpsilon/Manifest @@ -1,6 +1,7 @@ +AUX EmptyEpsilon-Install-EmptyEpsilon.desktop.patch 1170 BLAKE2B e844399b993374b05a6ebe80d66b0845f2170aaf2a40a51fdc6991d15a175fa5e8654787d7722154844fae4bfb399faf1c0367cc9bd9d99cc2998a715039c491 SHA512 d64d1b6cfcd9bed65b03a065f91e838c124bed00d98de71a69493e2725c8411be1d8d3f3559af53f94cfd7d867fa8b23521333cd53b2004fe8b24f441904f000 AUX EmptyEpsilon-Make-CMake-call-find_package-glm.patch 1056 BLAKE2B 9522b7e2b45531ebd82e1f454a889ccd4c688adcbcdb753ca3c0c23ee2f0b94ed9537956bbbd8faca8305065017daf178278d5c14661d68de24d9c008339d6f2 SHA512 c6ccddf2a9f6fc7342428d5c197bec6fc01f24e3c9c9aa19bbccedba3c16bd825f59566fb0239b64bdd3914abfd584382742544f79c4266eef6e4ee7aabf3238 AUX SeriousProton-Unbundle-json11.patch 722 BLAKE2B ab12cf044d38bc78eac3d4fdd7f3c9db062784177e848ca62135b356fec88be9876fa98f23d1195e3c3a2ef791166cb3c0fe220bce9c53a667b628a2e3602eb4 SHA512 da912f148738a409dd1eee4a8a926930ed31220c9b6477eb8a89da797dd659e2a576ca44875410cbc46c86f7d5b6e44037ed3f44c8d7ecd5a4680f12f626f013 DIST EmptyEpsilon-2021.06.23.tar.gz 285211647 BLAKE2B 813b7e02ff7f046b7f28139063441eb421861b720c7b55d25930d3a418211fefdce7ac0e6ab705b4afe52df58f85a9298ff3e6be883a841e6eb9f7037eca297b SHA512 209ea68d99ef5ef53f1e3484d6471cafc01d4cb6505609a5b41d468387147127b4b4bbc20af75404d2cdef3d3cfb37bbb7f6fb3ae336d2f7e264e9c470ad7764 DIST SeriousProton-2021.06.23.tar.gz 1181117 BLAKE2B 433280b7f6994bed0b86ffc4135a1e91bd9521c508b875332d17dc041da6b77a4260de784b6b75e79aab072d6bc68108a8b6b4949d674670f1d13ed1abe90d7e SHA512 4519801c30cd87436704023090ce39299573b02637a86b0d5c6ac0f4e99b4bddc6724b2b660edfd29d33a908b67268409a8c47dab7b5d59958a5abd52d5610bf -EBUILD EmptyEpsilon-2021.06.23.ebuild 1957 BLAKE2B 9c88c669ee835bbf244392a85c334cac0cb9470605af2f196f9141476ebc6f7ca918a51025206b5b9bac3ee3ff93bb1e7250e1911bda3ccc213f1849fa6a17ee SHA512 bad61aca9a503fb24c47fdcdf7ce008e2c6ba6f92de4c8546dd1218e4991a365bf617db3f2bab9a0ebf366a8ef263cc91c7073705da9283c236701e8ce378de3 +EBUILD EmptyEpsilon-2021.06.23-r1.ebuild 2020 BLAKE2B 0ff793513fc4f9ae446fb85d7ff6fb1fe455272341e5baf26f96a0a7aed911a317e8a89e80fdfedd81140d0f1bc47f9f4da4abaf0a5a39eb3ad3895ad25e07cd SHA512 e16a364466342dcb21a796c367c5c4a7c2007d81b4ce93dc3a122e0aba1523a696e083ca1bed73ff802412a22acb1c7f65cdd9999bfbbbf5122fac43b96f353f MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53 diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch new file mode 100644 index 000000000000..4730bcbabb25 --- /dev/null +++ b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch @@ -0,0 +1,45 @@ +From c34c773ab5a403c288d7eecd971ae5b0d9eecfa0 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Thu, 21 Oct 2021 10:33:28 +0200 +Subject: [PATCH] Install EmptyEpsilon.desktop + +Fixes #405. + +See also https://bugs.gentoo.org/818697 +--- + CMakeLists.txt | 5 +++++ + EmptyEpsilon.desktop | 9 +++++++++ + 2 files changed, 14 insertions(+) + create mode 100644 EmptyEpsilon.desktop + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb3e32c0e6ed..b630668aecd9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -711,3 +711,8 @@ set(CPACK_INSTALL_CMAKE_PROJECTS + ) + + include(CPack) ++ ++if(UNIX AND NOT APPLE) ++ install(FILES EmptyEpsilon.desktop DESTINATION "share/applications") ++ install(FILES logo.png DESTINATION "share/icons" RENAME "EmptyEpsilon.png") ++endif() +diff --git a/EmptyEpsilon.desktop b/EmptyEpsilon.desktop +new file mode 100644 +index 000000000000..07cc109b578d +--- /dev/null ++++ b/EmptyEpsilon.desktop +@@ -0,0 +1,9 @@ ++[Desktop Entry] ++Name=EmptyEpsilon ++GenericName=EmptyEpsilon ++Comment=Spaceship bridge simulator game ++Exec=EmptyEpsilon ++Icon=EmptyEpsilon ++Terminal=false ++Type=Application ++Categories=Game;Simulation; +-- +2.33.1 + -- cgit v1.2.3