gentoo auto-resync : 29:05:2024 - 00:07:15

10 files changed, 119 insertions, 5 deletions

diff --git a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index 14311b6b04fe..7c7373e81a78 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -101,6 +101,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-add-missing-cstdint-include.patch
 	# https://code.wildfiregames.com/D5219
 	"${FILESDIR}"/${P}-libxml2-2.12.patch
+	# https://code.wildfiregames.com/D5267
+	"${FILESDIR}"/${P}-boost-1.85.patch
 )
 
 pkg_setup() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 9fd409d38286..8bf401727124 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,10 +1,11 @@
 AUX 0ad-0.0.24b_alpha-respect-tc.patch 1095 BLAKE2B c7f2747ae832de76da3711687ce8e6d52039e23cbe31ca1114d27e93ec2b3ef150f4b241a0d869ec393c9f73e702f35ce5610f9b383bbe43e958989bbcfa0c17 SHA512 00c439a086da6553b09230cf57e76c9abcf8c13093a4d439ccb5724d6dee5474c46f924c5a0c5b43cdc8572445347dcf2a77eba3fcff17b16d492ca4bef90594
 AUX 0ad-0.0.25b_alpha-fix-setuptools.patch 8270 BLAKE2B 65ec2d7be8602427a39b3b426dea0b4aa5741385d8416ae4db94f0f94d73b3c7ae2b3a851fbb5afe4e8d07d9d65739b5323d3f40e239fcb0d3d39e479419c3cf SHA512 b08424de3685c87901b3caeb39c415f0814f5a5a0a5df6890cf1fe829a822f4d52711c4219b230414c9144ecd1a6ff2b68973f91be415cff350df6f5b5f91fc9
 AUX 0ad-0.0.26_alpha-add-missing-cstdint-include.patch 873 BLAKE2B cc4b621f3f6b1811e3e84262e7ec92a387d3b22a0f40f8405829d494f33700ecf9609cdb73eca90f649b5a270c24682a25d8ba4c9f5fc3468c87d8cb844f2f0c SHA512 576bf24bdc2b1fafb2d6917a40f978c864b5613631ce4630db96976205409799dac4bbf7c978958d1a073c90f2c955da2713202f41e8e1c21135f9683e48ecad
+AUX 0ad-0.0.26_alpha-boost-1.85.patch 1229 BLAKE2B 8aaf7b53806672e7812e7b796d07310995031fc6a36a6861e9133595990d5441ac2e69d0b845f89d7fdc0995c7e1a710d5ecaf861bebb6819892370497508f27 SHA512 e100942db7c69a8833665f7d085edef62224ebcf2aaf4d328290c0e971b62d8a69a037d3fabe6110b9aa906fe4e0a6197e17a8b667e3286888a3fa55ab82a7fa
 AUX 0ad-0.0.26_alpha-libxml2-2.12.patch 9046 BLAKE2B a4c914526ca2fa29a37aa72f390053ff95bd57e7a3a7d7653b30ac62e8ec8a7998082bd3bd2102654467242e32559c3cc517d813f60685b444ce0ffbf42b92eb SHA512 419af3d589c1465659e5077784d758db4d3b7fa36ac1e7a3e29e6620cc30b784282c299080d1fb8ef8936edc6a7d02d991ae4b911038da2c06705ae9e9945d3a
 DIST 0ad-0.0.26-alpha-unix-build.tar.xz 75599800 BLAKE2B ddd589840b0dacee2377ff4e5624f69646b92da4217015d788c6abec097578e44aee6641b6a6945d15f50d8e50673a1d44587c2faf02278d981a0ed30c950214 SHA512 aaf647d5d8454c244015d2a198beeaaebc571a5bc96446f3acff8dbd05f9843029c500bf4162651a5e1fcdb42bd5fb5b4f5c512c78372479fbd8565dd093f272
 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 8250 BLAKE2B 1dbd85478cfacf11325211fd79321cfca305999834c35604f5011fbe8a0922c99c45e9eee1b9df02c4dbc92f00e717ca8f780bae746875ced0dd8f7579a55b6e SHA512 de4d14c9c708bb0931a16cbc63b509af8e09350e40b285e41e526acfaa52875a6467aad43a5c11a56731de67f67a659e7543d6eb785c8c21c8e754852113f075
+EBUILD 0ad-0.0.26_alpha-r1.ebuild 8327 BLAKE2B b2f132adbb5ca8ac0a33b9378feb08a3e9cdad78f0a56e687275107881d417a6f4e4bc27a9bc64d2528bbb857f7c31099b12c03354e4f2cce59d857fb0002647 SHA512 903029c8b488aae7b63b2daf542c5b2947bfc474e49221df8c38fe988664f29e763101deb0e9d12caf14e12c266782fc69f2d37bb8e0722270a43fc5f8564346
 MISC metadata.xml 667 BLAKE2B 3460d1e769fd9bab7f44c1387b9ccb6acb8b6030e5e307311aca479a0857a3719c22352e3b496dff2569536675e449f98aeccc62999283d2ebd3b3feefe444ee SHA512 65134f211aa3509589f9d333c0b2ceb7cb2dcfe394d3eb84323f5cafb43d8ec6d65738a38552d3c955eab5e7fcb5b71da575df5a1e21e0cbd49dcc4b89fc0f39
diff --git a/games-strategy/0ad/files/0ad-0.0.26_alpha-boost-1.85.patch b/games-strategy/0ad/files/0ad-0.0.26_alpha-boost-1.85.patch
new file mode 100644
index 000000000000..cddec5e2a86c
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.26_alpha-boost-1.85.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/932254
+https://code.wildfiregames.com/file/data/ubpvat3mgrfn6gnaquuq/PHID-FILE-d7xwslolc5hv2vwv66tb/D5267.diff
+
+Index: source/graphics/TextureManager.cpp
+===================================================================
+--- a/source/graphics/TextureManager.cpp
++++ b/source/graphics/TextureManager.cpp
+@@ -806,7 +806,7 @@
+ 				files.push_back(f);
+ 			p = p / GetWstringFromWpath(*it);
+ 		}
+-		return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files);
++		return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.filename()), files);
+ 	}
+ 
+ 	/**
+Index: source/lib/file/file_system.cpp
+===================================================================
+--- a/source/lib/file/file_system.cpp
++++ b/source/lib/file/file_system.cpp
+@@ -229,7 +229,11 @@
+ 	try
+ 	{
+ 		if(override_if_exists)
++#if BOOST_VERSION >=107400
++			fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_options::overwrite_existing);
++#else
+ 			fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_option::overwrite_if_exists);
++#endif
+ 		else
+ 			fs::copy_file(fs::path(path.string()), fs::path(newPath.string()));
+ 	}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 283a8f7b7f17..66bd688a8406 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 9c56cf034122..35e374e26db1 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,3 +1,4 @@
+AUX freeorion-0.5.0.1-boost1.85.patch 2287 BLAKE2B 30ba9d71ca0f69c42dd0b795e46702d324dddba727cfc14a80d2ba011809c78b3ebb51a600945e0a50d27f8fe0fc054814a4403cca63ce81d02508425c4cfbc9 SHA512 83ebc9a50121df011436bf6dcfb641601e15e224055e44b076a64a73e3623b7a6407c146477bf63cc1f150a5629aece870010d25fbb1c537fcdcb64c2b192b74
 DIST FreeOrion_v0.5.0.1_Source.tar.gz 152861158 BLAKE2B 6924d4916fcd3ac93e7498b5247957a6fb62b8523aa49114e9e11ef5e3b89374966551bc14192fa7928951728ce814fb86d89365beb97aa7c2bc84408bfcadd2 SHA512 dc267231329f0615f12887f22139d57a2611f378e17e8b0f26c00efdb77e73ef737ff875350f805d34a07ca4ce0595758e4f61168878477ebbd92d0149bcdc22
-EBUILD freeorion-0.5.0.1.ebuild 2822 BLAKE2B 57e06b2443f6c1f35217c1fe89982543ae81d4a75702f2f5cc918d18ca1e98fd3e88fc08c96f04109e264d1efc6fb4d9e31cb8513895d41819bedcca362f736e SHA512 17effb25e8d460a992935fb9dc27c427f1469676e7e209ef197bab3d6eb727059d31539f7b58ca81f49e87e945348fc5ecfeb54474be375e79891991d28c6d68
+EBUILD freeorion-0.5.0.1-r1.ebuild 2872 BLAKE2B bea166126374b52dfb17f25d01eebd0a93b872cc069f360b87a0af023872f3d61d7dd2be9ba577619777da6ede1b57ee5dff4d885ba72b6fdb6a394c0dc733fa SHA512 5326b4ea0de19a26884945ab00746745ee33eeb7364112bfec3e0032c3ec61e8ee558879317785d7259556f6807fe53ee690c2cad28ef6e1ddd0594797b3a140
 MISC metadata.xml 757 BLAKE2B 64e1e5a856369650c9d41b75f7af091c5fde43ab2992911cc81d5e4ba12d13fea5e4e82ae960e75208979aea38eeeb07d4bfebdb1eb45c035796ed854090cbe6 SHA512 5e631e52b5dbabbb6ce1cde6e416c4ed228dbf4a1ddda7899e5565c9abd5b7080894866aef375ff66cef3facd06faadcaea2ccefd8fb34d6bb461bfd32879d6e
diff --git a/games-strategy/freeorion/files/freeorion-0.5.0.1-boost1.85.patch b/games-strategy/freeorion/files/freeorion-0.5.0.1-boost1.85.patch
new file mode 100644
index 000000000000..cb7f450ffc37
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.5.0.1-boost1.85.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/932780
+https://github.com/freeorion/freeorion/issues/4897
+
+Backport of: https://github.com/freeorion/freeorion/pull/4899/commits
+--- a/GG/src/dialogs/FileDlg.cpp
++++ b/GG/src/dialogs/FileDlg.cpp
+@@ -11,3 +11,3 @@
+ #include <boost/algorithm/string/predicate.hpp>
+-#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem.hpp>
+ #include <boost/format.hpp>
+@@ -217,3 +217,3 @@
+         fs::path filename_path = fs::system_complete(fs::path(m_init_filename));
+-        m_files_edit->SetText(filename_path.leaf().string());
++        m_files_edit->SetText(filename_path.filename().string());
+     }
+@@ -550,3 +550,3 @@
+         if ((s_working_dir.string() != s_working_dir.root_path().string() &&
+-             !s_working_dir.branch_path().string().empty()) ||
++             !s_working_dir.parent_path().string().empty()) ||
+             Win32Paths())
+@@ -696,6 +696,6 @@
+         if (s_working_dir.string() != s_working_dir.root_path().string() &&
+-            !s_working_dir.branch_path().string().empty())
++            !s_working_dir.parent_path().string().empty())
+         {
+             // move to new directory
+-            SetWorkingDirectory(s_working_dir.branch_path());
++            SetWorkingDirectory(s_working_dir.parent_path());
+ 
+--- a/util/Directories.cpp
++++ b/util/Directories.cpp
+@@ -6,5 +6,4 @@
+ #include <boost/algorithm/string/trim.hpp>
+-#include <boost/filesystem/convenience.hpp>
+-#include <boost/filesystem/operations.hpp>
+ #include <boost/date_time/posix_time/posix_time.hpp>
++#include <boost/filesystem.hpp>
+ 
+@@ -268,3 +267,3 @@
+         fs::path binary_file = fs::system_complete(FilenameToPath(argv0));
+-        bin_dir = binary_file.branch_path();
++        bin_dir = binary_file.parent_path();
+     } catch (const fs::filesystem_error &) {
+@@ -317,3 +316,3 @@
+             fs::path binary_file = fs::system_complete(fs::path(path_text));
+-            bin_dir = binary_file.branch_path();
++            bin_dir = binary_file.parent_path();
+ 
+--- a/util/OptionsDB.cpp
++++ b/util/OptionsDB.cpp
+@@ -16,4 +16,3 @@
+ #include <boost/algorithm/string/predicate.hpp>
+-#include <boost/filesystem/fstream.hpp>
+-#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem.hpp>
+ #include <boost/range/algorithm_ext/erase.hpp>
diff --git a/games-strategy/freeorion/freeorion-0.5.0.1.ebuild b/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
index 7f69517f40d8..60ff58559cb2 100644
--- a/games-strategy/freeorion/freeorion-0.5.0.1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
@@ -18,10 +18,9 @@ IUSE="+client doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
-# bug #932780 wrt boost upper bound
 DEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep '<dev-libs/boost-1.85:=[${PYTHON_USEDEP},nls,python]')
+	$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]')
 	sys-libs/zlib:=
 	client? (
 		media-libs/freetype
@@ -50,6 +49,10 @@ BDEPEND="
 	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-boost1.85.patch
+)
+
 freeorion_check-reqs() {
 	# cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB
 	# if debug symbols) then far less for the rest, check minimal jobs*1.5
@@ -75,6 +78,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -fno-strict-aliasing #932780
 	filter-lto # -Werror=odr issues
 
 	local mycmakeargs=(
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index bd8298e235ce..50c8c4fe9b3f 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,9 +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.17.20.tar.bz2 424613262 BLAKE2B acf8b6a9213b1fea9370c76cc7e63001fa34777357ab791db8380ca684195e830385939d0e31fbb058e5c84ebce74f084d9884bdf27d1ecb662e28dbcb477dab SHA512 b7eaaf624e84b28eca7d702a791fbe7c6b9e833d3e4f9d61ee79c70737ec396b81b2cefedae0ef272ec5384d71c28a4b083bf837591f6ce2c345d79f43b1e87e
 DIST wesnoth-1.18.0.tar.bz2 460686063 BLAKE2B 9dd898a6b430999873ae001dad47b2bcadcbbfc4672bf4489533c0268a4bf982a4e4451f79bf62bb1ac66d4ba2f06b62484b2b1b1fccb2e434c4ceef95a2c2bc SHA512 7c7cd1021d9af2e790f3973ae258d7e401b665102cfcdb9e7fb400471d8488b7fa3f35a17a32c53b646d707dcc0508fef379ae6ce2dc79f1d675a7b2ec0e50c2
 EBUILD wesnoth-1.16.10.ebuild 2322 BLAKE2B cd96d39da2b17ee4ab3d244e9716c53067220a24ff0323c57ef48b83ecefb67cc32288a6f53eeab8f3e0782f6074f45d4caec308807d3bbf58dc9cf288064567 SHA512 ea2be082e8ce3df3de5af279d07d344448830bc30ad69338729e8d899842fd3f122bbac2e1dc8f793ca336977627cbc4a06d44a9fd8119b0a41b4f41230f0f5c
 EBUILD wesnoth-1.17.20.ebuild 2246 BLAKE2B 4970ac0ecc9362777b095bd18349bb55cb7e3957fe5bef4f4dfd1a9dea135c73ef9957ccf9d6ca5952ec7571d13f5d9d8893d336ead7d9b4d7edbd3b542061b3 SHA512 b7e968364900812c2fd2cbe39111b58c743ee9b9819f6bf0fc6036321c001ecf7fea7d383f0e32ac2ade771e25a5d1dfd33ae0d615ae88164af7be0dd8473db3
-EBUILD wesnoth-1.18.0.ebuild 2345 BLAKE2B 6483f31b5bca9f9e11ca5345d3ca109fca2776c8f370717c1a016276e6bde02dfab3c02efeb1bc867862605f6f5b86a2df2509cb393253b96a1694304d735179 SHA512 ad79e6f7261d21926843b6c4bf7f185138cddca9c838c84c6ab1b6083407761e00035009be6c72757832ce748b29b6097749965325fd8c78f507c16b5dace3d5
+EBUILD wesnoth-1.18.0.ebuild 2405 BLAKE2B 3968383067bdc4f69a9a8ce14dbc83df5c8d7cc6fef8699169e422a86e83608008b6c1e33a8b6665971e9f2b3c8d42eb0f630ad09273b10c3df51d261e45e0ad SHA512 ca1f77d4de4ae9200c6df8af85e1dba5f8a49d35fafe05136ed2df43bf192730d2eabdc184d12758f17c9904838a697d7ae9df31d4c6ca5c3bf1a7b40f4f7bf8
 MISC metadata.xml 475 BLAKE2B fe3a0b92f39b2158ec38fe2d7528463bb243cc44df562f7ad450227b35bab1d59a1638fe1d702cd70358a0137851e08be1878d590afbcc28dd19176b2a7df7fd SHA512 6293671db448eef2a211ae8dbb88624a42ac46712331db441a55d44566e7843f820047dde7936d725fea6d24a8196223e30712ffbd3864e63614f7f849cda6b4
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
new file mode 100644
index 000000000000..412a4cf8e39d
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch
@@ -0,0 +1,12 @@
+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.0.ebuild
index ba33c9b827a8..1843a5985958 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
@@ -43,6 +43,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/wesnoth-1.18.0-boost-1.85.patch
+)
+
 src_prepare() {
 	cmake_src_prepare