gentoo resync : 12.05.2022

3 files changed, 56 insertions, 3 deletions

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 97aa95882193..66a891c4536a 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,7 +1,8 @@
-DIST quake2-8.00.tar.xz 2086776 BLAKE2B 6a525b0d3703e17ca6ff85cbef7cf0c0522308fb71f8db4649e7bfbe3326c610d878d6a4af36ed6a578c700c5e1d004be7c0a9dd86cb495a27c8deb8b761eab9 SHA512 886c0df687e7e64a534f6e6f0b212084212d4d5c1278d2567b25bdd48df9ffab9ce75894ab6cfc2fd3a070adf9c1e3d7bb2e823d4f5aef8ef2cbc21c21c063bd
+AUX yamagi-quake2-8.01-execinfo.patch 1356 BLAKE2B 0e2ca61efc754046b4b66179f00ac176b24f7a76b27a2706abcadcacf74eddda7dcc042a0932ce04988b60ceb2682ac5870f67fd929440649a5007d3da20a89a SHA512 0daeb4621cdc93a2477cc84b9eb7f70a46d17aee3eab52991f90f17a38bada6e815a5164637629ae481ce0a5520089dfce14fad97eb986823885aadebbb34827
+DIST quake2-8.01.tar.xz 2109408 BLAKE2B a68fe6ea3a0ab44ba9776bf99a3a826afe0ee25c842d6169296eb8837a3b22146f481defd7a66294dc9e42e75e5848225199e4314bf94756606e7325ba789db2 SHA512 8f616f8f09ad9e44bb34227d5492cc0d63180cecebcc39760582590078f4a63a0a4433d66cdffefb26a68d070b2ea1223334de9ae7c32e6c46e42a5aab721a06
 DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
 DIST quake2-ref_vk-1.0.1.tar.gz 290799 BLAKE2B 0716d539704a58067fd2d6d4f21b27976c6bd073b2722584a804c9702f2886b252701d81f2fe1e5aba22ab83fbddd1e35ce3574c3e3d41b609ebac417ee7cfe4 SHA512 99a6b7191a2eed714f70ec389a1f1972f430b9ba324e6880ce96101336beac640fef2d45adc1a6bf04c386a1d088fafd401d303704079ed7207fe7b56d2758db
 DIST quake2-rogue-2.08.tar.xz 282140 BLAKE2B e4ead304f35028010f4ffea6eed15753feac99cfa301975f8cae88d9ac10313c9e1a9e29e37d4f186df34abf659dd45b79bda04b5f420565f256bde8b69ab199 SHA512 216b8a9862c7f189bdabc68770306ead4fa2173f9051a8fd2a7927eae8aa4e42116bbde947591432d200832a3038c79316325549822fa531fc0e76a2bec57762
 DIST quake2-xatrix-2.09.tar.xz 214096 BLAKE2B a4115da0d5624245d1065a67379d95a2b22330e1a5a999d7493d832d5edca4c83752f3a447ab1934c6709b7ed9247d5edd2b3f4b9b398a04982a9428381f2f9d SHA512 a4cf351eca2a72e6b5d8eeecf5d582a3c2c677b71dcf6bcdea310f1503f55ad8ccaf7225461bd78fc695e90d57525fd9a53c5d17e1eabd3a1d28e9386331399c
-EBUILD yamagi-quake2-8.00.ebuild 3608 BLAKE2B 52f857ec1e61ac6a73a0186f5c96acc7350214a0b2731ac5e13eb46a63a7b6bc22fd052c996c9c8701d927de49cc11701c07163e9070c0472a1b62750d309692 SHA512 a5b07b47fc3c4e56845f900b8fce24ff7edc94eb287c864aa62f312d8edae7f3772010c5284c4fea55321a0088452fd8302da9e7426e3eaf3967fffa9dd66dd4
+EBUILD yamagi-quake2-8.01.ebuild 3703 BLAKE2B ff516ec4856871b12181bb3ce7632dc175e8b7afa012fc65901b126c32edf64ceb6cc03c5293f79b356e08cf54e009bcc5f66c8ec3ba012268df587a5c30975e SHA512 4f64b0e621ca5bb6c3538bac755f55578237bf9364614a5a1a60d5588e6d4f9bca37453d78cd80392e55149a43074776ff8ff1731a21678de31478432f9f8866
 MISC metadata.xml 997 BLAKE2B 66368300709fa3d96efe1ef99188a77f0aab83526a0685e9f10d91100233352e115082eaf00713d2df6a4b42a7607efc0099fa4176d7b8b739061592969a51cc SHA512 7127d9fc2234157ad10a801fd27c6c84f132d7a05fb0a8bc4c4d31f2e0294827f416747cf0298680d99e29a87c1f261273e960c42c96708d67ee99b72f402284
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-8.01-execinfo.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-8.01-execinfo.patch
new file mode 100644
index 000000000000..40de2342fa8e
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-8.01-execinfo.patch
@@ -0,0 +1,49 @@
+From e4a23de95ac1b1333a8f349a1ead82999bca3862 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Sun, 17 Apr 2022 17:07:28 +0300
+Subject: [PATCH] build: Make execinfo optional
+
+---
+ Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 3f9d72ce..99048a82 100644
+--- a/Makefile
++++ b/Makefile
+@@ -62,6 +62,8 @@ WITH_SYSTEMWIDE:=no
+ # MUST NOT be surrounded by quotation marks!
+ WITH_SYSTEMDIR:=""
+ 
++WITH_EXECINFO:=yes
++
+ # This will set the build options to create an MacOS .app-bundle.
+ # The app-bundle itself will not be created, but the runtime paths
+ # will be set to expect the game-data in *.app/
+@@ -406,6 +408,7 @@ config:
+ 	@echo "WITH_RPATH = $(WITH_RPATH)"
+ 	@echo "WITH_SYSTEMWIDE = $(WITH_SYSTEMWIDE)"
+ 	@echo "WITH_SYSTEMDIR = $(WITH_SYSTEMDIR)"
++	@echo "WITH_EXECINFO = $(WITH_EXECINFO)"
+ 	@echo "============================"
+ 	@echo ""
+ 
+@@ -492,6 +495,7 @@ release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1
+ endif
+ endif
+ 
++ifeq ($(WITH_EXECINFO),yes)
+ ifeq ($(YQ2_OSTYPE), Linux)
+ release/quake2 : CFLAGS += -DHAVE_EXECINFO
+ endif
+@@ -523,6 +527,7 @@ ifeq ($(YQ2_OSTYPE), Haiku)
+ release/quake2 : CFLAGS += -DHAVE_EXECINFO
+ release/quake2 : LDLIBS += -lexecinfo
+ endif
++endif
+ 
+ ifeq ($(WITH_RPATH),yes)
+ ifeq ($(YQ2_OSTYPE), Darwin)
+-- 
+2.35.1
+
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
index 195061628b29..12f94411a485 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 	client? ( vulkan? ( dev-util/vulkan-headers ) )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-8.01-execinfo.patch )
+
 DOCS=( CHANGELOG README.md doc )
 
 src_compile() {
@@ -51,6 +53,7 @@ src_compile() {
 	local targets=( game )
 	local emakeargs=(
 		VERBOSE=1
+		WITH_EXECINFO=$(usex elibc_musl no yes)
 		WITH_SYSTEMWIDE=yes
 		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
 		WITH_OPENAL=$(usex openal)