diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /dev-ros/rosmsg | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'dev-ros/rosmsg')
| -rw-r--r-- | dev-ros/rosmsg/Manifest | 7 | ||||
| -rw-r--r-- | dev-ros/rosmsg/files/duplicates.patch | 13 | ||||
| -rw-r--r-- | dev-ros/rosmsg/rosmsg-1.15.8.ebuild | 25 | ||||
| -rw-r--r-- | dev-ros/rosmsg/rosmsg-1.15.9.ebuild (renamed from dev-ros/rosmsg/rosmsg-1.15.7.ebuild) | 6 |
4 files changed, 22 insertions, 29 deletions
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest index f86d36d5d6a9..f45945b4eb1c 100644 --- a/dev-ros/rosmsg/Manifest +++ b/dev-ros/rosmsg/Manifest @@ -1,6 +1,5 @@ -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 rosmsg-1.15.7.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394 -EBUILD rosmsg-1.15.8.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394 +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 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45 diff --git a/dev-ros/rosmsg/files/duplicates.patch b/dev-ros/rosmsg/files/duplicates.patch new file mode 100644 index 000000000000..4705f00d2e85 --- /dev/null +++ b/dev-ros/rosmsg/files/duplicates.patch @@ -0,0 +1,13 @@ +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.8.ebuild b/dev-ros/rosmsg/rosmsg-1.15.8.ebuild deleted file mode 100644 index ba0d62bb080b..000000000000 --- a/dev-ros/rosmsg/rosmsg-1.15.8.ebuild +++ /dev/null @@ -1,25 +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" -ROS_SUBDIR=tools/${PN} - -inherit ros-catkin - -DESCRIPTION="Command-line tools for displaying information about message and services" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]") - dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] - dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] ) -" diff --git a/dev-ros/rosmsg/rosmsg-1.15.7.ebuild b/dev-ros/rosmsg/rosmsg-1.15.9.ebuild index ba0d62bb080b..c750959458b6 100644 --- a/dev-ros/rosmsg/rosmsg-1.15.7.ebuild +++ b/dev-ros/rosmsg/rosmsg-1.15.9.ebuild @@ -23,3 +23,9 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] ) " +PATCHES=( "${FILESDIR}/duplicates.patch" ) + +src_test() { + export ROS_PACKAGE_PATH="${S}/../../:${ROS_PACKAGE_PATH}" + ros-catkin_src_test +} |