gentoo resync : 22.01.2021

5 files changed, 6 insertions, 212 deletions

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 4389cbf9f2b0..294db4c34b78 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,7 +1,5 @@
-AUX boost173.patch 7177 BLAKE2B 45b8b5bda4274727bf9e55ab5a7d3eb1ccc403a91f1a6988fb2f6cc3c02a13c1d7cb921a483d793d2f6cb78a23724407a33dc40a6bcadd77c0b9e1b7f104bef9 SHA512 a7caa36a35087db455e06bf745d4b4e2ba20ddc4396a6e6998b609a6c9f0d0806630d1c38bae6da6ef264a9a4cfa8219d39e8f54fb88f6a1cb8d7d0927e649fb
-AUX boost174.patch 554 BLAKE2B 71b9e37079cde717a26d3ea36e4551adac3f3017c05e95fc488b9d51e0ef6cf79780dc5a622dad2f209ce862e4fa56ddf40ee198002184bb80add36370918576 SHA512 38854c65ca67924a10add9164659d28ca84bc1f8f5e50e6bfe98231103330d4d74596fd9de1b4d2cc23658fedaafd171acec87d552f48609c9a62265a8eb4912
 AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
-AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
-DIST gazebo-11.1.0.tar.bz2 53856366 BLAKE2B 6e3df164e40c44265da68eae260012d873121631e56e9ae4ca3d8355e9c22ac80811549103e83d5f20d40f92c80f7a7a313c2395209b1c5177f518d0c0b2117c SHA512 39866991d8b996656a9f927a70e215175ecef671a1e317bfe9221df38bdc08be9825d36018da90cc6843480643a7716586ce8d61f36ffc8b4558ef7096ef6f76
-EBUILD gazebo-11.1.0-r1.ebuild 1897 BLAKE2B bd698c48be3d530f667b3e9ccbd10e8b83dd1666e2278a4723e5680ce17a26e7cc2ba5e6cf524a36dca2ab8219625199ec06309d53c88ea31be20a8afe4d26dd SHA512 12e26a463d9a7210e4e6a5b8497c48b8be5d97e3a9a2db7e8d82495cda9450a714fa20ba325ddec4f0c5da5ad371e17b9ad6b9c971fdd21648f60288be31b43d
+AUX qwt.patch 555 BLAKE2B f959e84dc5e144fd3dd35e6e6c7714507e1a4815495d41611198381165e386d135d334c4f3cb2293592abca72bbb16307b2e5a17d5903d4899c7fa2cd1790d5a SHA512 9a1138acd9bd5ce75a709d50dd585a17ca7d913d4cf37283d8db68e79fd08bf98ddd27ea5d2e459efac0a71df1369c83a67f6727419c0d26c0dd02f5a6ce22b8
+DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970
+EBUILD gazebo-11.3.0.ebuild 1870 BLAKE2B 97ef2feea9d27afc85eabdcd986009820340f98d2a434321558821b665dec17c26bd4f8a5bdd42aa054514b66d599a00d1c40cbe195f4cc45f740b823cee354c SHA512 fb7c20055c929c3221b7b04b13f13c9baa1a3e4d1c0551522068bae6e04df45fca0cf9511e5ff0b3d0cd48e9ccade5c6b50e6afe89c6d593eabe66f6a419f43e
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/boost173.patch b/sci-electronics/gazebo/files/boost173.patch
deleted file mode 100644
index 618f6f1b5349..000000000000
--- a/sci-electronics/gazebo/files/boost173.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Index: gazebo-11.0.0/gazebo/gui/model/ModelTreeWidget.cc
-===================================================================
---- gazebo-11.0.0.orig/gazebo/gui/model/ModelTreeWidget.cc
-+++ gazebo-11.0.0/gazebo/gui/model/ModelTreeWidget.cc
-@@ -162,7 +162,7 @@ ModelTreeWidget::ModelTreeWidget(QWidget
-   // Connections
-   this->connections.push_back(
-       gui::model::Events::ConnectSaveModel(
--      boost::bind(&ModelTreeWidget::OnSaveModel, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnSaveModel, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectNewModel(
-@@ -170,11 +170,11 @@ ModelTreeWidget::ModelTreeWidget(QWidget
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectModelPropertiesChanged(
--      boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, _1, _2)));
-+      boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectModelNameChanged(
--      boost::bind(&ModelTreeWidget::OnModelNameChanged, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnModelNameChanged, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectNestedModelInserted(
-@@ -183,51 +183,51 @@ ModelTreeWidget::ModelTreeWidget(QWidget
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectLinkInserted(
--      boost::bind(&ModelTreeWidget::OnLinkInserted, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnLinkInserted, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectJointInserted(
--      boost::bind(&ModelTreeWidget::OnJointInserted, this, _1, _2, _3, _4)));
-+      boost::bind(&ModelTreeWidget::OnJointInserted, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectModelPluginInserted(
--      boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectNestedModelRemoved(
--      boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectLinkRemoved(
--      boost::bind(&ModelTreeWidget::OnLinkRemoved, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnLinkRemoved, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectJointRemoved(
--      boost::bind(&ModelTreeWidget::OnJointRemoved, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnJointRemoved, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectModelPluginRemoved(
--      boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectJointNameChanged(
--      boost::bind(&ModelTreeWidget::OnJointNameChanged, this, _1, _2)));
-+      boost::bind(&ModelTreeWidget::OnJointNameChanged, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      event::Events::ConnectSetSelectedEntity(
--       boost::bind(&ModelTreeWidget::OnDeselectAll, this, _1, _2)));
-+       boost::bind(&ModelTreeWidget::OnDeselectAll, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedEntity(
--       boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, _1, _2)));
-+       boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedJoint(
--       boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, _1, _2)));
-+       boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedModelPlugin(
--     boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, _1, _2)));
-+     boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->ClearModelTree();
- }
-Index: gazebo-11.0.0/gazebo/gui/model/SchematicViewWidget.cc
-===================================================================
---- gazebo-11.0.0.orig/gazebo/gui/model/SchematicViewWidget.cc
-+++ gazebo-11.0.0/gazebo/gui/model/SchematicViewWidget.cc
-@@ -83,31 +83,31 @@ void SchematicViewWidget::Reset()
- void SchematicViewWidget::Init()
- {
-   this->connections.push_back(gui::model::Events::ConnectLinkInserted(
--      boost::bind(&SchematicViewWidget::AddNode, this, _1)));
-+      boost::bind(&SchematicViewWidget::AddNode, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(gui::model::Events::ConnectLinkRemoved(
--      boost::bind(&SchematicViewWidget::RemoveNode, this, _1)));
-+      boost::bind(&SchematicViewWidget::RemoveNode, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(gui::model::Events::ConnectJointInserted(
--      boost::bind(&SchematicViewWidget::AddEdge, this, _1, _2, _3, _4, _5)));
-+      boost::bind(&SchematicViewWidget::AddEdge, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5)));
- 
-   this->connections.push_back(gui::model::Events::ConnectJointRemoved(
--      boost::bind(&SchematicViewWidget::RemoveEdge, this, _1)));
-+      boost::bind(&SchematicViewWidget::RemoveEdge, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(gui::model::Events::ConnectJointChanged(
--      boost::bind(&SchematicViewWidget::UpdateEdge, this, _1, _2, _3, _4, _5)));
-+      boost::bind(&SchematicViewWidget::UpdateEdge, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5)));
- 
-   this->connections.push_back(
-      event::Events::ConnectSetSelectedEntity(
--       boost::bind(&SchematicViewWidget::OnDeselectAll, this, _1, _2)));
-+       boost::bind(&SchematicViewWidget::OnDeselectAll, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedEntity(
--       boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, _1, _2)));
-+       boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedJoint(
--       boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, _1, _2)));
-+       boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, boost::placeholders::_1, boost::placeholders::_2)));
- }
- 
- /////////////////////////////////////////////////
diff --git a/sci-electronics/gazebo/files/boost174.patch b/sci-electronics/gazebo/files/boost174.patch
deleted file mode 100644
index 82bbdf40f7a7..000000000000
--- a/sci-electronics/gazebo/files/boost174.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc
-===================================================================
---- gazebo-11.1.0.orig/plugins/SimpleTrackedVehiclePlugin.cc
-+++ gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc
-@@ -30,6 +30,7 @@
- 
- #include "plugins/SimpleTrackedVehiclePlugin.hh"
- 
-+#if BOOST_VERSION < 107400 || defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
- namespace std {
- template<class T>
- class hash<boost::shared_ptr<T>> {
-@@ -38,6 +39,7 @@ class hash<boost::shared_ptr<T>> {
-   }
- };
- }
-+#endif
- 
- namespace gazebo
- {
diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch
index d7bbce2f8cbe..d4f1538900bc 100644
--- a/sci-electronics/gazebo/files/qwt.patch
+++ b/sci-electronics/gazebo/files/qwt.patch
@@ -15,50 +15,3 @@ Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
    /usr/lib
    /usr/local/lib
    /usr/local/lib/qwt.framework
-Index: gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
-===================================================================
---- gazebo-8.0.0.orig/gazebo/gui/plot/qwt_gazebo.h
-+++ gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
-@@ -23,24 +23,24 @@
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wfloat-equal"
- 
--#include <qwt/qwt_curve_fitter.h>
--#include <qwt/qwt_legend.h>
--#include <qwt/qwt_painter.h>
--#include <qwt/qwt_picker_machine.h>
--#include <qwt/qwt_plot.h>
--#include <qwt/qwt_plot_canvas.h>
--#include <qwt/qwt_plot_curve.h>
--#include <qwt/qwt_plot_directpainter.h>
--#include <qwt/qwt_plot_grid.h>
--#include <qwt/qwt_plot_layout.h>
--#include <qwt/qwt_plot_magnifier.h>
--#include <qwt/qwt_plot_marker.h>
--#include <qwt/qwt_plot_panner.h>
--#include <qwt/qwt_plot_zoomer.h>
--#include <qwt/qwt_scale_engine.h>
--#include <qwt/qwt_scale_widget.h>
--#include <qwt/qwt_symbol.h>
--#include <qwt/qwt_plot_renderer.h>
-+#include <qwt6/qwt_curve_fitter.h>
-+#include <qwt6/qwt_legend.h>
-+#include <qwt6/qwt_painter.h>
-+#include <qwt6/qwt_picker_machine.h>
-+#include <qwt6/qwt_plot.h>
-+#include <qwt6/qwt_plot_canvas.h>
-+#include <qwt6/qwt_plot_curve.h>
-+#include <qwt6/qwt_plot_directpainter.h>
-+#include <qwt6/qwt_plot_grid.h>
-+#include <qwt6/qwt_plot_layout.h>
-+#include <qwt6/qwt_plot_magnifier.h>
-+#include <qwt6/qwt_plot_marker.h>
-+#include <qwt6/qwt_plot_panner.h>
-+#include <qwt6/qwt_plot_zoomer.h>
-+#include <qwt6/qwt_scale_engine.h>
-+#include <qwt6/qwt_scale_widget.h>
-+#include <qwt6/qwt_symbol.h>
-+#include <qwt6/qwt_plot_renderer.h>
- 
- #pragma clang diagnostic pop
- 
diff --git a/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild b/sci-electronics/gazebo/gazebo-11.3.0.ebuild
index 2bb213d040a5..e1a11ffee743 100644
--- a/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -64,14 +64,12 @@ BDEPEND="
 CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
 	"${FILESDIR}/qwt.patch"
-	"${FILESDIR}/boost173.patch"
 	"${FILESDIR}/cmake.patch"
-	"${FILESDIR}/boost174.patch"
 )
 
 src_configure() {
-	# doesnt build with as-needed
-	#append-ldflags "-Wl,--no-as-needed"
+	# find OGRE properly
+	sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
 
 	local mycmakeargs=(
 		"-DUSE_UPSTREAM_CFLAGS=OFF"