gentoo auto-resync : 03:03:2025 - 19:30:11

6 files changed, 142 insertions, 18 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 8936c986780b..e8b3344bf25a 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/bomns/Manifest b/games-arcade/bomns/Manifest
index 5d5d68cdf858..a60231674787 100644
--- a/games-arcade/bomns/Manifest
+++ b/games-arcade/bomns/Manifest
@@ -1,4 +1,7 @@
+AUX bomns-0.99.2-c23.patch 849 BLAKE2B 58ceeb2f5cab60003f09f04840fb144419d9fb863bec5ee664eb9fc8494135a83b4dda49a1425202f5be5a05290e0fe2204b579b56981d0e7e1c56aeccc8dc00 SHA512 bfdcf8445a49bf0c4aa35ed41a862b3d3a6f83280317405f5e14e90b3e42e96cd84333b8cc4f65f2a126be5ca905f2618f703a389d7277de64b3dcd1e4b85238
+AUX bomns-0.99.2-clang.patch 1382 BLAKE2B 26fad2cd5da251999f15a356ab9c3c4d2f7fc2a866d529154d73c2aa1ae3be2cf01d8e7dd6098cc353390ae116b58eca6ffc066b2b36517ae941e5190104d672 SHA512 7a972fc5126a562379de0cc9e3046c353d4593a20f8c6d6863abc5aa87eeca404d769d791c23a65664295046b90f13d04c2540025d9692949259edb2a10c2f75
 AUX bomns-0.99.2-fpe.patch 278 BLAKE2B 6fe7caf77953d198bc7013ab4302820ad43728e42470ccf419eeffc2fc4aec9b8a5866100a0afe12b7ff38425ef220ba9dce14754b8e65dcedff314f2eb913f8 SHA512 e2942dd3842cae18c3c5e674dbbdbf733d080b48f427fc5f16a2aa2bb2d001210b9dfcc7930246840b23c79513aa0adca44eda378a9b1bf8bed6109ec73be84d
+AUX bomns-0.99.2-makefile.patch 2125 BLAKE2B 85e88aea97f436bc81fa3add488c4b1bdede5a673d074b1d9d276a3e5ac60a058fe7af3cc09ea7aab66af2f620dd9e44a2e9eff0006c7a160177c2c8dec4de1b SHA512 7422f47780ef3e2f7533449e1f7b43c57e4a10487794ba37c7e08d031ddfc654a25e25a06bf811ebbe4992a4259e25888a2c93c6ec557ab9d5e11c8d2c0abaf6
 DIST bomns-0.99.2.tar.gz 1079850 BLAKE2B 7d7eb5a55455fc300d265b5efa652310d0e08b1c4a688221ca0ad8d578b423efac1bd00cd637f1918d1ba9fe903c5890e63c1ce3dab80e9e8f312083be824898 SHA512 db4a2352af0cb220dc0c12de8796d17bbfb71e1aa7de1743dfe534fe4f54c38217f893f0fcaef1dc97509198eec7446d352e92077644664d4bf48acbc2a7897f
-EBUILD bomns-0.99.2-r1.ebuild 1054 BLAKE2B 6dbdc427dde9ce832a347b4ac93ff12e44e658f85dada51fb871aa3608caa6709c9c336e0d89b39bf28eac545a7817c71fa35c48400b6a6d1c7146e5007d1581 SHA512 cd21f80b831189227739ae10c4b2babae92fb676015dc00b985611dab8ff08441fe6bc84d3f28f2a65fc99be1f331c35036d6869e8cb571fe6f14323a04fea12
+EBUILD bomns-0.99.2-r2.ebuild 788 BLAKE2B ca2462d65778cf58ec250fee1f57e83009ab654f37cf4e5a47ae264a8d04f258afb649d30c3c18ccf34e3c314f5ad9fe1ef5c3cbc40c1b620bb41bf77e35d3fc SHA512 9ac6bc436af28a1bcc9dae37ec933d7d7ada47947eed8e769259e2a4a36ea25bfdca82b368a796042ea336f77ff3b94c38c3f5be8526d2c2b9d13f105afda07b
 MISC metadata.xml 496 BLAKE2B 7589105112b0ee58a99c424fcbbf756c820c450feaf57e2904f3ab7fb69fdd8250e8bc9855523b6c4e7f2ddb4fb3c57c120d9b7f22a22ff5c9e272c6f5105189 SHA512 a40ca4ada9e6d11187d5d63e2979c67c9d6b6a252244e07a960476ff15263ad482e616f4e243bd0c696000035fca94c70bc74114f2a01fe8024db76632812a3a
diff --git a/games-arcade/bomns/bomns-0.99.2-r1.ebuild b/games-arcade/bomns/bomns-0.99.2-r2.ebuild
index f98b7fe750a8..e53264cf243f 100644
--- a/games-arcade/bomns/bomns-0.99.2-r1.ebuild
+++ b/games-arcade/bomns/bomns-0.99.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools flag-o-matic
 
@@ -23,26 +23,13 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fpe.patch
+	"${FILESDIR}"/${P}-c23.patch
+	"${FILESDIR}"/${P}-clang.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i \
-		-e "/appicondir/s:\$(prefix):/usr:" \
-		-e "/desktopdir/s:\$(prefix):/usr:" \
-		$(find icons -name Makefile.am) \
-		Makefile.am || die
-
-	sed -i \
-		-e "s:\$*[({]prefix[})]/share:/var/lib/:" \
-		configure.in \
-		graphics/Makefile.am \
-		levels/Makefile.am \
-		sounds/Makefile.am || die
-
-	mv configure.{in,ac} || die
-
 	eautoreconf
 }
 
diff --git a/games-arcade/bomns/files/bomns-0.99.2-c23.patch b/games-arcade/bomns/files/bomns-0.99.2-c23.patch
new file mode 100644
index 000000000000..a4355d08477f
--- /dev/null
+++ b/games-arcade/bomns/files/bomns-0.99.2-c23.patch
@@ -0,0 +1,26 @@
+Fix build with C23
+https://bugs.gentoo.org/936565
+diff '--color=auto' -ru bomns-0.99.2.old/src/launcher2/main.c bomns-0.99.2/src/launcher2/main.c
+--- a/src/launcher2/main.c	2025-03-02 16:28:35.646507541 +0400
++++ b/src/launcher2/main.c	2025-03-02 16:29:13.890873033 +0400
+@@ -27,6 +27,7 @@
+ #include <gtk/gtk.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <ctype.h>
+ 
+ #include "main.h"
+ #include "interface.h"
+diff '--color=auto' -ru bomns-0.99.2.old/src/launcher2/main.h bomns-0.99.2/src/launcher2/main.h
+--- a/src/launcher2/main.h	2025-03-02 16:28:35.646507541 +0400
++++ b/src/launcher2/main.h	2025-03-02 16:29:54.746212077 +0400
+@@ -26,7 +26,7 @@
+ void set_defaults();
+ void write_bomns_rc();
+ void load_bomns_rc();
+-void parse_bomns_rc();
++void parse_bomns_rc(const char * cszBuf);
+ 
+ 
+ #endif
+Only in bomns-0.99.2/src/launcher2: main.o
diff --git a/games-arcade/bomns/files/bomns-0.99.2-clang.patch b/games-arcade/bomns/files/bomns-0.99.2-clang.patch
new file mode 100644
index 000000000000..eaf7b4ebfbb7
--- /dev/null
+++ b/games-arcade/bomns/files/bomns-0.99.2-clang.patch
@@ -0,0 +1,35 @@
+Static-cast int to Sint16, for clang
+https://bugs.gentoo.org/730794
+--- a/src/bomns.cpp
++++ b/src/bomns.cpp
+@@ -643,7 +643,7 @@
+   int      nDig1  = (int)floor(nNum / 10);
+ 	int      nDig2  =  nNum % 10;
+ 	SDL_Rect rcSrc  = {0, 0, 0, 0};
+-	SDL_Rect rcDest = {nX, nY, 15, 20};
++	SDL_Rect rcDest = {static_cast<Sint16>(nX), static_cast<Sint16>(nY), 15, 20};
+ 
+ 	//three digit num
+   if(nDig0 || bPad)
+--- a/src/level.cpp
++++ b/src/level.cpp
+@@ -163,8 +163,8 @@
+ 
+ bool DrawExplosion(int nX, int nY, SDL_Surface * psdlsDest, int nExplosionState)
+ {
+-	SDL_Rect rcDest = {nX, nY, 10, 10};
+-	SDL_Rect rcSrc  = {(nExplosionState == EXPLOSION_1 ? 90 : (nExplosionState == EXPLOSION_2 ? 150 : 160)), 0, 10, 10};
++	SDL_Rect rcDest = {static_cast<Sint16>(nX), static_cast<Sint16>(nY), 10, 10};
++	SDL_Rect rcSrc  = {static_cast<Sint16>(nExplosionState == EXPLOSION_1 ? 90 : (nExplosionState == EXPLOSION_2 ? 150 : 160)), 0, 10, 10};
+ 	if(SDL_BlitSurface(g_psdlsObjects, &rcSrc, psdlsDest, &rcDest) < 0)
+ 	  return FALSE;
+ 		
+@@ -173,7 +173,7 @@
+ 
+ bool ClearTile(int nX, int nY, SDL_Surface * psdlsDest)
+ {
+-  SDL_Rect rcDest = {nX * 10, nY * 10, 10, 10};
++  SDL_Rect rcDest = {static_cast<Sint16>(nX * 10), static_cast<Sint16>(nY * 10), 10, 10};
+ //  SDL_Rect rcSrc  = {X: 246 - 255}
+   SDL_Rect rcSrc = {246, 0, 10, 10};
+   if(SDL_BlitSurface(g_psdlsObjects, &rcSrc, psdlsDest, &rcDest) < 0)
diff --git a/games-arcade/bomns/files/bomns-0.99.2-makefile.patch b/games-arcade/bomns/files/bomns-0.99.2-makefile.patch
new file mode 100644
index 000000000000..64f03854b5a0
--- /dev/null
+++ b/games-arcade/bomns/files/bomns-0.99.2-makefile.patch
@@ -0,0 +1,73 @@
+Were seds:
+sed -i \
+	-e "/appicondir/s:\$(prefix):/usr:" \
+	-e "/desktopdir/s:\$(prefix):/usr:" \
+	$(find icons -name Makefile.am) \
+	Makefile.am || die
+
+sed -i \
+	-e "s:\$*[({]prefix[})]/share:/var/lib/:" \
+	configure.in \
+	graphics/Makefile.am \
+	levels/Makefile.am \
+	sounds/Makefile.am || die
+diff '--color=auto' -ru a/configure.in b/configure.in
+--- a/configure.in	2025-03-02 16:31:36.838786226 +0400
++++ b/configure.in	2025-03-02 16:33:05.229759963 +0400
+@@ -66,7 +66,7 @@
+ then
+   prefix="/usr/local"
+ fi
+-AC_DEFINE_UNQUOTED(DATA_PATH, "${prefix}/share/bomns")
++AC_DEFINE_UNQUOTED(DATA_PATH, "/var/lib/bomns")
+ 
+ 
+ # Do substitutions
+diff '--color=auto' -ru a/graphics/Makefile.am b/graphics/Makefile.am
+--- a/graphics/Makefile.am	2025-03-02 16:31:36.837344972 +0400
++++ b/graphics/Makefile.am	2025-03-02 16:33:05.230008390 +0400
+@@ -10,7 +10,7 @@
+   players.bmp \
+   winscreen.bmp
+ 
+-graphicsdir = $(prefix)/share/bomns/graphics
++graphicsdir = /var/lib/bomns/graphics
+ graphics_DATA = \
+   bomn32.bmp \
+ 	editor_cursor.bmp \
+diff '--color=auto' -ru a/levels/Makefile.am b/levels/Makefile.am
+--- a/levels/Makefile.am	2025-03-02 16:31:36.837084463 +0400
++++ b/levels/Makefile.am	2025-03-02 16:33:05.230101489 +0400
+@@ -4,7 +4,7 @@
+ 	narrow.lvl \
+ 	test.lvl
+ 
+-levelsdir = $(prefix)/share/bomns/levels
++levelsdir = /var/lib/bomns/levels
+ levels_DATA = \
+ 	faceoff.lvl \
+ 	killyou.lvl \
+diff '--color=auto' -ru a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2025-03-02 16:31:36.839799769 +0400
++++ b/Makefile.am	2025-03-02 16:32:27.293524896 +0400
+@@ -9,7 +9,7 @@
+ 					src/launcher2
+ 
+ # installs desktop entry (for menus, &c.)
+-desktopdir = $(prefix)/share/applications
++desktopdir = /usr/share/applications
+ desktop_DATA = bomns.desktop
+ 
+ EXTRA_DIST = TODO \
+diff '--color=auto' -ru a/sounds/Makefile.am b/sounds/Makefile.am
+--- a/sounds/Makefile.am	2025-03-02 16:31:36.836753343 +0400
++++ b/sounds/Makefile.am	2025-03-02 16:33:05.230199687 +0400
+@@ -12,7 +12,7 @@
+   warp.wav \
+   winner.wav
+ 
+-soundsdir = $(prefix)/share/bomns/sounds
++soundsdir = /var/lib/bomns/sounds
+ sounds_DATA = \
+ 	beep.wav \
+   begin1.wav \