[gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/, games-roguelike/tomenet/files/

["Stefan Strogin" <steils@gentoo.org>]

commit:     c5cd33e80112cc1b37390156635c43b792e3b304
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 11 01:03:01 2024 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 01:10:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5cd33e8

games-roguelike/tomenet: upgrade 4.9.1 -> 4.9.2

Upgrade deps to sdl2.

Closes: https://bugs.gentoo.org/934029
Closes: https://bugs.gentoo.org/936759
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-roguelike/tomenet/Manifest                         |  2 +-
 ...4.9.1-makefile.patch => tomenet-4.9.2-makefile.patch} | 16 ++++++++--------
 .../{tomenet-4.9.1.ebuild => tomenet-4.9.2.ebuild}       |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index d4f0ae718ac3..b410db5df252 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,2 +1,2 @@
 DIST tomenet-4.7.3.tar.bz2 3355774 BLAKE2B e574434d283525793ad7b7e2c23103692c540be8727a90623b9fd52aba47d245be99cb39846046f4ba78795e168c8ef9342ff9ee16417dce3698036cbd6c50eb SHA512 25c7dedcd63306ada738078c412a45483ee6ac4c6fe116624a409cb4c9795270942cac2428c1ecafac45bbc9e3044890e308f8bd1bb1344dd156a610948addcd
-DIST tomenet-4.9.1.tar.bz2 5203112 BLAKE2B fa7ade988c94334416101d31fed0538b50a49cc46027d40eef3a85573973cee2b5c70db1815b531137104e4f51d42efc2cdf7bbc76219ee7b89b5d60dd0bea4a SHA512 20c03aea73f6d231a8e3d9bd0426baf5e96582e0df54c907565fbb4214d76eb0d42f59bb3ca1c604ec0e20604877f71b31c821140a8763b22ddcf55ba9c3f9ef
+DIST tomenet-4.9.2.tar.bz2 7601198 BLAKE2B 3b7ac9264973ba04e929bbc29636ccfbd4f3ddc1990e9de50c500b58a8ae2ffd460bbde13656b834853cbbdcc89a399a0620b7069b59aa69e000af98f907ea48 SHA512 efa68b3e0ca4c090659991edf72bade09ed64de34e6dd5c6b9d562d2c24fa3fdad90b8ed5c04deab39820a8430c1149f85b24cc7fc4b943a8b980c15f91de958

diff --git a/games-roguelike/tomenet/files/tomenet-4.9.1-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.9.2-makefile.patch
similarity index 80%
rename from games-roguelike/tomenet/files/tomenet-4.9.1-makefile.patch
rename to games-roguelike/tomenet/files/tomenet-4.9.2-makefile.patch
index 3c2a104a4d11..8a66a54a29bd 100644
--- a/games-roguelike/tomenet/files/tomenet-4.9.1-makefile.patch
+++ b/games-roguelike/tomenet/files/tomenet-4.9.2-makefile.patch
@@ -1,17 +1,17 @@
 diff --git a/makefile b/makefile
-index cd79e4d4d..4d3c5e53b 100644
+index 60129a707..45ac2639d 100644
 --- a/makefile
 +++ b/makefile
-@@ -224,7 +224,7 @@ CPP = cpp
- #thing is, that the correctly transcribed URL will actually make tolua choke.
+@@ -226,7 +226,7 @@ CPP = cpp
  #So, -nostdinc will prevent the whole own comment blob of cpp to get generated
  #in the first place, as we never asked for it:
--CPPFLAGS = -C -P -nostdinc
-+CPPFLAGS = -C -P -nostdinc $(GENTOO_CPPFLAGS)
+ #CPPFLAGS = -C -P -nostdinc
+-CPPFLAGS = -x c -E -Wp,-C,-P,-nostdinc,-Wno-format-overflow
++CPPFLAGS = -x c -E -Wp,-C,-P,-nostdinc,-Wno-format-overflow $(GENTOO_CPPFLAGS)
  
  # gcc variant:
  #CPP = gcc
-@@ -235,6 +235,21 @@ CPPFLAGS = -C -P -nostdinc
+@@ -237,6 +237,21 @@ CPPFLAGS = -x c -E -Wp,-C,-P,-nostdinc,-Wno-format-overflow
  # For variations with X11
  X11BASE = /usr/X11R6
  
@@ -33,11 +33,11 @@ index cd79e4d4d..4d3c5e53b 100644
  
  # Account editor
  ACCEDIT_LIBS = -lncurses -lcrypt
-@@ -289,12 +304,10 @@ SERVER_EXTRA_LIBS = -lcrypt
+@@ -291,12 +306,10 @@ SERVER_EXTRA_LIBS = -lcrypt
  
  # With SDL2
  #  With sdl2-config
--CFLAGS = -pipe -Wall -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -D_DEFAULT_SOURCE -DACC32 -fPIE -fsigned-char -Wno-format-truncation
+-CFLAGS = -pipe -Wall -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -D_DEFAULT_SOURCE -DACC32 -fPIE -fsigned-char
  # Note: -fsigned-char is important for ARM64, as there 'char' is by default unsigned, while on x86/AM64 it is by default signed!
  #  With manually set prefix
  #CFLAGS = -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL -I/usr/local/include/SDL2 -I/usr/include/SDL2 -D_REENTRANT -D_DEFAULT_SOURCE -DACC32 -fPIE -Wno-format-truncation

diff --git a/games-roguelike/tomenet/tomenet-4.9.1.ebuild b/games-roguelike/tomenet/tomenet-4.9.2.ebuild
similarity index 94%
rename from games-roguelike/tomenet/tomenet-4.9.1.ebuild
rename to games-roguelike/tomenet/tomenet-4.9.2.ebuild
index 150a3fa9fbab..444f60a88e34 100644
--- a/games-roguelike/tomenet/tomenet-4.9.1.ebuild
+++ b/games-roguelike/tomenet/tomenet-4.9.2.ebuild
@@ -20,8 +20,8 @@ RDEPEND="sys-libs/ncurses:0
 			x11-libs/libX11
 		)
 		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis,smpeg,mp3]
+			media-libs/libsdl2[sound]
+			media-libs/sdl2-mixer[vorbis,mp3]
 		)
 	)"
 DEPEND="${RDEPEND}
@@ -32,7 +32,7 @@ S=${WORKDIR}/${P}/src
 
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
-	"${FILESDIR}"/${P}-disable-experimental.patch
+	"${FILESDIR}"/${PN}-4.9.1-disable-experimental.patch
 )
 
 src_prepare() {