gentoo auto-resync : 14:05:2024 - 00:01:24

3 files changed, 66 insertions, 10 deletions

diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 80c9e1d28539..684d535a45d8 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -1,5 +1,5 @@
 AUX 0.16-rogue-armor.patch 231 BLAKE2B a913e4bd4ea987967af1f35c1fd25e69ea69d81395419390d17164f6f59b98fcd1bfdd38792d0c59da08fc05ee15be3fa75e5f1ee7c96eb9344cf5071297839c SHA512 2e1b80fff54e5b069f9b41ee400c7d72b118b7243f5e8c61e6d187c92e3fb5e8f483fba1b81fc53aab661236e14400959facc008e66b193255b70316832f8b2b
-AUX 0.16-rogue-nan.patch 161 BLAKE2B a80bf2cf61545c1deb682de842f4d43bc4b65ed73cfdb24a090f36b463a77006316d4a194c434ecb4dfd2ff94569af033624731470a5c631406a151e46ac8719 SHA512 4ecf761ace381d08529ab2c1e0ccd5f0e11f26bacbbd874c1d37a9d1656e21e20e71f4d8a25d298e73ccd2f0b4f3cb226106e417c11816e3e42b21c27c8969d2
+AUX 0.16-rogue-nan.patch 1702 BLAKE2B d9db893ca4ed67f2d35a903f6187a6f74aaba24418789550364a597223ea57ce7d8749926d3314c5bf12320e695b73ad270a2deeaa4532949f785288a5854799 SHA512 046a3f91c6b6844a015c71e075f301c38884595bc27a36752564d05e345ae563de17aa08ddcf0af52a2f0b51706f955c50e0765314bb9f7608e54c4b31d4c81e
 AUX README-postinstall 3083 BLAKE2B 364510b4eb37b6623e8346c74743b27156f99938fc9726929500c4488fd9d8a54b45d762586bfb43996d27f8aab09b2cd2feda08cad2aba0be534f4b8ca303e0 SHA512 cc7441ce14117ea765a7df98b3de0370b251f444289fd8aaa03c97ea5b383d626088977bc30dfc7a30124dedce4796b5d6392dad7e3d203ee2257d71a9b49bfe
 AUX quake2-icculus-0.16.1-alsa.patch 4386 BLAKE2B 3ca70a0019a89eef53ef21e9980ece4b4c131e51015b3ffc59f3ece67becfe292a0228d6e05a2ce1bca29ed41075f18593c0374986c04fac2d558ce83ed30ac0 SHA512 75184e826611c6341e7bd128c5a0c8485ec4348d7ea65edd4b8e25f7342a13c47675b809a9522be7ba29b492b643c723ead720b8c7074b217c205cd7a658a487
 AUX quake2-icculus-0.16.1-amd64.patch 538 BLAKE2B 4ef45493f21b12d68c25e1c4568f4a964b69e6e73dd1fef2b04e020a65ce134b58fb4689a44c344906b50b59de98398af622245bd26918d881382242f83dbdcb SHA512 7e493d09dd958d8ed10629057edaeef0dd78b2f34a0f75f2538fcff23474e96a99e3b985233d2e5a736102c92d0999e919aee94bb7141bb311c082e19e191565
@@ -17,5 +17,5 @@ DIST maxpak.pak 3282742 BLAKE2B 3ad4dd5aade5747b100a24499bae0f0d7fd5cc610e4671c1
 DIST quake2-r0.16.1.tar.gz 1525384 BLAKE2B b95db08ed3799d2788a20d24f63ea3a84d7ff4b581ee5f01dc5d588a1d5af50d52586a04ca28d9942e953d028e140112737432e499edcebf999085a29c63fcfb SHA512 63e8fa10446698b1f1cbd20b4bbfeec75d7620cb6454bb90b853cd2a3d6cd9040041a164666a5e015c3a8289423127f9164b500f57793505f6e4671dec932cf2
 DIST roguesrc320.shar.Z 626769 BLAKE2B f6d79630ee41e834ad07907f886766fdc9fd99152c2a1964629d2c74de259b9a232f691e5e3c4ad26ff3239d127f06d20878422dd7c1b896591db7c732a41ef7 SHA512 330db4966b758b8e363eb8d699b30ce5ec7d9fa581936288e7267000d0815996388adebc0206a8903734cdc1c5658616b15518a2bf888ad9e6059f8155960141
 DIST xatrixsrc320.shar.Z 455917 BLAKE2B 646801fad3c7eaac4957a971f507b13fff0ea6ae0423cb7fe8e8276666c4f89165384e2e2148e828b692533f9f582b64db849efe8d858e51026b9fb847282101 SHA512 6723440d3cfdaf7f9b260d5777d9823937a4c3ee800c8c204e8a5c3d29f2b37f6bdc7c0786025a19d040b5692aa54b99b9db2dc121bc0ca2b53c8763b4ab4dfa
-EBUILD quake2-icculus-0.16.1-r2.ebuild 5275 BLAKE2B d3ace24fc61e02223bd159e042858c039a8728d702fd7816f4a8aac354f54c548ae888ed7f832587c9336fb4e20648af0646beb184a090bc71ff47c1de1540d0 SHA512 8ec7804b03f95be8032b9615372a1ea54ea84602670fcb0961626151d8c4bc5af5d619c7f52e33a9b2907a52f096faa85f65b68453f8e82b5c7020e9b7a1fb90
+EBUILD quake2-icculus-0.16.1-r3.ebuild 5600 BLAKE2B ab52b1bca261c5a8e326e3ac28142cecc10ca37606f5624aa8a6dcbd7b2cb2fd3d38dd50c50dd1f172ccffc150a7e8ef536ee31d57e452690230a309d17ac3b1 SHA512 de83c9e0a4b17d235fef5effe900754af5aeb86585ec4cd68896ce87bcd29f022934da60e467a4a16ad82949aa8c5f0dc49efa4d9d9d8cf6a809e62a761a7fb0
 MISC metadata.xml 613 BLAKE2B ba4bfdcef7fe0a9ba6d0ed8e6cd90064b48e45e39b4a19149995d59aafd6bdc125f4a8da46fdd369f46a83c3865239459f8e93775524c18270fe87c497df4cc5 SHA512 15de81177a743547f826dfe31d00d8e87ac4701f10c844a02b4e554129c08371db9a453e8396286d872267c080e1066f84300ead25b5c7b251e9e4723192a494
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
index 09da62bee201..318d514b944c 100644
--- a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
+++ b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
@@ -1,7 +1,55 @@
+From db3c20829db69b3e7451a167f9f639a89d41491a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 12 May 2024 14:31:52 -0400
+Subject: [PATCH] remove bogus nan.h header
+
+In theory somehow maybe possibly sort of, glibc has bits/nan.h, and in
+gentoo-historical-2.git:
+
+commit e5551898509b2b7802941b16bb580ef7cf34b488
+Author:     Mike Frysinger <vapier@gentoo.org>
+AuthorDate: Sat Dec 27 14:45:18 2003
+Commit:     Mike Frysinger <vapier@gentoo.org>
+CommitDate: Sat Dec 27 14:45:18 2003
+
+    add rogue/xatrix game support #33029
+
+a patch was added to switch it to including that header instead.
+Helpfully, bits/nan.h has this to say:
+
+#ifndef _MATH_H
+#error "Never use <bits/nan.h> directly; include <math.h> instead."
+#endif
+
+... or at least it does, on versions of glibc that installed such a
+header. In 2.27 the header file was removed entirely.
+
+Now, "fortunately", g_local.h had already included math.h, which meant
+the best efforts of glibc developers to demonstrate this is an error
+were evaded; no error was emitted. Unfortunately, glibc 2.27 is long in
+the past and this code no longer builds, times 2 because now we patched
+it to be extra silly.
+
+Fix it properly this time.
+
+Bug: https://bugs.gentoo.org/33029
+Bug: https://bugs.gentoo.org/738832
+---
+ src/rogue/g_local.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/rogue/g_local.h b/src/rogue/g_local.h
+index 6ecbe2d..6746240 100644
 --- a/rogue/g_local.h
 +++ b/rogue/g_local.h
-@@ -24,3 +24,3 @@
+@@ -22,7 +22,6 @@
+ //==================================================================
+ 
  #ifndef _WIN32
 -#include <nan.h>
-+#include <bits/nan.h>
  #define min(a,b) ((a) < (b) ? (a) : (b))
+ #define max(a,b) ((a) > (b) ? (a) : (b))
+ #ifdef __sun__
+-- 
+2.43.2
+
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r2.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r3.ebuild
index ef6f7b8b34a4..c51bb899c34f 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r2.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop toolchain-funcs
+inherit desktop flag-o-matic toolchain-funcs
 
 MY_P="quake2-r${PV}"
 DESCRIPTION="The icculus.org Linux port of iD's Quake 2 engine"
-HOMEPAGE="http://icculus.org/quake2/"
-SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
-	qmax? ( http://icculus.org/quake2/files/maxpak.pak )
+HOMEPAGE="https://icculus.org/quake2/"
+SRC_URI="https://icculus.org/quake2/files/${MY_P}.tar.gz
+	qmax? ( https://icculus.org/quake2/files/maxpak.pak )
 	rogue? ( mirror://idsoftware/quake2/source/roguesrc320.shar.Z )
 	xatrix? ( mirror://idsoftware/quake2/source/xatrixsrc320.shar.Z )"
 S="${WORKDIR}"/${MY_P}
@@ -102,6 +102,14 @@ yesno() {
 }
 
 src_compile() {
+	# -Werror=strict-aliasing, also -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/858752
+	#
+	# Upstream last committed changes in 2006, and that was "Switch from CVS to SVN".
+	# Effectively no mailing list discussion since then (sporadic posts from users).
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	# xatrix fails to build
 	# rogue fails to build
 	local libsuffix