gentoo resync : 25.11.2020

5 files changed, 3 insertions, 100 deletions

diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index de84df2ca95d..a9631c8e32f3 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,7 +1,4 @@
-AUX boost173.patch 3035 BLAKE2B 3ce759d081ebaaab9e10b838515ffe41d3e5c3925e995379fe768030e1a308f3531aea70c97aa0b761fd9531ec18fb054a7b1f4ff0ad3f522a4e28a7165f7571 SHA512 6b263429c7172189e4d341a1e0471d70de419d3c694bcd09549d057fd8568facd30b46a2adbb66f0cb5216333225ed5db5752be4ebc17980e2080312031c7409
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-EBUILD roscpp-1.15.7.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
-EBUILD roscpp-1.15.8.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
-EBUILD roscpp-9999.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
+EBUILD roscpp-1.15.9.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
+EBUILD roscpp-9999.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/files/boost173.patch b/dev-ros/roscpp/files/boost173.patch
deleted file mode 100644
index d31f8c8ff246..000000000000
--- a/dev-ros/roscpp/files/boost173.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: roscpp/include/ros/timer_manager.h
-===================================================================
---- roscpp.orig/include/ros/timer_manager.h
-+++ roscpp/include/ros/timer_manager.h
-@@ -349,7 +349,7 @@ int32_t TimerManager<T, D, E>::add(const
-     {
-       boost::mutex::scoped_lock lock(waiting_mutex_);
-       waiting_.push_back(info->handle);
--      waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
-+      waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
-     }
- 
-     new_timer_ = true;
-@@ -416,7 +416,7 @@ void TimerManager<T, D, E>::schedule(con
- 
-     waiting_.push_back(info->handle);
-     // waitingCompare requires a lock on the timers_mutex_
--    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
-+    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
-   }
- 
-   new_timer_ = true;
-@@ -490,7 +490,7 @@ void TimerManager<T, D, E>::setPeriod(in
-     // In this case, let next_expected be updated only in updateNext
-     
-     info->period = period;
--    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
-+    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
-   }
- 
-   new_timer_ = true;
-Index: roscpp/src/libros/connection_manager.cpp
-===================================================================
---- roscpp.orig/src/libros/connection_manager.cpp
-+++ roscpp/src/libros/connection_manager.cpp
-@@ -66,7 +66,7 @@ void ConnectionManager::start()
-   tcpserver_transport_ = boost::make_shared<TransportTCP>(&poll_manager_->getPollSet());
-   if (!tcpserver_transport_->listen(network::getTCPROSPort(), 
- 				    MAX_TCPROS_CONN_QUEUE, 
--				    boost::bind(&ConnectionManager::tcprosAcceptConnection, this, _1)))
-+				    boost::bind(&ConnectionManager::tcprosAcceptConnection, this, boost::placeholders::_1)))
-   {
-     ROS_FATAL("Listen on port [%d] failed", network::getTCPROSPort());
-     ROS_BREAK();
-@@ -142,7 +142,7 @@ void ConnectionManager::addConnection(co
-   boost::mutex::scoped_lock lock(connections_mutex_);
- 
-   connections_.insert(conn);
--  conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, _1));
-+  conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, boost::placeholders::_1));
- }
- 
- void ConnectionManager::onConnectionDropped(const ConnectionPtr& conn)
-@@ -190,7 +190,7 @@ void ConnectionManager::tcprosAcceptConn
-   ConnectionPtr conn(boost::make_shared<Connection>());
-   addConnection(conn);
- 
--  conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, _1, _2));
-+  conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, boost::placeholders::_1, boost::placeholders::_2));
- }
- 
- bool ConnectionManager::onConnectionHeaderReceived(const ConnectionPtr& conn, const Header& header)
diff --git a/dev-ros/roscpp/roscpp-1.15.8.ebuild b/dev-ros/roscpp/roscpp-1.15.8.ebuild
deleted file mode 100644
index 8863bf3d38b4..000000000000
--- a/dev-ros/roscpp/roscpp-1.15.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/roscpp/roscpp-1.15.7.ebuild b/dev-ros/roscpp/roscpp-1.15.9.ebuild
index 8863bf3d38b4..033a2eb87fd0 100644
--- a/dev-ros/roscpp/roscpp-1.15.7.ebuild
+++ b/dev-ros/roscpp/roscpp-1.15.9.ebuild
@@ -27,4 +27,3 @@ RDEPEND="
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/roscpp/roscpp-9999.ebuild b/dev-ros/roscpp/roscpp-9999.ebuild
index 8863bf3d38b4..033a2eb87fd0 100644
--- a/dev-ros/roscpp/roscpp-9999.ebuild
+++ b/dev-ros/roscpp/roscpp-9999.ebuild
@@ -27,4 +27,3 @@ RDEPEND="
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost173.patch" )