gentoo resync : 28.04.2021

4 files changed, 23 insertions, 23 deletions

diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index f45945b4eb1c..5a9d85d8368a 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,5 +1,4 @@
-AUX duplicates.patch 634 BLAKE2B a856eca55e0e293bd61054dfad52f95bee785eb70dcc32018104800241f960702c15547b52836e0080a7b3f46b5961af4ff0aea591cadf46500d64803b24c192 SHA512 e1bc63c9d765b41b6a42d033877ca4b5041729a7e6d19b747c6681b5c84d6e2a6197d8f2812f6243dbff86fc7ffbf6264a09e2f8935e8da1bfd9f92284e42a3e
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosmsg-1.15.9.ebuild 763 BLAKE2B ab90d989f27cd1a5fa81b9740f48b946466d7527cfe5b94f08cb61dcf36f49952633f8e274def64933d9dd8729ccc947b9f72669d7da9e5ec5cb9392eb3f3801 SHA512 8725f91c7f1a84507c46246af3efb01866f685ac10000b90ee8b32a648dac4c8c6bb0bdd3c162f9aae15baf597c07ceb07a437f7da0eb0614181f819f9de47f7
-EBUILD rosmsg-9999.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+EBUILD rosmsg-1.15.10.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
+EBUILD rosmsg-9999.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/files/duplicates.patch b/dev-ros/rosmsg/files/duplicates.patch
deleted file mode 100644
index 4705f00d2e85..000000000000
--- a/dev-ros/rosmsg/files/duplicates.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rosmsg/src/rosmsg/__init__.py
-===================================================================
---- rosmsg.orig/src/rosmsg/__init__.py
-+++ rosmsg/src/rosmsg/__init__.py
-@@ -618,7 +618,7 @@ def rosmsg_cmd_show(mode, full, alias='s
-         if '/' in arg: #package specified
-             rosmsg_debug(rospack, mode, arg, options.raw)
-         else:
--            found_msgs = list(rosmsg_search(rospack, mode, arg))
-+            found_msgs = list(dict.fromkeys(rosmsg_search(rospack, mode, arg)))
-             if not found_msgs:
-                 print("Could not find msg '%s'" % arg, file=sys.stderr)
-                 return 1
diff --git a/dev-ros/rosmsg/rosmsg-1.15.9.ebuild b/dev-ros/rosmsg/rosmsg-1.15.10.ebuild
index c750959458b6..d4be4db4044c 100644
--- a/dev-ros/rosmsg/rosmsg-1.15.9.ebuild
+++ b/dev-ros/rosmsg/rosmsg-1.15.10.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
@@ -21,11 +21,15 @@ RDEPEND="
 	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
 "
-PATCHES=( "${FILESDIR}/duplicates.patch" )
 
 src_test() {
-	export ROS_PACKAGE_PATH="${S}/../../:${ROS_PACKAGE_PATH}"
+	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
 	ros-catkin_src_test
 }
diff --git a/dev-ros/rosmsg/rosmsg-9999.ebuild b/dev-ros/rosmsg/rosmsg-9999.ebuild
index ba0d62bb080b..d4be4db4044c 100644
--- a/dev-ros/rosmsg/rosmsg-9999.ebuild
+++ b/dev-ros/rosmsg/rosmsg-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
@@ -21,5 +21,15 @@ RDEPEND="
 	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
+	ros-catkin_src_test
+}