gentoo auto-resync : 17:06:2024 - 00:09:46

7 files changed, 4 insertions, 101 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 362e3ab62923..e92ec9178b9a 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index e2046dde2b97..bdb4942b7fbd 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -4,5 +4,5 @@ AUX odamex-lto.patch 1570 BLAKE2B 9284ff378e543b26a9871a21017ee93c5b0b426c1b3eb8
 AUX odamex-musl.patch 2693 BLAKE2B 3bb517aeeb7bb3ba38ad83f8cfb973c171a713874ca694b821ed0267da5d796ae3ab6f4d904b8dcf3c2d844e2fe71f4ba34a3d54dcf312fc2c23c8fb54e46fc0 SHA512 80065d86fc1f671baaa920a40c787158eba68fb218f164c810e3dcbd8b601aeb1da545de3b2da8a6a47927a3f4c83a5903898f3e87d06413adda8837ccf12775
 AUX odamex-odalaunch-prefix.patch 1890 BLAKE2B 948054a8b66aacc68b000635a15c17544cf745ba87c71a89b230e76e5b316d41c929fbe792904c76ca2d474d810ac6880a99ba28bed07b04b039b0496af0d7e7 SHA512 8de4a39999af6a1e1f040d26d2c0ed4f1bc100b6c5c407fd6b75408e21cdea3b94a7052432f3e1229816ed7094ce95a7b2f2b8467a2aa8df5a1cf4ccb8c0e7f4
 DIST odamex-src-10.4.0.tar.xz 17255540 BLAKE2B bdfb357424bd1712cf763f5e6109b67910e518703e8a29fa3b071f73302beea2d3e7ed63a4e7195c367a01947ad829a78967cc77acfe3455a6e2094ca33b6590 SHA512 bea6a2e70e6bdab6a1d6b5beccf981b7570142cdabc6e54935601c5fd966e1a0e7935aa6b492185165440b31899fa6240f038a75d4741a92520e6e9be935ef7b
-EBUILD odamex-10.4.0-r3.ebuild 2413 BLAKE2B e2d8367bf2814037fbcc67c36991c5fe4b9eb2ed8ec78e96510c2f36a63ffa043e14d596c0f03ef2b671499d663ab36e652c8acd6f1d28deeb37807ce5f958b2 SHA512 4beb4ffb53c5f73f468f5282f7e37a5c5cb11fc296ee11cedb4d93fd19258daf9ae21a7e4ea5d86c9895c75c7516c9ca59220aa864839a045fe7b0961802574a
+EBUILD odamex-10.4.0-r3.ebuild 2459 BLAKE2B 423075cfc05891f42ec22bf49d73772a9ddafeae06b3c828643b3d979924ea96637123e65423c256ca78a36b3d940777ccf69e82fae7e01a11ab63a5460a8a18 SHA512 a4d441521029f2169273df3bf8fa56620abdd4c3b58afdc459e2a0f929043fae0401c0a46d70661dcfa19012c96fc146f2765126f607ebdc7596f09c6b5664cb
 MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af
diff --git a/games-engines/odamex/odamex-10.4.0-r3.ebuild b/games-engines/odamex/odamex-10.4.0-r3.ebuild
index 8b0fd3fd1b7b..2b88ef70989c 100644
--- a/games-engines/odamex/odamex-10.4.0-r3.ebuild
+++ b/games-engines/odamex/odamex-10.4.0-r3.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-WX_GTK_VER="3.0-gtk3" # odalaunch crashes with 3.2. Check it before updating!
+# odalaunch crashes with 3.2. Check it before updating!
+# https://github.com/odamex/odamex/issues/879
+WX_GTK_VER="3.0-gtk3"
 inherit cmake desktop prefix wxwidgets xdg
 
 DESCRIPTION="Online multiplayer free software engine for DOOM"
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index 6ead6545d409..1d3c79f761b9 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,10 +1,6 @@
-AUX scummvm-tools-1.8.0-binprefix.patch 539 BLAKE2B 8c3ebc7202e209552fe2521e445a8a1dd025bfa872bd78cc31f05c01b2d559f619f3f1f15dd9f26a66d192410fc5404a5b0afee636cd33603112535500d07459 SHA512 4d2f06dcc3092dd5abab218b68c83dfc2353810b56e3a1d41fab1c7eb20b008ed2e54af486c4c4f2ecbd383ef0afa6f333ed90c694ed3b1733393a6f2ef6fbe3
-AUX scummvm-tools-2.2.0-strings.patch 559 BLAKE2B 44d3c40cd57293cc589a19b7e73f737e84cbbc88ece32e8b078dbf3ada0b4a9d8cafa0a96ad2c2020803da61172ae3f8dfadc66842cb773b2192091a71a3eeb7 SHA512 60e53a68acbab3ee983471f604a691eb66344f2f4a6a30a57d268c52d00cac05083606ec062f043bcf511edb32c27fce69d95c5a17229e94dd16af98806ac701
 AUX scummvm-tools-2.7.0-endianess.patch 1811 BLAKE2B 78d852504e38ba61ea4cc4c979506931c2f6fc485ca0ac608c77dab5cc179a412784f81e0922cb3685777249bb86195a334e3e1c6113f2e719c4fc37e20e2229 SHA512 81413bea78af4c95b68cc623f91a563aabfc93850b2f8ba724214a7d6f90e36e6df6383a8818ff5c1f20e46c6424dcd4051957ad7b4d4a17c015d81eb374178e
-DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e SHA512 97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89
 DIST scummvm-tools-2.7.0.tar.xz 1286572 BLAKE2B bcb58267a9c04849ab3145f2d5a657b9e1ec6c2bb9e59bbf47ae6aae842385e70d0417f92ca4018786cf91f8c607a5fe1246f846dc496318b01ec51bd059358b SHA512 0f6541f86814a089b10969e8e0cc8c985ac4d3b5f15daf91869a9b9cc748d7b6c668ffd428c1f0726ff9a1fb5cc7b496098481778cbf41203a7eb3077a189ce7
 DIST scummvm-tools_2.7.0-1.debian.tar.xz 10212 BLAKE2B 9805222166f30d1535642958ac74984968dd19bfa3b7a159b61509215fd29d370a9393d0a25e4dfd041ee83feb9fffb55f5f705d76ac03de95d925718166c263 SHA512 f7234e58312f7979b9f87940020d9815429a24be6083e8ed61ef14c342c83edfb00f2f9d130e2a18b34099c3a20df3093556b017f28a40a1f8d8037ad8d99bed
 DIST scummvm-tools_512.png 56989 BLAKE2B 8173b580a542d78a4dcb859f8ba008af8f5dcd707c6213a3fc961dc5f8bbe02f3e67beafbaceff8ffb75a26d0a1c441642a103c1607b7c776b6da6c803545a47 SHA512 94d0cd2ccb7ac7ea1ca20ba208908ac05e064470f260e3347aec2aa457f1cf281c6bc88056e14001a1f93422f9cdfb732c53262d8067a4c487a57396b510fd7f
-EBUILD scummvm-tools-2.2.0-r1.ebuild 1354 BLAKE2B ded211f8bf10e151b868dd7085f3b1bba3620b0439b866355ad0407d0b3025bbfa0781ad09dab10caf4e4de54b173921048e2db63f85587169351731a4f83534 SHA512 57105b4312324cf77d90e714a7b11d75209f7c319fef12a3fcbc447896e7fa285ab95418d8a9b40aa1b3af49b8a4aa7bb4ac597002f55d1eedff3b611de920c5
 EBUILD scummvm-tools-2.7.0_p1.ebuild 2079 BLAKE2B 49b6ebc34cae4a7144f370f5395fa9093f9a096c5154e8950b05428f372ce743f7689536ac6010b71c3bf36c1593f82dc6cd9522b4b06db1ebde9034e18eb6c0 SHA512 d2fc261a90c69badf9f8e8a40f915fbfdff53d906d29cbeada01a88bbc9d55ae90f0d0c10c0b6d0d13326c11cd179763c6b316e3c491679a0a4fd7363adb0e4a
 MISC metadata.xml 438 BLAKE2B f066a8163b876d4046f62ce8d40d00de386800b255208ae987bb0291770f1977d1df1b62e800e0a22abf735bbb8b043a43280d8fb3b92475609e5f2d1bd8ebae SHA512 19add2d688494acdccc4475d917098c4e96b17da0ceba2996a53be2bf5866ee3fba5527be21b1fc5fa2f92ed777ca615d9f49945ef2cfdd2e26165ed68674e3d
diff --git a/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch b/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch
deleted file mode 100644
index 604db075395c..000000000000
--- a/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scummvm-tools-1.7.0.orig/Makefile.common
-+++ scummvm-tools-1.7.0/Makefile.common
-@@ -312,7 +312,7 @@
- install: $(TARGETS)
- 	$(INSTALL) -p -m 0755 -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -p -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
--	for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR) ; done
-+	for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR)/$(EXEPREFIX)$$i ; done
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
- 	$(INSTALL) -p -m 0644 $(srcdir)/gui/media/*.* $(DESTDIR)$(DATADIR)/scummvm-tools
- 
diff --git a/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch
deleted file mode 100644
index 1bd3f9f399dc..000000000000
--- a/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix build without native symlinks
-https://bugs.gentoo.org/744424
-
---- a/configure
-+++ b/configure
-@@ -1026,9 +1026,9 @@ void _ebcdic() { char* s = (char*) ebcdi
- int main() { _ascii (); _ebcdic (); return 0; }
- EOF
- $CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp
--if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
-+if ${STRINGS} $TMPO.o | grep BIGenDianSyS >/dev/null; then
- 	_endian=big
--elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then
-+elif ${STRINGS} $TMPO.o | grep LiTTleEnDian >/dev/null; then
- 	_endian=little
- fi
- echo $_endian;
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.2.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.2.0-r1.ebuild
deleted file mode 100644
index a11f5da1293a..000000000000
--- a/games-engines/scummvm-tools/scummvm-tools-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER=3.0-gtk3
-inherit wxwidgets toolchain-funcs
-
-DESCRIPTION="Utilities for the SCUMM game engine"
-HOMEPAGE="https://www.scummvm.org/"
-SRC_URI="https://www.scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="flac iconv mad png vorbis"
-RESTRICT="test" # some tests require external files
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}
-	flac? ( media-libs/flac:= )
-	iconv? ( virtual/libiconv media-libs/freetype:2 )
-	mad? ( media-libs/libmad )
-	png? ( media-libs/libpng:= )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-binprefix.patch"
-	"${FILESDIR}/${PN}-2.2.0-strings.patch"
-)
-
-src_prepare() {
-	default
-
-	rm -r *.bat dists/win32 || die
-}
-
-src_configure() {
-	setup-wxwidgets
-	tc-export CXX STRINGS
-
-	# Not an autoconf script
-	./configure \
-		--disable-tremor \
-		--enable-verbose-build \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--prefix="${EPREFIX}/usr" \
-		$(use_enable flac) \
-		$(use_enable iconv) \
-		$(use_enable iconv freetype2) \
-		$(use_enable mad) \
-		$(use_enable png) \
-		$(use_enable vorbis) || die
-}
-
-src_install() {
-	EXEPREFIX="${PN}-" default
-}