From c18398e8c10c222f0daed55f7d69339e3c7885bd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 24 Feb 2023 15:48:26 +0000 Subject: gentoo auto-resync : 24:02:2023 - 15:48:26 --- games-strategy/endless-sky/Manifest | 4 -- .../endless-sky/endless-sky-0.9.14.ebuild | 64 ---------------------- .../files/endless-sky-0.9.14-respect-cflags.patch | 20 ------- .../endless-sky-0.9.14-use-system-catch2.patch | 14 ----- 4 files changed, 102 deletions(-) delete mode 100644 games-strategy/endless-sky/endless-sky-0.9.14.ebuild delete mode 100644 games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch delete mode 100644 games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch (limited to 'games-strategy/endless-sky') diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest index 3a7ebb3c0ccd..862502a880fa 100644 --- a/games-strategy/endless-sky/Manifest +++ b/games-strategy/endless-sky/Manifest @@ -1,11 +1,7 @@ AUX endless-sky-0.9.14-dont-compress-man-page.patch 602 BLAKE2B 9aaa08338ed26e53f5eaa3e42a0aaa8c9c8f56099518a688d3f91fd860945a883252345bd8f9df9b6d591751afc171f6d6e845c86083bc246316fec6e5d3eb7e SHA512 a3b951be268b8e6689da97b7ec77ebb7a5d65a6381dbbdfd0b607c62d2d0418f78290189b6cf94c33acfd238c7c8b1b5b0737629486ca2af18d9022ada1789ec AUX endless-sky-0.9.14-no-games-path.patch 1919 BLAKE2B 7650a1e3a355a0e9a591f191fbc2eb0f5400924cac7fa2ac0ef3419a6c7c6524e19956907c3904267c9ba1e1bedbceb7b5fa19af07316c6137c9075f9a051c03 SHA512 c9b867fb0d8c82a1ebaa5bc04ba615d39d81031bcec204b5e5a3d0daff040ae30f59ba4f80e76ca671db0a9073c63ad0b3cb8f125ca628bbaa1774c212e6c2b3 -AUX endless-sky-0.9.14-respect-cflags.patch 717 BLAKE2B 40df2f55bb3d1a1bcd21ae5256b17f2d4aa0aa0ee355fce72e73e7e5f3a5eca7569f86e1a1ade2065bcb7f730bdefe58e96acff0f9372bf80f84a088e7d36231 SHA512 2730b4ac105e8b8cf7b5d470998c0c9ab82b638c765406387a36943404e8b4ad6ba58309586090417b570f58dbbc8f2534c0b63a4ca6490fd3f806458302faab -AUX endless-sky-0.9.14-use-system-catch2.patch 500 BLAKE2B 3faedad278e2cb08cb1a03fb7d63144721bb33710cf71f1630c6ed6d168ff6b9754a9dc3362d6ab55b43c2dfb59a0f94c03c21a75d22f124ee45e9cce78c44ac SHA512 7e9813e13a99111f1abbb9e4cfaf1f419fbdc28076e258d48d8ebb438b79ca09599b4e8ed60abc1534083f02a73bb83cd27597437c0b0ba4b610e96af76deb3b AUX endless-sky-0.9.16.1-respect-cflags.patch 389 BLAKE2B 1dc481b771fc9ab5af455c623aae6941d3b81b7b74ad031e7702dfc6a3832713ea040130a81ddee1c1e129758d85a0e25eff74bca4fba66b7cd940a9373bccf9 SHA512 a309b981791ea81538d8ee47aef4b590cf01af024280e73f883ce8145621a533daa404b87c04f7545bc8922be9dec77c8c4c0142dc2b3e490cd5e252d0087cf0 AUX endless-sky-0.9.16.1-test-libs.patch 448 BLAKE2B 41c7617f7087140cee0540e432540098f47d6c2037b02da2a594899b8140db32c40676611a081f56767f48707daf9e5eaebf48eb81ec0ee03d57cb2afa1d0d1c SHA512 fe4a698de27a48439e7a205ce36b0eed29e8f5264422717c412be5726dedf236ac20668a20e850d2cb14782b5a1351d20582dc065b502bef978ab89416658ae0 -DIST endless-sky-0.9.14.tar.gz 124358153 BLAKE2B 5845c3b595f0feba7fc5f6ce1ead88b34e9426c3db53cf013fc67f9197d2cabad8fae39056fa6f4d6da76fceb43a9709397b95daba855d1b1ebf3c25a04ba007 SHA512 861fddc8e2f167d335247f3ce1efb59bb4a5951cb0aa5e4a10517fded096db7e69ac17cf0e813f2a1ec040bef57c5d6b6e8e90d952debc9b2caa38d1fb91abe5 DIST endless-sky-0.9.16.1.tar.gz 184582283 BLAKE2B 3c35df96b54546811713b123bf43993df6ba5271988decd7408722263c2edd904c84888db61c2d22554b3f60edebd25db7913e7784f309ff936d37c815bc6650 SHA512 83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56 -EBUILD endless-sky-0.9.14.ebuild 1481 BLAKE2B f4535df8be76add95da888233eae7623070f67e1a61ec1151abf15b0e55df54fdd0dc7c208cb48744664084131478ab6238be7d709f623e6ac5c3a4a00cb4975 SHA512 0d3deef14cef49780f7130c6a49367ed415c4cb9158a1f51b85c2df8e2c40287ff89737388420480a16c2889c23fa3a11e54b9b620a64145468d92f7e6d94c30 EBUILD endless-sky-0.9.16.1.ebuild 1720 BLAKE2B 7a5687d7b956134c892262757a7d248d91486158a439f6b8c557a1954b44a7a47986ca11b17667b8a16979dd5f8515c42db6d8d9e9a69845374be574db67df1f SHA512 a61bddf9a8c05cf15e709d849c690a58c507372f7a9b4ef76e43d9ced6ff5dc57e075271a15ff7a2a57b21342b1bbf7725c7ae7b047f441c4a862349f170c1e3 MISC metadata.xml 732 BLAKE2B 05e221e5b8bc45baf62a5361a1fa11affd5bfce04bb1ed4127251c151771df72c873e9c2deab4aa9b4800fa3314fa768c635e61bf941e3eb74241ee5f2a8aabf SHA512 2aefeccd986719aab4be77af1bf4458b36a873918c04905f9b432a591a44dfdd001faf29ab16ced565c069e846bfe5a96e2c12ffa1e4d62a7b202cf7fc356949 diff --git a/games-strategy/endless-sky/endless-sky-0.9.14.ebuild b/games-strategy/endless-sky/endless-sky-0.9.14.ebuild deleted file mode 100644 index 8a815e3b53e5..000000000000 --- a/games-strategy/endless-sky/endless-sky-0.9.14.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9,10} ) -inherit python-any-r1 scons-utils toolchain-funcs xdg - -DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity" -HOMEPAGE="https://endless-sky.github.io" -SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# Needs work; doesn't link against SDL 2 -RESTRICT="test" - -RDEPEND="media-libs/glew:0= - media-libs/libsdl2 - media-libs/libjpeg-turbo:= - media-libs/libmad - media-libs/libpng:= - media-libs/openal - virtual/opengl" -DEPEND="${RDEPEND} - test? ( dev-cpp/catch:0 )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.14-respect-cflags.patch - "${FILESDIR}"/${PN}-0.9.14-no-games-path.patch - "${FILESDIR}"/${PN}-0.9.14-dont-compress-man-page.patch - "${FILESDIR}"/${PN}-0.9.14-use-system-catch2.patch -) - -src_compile() { - tc-export AR CXX - - escons -} - -src_test() { - escons test -} - -src_install() { - escons PREFIX="${ED}"/usr/ install -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "Endless Sky provides high-res sprites for high-dpi screens." - einfo "If you want to use them, download" - einfo - einfo " https://github.com/endless-sky/endless-sky-high-dpi/releases" - einfo - einfo "and extract it to ~/.local/share/endless-sky/plugins/." - einfo - einfo "Enjoy." -} diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch deleted file mode 100644 index 8bea82409af0..000000000000 --- a/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://src.fedoraproject.org/rpms/endless-sky/raw/rawhide/f/endless-sky-0.9.14-remove-additional-ccflags.patch ---- a/SConstruct -+++ b/SConstruct -@@ -46,15 +46,7 @@ - # $ CXXFLAGS=-msse3 scons - # $ CXXFLAGS=-march=native scons - # or modify the `flags` variable: --flags = ["-std=c++11", "-Wall", "-Werror", "-Wold-style-cast"] --if env["mode"] != "debug": -- flags += ["-O3", "-flto"] -- env.Append(LINKFLAGS = ["-O3", "-flto"]) --if env["mode"] == "debug": -- flags += ["-g"] --elif env["mode"] == "profile": -- flags += ["-pg"] -- env.Append(LINKFLAGS = ["-pg"]) -+flags = ["-std=c++11"] - env.Append(CCFLAGS = flags) - - # Always use `ar` to create the symbol table, and don't use ranlib at all, since it fails to preserve diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch deleted file mode 100644 index 9b38e28a60fe..000000000000 --- a/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch +++ /dev/null @@ -1,14 +0,0 @@ -From e8119dcdcb42479896a35cec5dc85c17c1901b2e Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Thu, 6 Jan 2022 23:56:59 +0000 -Subject: [PATCH 1/2] Use system copy of catch2 - -In particular, we get glibc-2.34 fixes for free then. ---- a/tests/include/es-test.hpp -+++ b/tests/include/es-test.hpp -@@ -23,4 +23,4 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. - // #define CATCH_CONFIG_WINDOWS_CRTDBG - #endif - --#include "catch.hpp" -+#include -- cgit v1.2.3