gentoo auto-resync : 19:12:2022 - 07:47:44

4 files changed, 53 insertions, 1 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index c79c415efbca..98547e359770 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index ceb3e8adfecb..2f66be04d758 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,10 +1,11 @@
+AUX wesnoth-1.16.6-fix-build-with-boost-1.81.patch 1907 BLAKE2B 8c98e374f17ceb8afd29aad80ee2e3971d62fcd8b996379b6d198c162fe8376fde7f7d68122a955e65852a40f9712bfdd941630722011a8326c0216eaf73aed2 SHA512 3d930b1de00163e7970c35e80d2c87069050b1a64884cbd5ed7c9e44f47857e070561d0cb31575e7263b4cfd5907d82f067445115acf7a66823a1f5eed752a55
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20 SHA512 7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
 DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758 SHA512 fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
 DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830 SHA512 7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377
 DIST wesnoth-1.17.9.tar.bz2 420547403 BLAKE2B 8fcef89b72057ce60e292a7a986010f4b0d060e7542ff20029306cde4580473f5e8240f9d99a6248d23147be7a61345a04dca97fa70fb9a1fa039603b8ddd8d9 SHA512 c8f9eb8cc77ea239e710e52a23333636700b34cea5fc8d73d5a62f80d0b58867ee633f556c170700e65e4ad234a69ea1746a1a4148efb64979cf22129ee59157
 EBUILD wesnoth-1.16.3.ebuild 2230 BLAKE2B 72027fdc814cc0aa769a94d971b7eb5f769265861ffadf1a30f612ef1d01b89725e04d16ffd32f9889c4a2b19796be7dfd072504fce1826f4dbb4afd37e9b73f SHA512 2efd412cce8e8cda42cf3421de5d60ff514778bd7355155c7252ef06859eb23ccb650719677968339b2a77a060cbb6b911a6ca23523e44a5b91f95147b1f72a2
-EBUILD wesnoth-1.16.6.ebuild 2230 BLAKE2B 72027fdc814cc0aa769a94d971b7eb5f769265861ffadf1a30f612ef1d01b89725e04d16ffd32f9889c4a2b19796be7dfd072504fce1826f4dbb4afd37e9b73f SHA512 2efd412cce8e8cda42cf3421de5d60ff514778bd7355155c7252ef06859eb23ccb650719677968339b2a77a060cbb6b911a6ca23523e44a5b91f95147b1f72a2
+EBUILD wesnoth-1.16.6.ebuild 2304 BLAKE2B 29929dda7e4950588c33ae9a1159c072ce0bd284df9bcde29e1d7540b89d4e91eca9ddb54781f835ff2f0cdbad691e61ef9657df755fb6551dc40531863861b7 SHA512 57435db84babedb9d0aba64dcc083f569eba539632b0bd2fe3827a8177cdc283df881af9ca049d4a5077faa6d341a777a82fe76f97e7833b825b87dad0d99479
 EBUILD wesnoth-1.17.5.ebuild 2203 BLAKE2B 9c5f81f08b619e228052ca7bc4c8d667524a15df4e8d81db47a3a54bc3165f53ee07db38f593debf37f0d4fbee1af4242147e7843f1a0e47923f082397fec4a3 SHA512 4776a5abc4f2d048e4f628d29ee5ebbe4a372dd4d6e049965b4c583258f09c3c8e688175d99121228a842b314ae91a6f40086f1e8d1aec5d8f2034c78be5cb27
 EBUILD wesnoth-1.17.9.ebuild 2203 BLAKE2B 9c5f81f08b619e228052ca7bc4c8d667524a15df4e8d81db47a3a54bc3165f53ee07db38f593debf37f0d4fbee1af4242147e7843f1a0e47923f082397fec4a3 SHA512 4776a5abc4f2d048e4f628d29ee5ebbe4a372dd4d6e049965b4c583258f09c3c8e688175d99121228a842b314ae91a6f40086f1e8d1aec5d8f2034c78be5cb27
 MISC metadata.xml 418 BLAKE2B 636dfbbd604111ba7c6241fbbc8ba8bd9a4f1f6e30811c9f3788a3624deadf751ad62dca9e24a74f19709900c32530fd3b12363ba288a94d2d94eb9c7e15b6f1 SHA512 298467b69ae7455c096e186061df02c45dd42aa33241ea12bd672a551589dd62a7cf5d2e383a6e94a6ee1332bc29b24f80e4597cbb0771e64b40d3bee5249102
diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch b/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
new file mode 100644
index 000000000000..785a5440cbbf
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/886575
+https://github.com/wesnoth/wesnoth/issues/7215
+
+From d71e90ee50a89673cf9b6748bcb2975071d15445 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 28 Nov 2022 23:21:38 +0700
+Subject: [PATCH] gettext: fix build with Boost.Locale 1.81
+
+See https://github.com/boostorg/locale/pull/128/
+
+(cherry picked from commit fd96415bdf0a2e3a05e1a587a1c3853847e2c2bc)
+--- a/src/gettext.cpp
++++ b/src/gettext.cpp
+@@ -26,6 +26,7 @@
+ #include <mutex>
+ #include <boost/locale.hpp>
+ #include <set>
++#include <type_traits>
+ 
+ #if defined(__GNUC__)
+ #pragma GCC diagnostic push
+@@ -224,8 +225,13 @@ namespace
+ 			}
+ 
+ 			generator_.use_ansi_encoding(false);
++#if BOOST_VERSION < 108100
+ 			generator_.categories(bl::message_facet | bl::information_facet | bl::collation_facet | bl::formatting_facet | bl::convert_facet);
+ 			generator_.characters(bl::char_facet);
++#else
++			generator_.categories(bl::category_t::message | bl::category_t::information | bl::category_t::collation | bl::category_t::formatting | bl::category_t::convert);
++			generator_.characters(bl::char_facet_t::char_f);
++#endif
+ 			// We cannot have current_locale_ be a non boost-generated locale since it might not supply
+ 			// the bl::info facet. As soon as we add message paths, update_locale_internal might fail,
+ 			// for example because of invalid .mo files. So make sure we call it at least once before adding paths/domains
+@@ -368,7 +374,12 @@ namespace
+ 			if(std::has_facet<bl::collator<char>>(current_locale_)) {
+ 				res << "has bl::collator<char> facet, ";
+ 			}
++#if BOOST_VERSION < 108100
+ 			res << "generator categories='" << generator_.categories() << "'";
++#else
++			res << "generator categories='" <<
++				static_cast<std::underlying_type<bl::category_t>::type>(generator_.categories()) << "'";
++#endif
+ 			return res.str();
+ 		}
+ 
diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
index 1ee6998e389d..ebb79a331120 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
@@ -43,6 +43,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/wesnoth-1.16.6-fix-build-with-boost-1.81.patch" )
+
 src_prepare() {
 	cmake_src_prepare