8 files changed, 183 insertions, 0 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index c21abb30b08b..83c6a02a56b4 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest
new file mode 100644
index 000000000000..a893386abbda
--- /dev/null
+++ b/games-strategy/endless-sky/Manifest
@@ -0,0 +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
+DIST endless-sky-0.9.14.tar.gz 124358153 BLAKE2B 5845c3b595f0feba7fc5f6ce1ead88b34e9426c3db53cf013fc67f9197d2cabad8fae39056fa6f4d6da76fceb43a9709397b95daba855d1b1ebf3c25a04ba007 SHA512 861fddc8e2f167d335247f3ce1efb59bb4a5951cb0aa5e4a10517fded096db7e69ac17cf0e813f2a1ec040bef57c5d6b6e8e90d952debc9b2caa38d1fb91abe5
+EBUILD endless-sky-0.9.14.ebuild 1483 BLAKE2B 8f3539180cbe606b41bfa38b4edb333af25ca7aac5cf8b71deafbc7cb56671a84737d79d39ea001424eda98e5e6d6d783882847d1db1089c083eee4cda8fed1c SHA512 9ca783815ae64b226b254768b9a977ddb008c84f42eaecc0f52eecc4000854abc8cd52c59f8fde734d1c3572bcfaa5bb6e6c04d6a78f38cf0b293b99b846118d
+MISC metadata.xml 731 BLAKE2B 8e71c81f3f236d8c7fdfd6c5d6f3f5c5bc60ae3cae2ae8d01d82af1c3e2f38f19aaaf8b50219ade293e16fad552b6cc2a1e825c3d5aa2e0026286ee87fadbbb5 SHA512 956eb6d672d3052bf673975f5ab3addf2a6e141c327583ef9a61965f4ef2363ab99fadac4673da8091661734ca72bc37db77ecbd739608c06c2b0376ad20b8eb
diff --git a/games-strategy/endless-sky/endless-sky-0.9.14.ebuild b/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
new file mode 100644
index 000000000000..0a6641ac67ee
--- /dev/null
+++ b/games-strategy/endless-sky/endless-sky-0.9.14.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,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-dont-compress-man-page.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
new file mode 100644
index 000000000000..d3836c088f31
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
@@ -0,0 +1,20 @@
+From 07f273e6f72a01158934158c3e8ff84c530367c9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@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
new file mode 100644
index 000000000000..bdec820de1e1
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch
@@ -0,0 +1,42 @@
+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.14-respect-cflags.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch
new file mode 100644
index 000000000000..8bea82409af0
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000000..9b38e28a60fe
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch
@@ -0,0 +1,14 @@
+From e8119dcdcb42479896a35cec5dc85c17c1901b2e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+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 <catch2/catch.hpp>
diff --git a/games-strategy/endless-sky/metadata.xml b/games-strategy/endless-sky/metadata.xml
new file mode 100644
index 000000000000..6f9e5ee62db4
--- /dev/null
+++ b/games-strategy/endless-sky/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games</name>
+	</maintainer>
+	<longdescription>
+		Explore other star systems. Earn money by trading, carrying passengers, or completing missions.
+		Use your earnings to buy a better ship or to upgrade the weapons and engines on your current one. Blow up pirates.
+		Take sides in a civil war. Or leave human space behind and hope to find some friendly aliens whose culture is more civilized than your own...
+	</longdescription>
+	<upstream>
+		<remote-id type="github">endless-sky/endless-sky</remote-id>
+	</upstream>
+</pkgmetadata>