gentoo resync : 28.04.2021

4 files changed, 7 insertions, 44 deletions

diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 36b517bde683..2f5385bafe5d 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,6 +1,4 @@
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD topic_tools-1.15.8.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
-EBUILD topic_tools-1.15.9.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
-EBUILD topic_tools-9999.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+EBUILD topic_tools-1.15.10-r1.ebuild 833 BLAKE2B de242b907f1063dec86baadb58aec99b1b1ece5027e253c24bb54207f172778bb5d2819392436fc68651a9715364c6bbe87dbbf9ae3e5122e7f60a15c4eafa64 SHA512 f44b083ee74d4dd855e0fa89c51bee534bb1c93508fb14189f2c1730ad638379c0ff0b0aa1fb508aea8e4d263eb10cb5e6310a043d55ec0b813f38fffd769e92
+EBUILD topic_tools-9999.ebuild 833 BLAKE2B de242b907f1063dec86baadb58aec99b1b1ece5027e253c24bb54207f172778bb5d2819392436fc68651a9715364c6bbe87dbbf9ae3e5122e7f60a15c4eafa64 SHA512 f44b083ee74d4dd855e0fa89c51bee534bb1c93508fb14189f2c1730ad638379c0ff0b0aa1fb508aea8e4d263eb10cb5e6310a043d55ec0b813f38fffd769e92
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/topic_tools-1.15.8.ebuild b/dev-ros/topic_tools/topic_tools-1.15.10-r1.ebuild
index 8c28b2e72861..56e95ed254bf 100644
--- a/dev-ros/topic_tools/topic_tools-1.15.8.ebuild
+++ b/dev-ros/topic_tools/topic_tools-1.15.10-r1.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
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rostime
 	dev-ros/xmlrpcpp
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
@@ -30,6 +29,7 @@ DEPEND="${RDEPEND}
 		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
 		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
diff --git a/dev-ros/topic_tools/topic_tools-1.15.9.ebuild b/dev-ros/topic_tools/topic_tools-1.15.9.ebuild
deleted file mode 100644
index 8c28b2e72861..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.15.9.ebuild
+++ /dev/null
@@ -1,35 +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=tools/${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
-		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/topic_tools/topic_tools-9999.ebuild b/dev-ros/topic_tools/topic_tools-9999.ebuild
index 8c28b2e72861..56e95ed254bf 100644
--- a/dev-ros/topic_tools/topic_tools-9999.ebuild
+++ b/dev-ros/topic_tools/topic_tools-9999.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
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rostime
 	dev-ros/xmlrpcpp
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
@@ -30,6 +29,7 @@ DEPEND="${RDEPEND}
 		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
 		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"