gentoo resync : 06.08.2019

8 files changed, 75 insertions, 161 deletions

diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
index 5e8a2cf69384..42c604f67fd1 100644
--- a/dev-ros/rosserial_server/Manifest
+++ b/dev-ros/rosserial_server/Manifest
@@ -1,13 +1,5 @@
-AUX boost162.patch 2859 BLAKE2B f8555ab6ed3adf3062061b1d226a9ce79d51769021db54d345fc2d6759cda50a72da3333ce4fbd19ea1a5e085e8cde0ebe169c5bca6b509e2508cf8da658b9b6 SHA512 81ce80b1c72f39fc8edf5859564f1c470c5f1cb89b6d1f032f7ea155b099ca1736a04d6e5f3110fc3ba95dc23c37c625718fe6a588d36166ba3605a69042dc71
-DIST rosserial-0.7.4.tar.gz 150244 BLAKE2B 57cc4711f42506587cc6e004f321fe4f4f1ba4e1843a3370ecc50ccb7a26912a4896b31351afaa8e3a02fa07fe7d2b0bb705d248b5a39925873df76c195aaa1f SHA512 a3b9590aeac0a557bee7fa2aa4b561f2dd83dcaff9033425c77cdeca572f4a4ba8fc30b21a3cd035e454e4997d99f9e6541d54739aa9051b9e22d84710e10e00
-DIST rosserial-0.7.5.tar.gz 150687 BLAKE2B 08026b17b08747fd9b1e23a693349f30ff8406cc50f0bd0c949b9367a2b8845b821d69d25e3d35ce9e552e9aa423471e62399ef95c17e35849fcfd858eae6d75 SHA512 3c9ce00b3d95f6d29360aee3b45cb35339ba8646f0f43f64cf1c3f2e77a7c9edbb4f85b761a21a0a3e73cdd064a59c98f997f408a6e8526641499420a94c8a36
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
+AUX boost170.patch 2996 BLAKE2B d34ed939d222fa4d9528e8e6a7f3aaa90ebea944e651f7f25d4f254fec3e3b2c655f242fba7e00e315f54f8eb518309ea8f52de2a29c14d2dcdd5ec5c70c1a56 SHA512 4f0742061fdee931c5a934d5816e801bff30664e3a28e3970bf9e3636c2d8a562ff283a246b83bbabf7e4dfa755964e03c6a5b07d7d667583831cd3b6ed67fcc
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_server-0.7.4.ebuild 518 BLAKE2B b455a5a1762eefcad84069783614f93c3ecfde49c3053a77d5177fbea4c267b384a1b0ced72420a694e42cc68d5140f28c65a8fc8db107597773f10fa30b021a SHA512 3f80d6d50ee1b1db6cff6894afe8a6ccccdd3b0381132d21307244a61a94265651cf9cd68ab2504f29fc51d2d2431b0249848aa967d5f1ce01cfea3fee887931
-EBUILD rosserial_server-0.7.5.ebuild 477 BLAKE2B 79518fc245f624e1b74b34c87f21518f56ad4279536552b5daa6af93f6bada35ae2d8c3fb402da1b53306eb7726138b71fe67f8d7915cd7359de780404809c62 SHA512 f7fca26dec079fc7bd52b62ffb73da97e8b3b99fb88c32f25f675128883682f3fb536e129b9a3b2caa0283d5225025289992e6a882dcbc369941f499f56e1395
-EBUILD rosserial_server-0.7.6.ebuild 477 BLAKE2B fead5c5372a7d937149e60a5199b713f0f2c65be98e0543198e4762b300a9357f02030ff76587ca723da5f3856ab65e97810884c0a6741d3774d719be8224376 SHA512 bc3775b6682869c1818f0564913f4edaf12cfb25d5b1718ee5549ec9e6ac3153418442bf5a064ac29e18e59a8390d2ba379ba789a1aa6b77476ad1816f200330
-EBUILD rosserial_server-0.7.7.ebuild 477 BLAKE2B fead5c5372a7d937149e60a5199b713f0f2c65be98e0543198e4762b300a9357f02030ff76587ca723da5f3856ab65e97810884c0a6741d3774d719be8224376 SHA512 bc3775b6682869c1818f0564913f4edaf12cfb25d5b1718ee5549ec9e6ac3153418442bf5a064ac29e18e59a8390d2ba379ba789a1aa6b77476ad1816f200330
-EBUILD rosserial_server-0.8.0.ebuild 474 BLAKE2B ead1281a9d9b0623bb781bf19314fef704fd23b68a3faaf0e86f2c3405751fc6a1f65987e3248f99774761b1bc5bff9c2ca44e03b1ad601255420c365f7fef2f SHA512 0debfa6c14ea2f1a2d4b21a605e4eebf6b50078d7b59edad0aadba2b647f9729bfbe939f29d26e3f3b7f4e44a5b87533b79711604283c40d78be69d7acc43c0f
+EBUILD rosserial_server-0.8.0.ebuild 515 BLAKE2B c3d7da30d2933a83dfc9f848cf1aa559249fa145a30be06b22afdce081e0926eeaf673e3be56f05a2056f8944461fdd3be637c0d390fb07a540b388e378686cf SHA512 a95d1df1ca5f73613d82946bce7053ca77308b91677a6cd4ebfd52a67226994faa771f4b025b0334b15f174a533a6bfb5fc75cd8cf562f796839f6e77a879b27
 EBUILD rosserial_server-9999.ebuild 477 BLAKE2B 9b3dc301b81032dd2a4d9d5046f5659d2531cd94283dde61fe0dc634fc4a60300bd90298334c7168f7c8c7ec5fb0e32856cb2f788974f127e08e6a2243faee9b SHA512 be9ca28d3ce9c5e13a57fc8c3fed5f6e8a3a6decd61d504486034638332b5ed666fb4512c833f6eb9b0e01b866cd2d39c6183d501e47d12fa877057b254568f0
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_server/files/boost162.patch b/dev-ros/rosserial_server/files/boost162.patch
deleted file mode 100644
index d644d409f9e6..000000000000
--- a/dev-ros/rosserial_server/files/boost162.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit f8a46f3142444c854233a85f7a5ec7b91b5378a6
-Author: Malte Splietker <splietker@users.noreply.github.com>
-Date:   Wed Oct 5 04:26:00 2016 +0200
-
-    Fixing build errors for boost >=1.60 (#226) (#250)
-    
-    Signed-off-by: Malte Splietker <maltespl@mail.upb.de>
-
-diff --git a/rosserial_server/include/rosserial_server/session.h b/rosserial_server/include/rosserial_server/session.h
-index 86b9baa..ebd109a 100644
---- a/rosserial_server/include/rosserial_server/session.h
-+++ b/rosserial_server/include/rosserial_server/session.h
-@@ -499,7 +499,7 @@ private:
-   boost::asio::deadline_timer ros_spin_timer_;
-   std::string require_param_name_;
- 
--  std::map<uint16_t, boost::function<void(ros::serialization::IStream)> > callbacks_;
-+  std::map<uint16_t, boost::function<void(ros::serialization::IStream&)> > callbacks_;
-   std::map<uint16_t, PublisherPtr> publishers_;
-   std::map<uint16_t, SubscriberPtr> subscribers_;
-   std::map<std::string, ServiceClientPtr> services_;
-diff --git a/rosserial_server/include/rosserial_server/topic_handlers.h b/rosserial_server/include/rosserial_server/topic_handlers.h
-index 666f3fc..2f367c3 100644
---- a/rosserial_server/include/rosserial_server/topic_handlers.h
-+++ b/rosserial_server/include/rosserial_server/topic_handlers.h
-@@ -93,7 +93,7 @@ typedef boost::shared_ptr<Publisher> PublisherPtr;
- class Subscriber {
- public:
-   Subscriber(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info,
--      boost::function<void(std::vector<uint8_t> buffer)> write_fn)
-+      boost::function<void(std::vector<uint8_t>& buffer)> write_fn)
-     : write_fn_(write_fn) {
-     ros::SubscribeOptions opts;
-     opts.init<topic_tools::ShapeShifter>(
-@@ -119,7 +119,7 @@ private:
-   }
- 
-   ros::Subscriber subscriber_;
--  boost::function<void(std::vector<uint8_t> buffer)> write_fn_;
-+  boost::function<void(std::vector<uint8_t>& buffer)> write_fn_;
- };
- 
- typedef boost::shared_ptr<Subscriber> SubscriberPtr;
-@@ -127,7 +127,7 @@ typedef boost::shared_ptr<Subscriber> SubscriberPtr;
- class ServiceClient {
- public:
-   ServiceClient(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info,
--      boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn)
-+      boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn)
-     : write_fn_(write_fn) {
-     topic_id_ = -1;
-     if (!service_info_service_.isValid()) {
-@@ -185,7 +185,7 @@ private:
-   topic_tools::ShapeShifter response_message_;
-   ros::ServiceClient service_client_;
-   static ros::ServiceClient service_info_service_;
--  boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn_;
-+  boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn_;
-   std::string service_md5_;
-   std::string request_message_md5_;
-   std::string response_message_md5_;
diff --git a/dev-ros/rosserial_server/files/boost170.patch b/dev-ros/rosserial_server/files/boost170.patch
new file mode 100644
index 000000000000..cbf106fc9acd
--- /dev/null
+++ b/dev-ros/rosserial_server/files/boost170.patch
@@ -0,0 +1,71 @@
+Index: rosserial_server/include/rosserial_server/async_read_buffer.h
+===================================================================
+--- rosserial_server.orig/include/rosserial_server/async_read_buffer.h
++++ rosserial_server/include/rosserial_server/async_read_buffer.h
+@@ -166,7 +166,7 @@ private:
+ 
+     // Post the callback rather than executing it here so, so that we have a chance to do the cleanup
+     // below prior to it actually getting run, in the event that the callback queues up another read.
+-    stream_.get_io_service().post(boost::bind(read_success_callback_, stream));
++    static_cast<boost::asio::io_service&>(stream_.get_executor().context()).post(boost::bind(read_success_callback_, stream));
+ 
+     // Resetting these values clears our state so that we know there isn't a callback pending.
+     read_requested_bytes_ = 0;
+Index: rosserial_server/include/rosserial_server/udp_stream.h
+===================================================================
+--- rosserial_server.orig/include/rosserial_server/udp_stream.h
++++ rosserial_server/include/rosserial_server/udp_stream.h
+@@ -48,7 +48,6 @@ namespace rosserial_server
+ {
+ 
+ using boost::asio::ip::udp;
+-using boost::asio::handler_type;
+ 
+ 
+ class UdpStream : public udp::socket
+@@ -62,9 +61,9 @@ public:
+   {
+     boost::system::error_code ec;
+     const protocol_type protocol = server_endpoint.protocol();
+-    this->get_service().open(this->get_implementation(), protocol, ec);
++    udp::socket::open(protocol, ec);
+     boost::asio::detail::throw_error(ec, "open");
+-    this->get_service().bind(this->get_implementation(), server_endpoint, ec);
++    bind(server_endpoint, ec);
+     boost::asio::detail::throw_error(ec, "bind");
+ 
+     client_endpoint_ = client_endpoint;
+@@ -76,6 +75,8 @@ public:
+   async_write_some(const ConstBufferSequence& buffers,
+       BOOST_ASIO_MOVE_ARG(WriteHandler) handler)
+   {
++    return async_send(buffers, handler);
++#if 0
+     // If you get an error on the following line it means that your handler does
+     // not meet the documented type requirements for a WriteHandler.
+     BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check;
+@@ -94,6 +95,7 @@ public:
+         this->get_implementation(), buffers, client_endpoint_, 0,
+         BOOST_ASIO_MOVE_CAST(WriteHandler)(handler));
+ #endif
++#endif
+   }
+ 
+   template <typename MutableBufferSequence, typename ReadHandler>
+@@ -102,6 +104,8 @@ public:
+   async_read_some(const MutableBufferSequence& buffers,
+       BOOST_ASIO_MOVE_ARG(ReadHandler) handler)
+   {
++    return async_receive(buffers, handler);
++#if 0
+     // If you get an error on the following line it means that your handler does
+     // not meet the documented type requirements for a ReadHandler.
+     BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check;
+@@ -119,6 +123,7 @@ public:
+         this->get_implementation(), buffers, client_endpoint_, 0,
+         BOOST_ASIO_MOVE_CAST(ReadHandler)(handler));
+ #endif
++#endif
+   }
+ 
+ private:
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild
deleted file mode 100644
index da37baf0378a..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost162.patch" )
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.5.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.5.ebuild
deleted file mode 100644
index 305a25dc9b21..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.6.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.6.ebuild
deleted file mode 100644
index 813f62d5eb64..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.7.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.7.ebuild
deleted file mode 100644
index 813f62d5eb64..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild b/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
index 93bba24008f8..37c1c17be5dd 100644
--- a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
+++ b/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,3 +20,4 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )