gentoo auto-resync : 10:11:2024 - 03:03:09

11 files changed, 298 insertions, 333 deletions

diff --git a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.26_alpha-r2.ebuild
index e910f14e5bd2..3f85989916d2 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r2.ebuild
@@ -6,7 +6,9 @@ EAPI=8
 WX_GTK_VER="3.0-gtk3"
 # In alpha26 bundled spidermonkey-78.6.0 does not build with python 3.11.
 PYTHON_COMPAT=( python3_10 )
-inherit desktop flag-o-matic toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
+
+# rust is for bundled SpiderMonkey.
+inherit desktop flag-o-matic toolchain-funcs multiprocessing python-any-r1 rust wxwidgets xdg
 
 DESCRIPTION="A free, real-time strategy game"
 HOMEPAGE="https://play0ad.com/"
@@ -53,13 +55,11 @@ CHECKREQS_DISK_USR="3500M" # 3555340 KiB (3.3 GiB)
 # build and/or startup issues.
 QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
 
-# virtual/rust is for bundled SpiderMonkey.
 # Build-time Python dependency is for SM, too.
 BDEPEND="
 	${PYTHON_DEPS}
 	>=dev-util/premake-5.0.0_alpha12:5
 	virtual/pkgconfig
-	virtual/rust
 	test? ( dev-lang/perl )
 "
 
@@ -110,6 +110,7 @@ pkg_setup() {
 	use editor && setup-wxwidgets
 
 	python-any-r1_pkg_setup
+	rust_pkg_setup
 }
 
 src_unpack() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index b68b22b6fd16..52a6d3d36e6f 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -8,5 +8,5 @@ DIST 0ad-0.0.26-alpha-unix-build.tar.xz 75599800 BLAKE2B ddd589840b0dacee2377ff4
 DIST 0ad-0.0.26-alpha-unix-build.tar.xz.minisig 333 BLAKE2B 9f3146abda592fe6ab9433f6ee30060bcd4c5b594e00cb3fccc0aebb74652f3bc2ddd7b19a296da7ca13126ea9cc0337750f859e24f46adfcb84272bd2cce452 SHA512 eda542c1c363c7c0e6b235e6d8dfbd96d1c1e7cfca408b7215cf247b96c9f42b8bc206bbb4dd48dc41ee373db17d4a76cba940e454840dc41638dd572c580850
 DIST 0ad-0.0.26-alpha-unix-data.tar.xz 1351511480 BLAKE2B 2f483593b79a6ae87d7582625e89c890cfcf4ad7116348b184dae6c47a814d95a7b9f3018cb79e8f024a61c647abd39d6faf5ad3d3fcbb0c7a0583d0479d9b18 SHA512 8fe29fce68737d5b7001c8c2a7198766583b22556129cd2d927823da9b2c58f224fb1207f35bd03abea9380cf24d00ab6257b0dba86ce3ad1f357d7006f051d6
 DIST 0ad-0.0.26-alpha-unix-data.tar.xz.minisig 332 BLAKE2B fb4ec1bcabad79052a5e391557623ad61234d4948ec919d9a79011037855b6c7c94445d8f1667f1725bf80d15d66d1aa32c4e2b259831fbe088fe79e800515b3 SHA512 6dd55dda4e6cd52642b331aa571bc4ccfe30a33ad12a5d3ccf51c708d05dd74bf3234ca722c2a6501ba797bc1f8fa7c7aeb4d836dc4792bfd0c6bbccdc2c1237
-EBUILD 0ad-0.0.26_alpha-r1.ebuild 8363 BLAKE2B c687b47bdf2ab5d1400cd72d7d419417d93a4e6b2c9fe0968334e576a9632552203b742baaeea37d5f928e2584917eeb7aee9f9108ddf82d61b1013b2439f1d9 SHA512 e9fe4b421e62be6cfc060dbbad19453f14948ab342196f85d927d0c55c21e639991bbf6e55704c8c615f6a20671f3295120a8326dece8e34c96aff0b59fed541
+EBUILD 0ad-0.0.26_alpha-r2.ebuild 8363 BLAKE2B 4f3023a15a3d490266f8d47683281d6c1610ee53b9bb9e92b989655747d809a7fdfa40fde3e465fe86925d89171e9fb78d53eabe9abf617c4e242187fab0bf05 SHA512 5b423bd05d04ecfbf3372473882a7353a8181474573beecd0ddde98f74cc94e53f6479896a178e766a794521aaab925e3ee7a00423fa4f73eb4cd243e530086b
 MISC metadata.xml 667 BLAKE2B 3460d1e769fd9bab7f44c1387b9ccb6acb8b6030e5e307311aca479a0857a3719c22352e3b496dff2569536675e449f98aeccc62999283d2ebd3b3feefe444ee SHA512 65134f211aa3509589f9d333c0b2ceb7cb2dcfe394d3eb84323f5cafb43d8ec6d65738a38552d3c955eab5e7fcb5b71da575df5a1e21e0cbd49dcc4b89fc0f39
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 86369cea2d63..9b0b2cfede7d 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest
index af704409b4f3..7e029497dd80 100644
--- a/games-strategy/ja2-stracciatella/Manifest
+++ b/games-strategy/ja2-stracciatella/Manifest
@@ -155,5 +155,5 @@ DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360
 DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
-EBUILD ja2-stracciatella-0.21.0.ebuild 5301 BLAKE2B a899da44d67655f224a08291a1d15cc827c5cf077b7ad89293dbaeae19b11d6e99bd66cefcc469e4ea44d35b3454048d8051a11ff66f69937c192afea611c714 SHA512 af3074202fd1e85d512a24a32eb2b2d8b702a5ddcee81ae364a60f77a1bc7c290222ea87c69cd4186abf59f6b2a4bc7f89021ae6fdab405b78f6fc0a59a57406
+EBUILD ja2-stracciatella-0.21.0-r1.ebuild 5561 BLAKE2B 262ee8c014f93ecccb64423bcf75990c3572f393d7f35e1ab2cd5306c4f76144673a07bfde89c74fe94709c798871b5dc58a8a34d6f75850c8a7da51722f67c2 SHA512 1faf0414c15b57d2e4662a7c45bb044750c709dcaaf415370132fa702d69b7757902fe9457ed706784b55015819fe8f58442b9569ba8bb8ad724db9923ad58f3
 MISC metadata.xml 631 BLAKE2B 245b93568aa9a38270619635fb0c167a86abc7b567f8af1a3d5e63954446a185a69e3f3c8f672cebbb1dd72e7982c2736851722ad32a001a3af33afdfb974c9c SHA512 411c914e39091873c0a7fd48d5452a0780a6143e0c579447538183365c97a9fe0de7b13c17da787c07561a1be63e0f80b8f55514c451429beb4a94b2bd23aa5e
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild
new file mode 100644
index 000000000000..f296653e14c9
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line@0.17.0
+	adler@1.0.2
+	ahash@0.7.6
+	aho-corasick@0.7.18
+	ansi_term@0.11.0
+	anyhow@1.0.69
+	ascii@0.9.3
+	atty@0.2.14
+	autocfg@1.1.0
+	backtrace@0.3.65
+	base64@0.13.1
+	bit-set@0.5.3
+	bit-vec@0.6.3
+	bitflags@1.3.2
+	block-buffer@0.10.3
+	bytecount@0.6.3
+	byteorder@1.4.3
+	bytes@1.4.0
+	caseless@0.2.1
+	cbindgen@0.20.0
+	cc@1.0.73
+	cesu8@1.1.0
+	cfg-if@1.0.0
+	clap@2.33.4
+	combine@3.8.1
+	combine@4.6.4
+	crossbeam-channel@0.5.4
+	crossbeam-deque@0.8.1
+	crossbeam-epoch@0.9.8
+	crossbeam-utils@0.8.8
+	crypto-common@0.1.6
+	cty@0.2.2
+	deunicode@0.4.3
+	digest@0.10.6
+	dirs@4.0.0
+	dirs-sys@0.3.7
+	dunce@1.0.2
+	either@1.6.1
+	error-chain@0.12.4
+	fancy-regex@0.8.0
+	fastrand@1.7.0
+	form_urlencoded@1.1.0
+	fraction@0.10.0
+	generic-array@0.14.5
+	getopts@0.2.21
+	getrandom@0.2.6
+	gimli@0.26.1
+	hashbrown@0.12.3
+	heck@0.3.3
+	hermit-abi@0.1.19
+	hex@0.4.3
+	idna@0.3.0
+	indexmap@1.9.2
+	instant@0.1.12
+	iso8601@0.4.2
+	itoa@1.0.1
+	jni@0.14.0
+	jni@0.19.0
+	jni-sys@0.3.0
+	json_comments@0.2.1
+	jsonschema@0.16.0
+	lazy_static@1.4.0
+	libc@0.2.124
+	lock_api@0.4.9
+	log@0.4.16
+	lru@0.8.1
+	md-5@0.10.5
+	memchr@2.4.1
+	memoffset@0.6.5
+	minimal-lexical@0.2.1
+	miniz_oxide@0.5.1
+	ndk@0.7.0
+	ndk-sys@0.4.1+23.1.7779620
+	nom@7.1.3
+	num@0.2.1
+	num-bigint@0.2.6
+	num-cmp@0.1.0
+	num-complex@0.2.4
+	num-integer@0.1.45
+	num-iter@0.1.43
+	num-rational@0.2.4
+	num-traits@0.2.15
+	num_cpus@1.13.1
+	num_enum@0.5.7
+	num_enum_derive@0.5.7
+	num_threads@0.1.6
+	object@0.28.3
+	once_cell@1.10.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.7
+	percent-encoding@2.2.0
+	proc-macro-crate@1.1.3
+	proc-macro2@1.0.51
+	quote@1.0.18
+	raw-window-handle@0.5.0
+	rayon@1.6.1
+	rayon-core@1.10.2
+	redox_syscall@0.2.13
+	redox_users@0.4.3
+	regex@1.7.1
+	regex-syntax@0.6.28
+	remove_dir_all@0.5.3
+	rustc-demangle@0.1.21
+	ryu@1.0.9
+	same-file@1.0.6
+	scopeguard@1.1.0
+	send_wrapper@0.6.0
+	serde@1.0.152
+	serde_derive@1.0.152
+	serde_json@1.0.93
+	serde_yaml@0.9.17
+	simplelog@0.12.0
+	slug@0.1.4
+	smallvec@1.10.0
+	strsim@0.8.0
+	syn@1.0.107
+	tempfile@3.3.0
+	termcolor@1.1.3
+	textwrap@0.11.0
+	thiserror@1.0.30
+	thiserror-impl@1.0.30
+	time@0.3.15
+	time-macros@0.2.4
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	toml@0.5.9
+	typenum@1.15.0
+	unicode-bidi@0.3.10
+	unicode-ident@1.0.6
+	unicode-normalization@0.1.19
+	unicode-segmentation@1.10.1
+	unicode-width@0.1.9
+	unreachable@1.0.0
+	unsafe-libyaml@0.2.5
+	url@2.3.1
+	uuid@0.8.2
+	vec_map@0.8.2
+	version_check@0.9.4
+	void@1.0.2
+	walkdir@2.3.2
+	wasi@0.10.2+wasi-snapshot-preview1
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	windows-sys@0.45.0
+	windows-targets@0.42.1
+	windows_aarch64_gnullvm@0.42.1
+	windows_aarch64_msvc@0.42.1
+	windows_i686_gnu@0.42.1
+	windows_i686_msvc@0.42.1
+	windows_x86_64_gnu@0.42.1
+	windows_x86_64_gnullvm@0.42.1
+	windows_x86_64_msvc@0.42.1
+"
+
+# See dependencies/lib-lua/CMakeLists.txt
+LUA_COMPAT=( lua5-3 )
+
+# proc_macro-span_shrink; update proc-macro2 crate
+RUST_MAX_VER="1.71.1"
+
+inherit cargo cmake flag-o-matic lua-single xdg
+
+DESCRIPTION="An improved, cross-platform, stable Jagged Alliance 2 runtime"
+HOMEPAGE="https://github.com/ja2-stracciatella/"
+SRC_URI="
+	https://github.com/ja2-stracciatella/ja2-stracciatella/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	editor? ( https://github.com/ja2-stracciatella/free-ja2-resources/releases/download/v1/editor.slf -> ${P}-editor.slf )
+"
+SRC_URI+=" $(cargo_crate_uris ${CARGO_CRATES_URIS})"
+
+LICENSE="public-domain SFI-SCLA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="cdinstall editor ru-gold test"
+# ./ja2 -unittest can't find save files
+RESTRICT="!test? ( test ) test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="
+	${LUA_DEPS}
+	>=dev-cpp/magic_enum-0.9.5
+	>=dev-cpp/sol2-3.3.0
+	>=dev-cpp/string-theory-3.1
+	>=dev-games/libsmacker-1.1.1
+	>=dev-libs/miniaudio-0.11.11
+	>=dev-libs/rapidjson-1.1.0
+	media-libs/libsdl2[X,sound,video]
+	>=x11-libs/fltk-1.3.5[opengl]
+"
+RDEPEND="
+	${DEPEND}
+	cdinstall? ( games-strategy/ja2-stracciatella-data )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-lua-cmake.patch
+)
+
+pkg_setup() {
+	lua-single_pkg_setup
+	rust_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/916965
+	# https://github.com/ja2-stracciatella/ja2-stracciatella/issues/1963
+	filter-lto
+
+	local mycmakeargs=(
+		-DUSE_SCCACHE=OFF
+
+		-DLOCAL_GTEST_LIB=OFF
+		-DLOCAL_FLTK_LIB=OFF
+
+		-DLOCAL_LUA_LIB=OFF
+		-DLUA_VERSION="${ELUA#lua}"
+
+		-DLOCAL_MAGICENUM_LIB=OFF
+		-DLOCAL_MINIAUDIO_LIB=OFF
+		-DLOCAL_RAPIDJSON_LIB=OFF
+		-DLOCAL_SDL_LIB=OFF
+		-DLOCAL_SOL_LIB=OFF
+		-DLOCAL_STRING_THEORY_LIB=OFF
+
+		-DWITH_MAGICENUM=OFF
+		-DWITH_RUST_BINARIES=OFF
+		-DWITH_UNITTESTS=$(usex test)
+
+		-DBUILD_LAUNCHER=OFF
+
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DEXTRA_DATA_DIR="${EPREFIX}/usr/share/ja2"
+		-DMINIAUDIO_INCLUDE_DIR="${EPREFIX}/usr/include/miniaudio"
+		-DMAGICENUM_INCLUDE_DIR="${EPREFIX}/usr/include"
+	)
+
+	cargo_gen_config
+	cmake_src_configure
+}
+
+src_install() {
+	if use editor; then
+		insinto /usr/share/ja2
+		doins "${DISTDIR}/${P}-editor.slf"
+		dosym "${P}-editor.slf" "/usr/share/ja2/editor.slf"
+	fi
+
+	cmake_src_install
+}
+
+src_test() {
+	"${BUILD_DIR}"/ja2 -unittests || die
+}
+
+pkg_postinst() {
+	if ! use cdinstall ; then
+		elog "You need to copy all files from the Data directory of"
+		elog "Jagged Alliance 2 installation to"
+		elog "e.g. /opt/ja2/data and set game_dir in .ja2/ja2.json"
+		elog "accordingly."
+		elog "Make sure the filenames are lowercase."
+	fi
+
+	xdg_pkg_postinst
+}
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0.ebuild
deleted file mode 100644
index 52c5e077966c..000000000000
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-addr2line@0.17.0
-adler@1.0.2
-ahash@0.7.6
-aho-corasick@0.7.18
-ansi_term@0.11.0
-anyhow@1.0.69
-ascii@0.9.3
-atty@0.2.14
-autocfg@1.1.0
-backtrace@0.3.65
-base64@0.13.1
-bit-set@0.5.3
-bit-vec@0.6.3
-bitflags@1.3.2
-block-buffer@0.10.3
-bytecount@0.6.3
-byteorder@1.4.3
-bytes@1.4.0
-caseless@0.2.1
-cbindgen@0.20.0
-cc@1.0.73
-cesu8@1.1.0
-cfg-if@1.0.0
-clap@2.33.4
-combine@3.8.1
-combine@4.6.4
-crossbeam-channel@0.5.4
-crossbeam-deque@0.8.1
-crossbeam-epoch@0.9.8
-crossbeam-utils@0.8.8
-crypto-common@0.1.6
-cty@0.2.2
-deunicode@0.4.3
-digest@0.10.6
-dirs@4.0.0
-dirs-sys@0.3.7
-dunce@1.0.2
-either@1.6.1
-error-chain@0.12.4
-fancy-regex@0.8.0
-fastrand@1.7.0
-form_urlencoded@1.1.0
-fraction@0.10.0
-generic-array@0.14.5
-getopts@0.2.21
-getrandom@0.2.6
-gimli@0.26.1
-hashbrown@0.12.3
-heck@0.3.3
-hermit-abi@0.1.19
-hex@0.4.3
-idna@0.3.0
-indexmap@1.9.2
-instant@0.1.12
-iso8601@0.4.2
-itoa@1.0.1
-jni@0.14.0
-jni@0.19.0
-jni-sys@0.3.0
-json_comments@0.2.1
-jsonschema@0.16.0
-lazy_static@1.4.0
-libc@0.2.124
-lock_api@0.4.9
-log@0.4.16
-lru@0.8.1
-md-5@0.10.5
-memchr@2.4.1
-memoffset@0.6.5
-minimal-lexical@0.2.1
-miniz_oxide@0.5.1
-ndk@0.7.0
-ndk-sys@0.4.1+23.1.7779620
-nom@7.1.3
-num@0.2.1
-num-bigint@0.2.6
-num-cmp@0.1.0
-num-complex@0.2.4
-num-integer@0.1.45
-num-iter@0.1.43
-num-rational@0.2.4
-num-traits@0.2.15
-num_cpus@1.13.1
-num_enum@0.5.7
-num_enum_derive@0.5.7
-num_threads@0.1.6
-object@0.28.3
-once_cell@1.10.0
-parking_lot@0.12.1
-parking_lot_core@0.9.7
-percent-encoding@2.2.0
-proc-macro-crate@1.1.3
-proc-macro2@1.0.51
-quote@1.0.18
-raw-window-handle@0.5.0
-rayon@1.6.1
-rayon-core@1.10.2
-redox_syscall@0.2.13
-redox_users@0.4.3
-regex@1.7.1
-regex-syntax@0.6.28
-remove_dir_all@0.5.3
-rustc-demangle@0.1.21
-ryu@1.0.9
-same-file@1.0.6
-scopeguard@1.1.0
-send_wrapper@0.6.0
-serde@1.0.152
-serde_derive@1.0.152
-serde_json@1.0.93
-serde_yaml@0.9.17
-simplelog@0.12.0
-slug@0.1.4
-smallvec@1.10.0
-strsim@0.8.0
-syn@1.0.107
-tempfile@3.3.0
-termcolor@1.1.3
-textwrap@0.11.0
-thiserror@1.0.30
-thiserror-impl@1.0.30
-time@0.3.15
-time-macros@0.2.4
-tinyvec@1.6.0
-tinyvec_macros@0.1.1
-toml@0.5.9
-typenum@1.15.0
-unicode-bidi@0.3.10
-unicode-ident@1.0.6
-unicode-normalization@0.1.19
-unicode-segmentation@1.10.1
-unicode-width@0.1.9
-unreachable@1.0.0
-unsafe-libyaml@0.2.5
-url@2.3.1
-uuid@0.8.2
-vec_map@0.8.2
-version_check@0.9.4
-void@1.0.2
-walkdir@2.3.2
-wasi@0.10.2+wasi-snapshot-preview1
-winapi@0.3.9
-winapi-i686-pc-windows-gnu@0.4.0
-winapi-util@0.1.5
-winapi-x86_64-pc-windows-gnu@0.4.0
-windows-sys@0.45.0
-windows-targets@0.42.1
-windows_aarch64_gnullvm@0.42.1
-windows_aarch64_msvc@0.42.1
-windows_i686_gnu@0.42.1
-windows_i686_msvc@0.42.1
-windows_x86_64_gnu@0.42.1
-windows_x86_64_gnullvm@0.42.1
-windows_x86_64_msvc@0.42.1
-"
-
-# See dependencies/lib-lua/CMakeLists.txt
-LUA_COMPAT=( lua5-3 )
-
-inherit cargo cmake flag-o-matic lua-single xdg
-
-DESCRIPTION="An improved, cross-platform, stable Jagged Alliance 2 runtime"
-HOMEPAGE="https://github.com/ja2-stracciatella/"
-SRC_URI="
-	https://github.com/ja2-stracciatella/ja2-stracciatella/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	editor? ( https://github.com/ja2-stracciatella/free-ja2-resources/releases/download/v1/editor.slf -> ${P}-editor.slf )
-"
-SRC_URI+=" $(cargo_crate_uris ${CARGO_CRATES_URIS})"
-
-LICENSE="public-domain SFI-SCLA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="cdinstall editor ru-gold test"
-# ./ja2 -unittest can't find save files
-RESTRICT="!test? ( test ) test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-DEPEND="
-	${LUA_DEPS}
-	>=dev-cpp/magic_enum-0.9.5
-	>=dev-cpp/sol2-3.3.0
-	>=dev-cpp/string-theory-3.1
-	>=dev-games/libsmacker-1.1.1
-	>=dev-libs/miniaudio-0.11.11
-	>=dev-libs/rapidjson-1.1.0
-	media-libs/libsdl2[X,sound,video]
-	>=x11-libs/fltk-1.3.5[opengl]
-	>=virtual/rust-1.40.0
-"
-RDEPEND="
-	${DEPEND}
-	cdinstall? ( games-strategy/ja2-stracciatella-data )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-lua-cmake.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/916965
-	# https://github.com/ja2-stracciatella/ja2-stracciatella/issues/1963
-	filter-lto
-
-	local mycmakeargs=(
-		-DUSE_SCCACHE=OFF
-
-		-DLOCAL_GTEST_LIB=OFF
-		-DLOCAL_FLTK_LIB=OFF
-
-		-DLOCAL_LUA_LIB=OFF
-		-DLUA_VERSION="${ELUA#lua}"
-
-		-DLOCAL_MAGICENUM_LIB=OFF
-		-DLOCAL_MINIAUDIO_LIB=OFF
-		-DLOCAL_RAPIDJSON_LIB=OFF
-		-DLOCAL_SDL_LIB=OFF
-		-DLOCAL_SOL_LIB=OFF
-		-DLOCAL_STRING_THEORY_LIB=OFF
-
-		-DWITH_MAGICENUM=OFF
-		-DWITH_RUST_BINARIES=OFF
-		-DWITH_UNITTESTS=$(usex test)
-
-		-DBUILD_LAUNCHER=OFF
-
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DEXTRA_DATA_DIR="${EPREFIX}/usr/share/ja2"
-		-DMINIAUDIO_INCLUDE_DIR="${EPREFIX}/usr/include/miniaudio"
-		-DMAGICENUM_INCLUDE_DIR="${EPREFIX}/usr/include"
-	)
-
-	cargo_gen_config
-	cmake_src_configure
-}
-
-src_install() {
-	if use editor; then
-		insinto /usr/share/ja2
-		doins "${DISTDIR}/${P}-editor.slf"
-		dosym "${P}-editor.slf" "/usr/share/ja2/editor.slf"
-	fi
-
-	cmake_src_install
-}
-
-src_test() {
-	"${BUILD_DIR}"/ja2 -unittests || die
-}
-
-pkg_postinst() {
-	if ! use cdinstall ; then
-		elog "You need to copy all files from the Data directory of"
-		elog "Jagged Alliance 2 installation to"
-		elog "e.g. /opt/ja2/data and set game_dir in .ja2/ja2.json"
-		elog "accordingly."
-		elog "Make sure the filenames are lowercase."
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 0f8ea853a96e..dfe098f39a9c 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,12 +1,10 @@
-AUX wesnoth-1.16.10-boost-1.83.patch 787 BLAKE2B 943668f101ea223257131c83a1b4441fce9424a75dd9c9f69953a97eb30951b28d8cddf5594621ec7fda6882ecacb639a91866dc8956719dd4a1cccdf69ccb74 SHA512 0533fa7ff1fdefa8fcc1a6060c227d6c13dcd44f0e4bff33b71db18f53fd8a31dbd80115f2fe3756635b8d571ad2f21880f6997a15f5141802b5178ae0a2fede
-AUX wesnoth-1.18.0-boost-1.85.patch 348 BLAKE2B 173b502ede81a4dbc276bee963d117a8857a660109cdcd51f9848aa3918b42b5a3e5e5d632708cdc2802b699db3afb7237de231e44dfc8a2ff43e8297ac154ca SHA512 7895598c6c143954230fba9fb5d0d9d97457286767ecde6e83ef94b32c83befc56b55aedc201917ebc5515d31b88369d435dc93fc857798a3767bfa728a5eeef
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.16.10.tar.gz 518628374 BLAKE2B 7aaed481607bc58e9d0f22e4c4a36f24f19b4fc522ce3c1eb6366e70e3bd901a10f055d2add9dc1c73519368fd4a31cd6b326e42b1be0023eeda370076db0742 SHA512 0473ec4e4b7a33a37c2ff52b4e0c3dccec2e58a087517566967409dda03952127bf560b09cfccc7243f506201d98980aafdf289b7f1e5345a7e3b4316a908240
-DIST wesnoth-1.18.0.tar.bz2 460686063 BLAKE2B 9dd898a6b430999873ae001dad47b2bcadcbbfc4672bf4489533c0268a4bf982a4e4451f79bf62bb1ac66d4ba2f06b62484b2b1b1fccb2e434c4ceef95a2c2bc SHA512 7c7cd1021d9af2e790f3973ae258d7e401b665102cfcdb9e7fb400471d8488b7fa3f35a17a32c53b646d707dcc0508fef379ae6ce2dc79f1d675a7b2ec0e50c2
 DIST wesnoth-1.18.2.tar.bz2 461290798 BLAKE2B 6ff9538eca7f65e7413d9b220b07b5f76ad14b7853cb2b33195098f01544a6e3ba2603f927c55c2f5a42a4b3c148655483610beab985332737c4e0cf54be15df SHA512 de4d8ceaf29a93c174e9f832825542885bb90c4f481b6b248cc875cb0b1054435df3c2080c7693842b5e857af091e9219fa10b702d4fe63757f3d28871b63d4c
+DIST wesnoth-1.18.3.tar.bz2 461694247 BLAKE2B 1998e2fdff56271dd86c390e3c25dcbaa98b4f131f15584e5d3f2f5866856a69aebf9c8d97b1126601b3e08467a9410f3ba7b53c253737c6bbf62ccb1e9ba96f SHA512 def324c9ed66ac59e2a9d0ab9ab95f00ddab2d31dacb2d0b5cfba42c5acdba210937f7dd6afde8870a387847a6d021a28dffcb04ce513272df6a4b52a626f30a
 DIST wesnoth-1.19.1.tar.bz2 461918324 BLAKE2B 8fa97526831e14957449a0b33909b7d155be00659d9543efbea34bd7935fb05b4e99a419dcc2e9c426a2e0fb4fb1d40c2972236d0da5a1661970eb80103f04fc SHA512 73ab7d474b01ac753224f0c694a86679a28160e340a07d87b8f96398df2c39c39df95098b750516e7e69851843e68954b5939ae68dc3a232ec2e9cad256d1113
-EBUILD wesnoth-1.16.10.ebuild 2322 BLAKE2B cd96d39da2b17ee4ab3d244e9716c53067220a24ff0323c57ef48b83ecefb67cc32288a6f53eeab8f3e0782f6074f45d4caec308807d3bbf58dc9cf288064567 SHA512 ea2be082e8ce3df3de5af279d07d344448830bc30ad69338729e8d899842fd3f122bbac2e1dc8f793ca336977627cbc4a06d44a9fd8119b0a41b4f41230f0f5c
-EBUILD wesnoth-1.18.0.ebuild 2405 BLAKE2B 3968383067bdc4f69a9a8ce14dbc83df5c8d7cc6fef8699169e422a86e83608008b6c1e33a8b6665971e9f2b3c8d42eb0f630ad09273b10c3df51d261e45e0ad SHA512 ca1f77d4de4ae9200c6df8af85e1dba5f8a49d35fafe05136ed2df43bf192730d2eabdc184d12758f17c9904838a697d7ae9df31d4c6ca5c3bf1a7b40f4f7bf8
+DIST wesnoth-1.19.5.tar.bz2 509947975 BLAKE2B 26ae05b709a2643af493b98531a8456a57ad725baac31e11b2ab2207b3fbbfe655389d80bae01aece08b14df2046bcb80092eca7691fce5b838b9c3ef9727930 SHA512 e0332cb20469ba74aa60d109a0abf536767c04ce5007fa2ec7512c3e5d88b4fa32aacafb0fb729647dc0eb922fa8846fcbc24ffb681cd59bad8a07e4db0968da
 EBUILD wesnoth-1.18.2.ebuild 2346 BLAKE2B 2b28275cd43c0392a6c763ea60885dfc42ac4841afa64ed5b8cad12994dc6d863e4b4c079f721ad32b2c0ea82a7bfa4dc2aa2b76c808888d72ef4545bcbf7d0f SHA512 4da20189773ed38a24a516bc19b00444b9804319eb3e5687c621d09bd9e1889f66f37f522e19bf1941a8e722e03c36ec65b67a5d53eb4611c9983f368f5f39e7
+EBUILD wesnoth-1.18.3.ebuild 2346 BLAKE2B 2b28275cd43c0392a6c763ea60885dfc42ac4841afa64ed5b8cad12994dc6d863e4b4c079f721ad32b2c0ea82a7bfa4dc2aa2b76c808888d72ef4545bcbf7d0f SHA512 4da20189773ed38a24a516bc19b00444b9804319eb3e5687c621d09bd9e1889f66f37f522e19bf1941a8e722e03c36ec65b67a5d53eb4611c9983f368f5f39e7
 EBUILD wesnoth-1.19.1.ebuild 2346 BLAKE2B 7e6e442c416c5c0b3e700f5eb89fafa037d1cf71ed7ae3d5e2f56d2f30f3f569164c19e88283479769c897f44458e6dd42d65105afcd4bbdb2221994d3d44e79 SHA512 6ac04ec964bd9585734b0d23a0991abe6d73a874e552af08d9cdf5a5dbe046bcbf6673cdad628b4071dcef7f7bdd3618d1df2dac4f913fe11884000aa14ca0e7
+EBUILD wesnoth-1.19.5.ebuild 2346 BLAKE2B 7e6e442c416c5c0b3e700f5eb89fafa037d1cf71ed7ae3d5e2f56d2f30f3f569164c19e88283479769c897f44458e6dd42d65105afcd4bbdb2221994d3d44e79 SHA512 6ac04ec964bd9585734b0d23a0991abe6d73a874e552af08d9cdf5a5dbe046bcbf6673cdad628b4071dcef7f7bdd3618d1df2dac4f913fe11884000aa14ca0e7
 MISC metadata.xml 475 BLAKE2B fe3a0b92f39b2158ec38fe2d7528463bb243cc44df562f7ad450227b35bab1d59a1638fe1d702cd70358a0137851e08be1878d590afbcc28dd19176b2a7df7fd SHA512 6293671db448eef2a211ae8dbb88624a42ac46712331db441a55d44566e7843f820047dde7936d725fea6d24a8196223e30712ffbd3864e63614f7f849cda6b4
diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch b/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch
deleted file mode 100644
index 2c9e55db0472..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 136e651d69fc91fa7a4154f8a4a7e977cc46eca4 Mon Sep 17 00:00:00 2001
-From: Pentarctagon <pentarctagon@tutamail.com>
-Date: Thu, 17 Aug 2023 23:19:21 -0500
-Subject: [PATCH] Compile fix for boost 1.83.
-
-Fixes #7849
----
- src/gettext.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gettext.cpp b/src/gettext.cpp
-index 9888dede35ad..fa9b17ba85b2 100644
---- a/src/gettext.cpp
-+++ b/src/gettext.cpp
-@@ -169,7 +169,11 @@ namespace
- 			return msg;
- 		}
- 
-+#if BOOST_VERSION < 108300
- 		const char* get(int domain_id, const char* ctx, const char* sid, int n) const override
-+#else
-+		const char* get(int domain_id, const char* ctx, const char* sid, bl::count_type n) const override
-+#endif
- 		{
- 			auto& base = get_base();
- 			const char* msg = base.get(domain_id, ctx, sid, n);
diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch b/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch
deleted file mode 100644
index 412a4cf8e39d..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/932255
---- a/src/filesystem.cpp
-+++ b/src/filesystem.cpp
-@@ -30,6 +30,7 @@
- #include "serialization/unicode.hpp"
- #include "utils/general.hpp"
- 
-+#include <boost/filesystem/directory.hpp>
- #include <boost/filesystem/fstream.hpp>
- #include <boost/iostreams/device/file_descriptor.hpp>
- #include <boost/iostreams/stream.hpp>
-
diff --git a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild b/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
index 1843a5985958..4b40f0539945 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	acct-group/wesnoth
 	acct-user/wesnoth
 	dev-libs/boost:=[bzip2,context,icu,nls]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	>=media-libs/libsdl2-2.0.10:0[joystick,video,X]
 	!dedicated? (
 		dev-libs/glib:2
 		dev-libs/openssl:0=
@@ -43,10 +43,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/wesnoth-1.18.0-boost-1.85.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild b/games-strategy/wesnoth/wesnoth-1.19.5.ebuild
index cb9bc76bf65d..19a65877e088 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.19.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit cmake flag-o-matic xdg
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
 	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,12 +22,12 @@ RDEPEND="
 	acct-group/wesnoth
 	acct-user/wesnoth
 	dev-libs/boost:=[bzip2,context,icu,nls]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	>=media-libs/libsdl2-2.0.18:0[joystick,video,X]
 	!dedicated? (
 		dev-libs/glib:2
 		dev-libs/openssl:0=
 		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
 		>=media-libs/sdl2-mixer-2.0.0[vorbis]
 		media-libs/libvorbis
 		>=x11-libs/pango-1.22.0
@@ -43,10 +43,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.16.10-boost-1.83.patch #912385
-)
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -96,6 +92,11 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	# Allow SDL_Mixer test to pass, bug #931551
+	SDL_AUDIODRIVER=dummy cmake_src_test
+}
+
 src_install() {
 	local DOCS=( README.md changelog.md )
 	cmake_src_install