commit: 4b0087904d720f62a2c8c9d49edea8b9f34b502a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 20:02:22 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May 12 20:02:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b008790
games-strategy/endless-sky: drop 0.9.16.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-strategy/endless-sky/Manifest | 1 -
.../endless-sky/endless-sky-0.9.16.1.ebuild | 74 ----------------------
...endless-sky-0.9.14-dont-compress-man-page.patch | 20 ------
.../files/endless-sky-0.9.14-no-games-path.patch | 42 ------------
.../files/endless-sky-0.9.16.1-gcc13.patch | 45 -------------
.../endless-sky-0.9.16.1-respect-cflags.patch | 13 ----
.../files/endless-sky-0.9.16.1-test-libs.patch | 10 ---
7 files changed, 205 deletions(-)
diff --git a/games-strategy/endless-sky/Manifest
b/games-strategy/endless-sky/Manifest
index 69ff9993f8da..dc163477cf80 100644
--- a/games-strategy/endless-sky/Manifest
+++ b/games-strategy/endless-sky/Manifest
@@ -1,2 +1 @@
DIST endless-sky-0.10.6.tar.gz 256438340 BLAKE2B
39699f458b691dd8aa0586ebbb5b537b8b999ea0084abc561803e21e97986dd6ef28582545fc79cc5cd3ef5d4c587b96860fd7b94294acf2fee31224543ac4ff
SHA512
815f64db07997cc8732b12887f55d363f0ef7e44a158dc83fc0b6c4c12c69dab3bf7e1b14c7e93fe920974d8c28b8043f39808227219f09adfe618a00389a530
-DIST endless-sky-0.9.16.1.tar.gz 184582283 BLAKE2B
3c35df96b54546811713b123bf43993df6ba5271988decd7408722263c2edd904c84888db61c2d22554b3f60edebd25db7913e7784f309ff936d37c815bc6650
SHA512
83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56
diff --git a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
deleted file mode 100644
index 709d7de7ed87..000000000000
--- a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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="gles2-only"
-
-RDEPEND="
- media-libs/libjpeg-turbo:=
- media-libs/libmad
- media-libs/libpng:=
- media-libs/openal
- sys-apps/util-linux
- gles2-only? (
- media-libs/libglvnd
- media-libs/libsdl2[gles2,video]
- )
- !gles2-only? (
- media-libs/glew:0=
- media-libs/libglvnd[X]
- media-libs/libsdl2[opengl,video]
- )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.14-no-games-path.patch
- "${FILESDIR}"/${PN}-0.9.14-dont-compress-man-page.patch
- "${FILESDIR}"/${PN}-0.9.16.1-respect-cflags.patch
- "${FILESDIR}"/${PN}-0.9.16.1-test-libs.patch
- "${FILESDIR}"/${PN}-0.9.16.1-gcc13.patch
-)
-
-src_compile() {
- tc-export AR CXX
-
- MYSCONSARGS=(
- PREFIX="${EPREFIX}"/usr
- opengl=$(usex gles2-only gles desktop)
- )
-
- escons "${MYSCONSARGS[@]}"
-}
-
-src_test() {
- # TODO: unbundle dev-cpp/catch if upstream migrates to catch v3
- escons "${MYSCONSARGS[@]}" test
-}
-
-src_install() {
- escons "${MYSCONSARGS[@]}" DESTDIR="${D}" 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-dont-compress-man-page.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
deleted file mode 100644
index d3836c088f31..000000000000
---
a/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 07f273e6f72a01158934158c3e8ff84c530367c9 Mon Sep 17 00:00:00 2001
-From: Sam James <s...@gentoo.org>
-Date: Thu, 6 Jan 2022 23:57:32 +0000
-Subject: [PATCH 2/2] Don't compress man page
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -176,10 +176,9 @@ if env.get("PREFIX").startswith("/usr/"):
- "gtk-update-icon-cache -t $DESTDIR$PREFIX/share/icons/hicolor/")
-
- # Install the man page.
--env.Command(
-+env.Install(
- "$DESTDIR$PREFIX/share/man/man6/endless-sky.6.gz",
-- "endless-sky.6",
-- "gzip -c $SOURCE > $TARGET")
-+ "endless-sky.6")
-
- # Install the data files.
- def RecursiveInstall(env, target, source):
diff --git
a/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch
deleted file mode 100644
index bdec820de1e1..000000000000
--- a/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://src.fedoraproject.org/rpms/endless-sky/raw/rawhide/f/endless-sky-0.9.13-remove-games-path.patch
---- a/SConstruct
-+++ b/SConstruct
-@@ -191,11 +191,11 @@
- RecursiveInstall(env, pathjoin(target, name),
node.abspath)
- else:
- env.Install(target, node)
--RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data")
--RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images",
"images")
--RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds",
"sounds")
--env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt")
--env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt")
-+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/data", "data")
-+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/images", "images")
-+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/sounds", "sounds")
-+env.Install("$DESTDIR$PREFIX/share/endless-sky", "credits.txt")
-+env.Install("$DESTDIR$PREFIX/share/endless-sky", "keys.txt")
-
- # Make the word "install" in the command line do an installation.
- env.Alias("install", "$DESTDIR$PREFIX")
---- a/SConstruct
-+++ b/SConstruct
-@@ -142,7 +142,7 @@
-
-
- # Install the binary:
--env.Install("$DESTDIR$PREFIX/games", sky)
-+env.Install("$DESTDIR$PREFIX/bin", sky)
-
- # Install the desktop file:
- env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
---- a/source/Files.cpp
-+++ b/source/Files.cpp
-@@ -119,7 +119,7 @@
- // the executable, but are under the same prefix (/usr or /usr/local).
- static const string LOCAL_PATH = "/usr/local/";
- static const string STANDARD_PATH = "/usr/";
-- static const string RESOURCE_PATH = "share/games/endless-sky/";
-+ static const string RESOURCE_PATH = "share/endless-sky/";
- if(!resources.compare(0, LOCAL_PATH.length(), LOCAL_PATH))
- resources = LOCAL_PATH + RESOURCE_PATH;
- else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH))
diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch
deleted file mode 100644
index 428e67da568e..000000000000
--- a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/894782
-https://github.com/endless-sky/endless-sky/commit/a85df936c24feba6eb5f7f484c160aff0a60d6cb
-https://github.com/endless-sky/endless-sky/commit/7483f72cc72511786ba3aac13b4cbe0848a2aefc
-
-From a85df936c24feba6eb5f7f484c160aff0a60d6cb Mon Sep 17 00:00:00 2001
-From: Heiko Becker <m...@heiko-becker.de>
-Date: Sat, 28 Jan 2023 16:29:40 +0100
-Subject: [PATCH] chore: Fix build with gcc 13 by including <cstdint> (#8235)
-
---- a/source/ImageBuffer.h
-+++ b/source/ImageBuffer.h
-@@ -16,6 +16,7 @@ this program. If not, see <https://www.gnu.org/licenses/>.
- #ifndef IMAGE_BUFFER_H_
- #define IMAGE_BUFFER_H_
-
-+#include <cstdint>
- #include <string>
-
-
---- a/source/Sound.cpp
-+++ b/source/Sound.cpp
-@@ -20,6 +20,7 @@ this program. If not, see <https://www.gnu.org/licenses/>.
-
- #include <AL/al.h>
-
-+#include <cstdint>
- #include <cstdio>
- #include <vector>
-
-
-From 7483f72cc72511786ba3aac13b4cbe0848a2aefc Mon Sep 17 00:00:00 2001
-From: Nick <quy...@protonmail.com>
-Date: Wed, 8 Mar 2023 19:41:40 +0100
-Subject: [PATCH] chore: Add a missing #include, caught by gcc 13 (#8511)
-
---- a/source/Preferences.h
-+++ b/source/Preferences.h
-@@ -16,6 +16,7 @@ this program. If not, see <https://www.gnu.org/licenses/>.
- #ifndef PREFERENCES_H_
- #define PREFERENCES_H_
-
-+#include <cstdint>
- #include <string>
-
-
diff --git
a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch
deleted file mode 100644
index 6790f7de647f..000000000000
--- a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -53,10 +53,2 @@
- flags = ["-std=c++11", "-Wall", "-Wold-style-cast", "-fno-rtti"]
--if env["mode"] != "debug":
-- flags += ["-Werror", "-O3", "-flto"]
-- env.Append(LINKFLAGS = ["-O3", "-flto"])
--if env["mode"] == "debug":
-- flags += ["-g"]
--elif env["mode"] == "profile":
-- flags += ["-pg"]
-- env.Append(LINKFLAGS = ["-pg"])
- env.Append(CCFLAGS = flags)
diff --git
a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch
b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch
deleted file mode 100644
index 31b27de1d569..000000000000
--- a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Even if not actually used, ensure all symbols are available when linking
-tests to handle cases where unused symbols were not optimized out.
-https://bugs.gentoo.org/894702
---- a/SConstruct
-+++ b/SConstruct
-@@ -172,4 +172,2 @@
- CPPPATH=(env.get('CPPPATH', []) + [pathjoin('tests', 'unit',
'include')]),
-- # Do not link against the actual implementations of SDL, OpenGL, etc.
-- LIBS=sys_libs,
- # Pass the necessary link flags for a console program.
