gentoo auto-resync : 24:05:2024 - 00:07:11

4 files changed, 52 insertions, 1 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index d22047ef62cf..3e3cbd661c6d 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 977e3259f2d5..310c3af9f870 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1,4 @@
+AUX boost.patch 1851 BLAKE2B b05a0397ec6cd16d910c3edfa636d31959daea0992c56cfe67030ffe49a8462ddf20ce4a0d205c711ec0eedfe591381e342d3aacf5ddedb81ed49058a8436f93 SHA512 d1c4a4359e0f1719f8793bd65388cf2ac77494685e12dca6872c145dbea9abc1866375b171720937f9290d3c435c47254c37d6b26210a388069c55ef59007f8d
 AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
 AUX gv10.patch 1617 BLAKE2B 2fee9681e2f2f67e6a52bef75fc7c56217a4c57c8136e4b27ace7ba49c520161c2f15a1a73035822244b321b0f6b15c0af9c67254076e6168b4cc8624334e81d SHA512 3c3b8a08d212c5f93e85577ea043107e6008ebd85631951cd7ed6767a22be2b807b87b1cfce3f13f66d936ea53cf1eb14a4c067d1f444d2cd7e35462bb1f27bc
 AUX protobuf.patch 8899 BLAKE2B c8d181250926a7b22aa67e17b1e38b9713c50578458452d02b9af89400d4194f31808563709cbfc81fdb4709ee57032fbb77d26ff413bc069a5dc0407a57146b SHA512 eb36f0000204788ad9fa40d8fcdc0fcb6fc8d27489c5bae3cc12e910a7046936ed1d6adc23b3498060ee6da380df5f238bde17b699b3c3b0eec9f1c75a6c07e9
@@ -5,5 +6,5 @@ AUX qwt2.patch 592 BLAKE2B 77c1f9ffa4e1754d8f6bcbd7eff2dfa470abb2c265fb44a4d8a65
 DIST gazebo-11.13.0.tar.bz2 56636967 BLAKE2B 7c0ef875711e832a213631d97584edc2300d25be6d538d6f2ac782ab279b6518e1fb7c59d895a1c7b92fbaec46bb0e7c505afb34f05ab2eece016f5bd15a7c3f SHA512 a77ce4a02f723c615738d11a13aa10fa5124705bc9ca95153477d8df25b296eef7d442769379d3888a9ba0f04c1e5a3e38d686e7b5eef393b91bdc78f792c390
 DIST gazebo-11.14.0.tar.bz2 56640328 BLAKE2B 9712118339593edd6c3cc1321ffa3d60f9f986abecc858d0709a0ddd1600a00620b26141300083dcfbc8ff699ae01a21340190cda04b276d146e93ccd1bfc6dc SHA512 365bda1be67745b6b40834a059f220351559e962df5f7254c80d363a04cc4beb092d20eaa357469d87f64c00fd3c6b2480693d7b1d734b0b42a75eb0ba687e34
 EBUILD gazebo-11.13.0.ebuild 1893 BLAKE2B 01d3b523ca6342fea4be572679cbee959da6dbe89084680786ef5e0edb655f6fa3051e69aedfbfd0f929f41211447029b59021d31c22fe3ead1a07e803d57467 SHA512 e2f5973099b478942089d2863d2751ee7b47bf46db4ae0730cd3a765af3e484ef63c5c5df5d41c99eb32b47acf7775f6818cb70befad0e7a65c54bd27e6b75de
-EBUILD gazebo-11.14.0.ebuild 1889 BLAKE2B 3a93b2d82c4b27fe9b96d69ab240e17527f6c6403a47bcb4adf358c7cd04120a1bf46c14d688999235e83c4c94dd6118350432a7fd45acd4edd4b4d166a2a345 SHA512 737f583f700b81958735c1b15ce62371a48ee581e7ccf7ad49ee9472469e0ed0e98e1a05044ceb87aa0df9d10d45824c17aa038339433dcfea928ac466e93914
+EBUILD gazebo-11.14.0.ebuild 1916 BLAKE2B b5e41c3f385ee395db832507c3291f686975fce153529474462de239819649f7c068e3f72c0809669a3bb0a8937dc872278a09ac35ed2b67783dcc7aa040407b SHA512 7badc98f3bdf760f5d0df8a312e9b67e5be26c85b5fafa53247f27b1f1110f6b36c64c6b6b01651e1143d5e2e2b8b8478611833312f44ffd3f3b4463cf155bab
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/sci-electronics/gazebo/files/boost.patch b/sci-electronics/gazebo/files/boost.patch
new file mode 100644
index 000000000000..56f26387c58c
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost.patch
@@ -0,0 +1,49 @@
+From 6b4d0f0b94cb2d98e6a48970c1c128e9b4f13e47 Mon Sep 17 00:00:00 2001
+From: Steve Peters <scpeters@openrobotics.org>
+Date: Fri, 10 May 2024 15:39:02 +0200
+Subject: [PATCH 1/2] Fix build with boost 1.85.0
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ gazebo/common/Console.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gazebo/common/Console.cc b/gazebo/common/Console.cc
+index 6b86bc2d02..bb4dbe3180 100644
+--- a/gazebo/common/Console.cc
++++ b/gazebo/common/Console.cc
+@@ -221,7 +221,7 @@ void FileLogger::Init(const std::string &_prefix, const std::string &_filename)
+   if (boost::filesystem::is_directory(logPath))
+     this->logDirectory = logPath.string();
+   else
+-    this->logDirectory = logPath.branch_path().string();
++    this->logDirectory = logPath.parent_path().string();
+ }
+ 
+ /////////////////////////////////////////////////
+
+From 27c2277a2376f9d82755e975ae8b564d9d6ca6ed Mon Sep 17 00:00:00 2001
+From: Steve Peters <scpeters@openrobotics.org>
+Date: Fri, 10 May 2024 17:43:32 +0200
+Subject: [PATCH 2/2] Fix build error in LogPlay.cc as well
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ gazebo/util/LogPlay.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gazebo/util/LogPlay.cc b/gazebo/util/LogPlay.cc
+index 70cfcc3346..be00820edb 100644
+--- a/gazebo/util/LogPlay.cc
++++ b/gazebo/util/LogPlay.cc
+@@ -414,8 +414,8 @@ common::Time LogPlay::LogEndTime() const
+ /////////////////////////////////////////////////
+ std::string LogPlay::Filename() const
+ {
+-  return boost::filesystem::basename(this->dataPtr->filename) +
+-    boost::filesystem::extension(this->dataPtr->filename);
++  boost::filesystem::path path(this->dataPtr->filename);
++  return path.stem().string() + path.extension().string();
+ }
+ 
+ /////////////////////////////////////////////////
diff --git a/sci-electronics/gazebo/gazebo-11.14.0.ebuild b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
index 1746085d2235..04caee69b302 100644
--- a/sci-electronics/gazebo/gazebo-11.14.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}/qwt2.patch"
 	"${FILESDIR}/cmake.patch"
 	"${FILESDIR}/gv10.patch"
+	"${FILESDIR}/boost.patch"
 )
 
 src_configure() {