gentoo auto-resync : 10:01:2025 - 06:41:30

4 files changed, 285 insertions, 0 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 2e0ab2b2815c..77bc9a84162b 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 28f67c6599fc..c3afb598e4ec 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,11 +1,14 @@
 AUX boost.patch 1851 BLAKE2B b05a0397ec6cd16d910c3edfa636d31959daea0992c56cfe67030ffe49a8462ddf20ce4a0d205c711ec0eedfe591381e342d3aacf5ddedb81ed49058a8436f93 SHA512 d1c4a4359e0f1719f8793bd65388cf2ac77494685e12dca6872c145dbea9abc1866375b171720937f9290d3c435c47254c37d6b26210a388069c55ef59007f8d
 AUX boost186.patch 794 BLAKE2B 341d0636232511ae5d437a9806823a09bc107f2c89c04ac159871584c7eb773d638b43dd681b597712786935e9f95d5f8658dd58b2917e4fdd6dfbad8fdb53f0 SHA512 821ba11dfafed69d3f964e393cc829230594ab5be04d756ff834ac43b02734cc2105fbdb4ae8bc3e7207c72ee3d63a699a6d7d9af9c5f0e897e506de5d4b8206
+AUX boost187.patch 7727 BLAKE2B 861d4efb46f766d4f3fd3f844bfd65a86518187aaa8375900775e6296b5179774cc619f817b18d5e257cceb2703b97ba7e294dcca96b34e5c078df59c077692b SHA512 58b1aa3e1414f077798f1ec9d7dcc76c9fb3b21cc345bee393a0b7b755c7120190cdca9708c23e7d1d18fec0c8023e2f85348c416e725be83de9e98ffb00ebfb
 AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
 AUX gv10.patch 1617 BLAKE2B 2fee9681e2f2f67e6a52bef75fc7c56217a4c57c8136e4b27ace7ba49c520161c2f15a1a73035822244b321b0f6b15c0af9c67254076e6168b4cc8624334e81d SHA512 3c3b8a08d212c5f93e85577ea043107e6008ebd85631951cd7ed6767a22be2b807b87b1cfce3f13f66d936ea53cf1eb14a4c067d1f444d2cd7e35462bb1f27bc
 AUX protobuf.patch 8899 BLAKE2B c8d181250926a7b22aa67e17b1e38b9713c50578458452d02b9af89400d4194f31808563709cbfc81fdb4709ee57032fbb77d26ff413bc069a5dc0407a57146b SHA512 eb36f0000204788ad9fa40d8fcdc0fcb6fc8d27489c5bae3cc12e910a7046936ed1d6adc23b3498060ee6da380df5f238bde17b699b3c3b0eec9f1c75a6c07e9
 AUX qwt2.patch 592 BLAKE2B 77c1f9ffa4e1754d8f6bcbd7eff2dfa470abb2c265fb44a4d8a652d0be85b0f337fea7c8786b1f52ecf285a1b78d61238ce61a0d28ca2895d21b700ed3890585 SHA512 16e0c25c13985badc1f4870e02d35d9d72c3006abcc8ae736327b88b15323c2c52892a3d76c5a745b46f512b5f2b2bebd70e390bec2515d954a47e4a08c94792
 DIST gazebo-11.13.0.tar.bz2 56636967 BLAKE2B 7c0ef875711e832a213631d97584edc2300d25be6d538d6f2ac782ab279b6518e1fb7c59d895a1c7b92fbaec46bb0e7c505afb34f05ab2eece016f5bd15a7c3f SHA512 a77ce4a02f723c615738d11a13aa10fa5124705bc9ca95153477d8df25b296eef7d442769379d3888a9ba0f04c1e5a3e38d686e7b5eef393b91bdc78f792c390
 DIST gazebo-11.14.0.tar.bz2 56640328 BLAKE2B 9712118339593edd6c3cc1321ffa3d60f9f986abecc858d0709a0ddd1600a00620b26141300083dcfbc8ff699ae01a21340190cda04b276d146e93ccd1bfc6dc SHA512 365bda1be67745b6b40834a059f220351559e962df5f7254c80d363a04cc4beb092d20eaa357469d87f64c00fd3c6b2480693d7b1d734b0b42a75eb0ba687e34
+DIST gazebo-11.15.1.tar.bz2 111639491 BLAKE2B 1a97fd04980310ed8e775c5ba8aa36af6d60ea0235c467ade763a4d7cb2ca72008bae2299c73018f89b0d5b12c23f3663948fd0a5c91b58a3cf235b49ffaa975 SHA512 085bd71f2495d86752274c02578d4e30d49f4e35dc91226ad11242f0cc5129f98686dfbae83120d228036d2034beb21b9cd1be91505a48d4ccc757d19cecb111
 EBUILD gazebo-11.13.0.ebuild 1893 BLAKE2B 01d3b523ca6342fea4be572679cbee959da6dbe89084680786ef5e0edb655f6fa3051e69aedfbfd0f929f41211447029b59021d31c22fe3ead1a07e803d57467 SHA512 e2f5973099b478942089d2863d2751ee7b47bf46db4ae0730cd3a765af3e484ef63c5c5df5d41c99eb32b47acf7775f6818cb70befad0e7a65c54bd27e6b75de
 EBUILD gazebo-11.14.0.ebuild 1946 BLAKE2B 4835978994e711666ca4fd40d9046ec8458cee3a07ea9967224c91807658cd9fdc4d0f0ff9635c01739a34d9d951863cfef0a05859b02098ab257ec06a1a7821 SHA512 41d1fd8291bc7eaee1961b3608ad6dbe52eafb40ed9b7237885b5e3b15d9cdc170f3eee446a3447ba8aa01322cd6bbb2ca71b6dc45320197764ea5a1fcf9ffdf
+EBUILD gazebo-11.15.1.ebuild 1893 BLAKE2B 7e1e238bac3fd139cce1615e746fa26d2f7d3b7076f9f2165362f6c5badf92cbe59b75fb9e99182b0fe3ec2718c5ce8456072bf49b46c140140bfbb1e79645b0 SHA512 a6918b5c12f842c6e43a32e15d661edfb6443e9352a11c9d2230b6a24d8b5c41277b063771f48f807eb29fb5168700023169c97c1f309363883d18bcc0443012
 MISC metadata.xml 339 BLAKE2B 2e86aa36f341e7c650a7af81354fdbd8fffc63558877ea4a226e8d4bf6a9b4eceb14339ed2e2131fde619fef2f655c75a847bc2a671c71430b6aa19051dec34a SHA512 d19331593693ad389d6956bdbc5e3129f67d9bd417e0fc98cbb00130d6e2d1f0674d77387151830ecf2168bb1c09da56e5ffad05fadba3b6b16769ce3c96ddad
diff --git a/sci-electronics/gazebo/files/boost187.patch b/sci-electronics/gazebo/files/boost187.patch
new file mode 100644
index 000000000000..30fe4a82fa4d
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost187.patch
@@ -0,0 +1,198 @@
+Index: gazebo-11.15.1/gazebo/transport/Connection.cc
+===================================================================
+--- gazebo-11.15.1.orig/gazebo/transport/Connection.cc
++++ gazebo-11.15.1/gazebo/transport/Connection.cc
+@@ -73,7 +73,7 @@ IOManager *Connection::iomanager = NULL;
+ // is stolen from adress::is_unspecified function in boost v1.52.
+ static bool addressIsUnspecified(const boost::asio::ip::address_v4 &_addr)
+ {
+-  return _addr.to_ulong() == 0;
++  return _addr.to_uint() == 0;
+ }
+ 
+ // Version 1.52 of boost has an address::is_loopback function, but
+@@ -81,7 +81,7 @@ static bool addressIsUnspecified(const b
+ // is stolen from adress::is_loopback function in boost v1.52.
+ static bool addressIsLoopback(const boost::asio::ip::address_v4 &_addr)
+ {
+-  return (_addr.to_ulong() & 0xFF000000) == 0x7F000000;
++  return (_addr.to_uint() & 0xFF000000) == 0x7F000000;
+ }
+ 
+ //////////////////////////////////////////////////
+@@ -151,15 +151,15 @@ bool Connection::Connect(const std::stri
+     host = _host.substr(7, _host.size() - 7);
+ 
+   // Resolve the host name into an IP address
+-  boost::asio::ip::tcp::resolver::iterator end;
+   boost::asio::ip::tcp::resolver resolver(iomanager->GetIO());
+-  boost::asio::ip::tcp::resolver::query query(host, service,
++
++  auto res = resolver.resolve(host, service,
+       boost::asio::ip::resolver_query_base::numeric_service);
+-  boost::asio::ip::tcp::resolver::iterator endpointIter;
++  auto endpointIter = res.begin();
++  auto end = res.end();
+ 
+   try
+   {
+-    endpointIter = resolver.resolve(query);
+ 
+     // Find the first valid IPv4 address
+     for (; endpointIter != end &&
+@@ -690,9 +690,9 @@ boost::asio::ip::tcp::endpoint Connectio
+   if (hostname && !std::string(hostname).empty())
+   {
+     boost::asio::ip::tcp::resolver resolver(iomanager->GetIO());
+-    boost::asio::ip::tcp::resolver::query query(hostname, "");
+-    boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(query);
+-    boost::asio::ip::tcp::resolver::iterator end;
++    auto res = resolver.resolve(hostname, "");
++    auto iter = res.begin();
++    auto end = res.end();
+ 
+     // Loop through the results, and stop at the first valid address.
+     while (iter != end)
+@@ -724,7 +724,7 @@ boost::asio::ip::tcp::endpoint Connectio
+             << "] is invalid. We will still try to use it, be warned.\n";
+     }
+ 
+-    address = boost::asio::ip::address_v4::from_string(ip);
++    address = boost::asio::ip::make_address_v4(ip);
+   }
+ 
+   // Try to automatically find a valid address if GAZEBO_IP and
+@@ -774,7 +774,7 @@ boost::asio::ip::tcp::endpoint Connectio
+         if (!ValidateIP(host))
+           continue;
+ 
+-        address = boost::asio::ip::address_v4::from_string(host);
++        address = boost::asio::ip::make_address_v4(host);
+ 
+         // Also make sure that the IP address is not a loopback interface.
+         if (!addressIsLoopback(address))
+@@ -868,7 +868,7 @@ boost::asio::ip::tcp::endpoint Connectio
+       "but will almost certainly not work if you have remote processes."
+       "Report to the disc-zmq development team to seek a fix." << std::endl;
+   }
+-  address = boost::asio::ip::address_v4::from_string(retAddr);
++  address = boost::asio::ip::make_address_v4(retAddr);
+ #endif
+   }
+ 
+@@ -923,8 +923,9 @@ std::string Connection::GetHostname(boos
+   else
+   {
+     boost::asio::ip::tcp::resolver resolver(iomanager->GetIO());
+-    boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(_ep);
+-    boost::asio::ip::tcp::resolver::iterator end;
++    auto res = resolver.resolve(_ep);
++    auto iter = res.begin();
++    auto end = res.end();
+ 
+     while (iter != end)
+     {
+@@ -950,7 +951,7 @@ std::string Connection::GetLocalHostname
+ 
+ //////////////////////////////////////////////////
+ void Connection::OnConnect(const boost::system::error_code &_error,
+-    boost::asio::ip::tcp::resolver::iterator /*_endPointIter*/)
++    boost::asio::ip::tcp::resolver::results_type::iterator /*_endPointIter*/)
+ {
+   // This function is called when a connection is successfully (or
+   // unsuccessfully) established.
+Index: gazebo-11.15.1/gazebo/transport/Connection.hh
+===================================================================
+--- gazebo-11.15.1.orig/gazebo/transport/Connection.hh
++++ gazebo-11.15.1/gazebo/transport/Connection.hh
+@@ -409,7 +409,7 @@ namespace gazebo
+       /// \param[in] _error Error code thrown during connection
+       /// \param[in] _endPointIter Pointer to resolver iterator
+       private: void OnConnect(const boost::system::error_code &_error,
+-                  boost::asio::ip::tcp::resolver::iterator _endPointIter);
++                  boost::asio::ip::tcp::resolver::results_type::iterator _endPointIter);
+ 
+       /// \brief Socket pointer
+       private: boost::asio::ip::tcp::socket *socket;
+Index: gazebo-11.15.1/gazebo/transport/IOManager.cc
+===================================================================
+--- gazebo-11.15.1.orig/gazebo/transport/IOManager.cc
++++ gazebo-11.15.1/gazebo/transport/IOManager.cc
+@@ -17,6 +17,7 @@
+ #include <atomic>
+ #include <boost/bind/bind.hpp>
+ #include <boost/thread/thread.hpp>
++#include <boost/asio/executor_work_guard.hpp>
+ #include <iostream>
+ #include "gazebo/transport/IOManager.hh"
+ 
+@@ -28,10 +29,10 @@ namespace transport
+ class IOManagerPrivate
+ {
+   /// \brief IO service.
+-  public: boost::asio::io_service *io_service = nullptr;
++  public: boost::asio::io_context *io_service = nullptr;
+ 
+   /// \brief Use io_service::work to keep the io_service running in thread.
+-  public: boost::asio::io_service::work *work = nullptr;
++  //public: boost::asio::executor_work_guard<boost::asio::io_context> work;
+ 
+   /// \brief Reference count of connections using this IOManager.
+   public: std::atomic_int count;
+@@ -44,12 +45,11 @@ class IOManagerPrivate
+ IOManager::IOManager()
+   : dataPtr(new IOManagerPrivate)
+ {
+-  this->dataPtr->io_service = new boost::asio::io_service;
+-  this->dataPtr->work = new boost::asio::io_service::work(
+-      *this->dataPtr->io_service);
++  this->dataPtr->io_service = new boost::asio::io_context;
++  //this->dataPtr->work = boost::asio::make_work_guard(*this->dataPtr->io_service);
+   this->dataPtr->count = 0;
+   this->dataPtr->thread = new boost::thread(boost::bind(
+-      &boost::asio::io_service::run, this->dataPtr->io_service));
++      &boost::asio::io_context::run, this->dataPtr->io_service));
+ }
+ 
+ /////////////////////////////////////////////////
+@@ -57,9 +57,6 @@ IOManager::~IOManager()
+ {
+   this->Stop();
+ 
+-  delete this->dataPtr->work;
+-  this->dataPtr->work = nullptr;
+-
+   delete this->dataPtr->io_service;
+   this->dataPtr->io_service = nullptr;
+ 
+@@ -70,7 +67,7 @@ IOManager::~IOManager()
+ /////////////////////////////////////////////////
+ void IOManager::Stop()
+ {
+-  this->dataPtr->io_service->reset();
++  this->dataPtr->io_service->restart();
+   this->dataPtr->io_service->stop();
+   if (this->dataPtr->thread)
+   {
+@@ -81,7 +78,7 @@ void IOManager::Stop()
+ }
+ 
+ /////////////////////////////////////////////////
+-boost::asio::io_service &IOManager::GetIO()
++boost::asio::io_context &IOManager::GetIO()
+ {
+   return *this->dataPtr->io_service;
+ }
+Index: gazebo-11.15.1/gazebo/transport/IOManager.hh
+===================================================================
+--- gazebo-11.15.1.orig/gazebo/transport/IOManager.hh
++++ gazebo-11.15.1/gazebo/transport/IOManager.hh
+@@ -42,7 +42,7 @@ namespace gazebo
+ 
+       /// \brief Get handle to boost::asio IO service
+       /// \return Handle to boost::asio IO service
+-      public: boost::asio::io_service &GetIO();
++      public: boost::asio::io_context &GetIO();
+ 
+       /// \brief Increment the event count by 1
+       public: void IncCount();
diff --git a/sci-electronics/gazebo/gazebo-11.15.1.ebuild b/sci-electronics/gazebo/gazebo-11.15.1.ebuild
new file mode 100644
index 000000000000..d5dea1bebd8b
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.15.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="https://gazebosim.org/home"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/11"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/protobuf-2:=
+	virtual/opengl
+	media-libs/openal
+	net-misc/curl
+	dev-libs/tinyxml
+	>=dev-libs/tinyxml2-6:=
+	dev-libs/libtar
+	dev-cpp/tbb:=
+	>=dev-games/ogre-1.7.4:=[freeimage]
+	<dev-games/ogre-1.10
+	>=media-libs/freeimage-3.15.4[png]
+	sci-libs/libccd
+	>=media-video/ffmpeg-2.6:0=
+	sci-libs/gts
+	>=sci-physics/bullet-2.82:=
+	>=dev-libs/sdformat-9.8:=
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-libs/boost:=
+	sci-libs/gdal:=
+	virtual/libusb:1
+	dev-libs/libspnav
+	media-libs/freeimage
+	sci-libs/hdf5:=[cxx]
+	sys-apps/util-linux
+	>=media-gfx/graphviz-4
+	net-libs/ignition-msgs:5=
+	sci-libs/ignition-math:6=
+	net-libs/ignition-transport:8=
+	sci-libs/ignition-common:3=
+	sci-libs/ignition-fuel-tools:4=
+	x11-libs/qwt:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	x11-apps/mesa-progs
+	test? ( dev-libs/libxslt )
+"
+BDEPEND="
+	app-text/ronn-ng
+	app-arch/gzip
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+	"${FILESDIR}/qwt2.patch"
+	"${FILESDIR}/cmake.patch"
+	"${FILESDIR}/boost187.patch"
+)
+
+src_configure() {
+	# find OGRE properly
+	sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
+
+	local mycmakeargs=(
+		"-DUSE_UPSTREAM_CFLAGS=OFF"
+		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+		"-DUSE_HOST_CFLAGS=FALSE"
+		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
+		"-DENABLE_SCREEN_TESTS=FALSE"
+		"-DUSE_EXTERNAL_TINYXML2=TRUE"
+	)
+	cmake_src_configure
+}