gentoo auto-resync : 11:09:2024 - 12:30:54

3 files changed, 14 insertions, 14 deletions

diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index 054b4216391c..11f18de30b26 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,10 +1,10 @@
 AUX tomenet-4.7.3-makefile.patch 1627 BLAKE2B c34cb479c05590f00517009232a5ef0aee2e747d71f03f15e4ab3256b334dff757d42b8d75b1f167e934b8f7a55f51d8a87610ad75cba7ccb3d1ec0b291f6ed2 SHA512 3baf4952f1a4dcd99cca33d024b5c3bdf1adf5a4e433dc0b90fbf3857b164ce56fb3e8f9bad3f216e9d8cfc07e1c358b55a7cf05769b88fe54275149f457dd78
 AUX tomenet-4.9.1-disable-experimental.patch 399 BLAKE2B 820e3bec77aee902992c2e0be34b04fe9b8f5f57206f299f6ef4ab7c295737eee331a589fe95f232cbabbc45f5b10bd3f7bb68ba326b580fda2bb0c66392eac2 SHA512 dd6e0d46457ed112685cbd03fe4ed8131e3e1b270d20cd153b9206621af883b31459ef7fcc78fda1e6fa4bd411dc59858bb6059f732ef7bc9e920e38a5b7e6d3
-AUX tomenet-4.9.1-makefile.patch 1856 BLAKE2B c67d4d838698856546f840f4a91341bb5a944ff44dde5472d8a5ede8c63c34891a4a539c0b997d1a1ab90b0a92a514072bf955d43ede2a2e7fd1acbe7931e463 SHA512 ce7bedf978b99f291d42c78ca344a7e49d60a61909ae814ec4d520f4c266b4dc52452a717f8a4459f9e9d6007c1dbaac81aced5ade2f03c22f89eaf011c4636a
+AUX tomenet-4.9.2-makefile.patch 1882 BLAKE2B db985bdeca5afcf4319e0302d2269f245c575ef2ab21e187545cbc5437e46fdb02225b91c7a3db1c15768a2cd741a8a799d45b7667b86afa80f7950b73777a19 SHA512 95bf20584b984bcc7eed88eaaace1fd12a78a6f14ee97b8c3e77b5a852fd785ca53b8969ecf9d03243d11dfade2710d9286ac04748918a9a21bf1765a4353a7f
 AUX tomenet-server-wrapper 105 BLAKE2B 3b23750806b3bb3a6b5fa9c99aca0f2dbbcce2852bcb80296fd97b36ffb6fa0896939636fce6938f0874ece0b30abe800d10479431eac2cf6d883332d2b432e9 SHA512 9f509cdcc694fe47eed4cfdcb14f0ab3ea7006c202e7f4d8798012e62b89f34cc26834131412e18d2f0edba4237b6c66f4743ff6b780e3080a52e9da992d8cc3
 AUX tomenet-wrapper 557 BLAKE2B 9b73f87c55815b49f6444e01c552ee1ba102e64b042f33bed89627c39602cf5646e287be99ffd88f26a281b64c4d023b20f2eaac8b924438709a2ac9ef4e1009 SHA512 9a913502af52c7988e8cb3b9c678e556e5f07d4bf99e7e3951f1be6192980da22b8091617d4c4daaac356cd72d7e175706f96ca62d6581ab916bc7a7034eb629
 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
 EBUILD tomenet-4.7.3.ebuild 2029 BLAKE2B 34739cfb541be230d99ab0c6417fad696a5691d01f13dbf0e2b996899f83f52ca5a95f3fe36466a05a272966b0528b3293b5bd6247a17a2824ba3de6ce9a365b SHA512 41ff9227b02ecf00054247f00b7a65e901c11905a9a67cdbb1d6162dfb77666183825119bc1986c7b8cd712a5d0481e4fd32bc860cc31c45d4143da6e15615b4
-EBUILD tomenet-4.9.1.ebuild 2065 BLAKE2B 5310b9803f8f43422aeb76c5d03b01432b69f55ecf0f56b1925f55627aa415f66ccb18d27a7fe535adfedd518b91ab3d0be96c4c86831c603e525f511ea685d2 SHA512 f16b6cfa4a3a845bf08e6b30f185235521c77b54750b6ca4bc8815e522b9be050bd0af5e6f5a8570aee87214003ebcbef7aab5fe246f28d2b46c674c386b64b3
+EBUILD tomenet-4.9.2.ebuild 2068 BLAKE2B be49ebac2ba2ffcf6bf72f82ae2c8422abbaac31e304eaa9f12b535f813e8a01599d038d1f45e34973df8696596c8e540480f6fb7f0101ac125df8d0825e6b3a SHA512 e56491420d3f1f3c250066d5393884f4660603cf0ab5bdb42bf2fd1534e953fdbb0f45e9fedf1e2a41975c756a660ad379914eea245906615850d3e98f87a5cc
 MISC metadata.xml 916 BLAKE2B 14564d54ec94997c5884ebcbcbb8cba4dc431b10c4a70cd3fd51d6b5539f654eb92d9a6adbb5335d9c6d3ef386fcaf0db778e3ae5c971f91b959c8396033bce2 SHA512 e90a6bd9869285c7f09e2cf3bf551074b69d0aa1ea6f41c94e871c18d677b5e47d35561b02d89acd221ba844c10cf7082c4235d415deedeca008307336de8df9
diff --git a/games-roguelike/tomenet/files/tomenet-4.9.1-makefile.patch b/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
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() {