gentoo auto-resync : 25:12:2024 - 06:31:02next

4 files changed, 147 insertions, 3 deletions

diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 1ae1a8d47897..836f1ab26f45 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,3 +1,6 @@
+AUX naev-0.12.0-nfd.patch 853 BLAKE2B 509689d81e41cc73789abe98a5e8a343303ac1922207c9c6657bb35299ff6e589fe42beaba1c931d6be9259cc635fbe2d56b823d1b72accc6a78485e579324b0 SHA512 48b876e0e62d8ea362fcad222713a1be53d17d6ee32fda70983b3983bf4da1ff9f2a1e2028c190f3cae7d513a317339166e49555ffce2ce8fc466e186d19cf07
 DIST naev-0.11.5-source.tar.xz 453774708 BLAKE2B 36debc50b54c8f8c47851484cba7768242f70eebe1ef24f789c1435ee421ace4767b8be2ffda281162b796100c45882d6d7d8e005415ebbd81f56530831ca827 SHA512 de4896f705d020ab2f2c3ffd6c16599365caa8b87dbca6288f9dbcec114e97ee775a03819b958fdd697b1232295c6f6339a89e1b5c6671942efe26ec2d439755
-EBUILD naev-0.11.5.ebuild 2347 BLAKE2B d25f4e8e0baf14496c1630f13809644abb1e5e87164d239a3c70e075967afd807699edf5de11de6c716f7a4fa26c7e6c8520e706c675c9e08e8669a365574cb1 SHA512 9c4ef74a3a074ea199a1161510ce53b91c5bb52a449242c0abe6a157e1dc744c3b982fcedaddc6fd1fcb9e08fa3c4d206702056f8ea237d1f6d945dac4e3fa91
+DIST naev-0.12.0-source.tar.xz 463484668 BLAKE2B 4fc7a71625090d0b7f846933a26d768adc6ce05bddb6b49b829773c5bcea5ae1ec87026d9f07c1b7ba786f0b80bad9d01a6597e45b1d5f42faa4a371dff3b01c SHA512 1e0700f4ce58740490173f0b2a7e460b43fb269ebeeae54ffc3c8bada73b72fc0860083d2987868dee01b60ec110e7f39099b60367654d4bec04bf9b88ca57e2
+EBUILD naev-0.11.5.ebuild 2541 BLAKE2B 5c06546f0d654785489bee591819588e29883c134af2fdf6e1c881535f2be9db6274b1993b7b6690c290f55b1afc6c5d15e1d5f159e29a5b596932b6fa8d5e07 SHA512 acdf28cf7e9401e163838400beb65bcd911a7e9a8bd0f80390a216eedc336afad49d1cf6d12b325831ae009dc586ffebb1ee741ffc7f3e2e56ca06e194aa5625
+EBUILD naev-0.12.0.ebuild 2577 BLAKE2B a5a99f9003dcb9799547d6e0676570cbd8fd1b4b13c00c00781ab73780551a134dee85858842e3642bb870820b4e972f15d7ba03af8fb20dc92002ec28194c0e SHA512 ed364252ce211520e0d315b00c72d3a76f048720a6d9a4a3ba8de15a3c60f233d634fe21ff30550f8ccff1a2f51ac50626b1b49c27883cf65a35a019dab36377
 MISC metadata.xml 328 BLAKE2B 2c831943c7eee723e5c707906bcec96e97abd71e5d6fc3256010cca9626aebe95ecd7dca316a9567fe41186f0a656a434d774f83f088f414a95b3aba425c23b9 SHA512 426ac4b34b6cb45db05f5a7768a15947f67f5e90cda1bafa817320988aeb96ade18d774b2aa5e92d12c1fd1fd7a4964ac1bbdacbca6655325ccccc6a9405dfa4
diff --git a/games-strategy/naev/files/naev-0.12.0-nfd.patch b/games-strategy/naev/files/naev-0.12.0-nfd.patch
new file mode 100644
index 000000000000..0a79232b1750
--- /dev/null
+++ b/games-strategy/naev/files/naev-0.12.0-nfd.patch
@@ -0,0 +1,17 @@
+https://github.com/naev/naev/commit/b63510d4c7aa7126e6472a1f7a2b743000e6f476
+From: Jack Greiner <jack@emoss.org>
+Date: Mon, 23 Dec 2024 16:01:59 -0500
+Subject: [PATCH] meson.build: Fix using local installs of
+ nativefiledialog-extended when building
+
+--- a/meson.build
++++ b/meson.build
+@@ -111,7 +111,7 @@ int main (void) { return 0; }''')
+    yaml = dependency('yaml-0.1', required: true, version: '>=0.2.5', fallback: ['libyaml', 'yaml_dep'], static: get_option('steamruntime'))
+ 
+    # TODO replace nfd with SDL3 native functions when possible
+-   nfd = dependency('nativefiledialog-extended', required: true, fallback: ['nativefiledialog-extended'], static: true)
++   nfd = dependency('nfd', required: true, fallback: ['nativefiledialog-extended'], static: true)
+ 
+    libxml2 = dependency('libxml-2.0', required: false)
+    if not libxml2.found()
diff --git a/games-strategy/naev/naev-0.11.5.ebuild b/games-strategy/naev/naev-0.11.5.ebuild
index b15834855402..da1c44d6a2ad 100644
--- a/games-strategy/naev/naev-0.11.5.ebuild
+++ b/games-strategy/naev/naev-0.11.5.ebuild
@@ -21,6 +21,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
+# tests are very basic, equivalent of just starting the game and checking if
+# can see the main menu -- but this breaks easily with software rendering and
+# some Xorg/mesa versions, simpler to do manually than try to keep this working
+RESTRICT="test"
+
 # dlopen: libglvnd
 RDEPEND="
 	${LUA_DEPS}
@@ -78,8 +83,7 @@ src_prepare() {
 	# use eclass' generated lua.pc first rather than as fallback
 	sed -i "s/'lua51'/'lua'/" meson.build || die
 
-	# don't probe OpenGL for tests (avoids sandbox violations, bug #829369),
-	# mesa[llvm] should ensure software rendering will work
+	# don't probe OpenGL for tests (avoids sandbox violations, bug #829369)
 	sed -i "/subdir('glcheck')/d" test/meson.build || die
 }
 
diff --git a/games-strategy/naev/naev-0.12.0.ebuild b/games-strategy/naev/naev-0.12.0.ebuild
new file mode 100644
index 000000000000..31298e490603
--- /dev/null
+++ b/games-strategy/naev/naev-0.12.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit lua-single meson python-any-r1 virtualx xdg
+
+DESCRIPTION="2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.xz"
+
+LICENSE="
+	GPL-3+
+	Apache-2.0 BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0
+	CC-BY-SA-4.0 CC0-1.0 GPL-2+ MIT OFL-1.1 public-domain
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# tests are very basic, equivalent of just starting the game and checking if
+# can see the main menu -- but this breaks easily with software rendering and
+# some Xorg/mesa versions, simpler to do manually than try to keep this working
+RESTRICT="test"
+
+# dlopen: libglvnd
+RDEPEND="
+	${LUA_DEPS}
+	app-text/cmark:=
+	dev-games/physfs
+	dev-libs/libpcre2:=
+	dev-libs/libunibreak:=
+	dev-libs/libxml2
+	dev-libs/libyaml
+	dev-libs/nativefiledialog-extended
+	media-libs/freetype:2
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl2-image[png,webp]
+	net-libs/enet:1.3=
+	sci-libs/cholmod
+	sci-libs/cxsparse
+	sci-libs/openblas
+	sci-libs/suitesparse
+	sci-mathematics/glpk:=
+	virtual/libintl
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-games/physfs[zip]
+		media-libs/libsdl2[X]
+	)
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/gettext
+	doc? (
+		app-text/doxygen
+		dev-lua/ldoc
+		media-gfx/graphviz
+	)
+	test? (
+		media-libs/mesa[llvm]
+		x11-base/xorg-server[-minimal]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nfd.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't probe OpenGL for tests (avoids sandbox violations, bug #829369)
+	sed -i "/subdir('glcheck')/d" test/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		# *can* do lua5-1 but upstream uses+test luajit most (bug #946881)
+		-Dluajit=enabled
+		$(meson_feature doc docs_c)
+		$(meson_feature doc docs_lua)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	local DOCS=( CHANGELOG Readme.md )
+	meson_src_install
+
+	if use doc; then
+		dodir /usr/share/doc/${PF}/html
+		mv -- "${ED}"/usr/{doc/naev/{c,lua},share/doc/${PF}/html} || die
+		rm -r -- "${ED}"/usr/doc || die
+	fi
+
+	rm -r -- "${ED}"/usr/share/doc/naev || die
+}