summaryrefslogtreecommitdiff
path: root/dev-ros
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ros
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-ros')
-rw-r--r--dev-ros/Manifest.gzbin54580 -> 57266 bytes
-rw-r--r--dev-ros/amcl/Manifest9
-rw-r--r--dev-ros/amcl/amcl-1.16.3.ebuild (renamed from dev-ros/amcl/amcl-1.16.1.ebuild)4
-rw-r--r--dev-ros/amcl/amcl-9999.ebuild4
-rw-r--r--dev-ros/amcl/files/cmake.patch12
-rw-r--r--dev-ros/ament_cmake_core/Manifest4
-rw-r--r--dev-ros/ament_cmake_core/ament_cmake_core-0.8.1.ebuild41
-rw-r--r--dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild41
-rw-r--r--dev-ros/ament_cmake_core/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_export_definitions/Manifest4
-rw-r--r--dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild41
-rw-r--r--dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild41
-rw-r--r--dev-ros/ament_cmake_export_definitions/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_export_dependencies/Manifest4
-rw-r--r--dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild42
-rw-r--r--dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild42
-rw-r--r--dev-ros/ament_cmake_export_dependencies/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_export_include_directories/Manifest4
-rw-r--r--dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.8.1.ebuild41
-rw-r--r--dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild41
-rw-r--r--dev-ros/ament_cmake_export_include_directories/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_export_interfaces/Manifest4
-rw-r--r--dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.8.1.ebuild42
-rw-r--r--dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild42
-rw-r--r--dev-ros/ament_cmake_export_interfaces/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_export_libraries/Manifest4
-rw-r--r--dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.8.1.ebuild41
-rw-r--r--dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild41
-rw-r--r--dev-ros/ament_cmake_export_libraries/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_export_link_flags/Manifest4
-rw-r--r--dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.8.1.ebuild41
-rw-r--r--dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild41
-rw-r--r--dev-ros/ament_cmake_export_link_flags/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_gtest/Manifest4
-rw-r--r--dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.8.1.ebuild41
-rw-r--r--dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild41
-rw-r--r--dev-ros/ament_cmake_gtest/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_include_directories/Manifest4
-rw-r--r--dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.8.1.ebuild41
-rw-r--r--dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild41
-rw-r--r--dev-ros/ament_cmake_include_directories/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_libraries/Manifest4
-rw-r--r--dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.8.1.ebuild41
-rw-r--r--dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild41
-rw-r--r--dev-ros/ament_cmake_libraries/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_python/Manifest5
-rw-r--r--dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild42
-rw-r--r--dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild42
-rw-r--r--dev-ros/ament_cmake_python/files/destdir.patch26
-rw-r--r--dev-ros/ament_cmake_python/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_target_dependencies/Manifest4
-rw-r--r--dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild43
-rw-r--r--dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild43
-rw-r--r--dev-ros/ament_cmake_target_dependencies/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_test/Manifest4
-rw-r--r--dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild59
-rw-r--r--dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild59
-rw-r--r--dev-ros/ament_cmake_test/metadata.xml11
-rw-r--r--dev-ros/ament_cmake_version/Manifest4
-rw-r--r--dev-ros/ament_cmake_version/ament_cmake_version-0.8.1.ebuild41
-rw-r--r--dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild41
-rw-r--r--dev-ros/ament_cmake_version/metadata.xml11
-rw-r--r--dev-ros/base_local_planner/Manifest2
-rw-r--r--dev-ros/base_local_planner/base_local_planner-1.16.3.ebuild42
-rw-r--r--dev-ros/camera_calibration/Manifest2
-rw-r--r--dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild27
-rw-r--r--dev-ros/carrot_planner/Manifest2
-rw-r--r--dev-ros/carrot_planner/carrot_planner-1.16.3.ebuild (renamed from dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.2.ebuild)17
-rw-r--r--dev-ros/clear_costmap_recovery/Manifest14
-rw-r--r--dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.1-r1.ebuild30
-rw-r--r--dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.2.ebuild30
-rw-r--r--dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.3.ebuild (renamed from dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.0.ebuild)4
-rw-r--r--dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild4
-rw-r--r--dev-ros/compressed_depth_image_transport/Manifest3
-rw-r--r--dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild5
-rw-r--r--dev-ros/compressed_depth_image_transport/files/ocv4.patch13
-rw-r--r--dev-ros/compressed_image_transport/Manifest3
-rw-r--r--dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild5
-rw-r--r--dev-ros/compressed_image_transport/files/ocv4.patch22
-rw-r--r--dev-ros/console_bridge_vendor/Manifest4
-rw-r--r--dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild37
-rw-r--r--dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild37
-rw-r--r--dev-ros/console_bridge_vendor/metadata.xml11
-rw-r--r--dev-ros/costmap_2d/Manifest2
-rw-r--r--dev-ros/costmap_2d/costmap_2d-1.16.3.ebuild (renamed from dev-ros/navfn/navfn-1.16.2.ebuild)34
-rw-r--r--dev-ros/cpp_common/Manifest2
-rw-r--r--dev-ros/cpp_common/cpp_common-0.6.13.ebuild19
-rw-r--r--dev-ros/cv_bridge/Manifest3
-rw-r--r--dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild2
-rw-r--r--dev-ros/cv_bridge/files/ocv4.patch432
-rw-r--r--dev-ros/depth_image_proc/Manifest2
-rw-r--r--dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild31
-rw-r--r--dev-ros/dwa_local_planner/Manifest2
-rw-r--r--dev-ros/dwa_local_planner/dwa_local_planner-1.16.3.ebuild36
-rw-r--r--dev-ros/fake_localization/Manifest4
-rw-r--r--dev-ros/fake_localization/fake_localization-1.16.3.ebuild30
-rw-r--r--dev-ros/fake_localization/fake_localization-9999.ebuild3
-rw-r--r--dev-ros/gazebo_plugins/Manifest12
-rw-r--r--dev-ros/gazebo_plugins/files/ocv4.patch17
-rw-r--r--dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild52
-rw-r--r--dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild62
-rw-r--r--dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild53
-rw-r--r--dev-ros/gazebo_plugins/gazebo_plugins-2.8.4.ebuild53
-rw-r--r--dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild1
-rw-r--r--dev-ros/geometric_shapes/Manifest4
-rw-r--r--dev-ros/geometric_shapes/geometric_shapes-0.5.4.ebuild30
-rw-r--r--dev-ros/geometric_shapes/geometric_shapes-0.6.0.ebuild30
-rw-r--r--dev-ros/global_planner/Manifest2
-rw-r--r--dev-ros/global_planner/global_planner-1.16.3.ebuild (renamed from dev-ros/amcl/amcl-1.16.2.ebuild)27
-rw-r--r--dev-ros/hector_compressed_map_transport/Manifest2
-rw-r--r--dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild27
-rw-r--r--dev-ros/hector_geotiff/Manifest2
-rw-r--r--dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild33
-rw-r--r--dev-ros/hector_geotiff_plugins/Manifest2
-rw-r--r--dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild22
-rw-r--r--dev-ros/hector_imu_attitude_to_tf/Manifest2
-rw-r--r--dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild (renamed from dev-ros/hector_map_tools/hector_map_tools-0.3.3.ebuild)11
-rw-r--r--dev-ros/hector_imu_tools/Manifest2
-rw-r--r--dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild24
-rw-r--r--dev-ros/hector_map_server/Manifest2
-rw-r--r--dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild25
-rw-r--r--dev-ros/hector_map_tools/Manifest6
-rw-r--r--dev-ros/hector_map_tools/hector_map_tools-0.4.0.ebuild (renamed from dev-ros/hector_map_tools/hector_map_tools-0.3.4.ebuild)2
-rw-r--r--dev-ros/hector_mapping/Manifest2
-rw-r--r--dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild29
-rw-r--r--dev-ros/hector_marker_drawing/Manifest2
-rw-r--r--dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild21
-rw-r--r--dev-ros/hector_nav_msgs/Manifest2
-rw-r--r--dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.0.ebuild (renamed from dev-ros/rosparam/rosparam-1.13.2.ebuild)14
-rw-r--r--dev-ros/hector_slam_launch/Manifest2
-rw-r--r--dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild23
-rw-r--r--dev-ros/hector_trajectory_server/Manifest2
-rw-r--r--dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild24
-rw-r--r--dev-ros/image_proc/Manifest2
-rw-r--r--dev-ros/image_proc/image_proc-1.13.0.ebuild29
-rw-r--r--dev-ros/image_publisher/Manifest3
-rw-r--r--dev-ros/image_publisher/files/ocv4.patch44
-rw-r--r--dev-ros/image_publisher/image_publisher-1.13.0.ebuild30
-rw-r--r--dev-ros/image_rotate/Manifest2
-rw-r--r--dev-ros/image_rotate/image_rotate-1.13.0.ebuild30
-rw-r--r--dev-ros/image_view/Manifest2
-rw-r--r--dev-ros/image_view/image_view-1.13.0.ebuild34
-rw-r--r--dev-ros/laser_cb_detector/Manifest3
-rw-r--r--dev-ros/laser_cb_detector/files/ocv4.patch13
-rw-r--r--dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild2
-rw-r--r--dev-ros/map_server/Manifest2
-rw-r--r--dev-ros/map_server/map_server-1.16.3.ebuild28
-rw-r--r--dev-ros/mavlink-gbp-release/Manifest2
-rw-r--r--dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild22
-rw-r--r--dev-ros/mk/Manifest2
-rw-r--r--dev-ros/mk/mk-1.14.7.ebuild (renamed from dev-ros/rosbash/rosbash-1.14.3.ebuild)10
-rw-r--r--dev-ros/move_base/Manifest2
-rw-r--r--dev-ros/move_base/move_base-1.16.3.ebuild44
-rw-r--r--dev-ros/move_slow_and_clear/Manifest2
-rw-r--r--dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.3.ebuild (renamed from dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.1.ebuild)10
-rw-r--r--dev-ros/nav_core/Manifest2
-rw-r--r--dev-ros/nav_core/nav_core-1.16.3.ebuild22
-rw-r--r--dev-ros/navfn/Manifest11
-rw-r--r--dev-ros/navfn/files/tests.patch13
-rw-r--r--dev-ros/navfn/navfn-1.16.0.ebuild39
-rw-r--r--dev-ros/navfn/navfn-1.16.3.ebuild (renamed from dev-ros/navfn/navfn-1.16.1.ebuild)9
-rw-r--r--dev-ros/navfn/navfn-9999.ebuild9
-rw-r--r--dev-ros/opencv_apps/Manifest5
-rw-r--r--dev-ros/opencv_apps/files/ocv4.patch118
-rw-r--r--dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild (renamed from dev-ros/opencv_apps/opencv_apps-2.0.0-r1.ebuild)3
-rw-r--r--dev-ros/pcl_conversions/Manifest2
-rw-r--r--dev-ros/pcl_conversions/pcl_conversions-1.7.0.ebuild25
-rw-r--r--dev-ros/pcl_ros/Manifest2
-rw-r--r--dev-ros/pcl_ros/pcl_ros-1.7.0.ebuild40
-rw-r--r--dev-ros/poco_vendor/Manifest4
-rw-r--r--dev-ros/poco_vendor/metadata.xml11
-rw-r--r--dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild37
-rw-r--r--dev-ros/poco_vendor/poco_vendor-9999.ebuild37
-rw-r--r--dev-ros/qt_dotgraph/Manifest2
-rw-r--r--dev-ros/qt_dotgraph/qt_dotgraph-0.3.16.ebuild26
-rw-r--r--dev-ros/qt_gui/Manifest2
-rw-r--r--dev-ros/qt_gui/qt_gui-0.3.16.ebuild23
-rw-r--r--dev-ros/qt_gui_app/Manifest2
-rw-r--r--dev-ros/qt_gui_app/qt_gui_app-0.3.16.ebuild21
-rw-r--r--dev-ros/qt_gui_cpp/Manifest6
-rw-r--r--dev-ros/qt_gui_cpp/files/libdir.patch12
-rw-r--r--dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild (renamed from dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.11.ebuild)2
-rw-r--r--dev-ros/qt_gui_py_common/Manifest2
-rw-r--r--dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild22
-rw-r--r--dev-ros/rosbag/Manifest5
-rw-r--r--dev-ros/rosbag/files/yaml.patch53
-rw-r--r--dev-ros/rosbag/rosbag-1.14.3-r3.ebuild (renamed from dev-ros/rosbag/rosbag-1.14.3-r1.ebuild)3
-rw-r--r--dev-ros/rosbag/rosbag-9999.ebuild2
-rw-r--r--dev-ros/rosbash/Manifest18
-rw-r--r--dev-ros/rosbash/files/catkin_prefix.patch13
-rw-r--r--dev-ros/rosbash/files/catkin_prefix2.patch13
-rw-r--r--dev-ros/rosbash/rosbash-1.14.2.ebuild19
-rw-r--r--dev-ros/rosbash/rosbash-1.14.4.ebuild19
-rw-r--r--dev-ros/rosbash/rosbash-1.14.7.ebuild (renamed from dev-ros/rosbash/rosbash-1.14.6.ebuild)4
-rw-r--r--dev-ros/rosbash/rosbash-9999.ebuild6
-rw-r--r--dev-ros/rosboost_cfg/Manifest2
-rw-r--r--dev-ros/rosboost_cfg/rosboost_cfg-1.14.7.ebuild (renamed from dev-ros/rosmake/rosmake-1.14.2.ebuild)10
-rw-r--r--dev-ros/rosbridge_server/Manifest12
-rw-r--r--dev-ros/rosbridge_server/files/backports-ssl.patch13
-rw-r--r--dev-ros/rosbridge_server/files/tornado.patch91
-rw-r--r--dev-ros/rosbridge_server/rosbridge_server-0.10.1.ebuild25
-rw-r--r--dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild1
-rw-r--r--dev-ros/rosbridge_server/rosbridge_server-0.8.6.ebuild29
-rw-r--r--dev-ros/rosbridge_server/rosbridge_server-0.9.0.ebuild25
-rw-r--r--dev-ros/rosbridge_server/rosbridge_server-9999.ebuild3
-rw-r--r--dev-ros/rosbuild/Manifest2
-rw-r--r--dev-ros/rosbuild/rosbuild-1.14.7.ebuild (renamed from dev-ros/rosbash/rosbash-1.14.1.ebuild)7
-rw-r--r--dev-ros/rosclean/Manifest2
-rw-r--r--dev-ros/rosclean/rosclean-1.14.7.ebuild (renamed from dev-ros/rosmake/rosmake-1.14.1.ebuild)4
-rw-r--r--dev-ros/roscpp_serialization/Manifest2
-rw-r--r--dev-ros/roscpp_serialization/roscpp_serialization-0.6.13.ebuild21
-rw-r--r--dev-ros/roscpp_traits/Manifest2
-rw-r--r--dev-ros/roscpp_traits/roscpp_traits-0.6.13.ebuild20
-rw-r--r--dev-ros/roscreate/Manifest14
-rw-r--r--dev-ros/roscreate/roscreate-1.14.1.ebuild23
-rw-r--r--dev-ros/roscreate/roscreate-1.14.2.ebuild23
-rw-r--r--dev-ros/roscreate/roscreate-1.14.4.ebuild23
-rw-r--r--dev-ros/roscreate/roscreate-1.14.6.ebuild23
-rw-r--r--dev-ros/roscreate/roscreate-1.14.7.ebuild (renamed from dev-ros/roscreate/roscreate-1.14.0.ebuild)0
-rw-r--r--dev-ros/rosgraph/Manifest19
-rw-r--r--dev-ros/rosgraph/files/py3-2.patch52
-rw-r--r--dev-ros/rosgraph/files/py3.patch47
-rw-r--r--dev-ros/rosgraph/files/yaml.patch53
-rw-r--r--dev-ros/rosgraph/rosgraph-1.13.1.ebuild22
-rw-r--r--dev-ros/rosgraph/rosgraph-1.13.2.ebuild22
-rw-r--r--dev-ros/rosgraph/rosgraph-1.13.4.ebuild22
-rw-r--r--dev-ros/rosgraph/rosgraph-1.13.5.ebuild22
-rw-r--r--dev-ros/rosgraph/rosgraph-1.13.6.ebuild22
-rw-r--r--dev-ros/rosgraph/rosgraph-1.14.2.ebuild22
-rw-r--r--dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild (renamed from dev-ros/rosgraph/rosgraph-1.13.0.ebuild)1
-rw-r--r--dev-ros/rosgraph/rosgraph-1.14.3.ebuild22
-rw-r--r--dev-ros/roslang/Manifest2
-rw-r--r--dev-ros/roslang/roslang-1.14.7.ebuild (renamed from dev-ros/rosbash/rosbash-1.14.0.ebuild)7
-rw-r--r--dev-ros/roslaunch/Manifest25
-rw-r--r--dev-ros/roslaunch/files/py3-2.patch29
-rw-r--r--dev-ros/roslaunch/files/py3.patch45
-rw-r--r--[-rwxr-xr-x]dev-ros/roslaunch/files/roscore.initd2
-rw-r--r--[-rwxr-xr-x]dev-ros/roslaunch/files/roslaunch.initd2
-rw-r--r--dev-ros/roslaunch/files/yaml.patch44
-rw-r--r--dev-ros/roslaunch/roslaunch-1.13.1.ebuild63
-rw-r--r--dev-ros/roslaunch/roslaunch-1.13.2.ebuild63
-rw-r--r--dev-ros/roslaunch/roslaunch-1.13.4.ebuild63
-rw-r--r--dev-ros/roslaunch/roslaunch-1.13.5.ebuild63
-rw-r--r--dev-ros/roslaunch/roslaunch-1.13.6.ebuild63
-rw-r--r--dev-ros/roslaunch/roslaunch-1.14.2.ebuild63
-rw-r--r--dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild (renamed from dev-ros/roslaunch/roslaunch-1.13.0.ebuild)2
-rw-r--r--dev-ros/roslaunch/roslaunch-1.14.3.ebuild63
-rw-r--r--dev-ros/roslaunch/roslaunch-9999.ebuild2
-rw-r--r--dev-ros/roslib/Manifest2
-rw-r--r--dev-ros/roslib/roslib-1.14.7.ebuild28
-rw-r--r--dev-ros/rosmake/Manifest14
-rw-r--r--dev-ros/rosmake/rosmake-1.14.3.ebuild21
-rw-r--r--dev-ros/rosmake/rosmake-1.14.4.ebuild21
-rw-r--r--dev-ros/rosmake/rosmake-1.14.6.ebuild21
-rw-r--r--dev-ros/rosmake/rosmake-1.14.7.ebuild (renamed from dev-ros/rosmake/rosmake-1.14.0.ebuild)0
-rw-r--r--dev-ros/rosmsg/Manifest21
-rw-r--r--dev-ros/rosmsg/files/norm.patch31
-rw-r--r--dev-ros/rosmsg/files/py3.patch212
-rw-r--r--dev-ros/rosmsg/files/tests.patch15
-rw-r--r--dev-ros/rosmsg/rosmsg-1.13.1.ebuild24
-rw-r--r--dev-ros/rosmsg/rosmsg-1.13.2.ebuild24
-rw-r--r--dev-ros/rosmsg/rosmsg-1.13.4.ebuild24
-rw-r--r--dev-ros/rosmsg/rosmsg-1.13.5.ebuild24
-rw-r--r--dev-ros/rosmsg/rosmsg-1.13.6.ebuild24
-rw-r--r--dev-ros/rosmsg/rosmsg-1.14.2.ebuild24
-rw-r--r--dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild (renamed from dev-ros/rosmsg/rosmsg-1.13.0.ebuild)5
-rw-r--r--dev-ros/rosmsg/rosmsg-1.14.3.ebuild24
-rw-r--r--dev-ros/rosmsg/rosmsg-9999.ebuild4
-rw-r--r--dev-ros/rosparam/Manifest18
-rw-r--r--dev-ros/rosparam/files/yaml.patch22
-rw-r--r--dev-ros/rosparam/files/yaml2.patch76
-rw-r--r--dev-ros/rosparam/rosparam-1.13.1.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.13.4.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.13.5.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.13.6.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.14.2.ebuild22
-rw-r--r--dev-ros/rosparam/rosparam-1.14.3-r1.ebuild (renamed from dev-ros/rosparam/rosparam-1.13.0.ebuild)1
-rw-r--r--dev-ros/rosparam/rosparam-1.14.3.ebuild22
-rw-r--r--dev-ros/rospy/Manifest17
-rw-r--r--dev-ros/rospy/files/yaml.patch53
-rw-r--r--dev-ros/rospy/rospy-1.13.1.ebuild33
-rw-r--r--dev-ros/rospy/rospy-1.13.2.ebuild33
-rw-r--r--dev-ros/rospy/rospy-1.13.4.ebuild33
-rw-r--r--dev-ros/rospy/rospy-1.13.5.ebuild33
-rw-r--r--dev-ros/rospy/rospy-1.13.6.ebuild33
-rw-r--r--dev-ros/rospy/rospy-1.14.2.ebuild33
-rw-r--r--dev-ros/rospy/rospy-1.14.3-r1.ebuild (renamed from dev-ros/rospy/rospy-1.13.0.ebuild)1
-rw-r--r--dev-ros/rospy/rospy-1.14.3.ebuild33
-rw-r--r--dev-ros/rosservice/Manifest17
-rw-r--r--dev-ros/rosservice/files/yaml.patch62
-rw-r--r--dev-ros/rosservice/rosservice-1.13.1.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.13.2.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.13.4.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.13.5.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.13.6.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.14.2.ebuild24
-rw-r--r--dev-ros/rosservice/rosservice-1.14.3-r1.ebuild (renamed from dev-ros/rosservice/rosservice-1.13.0.ebuild)1
-rw-r--r--dev-ros/rosservice/rosservice-1.14.3.ebuild24
-rw-r--r--dev-ros/rostime/Manifest2
-rw-r--r--dev-ros/rostime/rostime-0.6.13.ebuild22
-rw-r--r--dev-ros/rostopic/Manifest18
-rw-r--r--dev-ros/rostopic/files/py3.patch89
-rw-r--r--dev-ros/rostopic/files/yaml.patch71
-rw-r--r--dev-ros/rostopic/rostopic-1.13.1.ebuild27
-rw-r--r--dev-ros/rostopic/rostopic-1.13.2.ebuild27
-rw-r--r--dev-ros/rostopic/rostopic-1.13.4.ebuild27
-rw-r--r--dev-ros/rostopic/rostopic-1.13.5.ebuild27
-rw-r--r--dev-ros/rostopic/rostopic-1.13.6.ebuild27
-rw-r--r--dev-ros/rostopic/rostopic-1.14.2.ebuild27
-rw-r--r--dev-ros/rostopic/rostopic-1.14.3-r1.ebuild (renamed from dev-ros/rostopic/rostopic-1.13.0.ebuild)1
-rw-r--r--dev-ros/rostopic/rostopic-1.14.3.ebuild27
-rw-r--r--dev-ros/rosunit/Manifest2
-rw-r--r--dev-ros/rosunit/rosunit-1.14.7.ebuild (renamed from dev-ros/roscreate/roscreate-1.14.3.ebuild)7
-rw-r--r--dev-ros/rotate_recovery/Manifest2
-rw-r--r--dev-ros/rotate_recovery/rotate_recovery-1.16.3.ebuild33
-rw-r--r--dev-ros/rviz/Manifest4
-rw-r--r--dev-ros/rviz/rviz-1.13.6.ebuild72
-rw-r--r--dev-ros/rviz/rviz-9999.ebuild8
-rw-r--r--dev-ros/stereo_image_proc/Manifest2
-rw-r--r--dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild31
-rw-r--r--dev-ros/test_roslib_comm/Manifest17
-rw-r--r--dev-ros/test_roslib_comm/files/yaml.patch53
-rw-r--r--dev-ros/test_roslib_comm/test_roslib_comm-1.13.1.ebuild24
-rw-r--r--dev-ros/test_roslib_comm/test_roslib_comm-1.13.2.ebuild24
-rw-r--r--dev-ros/test_roslib_comm/test_roslib_comm-1.13.4.ebuild24
-rw-r--r--dev-ros/test_roslib_comm/test_roslib_comm-1.13.5.ebuild24
-rw-r--r--dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild24
-rw-r--r--dev-ros/test_roslib_comm/test_roslib_comm-1.14.2.ebuild24
-rw-r--r--dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild (renamed from dev-ros/test_roslib_comm/test_roslib_comm-1.13.0.ebuild)3
-rw-r--r--dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild24
-rw-r--r--dev-ros/test_rosmaster/Manifest21
-rw-r--r--dev-ros/test_rosmaster/files/empty.patch12
-rw-r--r--dev-ros/test_rosmaster/files/py3.patch54
-rw-r--r--dev-ros/test_rosmaster/files/yaml.patch53
-rw-r--r--dev-ros/test_rosmaster/test_rosmaster-1.13.0.ebuild33
-rw-r--r--dev-ros/test_rosmaster/test_rosmaster-1.13.1.ebuild33
-rw-r--r--dev-ros/test_rosmaster/test_rosmaster-1.13.2.ebuild33
-rw-r--r--dev-ros/test_rosmaster/test_rosmaster-1.13.4.ebuild33
-rw-r--r--dev-ros/test_rosmaster/test_rosmaster-1.13.5.ebuild33
-rw-r--r--dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild33
-rw-r--r--dev-ros/test_rosmaster/test_rosmaster-1.14.2.ebuild33
-rw-r--r--dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild (renamed from dev-ros/test_rosmaster/test_rosmaster-1.12.7.ebuild)3
-rw-r--r--dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild33
-rw-r--r--dev-ros/test_rosparam/Manifest17
-rw-r--r--dev-ros/test_rosparam/files/yaml.patch75
-rw-r--r--dev-ros/test_rosparam/test_rosparam-1.13.0.ebuild26
-rw-r--r--dev-ros/test_rosparam/test_rosparam-1.13.1.ebuild26
-rw-r--r--dev-ros/test_rosparam/test_rosparam-1.13.2.ebuild26
-rw-r--r--dev-ros/test_rosparam/test_rosparam-1.13.4.ebuild26
-rw-r--r--dev-ros/test_rosparam/test_rosparam-1.13.5.ebuild26
-rw-r--r--dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild26
-rw-r--r--dev-ros/test_rosparam/test_rosparam-1.14.2.ebuild26
-rw-r--r--dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild3
-rw-r--r--dev-ros/test_rospy/Manifest20
-rw-r--r--dev-ros/test_rospy/files/py3-2.patch40
-rw-r--r--dev-ros/test_rospy/files/py3.patch34
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.0.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.1.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.2.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.4.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.5.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.13.6.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.14.2.ebuild33
-rw-r--r--dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild (renamed from dev-ros/test_rospy/test_rospy-1.12.7.ebuild)3
-rw-r--r--dev-ros/test_rospy/test_rospy-1.14.3.ebuild33
-rw-r--r--dev-ros/test_rosservice/Manifest17
-rw-r--r--dev-ros/test_rosservice/files/yaml.patch62
-rw-r--r--dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild30
-rw-r--r--dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild30
-rw-r--r--dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild30
-rw-r--r--dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild30
-rw-r--r--dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild30
-rw-r--r--dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild30
-rw-r--r--dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild (renamed from dev-ros/test_rosservice/test_rosservice-1.13.0.ebuild)3
-rw-r--r--dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild30
-rw-r--r--dev-ros/topic_tools/Manifest17
-rw-r--r--dev-ros/topic_tools/files/yaml.patch53
-rw-r--r--dev-ros/topic_tools/topic_tools-1.13.1.ebuild33
-rw-r--r--dev-ros/topic_tools/topic_tools-1.13.2.ebuild33
-rw-r--r--dev-ros/topic_tools/topic_tools-1.13.4.ebuild33
-rw-r--r--dev-ros/topic_tools/topic_tools-1.13.5.ebuild33
-rw-r--r--dev-ros/topic_tools/topic_tools-1.13.6.ebuild33
-rw-r--r--dev-ros/topic_tools/topic_tools-1.14.2.ebuild33
-rw-r--r--dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild (renamed from dev-ros/topic_tools/topic_tools-1.13.0.ebuild)3
-rw-r--r--dev-ros/topic_tools/topic_tools-1.14.3.ebuild33
-rw-r--r--dev-ros/visp_auto_tracker/Manifest5
-rw-r--r--dev-ros/visp_auto_tracker/files/ocv4.patch25
-rw-r--r--dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r1.ebuild (renamed from dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild)3
-rw-r--r--dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild5
-rw-r--r--dev-ros/voxel_grid/Manifest2
-rw-r--r--dev-ros/voxel_grid/voxel_grid-1.16.3.ebuild18
391 files changed, 5139 insertions, 4004 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index b98cadd84bd7..56ce00d87272 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
Binary files differ
diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest
index 3241f16a24d7..84aa2afba572 100644
--- a/dev-ros/amcl/Manifest
+++ b/dev-ros/amcl/Manifest
@@ -1,6 +1,5 @@
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-EBUILD amcl-1.16.1.ebuild 946 BLAKE2B 39816421ee2595d0e31dce41aabb7df12577f3e3023eb76369cdd76fdf9c6b2ebd07a865da38f3af6dd5e21ee14fa01164c6950e8fd0f2e8e2acbd9b286541a6 SHA512 7c08f6cc045f3b575dfdd6808266c7d46cabc32f24b0d9f3a2652b142c4227d105393b3f7a0e49539f613136331cfc81f4755124fce1a7ceb802bb15f0bf8db6
-EBUILD amcl-1.16.2.ebuild 946 BLAKE2B 39816421ee2595d0e31dce41aabb7df12577f3e3023eb76369cdd76fdf9c6b2ebd07a865da38f3af6dd5e21ee14fa01164c6950e8fd0f2e8e2acbd9b286541a6 SHA512 7c08f6cc045f3b575dfdd6808266c7d46cabc32f24b0d9f3a2652b142c4227d105393b3f7a0e49539f613136331cfc81f4755124fce1a7ceb802bb15f0bf8db6
-EBUILD amcl-9999.ebuild 946 BLAKE2B 39816421ee2595d0e31dce41aabb7df12577f3e3023eb76369cdd76fdf9c6b2ebd07a865da38f3af6dd5e21ee14fa01164c6950e8fd0f2e8e2acbd9b286541a6 SHA512 7c08f6cc045f3b575dfdd6808266c7d46cabc32f24b0d9f3a2652b142c4227d105393b3f7a0e49539f613136331cfc81f4755124fce1a7ceb802bb15f0bf8db6
+AUX cmake.patch 331 BLAKE2B 473d4915af835a5f374eddf6d24d8bb003b02aaabc43119fa1d4eb53ecc640ca0225d0be0a03f811414b729344d1218b264231b27cb77480ec613283b03db6b8 SHA512 c2bd6bf44eedf69c03de172b88d9b9471a78b7176d6a5d4db18564986780c9c05ce9d74a65ded689fe1480d2094a2c16feffe27f7797224f6f43d019a806c327
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
+EBUILD amcl-1.16.3.ebuild 1033 BLAKE2B 4ff3f9699e1a5c76b13e198816ce07d49da1c1bbd070f380d77e3d3a7277259e596565f8391cc29de42c4305fbefca42f7d9293764fdb0f3d8bdc95d1b6bfc10 SHA512 c1bde02d543e090c3a6605c9dddaf38619b110a1669313b56d1f24af73a84188f9b40f7891a670a00d12da07d96389ceb2b38e527767bb30b4a6f961ad3297ca
+EBUILD amcl-9999.ebuild 1033 BLAKE2B 4ff3f9699e1a5c76b13e198816ce07d49da1c1bbd070f380d77e3d3a7277259e596565f8391cc29de42c4305fbefca42f7d9293764fdb0f3d8bdc95d1b6bfc10 SHA512 c1bde02d543e090c3a6605c9dddaf38619b110a1669313b56d1f24af73a84188f9b40f7891a670a00d12da07d96389ceb2b38e527767bb30b4a6f961ad3297ca
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/amcl/amcl-1.16.1.ebuild b/dev-ros/amcl/amcl-1.16.3.ebuild
index 2c9900308d7a..e2d2d799884a 100644
--- a/dev-ros/amcl/amcl-1.16.1.ebuild
+++ b/dev-ros/amcl/amcl-1.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,6 +22,7 @@ RDEPEND="
dev-ros/rosbag
dev-libs/boost:=
dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf2
dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
@@ -31,3 +32,4 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
"
+PATCHES=( "${FILESDIR}/cmake.patch" )
diff --git a/dev-ros/amcl/amcl-9999.ebuild b/dev-ros/amcl/amcl-9999.ebuild
index 2c9900308d7a..e2d2d799884a 100644
--- a/dev-ros/amcl/amcl-9999.ebuild
+++ b/dev-ros/amcl/amcl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,6 +22,7 @@ RDEPEND="
dev-ros/rosbag
dev-libs/boost:=
dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf2
dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
@@ -31,3 +32,4 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
"
+PATCHES=( "${FILESDIR}/cmake.patch" )
diff --git a/dev-ros/amcl/files/cmake.patch b/dev-ros/amcl/files/cmake.patch
new file mode 100644
index 000000000000..da31fe79331d
--- /dev/null
+++ b/dev-ros/amcl/files/cmake.patch
@@ -0,0 +1,12 @@
+Index: amcl/CMakeLists.txt
+===================================================================
+--- amcl.orig/CMakeLists.txt
++++ amcl/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ cmake_minimum_required(VERSION 3.1)
+ project(amcl)
++include(CheckSymbolExists)
++include(CheckIncludeFile)
+
+ if(NOT CMAKE_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD 11)
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
new file mode 100644
index 000000000000..b301d7fe37cc
--- /dev/null
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_core-0.8.1.ebuild 926 BLAKE2B b712ca27c217324c2c5668b1288fed950f0a9cf30bf1ba558db1cb90607572a3c0b5c8adbfad0b417bbe1484719916f0d980cbf5b8c5fe3656ec6bd6d32fc406 SHA512 79c17fd87f232478772b66dee2f0284e18e8cf55a1268b1142ed20fa27a14913fb298541908e654c76d5241a10813f5a4cb27368786384178a9764e1c3d7cc51
+EBUILD ament_cmake_core-9999.ebuild 926 BLAKE2B b712ca27c217324c2c5668b1288fed950f0a9cf30bf1ba558db1cb90607572a3c0b5c8adbfad0b417bbe1484719916f0d980cbf5b8c5fe3656ec6bd6d32fc406 SHA512 79c17fd87f232478772b66dee2f0284e18e8cf55a1268b1142ed20fa27a14913fb298541908e654c76d5241a10813f5a4cb27368786384178a9764e1c3d7cc51
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-0.8.1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-0.8.1.ebuild
new file mode 100644
index 000000000000..6e3eac947c36
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-python/ament_package
+ dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
new file mode 100644
index 000000000000..6e3eac947c36
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-python/ament_package
+ dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_core/metadata.xml b/dev-ros/ament_cmake_core/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
new file mode 100644
index 000000000000..ea98d6478e1e
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_export_definitions-0.8.1.ebuild 1008 BLAKE2B 0a53e92aae2655d69581f5b6c5ab155555ddaffe5cdf251135961ba77fd5c7d21dca772c8d9f81bc4ef2ebf7b54f1d2edd12df78d84928db1ce05f9fff25a270 SHA512 c4ec21cb34fbcef2163da52b23fcbf645be77034abba029b5162c4a2390ec9040fca7ca452a7a217b929937745f48089ff45c08afd5767f7159154d3dc85df29
+EBUILD ament_cmake_export_definitions-9999.ebuild 1008 BLAKE2B 0a53e92aae2655d69581f5b6c5ab155555ddaffe5cdf251135961ba77fd5c7d21dca772c8d9f81bc4ef2ebf7b54f1d2edd12df78d84928db1ce05f9fff25a270 SHA512 c4ec21cb34fbcef2163da52b23fcbf645be77034abba029b5162c4a2390ec9040fca7ca452a7a217b929937745f48089ff45c08afd5767f7159154d3dc85df29
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild
new file mode 100644
index 000000000000..7174878a8530
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
new file mode 100644
index 000000000000..7174878a8530
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_definitions/metadata.xml b/dev-ros/ament_cmake_export_definitions/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
new file mode 100644
index 000000000000..e1a0435ec672
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_export_dependencies-0.8.1.ebuild 1049 BLAKE2B ffdb8d5b6bf64e55a54b3eca6ff87279f10a84503a738eb22d477c741d68030b242f30587b11011a34f668077ee97c643299493f2716eb15ee9879e475554d10 SHA512 746e41db31511e1a307ea7974595da0d6c08d1af5f238ee4fba3b5da3d5490a1066414f64ff97ca6f73eef9c49d08759a03545c59a374f3c349cfcf63ef00d2a
+EBUILD ament_cmake_export_dependencies-9999.ebuild 1049 BLAKE2B ffdb8d5b6bf64e55a54b3eca6ff87279f10a84503a738eb22d477c741d68030b242f30587b11011a34f668077ee97c643299493f2716eb15ee9879e475554d10 SHA512 746e41db31511e1a307ea7974595da0d6c08d1af5f238ee4fba3b5da3d5490a1066414f64ff97ca6f73eef9c49d08759a03545c59a374f3c349cfcf63ef00d2a
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild
new file mode 100644
index 000000000000..a8243ae65981
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+ dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
new file mode 100644
index 000000000000..a8243ae65981
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+ dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_dependencies/metadata.xml b/dev-ros/ament_cmake_export_dependencies/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
new file mode 100644
index 000000000000..186c7fa47fbf
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_export_include_directories-0.8.1.ebuild 1016 BLAKE2B f99154bd0ad55d9209e173d185ad14bedf0d6b835c34c1e6de9d90713190c482532692bb6d3a3eecbd3ffefb27685016175b4ca353919d8dbea65f8d164c5a7f SHA512 8628400c047fc898c3aaeee3258b0dc4904e14ed8c083e9b91d90c1d00965a31e2cbbd71565c3140c9b3453dee3a10d50a9141d67a0352c61efd6e2c1e2db55f
+EBUILD ament_cmake_export_include_directories-9999.ebuild 1016 BLAKE2B f99154bd0ad55d9209e173d185ad14bedf0d6b835c34c1e6de9d90713190c482532692bb6d3a3eecbd3ffefb27685016175b4ca353919d8dbea65f8d164c5a7f SHA512 8628400c047fc898c3aaeee3258b0dc4904e14ed8c083e9b91d90c1d00965a31e2cbbd71565c3140c9b3453dee3a10d50a9141d67a0352c61efd6e2c1e2db55f
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.8.1.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.8.1.ebuild
new file mode 100644
index 000000000000..3ec728675bae
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
new file mode 100644
index 000000000000..3ec728675bae
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_include_directories/metadata.xml b/dev-ros/ament_cmake_export_include_directories/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
new file mode 100644
index 000000000000..04a4283ea819
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_export_interfaces-0.8.1.ebuild 1045 BLAKE2B dcb61e865cdb17c4ebd3edb66ba40eb4f7947e88cf9a09a1471074d7a27d8b592794f7914a739e77847b648a2815ac967c46811bb9dfd0943cb855af2177d454 SHA512 8096978f17a317c88431b577d694cbca9933ae0a508756db1674c87551af0d1f9688d91298f03ff65237dde9fffc945d06c4d84830701d08a5c95a4c612fa9dc
+EBUILD ament_cmake_export_interfaces-9999.ebuild 1045 BLAKE2B dcb61e865cdb17c4ebd3edb66ba40eb4f7947e88cf9a09a1471074d7a27d8b592794f7914a739e77847b648a2815ac967c46811bb9dfd0943cb855af2177d454 SHA512 8096978f17a317c88431b577d694cbca9933ae0a508756db1674c87551af0d1f9688d91298f03ff65237dde9fffc945d06c4d84830701d08a5c95a4c612fa9dc
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.8.1.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.8.1.ebuild
new file mode 100644
index 000000000000..ecee8305483e
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.8.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+ dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
new file mode 100644
index 000000000000..ecee8305483e
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+ dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_interfaces/metadata.xml b/dev-ros/ament_cmake_export_interfaces/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
new file mode 100644
index 000000000000..2d69145edb91
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_export_libraries-0.8.1.ebuild 1006 BLAKE2B d43af8144788ca1db3b1f58547676d95c9742629bad70e8306f1c547a2e0b12384a69ccf280734e165b48d74396e09885bee65936a27facb075fab2bf3cd2f68 SHA512 42a0f7f9dc4564a8b2bcf3b3d099c9723ba75fccfd46fcedd82083f3452976b55b60bdef644a39d876b232467d68990291cb1fc2a8c2af893659f873811f2ba8
+EBUILD ament_cmake_export_libraries-9999.ebuild 1006 BLAKE2B d43af8144788ca1db3b1f58547676d95c9742629bad70e8306f1c547a2e0b12384a69ccf280734e165b48d74396e09885bee65936a27facb075fab2bf3cd2f68 SHA512 42a0f7f9dc4564a8b2bcf3b3d099c9723ba75fccfd46fcedd82083f3452976b55b60bdef644a39d876b232467d68990291cb1fc2a8c2af893659f873811f2ba8
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.8.1.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.8.1.ebuild
new file mode 100644
index 000000000000..c3827165a1ec
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
new file mode 100644
index 000000000000..c3827165a1ec
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_libraries/metadata.xml b/dev-ros/ament_cmake_export_libraries/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
new file mode 100644
index 000000000000..a1a5713f3a05
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_export_link_flags-0.8.1.ebuild 1007 BLAKE2B c7c2570116a159a3d723204e6a54f32bbc7bcc8c16566c2e9509b5819793458c9e7fc8125f536a1a8b97e1803ab91cd4cb2212584b31362af51c860f8da4d852 SHA512 ff033ae591eb5e45b1eaf12e0db50d1c859b5c0ceed51daec53ce3474b7202084629c66c5997178d46a15d4211b94b9e3876caac5b825ccd142c682278faf176
+EBUILD ament_cmake_export_link_flags-9999.ebuild 1007 BLAKE2B c7c2570116a159a3d723204e6a54f32bbc7bcc8c16566c2e9509b5819793458c9e7fc8125f536a1a8b97e1803ab91cd4cb2212584b31362af51c860f8da4d852 SHA512 ff033ae591eb5e45b1eaf12e0db50d1c859b5c0ceed51daec53ce3474b7202084629c66c5997178d46a15d4211b94b9e3876caac5b825ccd142c682278faf176
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.8.1.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.8.1.ebuild
new file mode 100644
index 000000000000..6f08b075e590
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild
new file mode 100644
index 000000000000..6f08b075e590
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_export_link_flags/metadata.xml b/dev-ros/ament_cmake_export_link_flags/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
new file mode 100644
index 000000000000..e5df054ae787
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_gtest-0.8.1.ebuild 1003 BLAKE2B 413f70393fa54bb43cd1b24eab7ae7cba5774a1e5694783e0201d67ddf5733acb784e38e5fe8f8a1f97c61c62b075df4685f26c4bf60ba0f5552fc66304d4e95 SHA512 3975665b4b898150ce9b0f8a7333bf01fdb5e6651aea04dceb0457af924fb8888f94f390f90e5249b0e07d65d0ea1e847392c7d38828c8a01402183fa9772667
+EBUILD ament_cmake_gtest-9999.ebuild 1003 BLAKE2B 413f70393fa54bb43cd1b24eab7ae7cba5774a1e5694783e0201d67ddf5733acb784e38e5fe8f8a1f97c61c62b075df4685f26c4bf60ba0f5552fc66304d4e95 SHA512 3975665b4b898150ce9b0f8a7333bf01fdb5e6651aea04dceb0457af924fb8888f94f390f90e5249b0e07d65d0ea1e847392c7d38828c8a01402183fa9772667
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.8.1.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.8.1.ebuild
new file mode 100644
index 000000000000..0987702da776
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
new file mode 100644
index 000000000000..0987702da776
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_gtest/metadata.xml b/dev-ros/ament_cmake_gtest/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
new file mode 100644
index 000000000000..520ca86e115b
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_include_directories-0.8.1.ebuild 1016 BLAKE2B f99154bd0ad55d9209e173d185ad14bedf0d6b835c34c1e6de9d90713190c482532692bb6d3a3eecbd3ffefb27685016175b4ca353919d8dbea65f8d164c5a7f SHA512 8628400c047fc898c3aaeee3258b0dc4904e14ed8c083e9b91d90c1d00965a31e2cbbd71565c3140c9b3453dee3a10d50a9141d67a0352c61efd6e2c1e2db55f
+EBUILD ament_cmake_include_directories-9999.ebuild 1016 BLAKE2B f99154bd0ad55d9209e173d185ad14bedf0d6b835c34c1e6de9d90713190c482532692bb6d3a3eecbd3ffefb27685016175b4ca353919d8dbea65f8d164c5a7f SHA512 8628400c047fc898c3aaeee3258b0dc4904e14ed8c083e9b91d90c1d00965a31e2cbbd71565c3140c9b3453dee3a10d50a9141d67a0352c61efd6e2c1e2db55f
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.8.1.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.8.1.ebuild
new file mode 100644
index 000000000000..3ec728675bae
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild
new file mode 100644
index 000000000000..3ec728675bae
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_include_directories/metadata.xml b/dev-ros/ament_cmake_include_directories/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
new file mode 100644
index 000000000000..6d15a061fa66
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_libraries-0.8.1.ebuild 1009 BLAKE2B aae89aeabfb4d7e7ab62596173fce72ad0f3454e307ac377062824328338e9f06d6cf1dacd0e5b330557fbe3d281ac15905b59caeaed6b97974413f623b74558 SHA512 41e12be13ea6f291a6f544e3a7124a94e0e2fdc9dcbe3c833b3aee3e18ff883442a48583a7e57a4bdf6909310040e4e3355bf3fcf2d6c2204a67573561cd6cad
+EBUILD ament_cmake_libraries-9999.ebuild 1009 BLAKE2B aae89aeabfb4d7e7ab62596173fce72ad0f3454e307ac377062824328338e9f06d6cf1dacd0e5b330557fbe3d281ac15905b59caeaed6b97974413f623b74558 SHA512 41e12be13ea6f291a6f544e3a7124a94e0e2fdc9dcbe3c833b3aee3e18ff883442a48583a7e57a4bdf6909310040e4e3355bf3fcf2d6c2204a67573561cd6cad
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.8.1.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.8.1.ebuild
new file mode 100644
index 000000000000..b38982c35672
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
new file mode 100644
index 000000000000..b38982c35672
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_libraries/metadata.xml b/dev-ros/ament_cmake_libraries/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
new file mode 100644
index 000000000000..060074eec0b6
--- /dev/null
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -0,0 +1,5 @@
+AUX destdir.patch 1203 BLAKE2B fe4e783ea9d4802752d79d489e5b05d0ca9688a76d678521af41f232005da611c0286f594d15045dcae5610362ccc1bb878d29bddbeb86a9452b0289af347d67 SHA512 85e196c9777a6cc8b8b693e3825d5027c7a5db0a74008ad34d9be3714a088a9e651bb99ce53ee2bd95c47b2c1f8c2c657fa18cce0f13b11e4ea437cdd03ef0b3
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_python-0.8.1-r1.ebuild 1032 BLAKE2B 8113b0daaed54dba1b76fcf18ee95f335591037d6ad83a5b0f9e7c6665c270a6fcbc8b27bbe28e63957c93d53b49d9fcbcebabc7db7ede8ce2358c85e12308dc SHA512 ebb58bf8f4b1e7f7afbad4f5d9bd5ae56dab68307e6c58361ecce66dbc98b70bb959e9d3db97aa83bcd11184be3cf0551c4477233417be7a646b4e22dfe163c1
+EBUILD ament_cmake_python-9999.ebuild 1032 BLAKE2B 8113b0daaed54dba1b76fcf18ee95f335591037d6ad83a5b0f9e7c6665c270a6fcbc8b27bbe28e63957c93d53b49d9fcbcebabc7db7ede8ce2358c85e12308dc SHA512 ebb58bf8f4b1e7f7afbad4f5d9bd5ae56dab68307e6c58361ecce66dbc98b70bb959e9d3db97aa83bcd11184be3cf0551c4477233417be7a646b4e22dfe163c1
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..fba573262bf6
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to use Python in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
+PATCHES=( "${FILESDIR}/destdir.patch" )
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
new file mode 100644
index 000000000000..fba573262bf6
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to use Python in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
+PATCHES=( "${FILESDIR}/destdir.patch" )
diff --git a/dev-ros/ament_cmake_python/files/destdir.patch b/dev-ros/ament_cmake_python/files/destdir.patch
new file mode 100644
index 000000000000..8e8f628afaf3
--- /dev/null
+++ b/dev-ros/ament_cmake_python/files/destdir.patch
@@ -0,0 +1,26 @@
+Index: ament_cmake_python/cmake/ament_python_install_module.cmake
+===================================================================
+--- ament_cmake_python.orig/cmake/ament_python_install_module.cmake
++++ ament_cmake_python/cmake/ament_python_install_module.cmake
+@@ -64,7 +64,7 @@ function(_ament_cmake_python_install_mod
+ "execute_process(
+ COMMAND
+ \"${PYTHON_EXECUTABLE}\" \"-m\" \"compileall\"
+- \"${CMAKE_INSTALL_PREFIX}/${destination}/${module_file}\"
++ \"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${destination}/${module_file}\"
+ )"
+ )
+ endif()
+Index: ament_cmake_python/cmake/ament_python_install_package.cmake
+===================================================================
+--- ament_cmake_python.orig/cmake/ament_python_install_package.cmake
++++ ament_cmake_python/cmake/ament_python_install_package.cmake
+@@ -65,7 +65,7 @@ function(_ament_cmake_python_install_pac
+ "execute_process(
+ COMMAND
+ \"${PYTHON_EXECUTABLE}\" \"-m\" \"compileall\"
+- \"${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}/${package_name}\"
++ \"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}/${package_name}\"
+ )"
+ )
+ endif()
diff --git a/dev-ros/ament_cmake_python/metadata.xml b/dev-ros/ament_cmake_python/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_python/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
new file mode 100644
index 000000000000..6a13a5a293df
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_target_dependencies-0.8.1.ebuild 1082 BLAKE2B 2564d6711bb8446b10231990580cf45774ea5e4dbbf1f01d0a3e43c31f2f09d91eaa6495dd95d0cd5a21ac7a291740c47ca8659eaa66d038830d14c8a7f80dc4 SHA512 c4fcfe25aafdceda2b8e5cf9fea02c6a67ca739b526c93b6c431ce22ac27c5a40aaafb10393113303f56e8340f2eb8690003c8c10e0071de680e15c98c8c02eb
+EBUILD ament_cmake_target_dependencies-9999.ebuild 1082 BLAKE2B 2564d6711bb8446b10231990580cf45774ea5e4dbbf1f01d0a3e43c31f2f09d91eaa6495dd95d0cd5a21ac7a291740c47ca8659eaa66d038830d14c8a7f80dc4 SHA512 c4fcfe25aafdceda2b8e5cf9fea02c6a67ca739b526c93b6c431ce22ac27c5a40aaafb10393113303f56e8340f2eb8690003c8c10e0071de680e15c98c8c02eb
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild
new file mode 100644
index 000000000000..c48f31a5cc7f
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+ dev-ros/ament_cmake_include_directories
+ dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
new file mode 100644
index 000000000000..c48f31a5cc7f
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+ dev-ros/ament_cmake_include_directories
+ dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_target_dependencies/metadata.xml b/dev-ros/ament_cmake_target_dependencies/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
new file mode 100644
index 000000000000..fab74a4dab92
--- /dev/null
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_test-0.8.1.ebuild 1265 BLAKE2B 4adc20d086fba6223df474bc8164c576e66f97a982cb5833c4bcc324436501f71c7775c4ebde40a407b117a6fc13a62d8264cc618075baedb8dabc672e49d6e3 SHA512 3133d5f3fec6035fd0e7c43207d76648b9dd10b3ee92f50949189e4e98ee0bbd47f6a62d5dd79a1806d6af52b3e68cfa4385adb302cf4adb19c78edd44356df7
+EBUILD ament_cmake_test-9999.ebuild 1265 BLAKE2B 4adc20d086fba6223df474bc8164c576e66f97a982cb5833c4bcc324436501f71c7775c4ebde40a407b117a6fc13a62d8264cc618075baedb8dabc672e49d6e3 SHA512 3133d5f3fec6035fd0e7c43207d76648b9dd10b3ee92f50949189e4e98ee0bbd47f6a62d5dd79a1806d6af52b3e68cfa4385adb302cf4adb19c78edd44356df7
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild
new file mode 100644
index 000000000000..fc08c8b4c3ee
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-r1 python-utils-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+ dev-ros/ament_cmake_core
+ dev-python/ament_package[${PYTHON_USEDEP}]
+ dev-python/catkin_pkg[${PYTHON_USEDEP}]
+ dev-ros/ament_cmake_python
+ ${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+ python_foreach_impl cmake-utils_src_configure
+}
+
+src_compile() {
+ python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+ python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+ python_foreach_impl cmake-utils_src_install
+ python_foreach_impl python_optimize
+}
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
new file mode 100644
index 000000000000..fc08c8b4c3ee
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-r1 python-utils-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+ dev-ros/ament_cmake_core
+ dev-python/ament_package[${PYTHON_USEDEP}]
+ dev-python/catkin_pkg[${PYTHON_USEDEP}]
+ dev-ros/ament_cmake_python
+ ${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+ python_foreach_impl cmake-utils_src_configure
+}
+
+src_compile() {
+ python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+ python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+ python_foreach_impl cmake-utils_src_install
+ python_foreach_impl python_optimize
+}
diff --git a/dev-ros/ament_cmake_test/metadata.xml b/dev-ros/ament_cmake_test/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_test/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/ament_cmake_version/Manifest b/dev-ros/ament_cmake_version/Manifest
new file mode 100644
index 000000000000..e2032dec4bb4
--- /dev/null
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -0,0 +1,4 @@
+DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
+EBUILD ament_cmake_version-0.8.1.ebuild 1004 BLAKE2B 243809015094231706345385f6556047a85bffd599e2ef5057d43bfada09deabdb4ebce24a739ec25b81e8817db462fb2acec5612cba43a7176518bbe99f0804 SHA512 63acd3647c4deb87a1a2b913964e5233672b58450e9807c8e08521d5d9df14951d3034af78f12ac0c05ca4470e457815d1b9718159a358becd9ee5b02ef6c451
+EBUILD ament_cmake_version-9999.ebuild 1004 BLAKE2B 243809015094231706345385f6556047a85bffd599e2ef5057d43bfada09deabdb4ebce24a739ec25b81e8817db462fb2acec5612cba43a7176518bbe99f0804 SHA512 63acd3647c4deb87a1a2b913964e5233672b58450e9807c8e08521d5d9df14951d3034af78f12ac0c05ca4470e457815d1b9718159a358becd9ee5b02ef6c451
+MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-0.8.1.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-0.8.1.ebuild
new file mode 100644
index 000000000000..0de78e13568c
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Override the exported package version in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
new file mode 100644
index 000000000000..0de78e13568c
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+ SRC_URI=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+ S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Override the exported package version in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+ dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/ament_cmake_version/metadata.xml b/dev-ros/ament_cmake_version/metadata.xml
new file mode 100644
index 000000000000..d1baaf5c70f1
--- /dev/null
+++ b/dev-ros/ament_cmake_version/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ament/ament_cmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/base_local_planner/Manifest b/dev-ros/base_local_planner/Manifest
index 5747de2f509d..2fd4d04a3a65 100644
--- a/dev-ros/base_local_planner/Manifest
+++ b/dev-ros/base_local_planner/Manifest
@@ -1,6 +1,8 @@
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD base_local_planner-1.16.1.ebuild 1088 BLAKE2B 07d1c699b36f6288a8c464d22428b45032b14e0139a3615f6b0ce2b0d772a33fc9894271c754f4c06a9f917e11b0b078a057f32c02e8e7d9872fdbfebc7ee65b SHA512 7c0a4f6750e3be9f4a480791a44d19fddc588061fb6f8dbeb0641b7b64e7a3f3204b0a21446a568f81391fd266004ec0aed55ac9e655252be87af0e4d20619b5
EBUILD base_local_planner-1.16.2.ebuild 1153 BLAKE2B 45ba326dfafd52147da17c0b34840c05fe438d1fa0d8bf990698e2c3986c691ae27d5299a42b43bb8e8ab3d5722bea2eedb7be20875aa6531f14c597df26f030 SHA512 eaf64d349960c06921abdd307da4c9689a1120b96c82176b7d78fd83d43d958658866e69aefe83b0d0a55ec31f57924a1fc77b817fe64985115e363514cf501f
+EBUILD base_local_planner-1.16.3.ebuild 1150 BLAKE2B bcf53fe75db20429ea4db153dda57f6d010441cdb78d7fe40d2af649d56c971f21ab049a78732f31d7264119fcdb1a6105e3e4392f0e92f0e080f6a0d50b6670 SHA512 ec286c6760d739e8e1db6d752585f4e080b040fdc154efbb4d1ceaad87d1941462205e9b3d2d4c8178ac23de2fc9223a6dfe642f506c5978cd0eebe5d7e789a2
EBUILD base_local_planner-9999.ebuild 1153 BLAKE2B 45ba326dfafd52147da17c0b34840c05fe438d1fa0d8bf990698e2c3986c691ae27d5299a42b43bb8e8ab3d5722bea2eedb7be20875aa6531f14c597df26f030 SHA512 eaf64d349960c06921abdd307da4c9689a1120b96c82176b7d78fd83d43d958658866e69aefe83b0d0a55ec31f57924a1fc77b817fe64985115e363514cf501f
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/base_local_planner/base_local_planner-1.16.3.ebuild b/dev-ros/base_local_planner/base_local_planner-1.16.3.ebuild
new file mode 100644
index 000000000000..7e87eb46a5ae
--- /dev/null
+++ b/dev-ros/base_local_planner/base_local_planner-1.16.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/angles
+ >=dev-ros/costmap_2d-1.16
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+ dev-cpp/eigen:3
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ >=dev-ros/nav_core-1.16
+ dev-ros/pluginlib
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2
+ dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_ros
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/voxel_grid
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ dev-ros/cmake_modules
+ test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/camera_calibration/Manifest b/dev-ros/camera_calibration/Manifest
index 934d83ceedd5..7cf1c5d6fed8 100644
--- a/dev-ros/camera_calibration/Manifest
+++ b/dev-ros/camera_calibration/Manifest
@@ -7,6 +7,7 @@ DIST image_pipeline-1.12.20.tar.gz 137888 BLAKE2B 2fa362acf59e545c794136262bab98
DIST image_pipeline-1.12.21.tar.gz 139264 BLAKE2B 0b60057d35a250b0f4938ad79d893b922501d9416a6a7122c49023f632affd06c1c82bfddff0f10bbebe683d8dd50eb4d947d5086a8bb6935da98f8a2d146eed SHA512 76f06e7a1effb3098454496e01a8c14b34a37a3ea96ac51a0deb860b6891b37d354dcf7d9c06389476decaa90c3097c4495e34d04f70ad6a571fc5469eda2f6c
DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
+DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
EBUILD camera_calibration-1.12.14.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
EBUILD camera_calibration-1.12.15.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
EBUILD camera_calibration-1.12.16.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
@@ -16,5 +17,6 @@ EBUILD camera_calibration-1.12.20.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a474817
EBUILD camera_calibration-1.12.21.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
EBUILD camera_calibration-1.12.22.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
EBUILD camera_calibration-1.12.23.ebuild 828 BLAKE2B 7584bc3eb7533127f2475f6a42ccde314f51cb64fcf14ca3e2e1e7ef3f8a3e83c606ce8cc00d0e329f359b46b4d5477d2e68f7a43c9b1b9dd61bbe6d3a8c32a7 SHA512 4fac89c8b30f0be4898a996cf1f2bc0af1643e2e2b0a9b3bfb72ddd50e9e235e623f5600a90f321030f75e1707e3fa200899e6e7e50ba5b81f736735f5227e53
+EBUILD camera_calibration-1.13.0.ebuild 825 BLAKE2B a9b21903a35b2eaa4e7a73b59abcfd6a0b59477cad33ff8a637153b9e0295998d1a377e1c5cf4c686a068c8cbdfdad82678f3550402581bacd27d2b816202615 SHA512 580a5ec88c72b7c699f00d9711593f84c7759c90eb58aa0fa85e094e4c9a30e10c02f5c743d6b6525f4648206bcf7a9e5268f1fb085be345f992ed09133ad1cb
EBUILD camera_calibration-9999.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild b/dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild
new file mode 100644
index 000000000000..dffb8eec336f
--- /dev/null
+++ b/dev-ros/camera_calibration/camera_calibration-1.13.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge[${PYTHON_USEDEP}]
+ dev-ros/image_geometry[${PYTHON_USEDEP}]
+ || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
+ dev-ros/message_filters[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/std_srvs[${PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/carrot_planner/Manifest b/dev-ros/carrot_planner/Manifest
index cc69f7885fb5..f509c8d52bfa 100644
--- a/dev-ros/carrot_planner/Manifest
+++ b/dev-ros/carrot_planner/Manifest
@@ -1,6 +1,8 @@
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD carrot_planner-1.16.1.ebuild 595 BLAKE2B c190b4df7617f2e600493e9841940b12b4841e17fea253cf59b20d86d2f701a80951f6b74b3074395967c7c22077f419efda210ee623427dc696dda11b45f833 SHA512 4457a05ddc7305f647c80a265b8ceb7e051452ade4e9f2ea316a53f389ed5e0685c186999de8d739f8a9a5c47c86fc5924bb46c4a2f16bb50286fe2954598f7b
EBUILD carrot_planner-1.16.2.ebuild 608 BLAKE2B 167e6751811107cf47a1f8eb596faa5ebf44dd65681d1db9bee8e9b4c10671dc6ed5fa4f75686578886217f4e201033fde2f1c280c6520d2b316933074ed6f6b SHA512 96e0afa83da45c339680c20b28a45b3829892d74d77244a794ecb644e51e20e5d513a5dfe94bf65660d0ce26ef5414b1103e51bdc284dafde2dffa90132fbb77
+EBUILD carrot_planner-1.16.3.ebuild 605 BLAKE2B 10430a945a7dded75071129160f0ef7e24bfde4cedafa9dff0bbc7257769f0bf3ef1b5be020d247f45e924d950b71d2a1949e0da12458bd951ea6bfe09a77314 SHA512 b0d37147cb1d25dba11e47bae0ef4c5ee0dc9594a9437e5e00921e9e1b422850cbc526c26447990467c8d3b5ce0b117ad9e2c881e2298e83c8d29dadd8dd906a
EBUILD carrot_planner-9999.ebuild 608 BLAKE2B 167e6751811107cf47a1f8eb596faa5ebf44dd65681d1db9bee8e9b4c10671dc6ed5fa4f75686578886217f4e201033fde2f1c280c6520d2b316933074ed6f6b SHA512 96e0afa83da45c339680c20b28a45b3829892d74d77244a794ecb644e51e20e5d513a5dfe94bf65660d0ce26ef5414b1103e51bdc284dafde2dffa90132fbb77
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.2.ebuild b/dev-ros/carrot_planner/carrot_planner-1.16.3.ebuild
index c88df16826d6..a1772a73b786 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.2.ebuild
+++ b/dev-ros/carrot_planner/carrot_planner-1.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,23 +8,22 @@ KEYWORDS="~amd64 ~arm"
inherit ros-catkin
-DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
+DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND="
- >=dev-ros/costmap_2d-1.16
+ dev-ros/base_local_planner
+ dev-ros/costmap_2d
dev-cpp/eigen:3
dev-ros/nav_core
dev-ros/pluginlib
dev-ros/roscpp
+ dev-ros/tf2
dev-ros/tf2_ros
- dev-libs/boost:=[threads]
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
- test? ( dev-ros/rostest dev-cpp/gtest )
+ dev-libs/boost:=
+ dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
index 0cb56f10403a..f370831cb569 100644
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ b/dev-ros/clear_costmap_recovery/Manifest
@@ -1,12 +1,4 @@
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-EBUILD clear_costmap_recovery-1.15.1-r1.ebuild 647 BLAKE2B c1d826027317640624ab0b1b65aa668eb90cdbedd36c5b6cf823b2ee0ebd0ba18869ba6ce0ea10b357412ca3a3e7c724212df063a52286ce88688771b6a1e258 SHA512 7561452bb3b29978c9984949b5c029b15cb5f22ff4356d212a765e921ae0b8780af4fa56fc32811f8f31c065254d68be2729e57575f968d1f0902d9d2617e23a
-EBUILD clear_costmap_recovery-1.15.2.ebuild 647 BLAKE2B 51836b3e628ad4602a74cd62e111b983ee0cfb1b65c906d8e3d695d13c594c7bc12933e2949f997448b11f97e9605c3faba834e039d8e55c7291fe7264621dff SHA512 7d484771d638a0be5c45d7f4409dc50d994dc7f3b91d8cd1c8ebc4afe176662650d4b982b36eb3b41bae41d173dbc054bcdcffd9d701548db1d326c99263755a
-EBUILD clear_costmap_recovery-1.16.0.ebuild 637 BLAKE2B 1fe350cb75dc86cdc175ff292d6473286ea723736e2d5e705ba83ce9eb897768cfc389afac7251914a85fa0103663f549fde97a74f7a3cebd13849a43e37d246 SHA512 65fba55d328b30785d55896bb30e78e22e12c9a81c94a08fd12ca5b502ae835becab6a0a789af809dde0d4ffe20a1f24280635b8805c09b47a39d2ada55e1000
-EBUILD clear_costmap_recovery-1.16.1.ebuild 637 BLAKE2B 1fe350cb75dc86cdc175ff292d6473286ea723736e2d5e705ba83ce9eb897768cfc389afac7251914a85fa0103663f549fde97a74f7a3cebd13849a43e37d246 SHA512 65fba55d328b30785d55896bb30e78e22e12c9a81c94a08fd12ca5b502ae835becab6a0a789af809dde0d4ffe20a1f24280635b8805c09b47a39d2ada55e1000
-EBUILD clear_costmap_recovery-1.16.2.ebuild 637 BLAKE2B 1fe350cb75dc86cdc175ff292d6473286ea723736e2d5e705ba83ce9eb897768cfc389afac7251914a85fa0103663f549fde97a74f7a3cebd13849a43e37d246 SHA512 65fba55d328b30785d55896bb30e78e22e12c9a81c94a08fd12ca5b502ae835becab6a0a789af809dde0d4ffe20a1f24280635b8805c09b47a39d2ada55e1000
-EBUILD clear_costmap_recovery-9999.ebuild 637 BLAKE2B 1fe350cb75dc86cdc175ff292d6473286ea723736e2d5e705ba83ce9eb897768cfc389afac7251914a85fa0103663f549fde97a74f7a3cebd13849a43e37d246 SHA512 65fba55d328b30785d55896bb30e78e22e12c9a81c94a08fd12ca5b502ae835becab6a0a789af809dde0d4ffe20a1f24280635b8805c09b47a39d2ada55e1000
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
+EBUILD clear_costmap_recovery-1.16.3.ebuild 636 BLAKE2B 732722bb2f8ee5dcd044b921a07d7a6f7c9a5e621ca213f2c2175cc894fee867efbebb4fd28254c1578b25165afa76d5ea34ca919cc704b5a7fa54dbe750fcc9 SHA512 2296a68eaedc697745fa30356e9f277fff7d347818099a35f1553fdc2d0dbf6046a5d88fc37b17970175004f8787f552822447e6cccc38515be0ee25decc742b
+EBUILD clear_costmap_recovery-9999.ebuild 636 BLAKE2B 732722bb2f8ee5dcd044b921a07d7a6f7c9a5e621ca213f2c2175cc894fee867efbebb4fd28254c1578b25165afa76d5ea34ca919cc704b5a7fa54dbe750fcc9 SHA512 2296a68eaedc697745fa30356e9f277fff7d347818099a35f1553fdc2d0dbf6046a5d88fc37b17970175004f8787f552822447e6cccc38515be0ee25decc742b
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.1-r1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.1-r1.ebuild
deleted file mode 100644
index 131722880ad5..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,30 +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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=dev-ros/costmap_2d-1.13.1
- dev-ros/nav_core
- dev-ros/pluginlib
- dev-ros/roscpp
- dev-ros/tf
- dev-cpp/eigen:3
- sci-libs/pcl
- dev-libs/boost:=[threads]
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
- test? ( dev-ros/rostest dev-cpp/gtest )
-"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.2.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.2.ebuild
deleted file mode 100644
index b1e48acec00b..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.15.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=dev-ros/costmap_2d-1.13.1
- dev-ros/nav_core
- dev-ros/pluginlib
- dev-ros/roscpp
- dev-ros/tf
- dev-cpp/eigen:3
- sci-libs/pcl
- dev-libs/boost:=[threads]
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
- test? ( dev-ros/rostest dev-cpp/gtest )
-"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.0.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.3.ebuild
index c88df16826d6..577df1d17e47 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.0.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ SLOT="0"
IUSE=""
RDEPEND="
- >=dev-ros/costmap_2d-1.16
+ >=dev-ros/costmap_2d-1.16.3
dev-cpp/eigen:3
dev-ros/nav_core
dev-ros/pluginlib
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
index c88df16826d6..577df1d17e47 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ SLOT="0"
IUSE=""
RDEPEND="
- >=dev-ros/costmap_2d-1.16
+ >=dev-ros/costmap_2d-1.16.3
dev-cpp/eigen:3
dev-ros/nav_core
dev-ros/pluginlib
diff --git a/dev-ros/compressed_depth_image_transport/Manifest b/dev-ros/compressed_depth_image_transport/Manifest
index f488283a7af9..b44237b93bb9 100644
--- a/dev-ros/compressed_depth_image_transport/Manifest
+++ b/dev-ros/compressed_depth_image_transport/Manifest
@@ -1,4 +1,5 @@
+AUX ocv4.patch 534 BLAKE2B 344016d8bacd6f2ee93604a94fb82a2b548b584540d8d39a6910d6ba7ed9882667e8da47f6b2654a9cc89e0424944728e34bb97a02ddba23f8621bd26baf9e1d SHA512 890b27946567e9290250bb8af10821ba8519dead141c8ff22cb2be8a201ca6bf26955503edbd767dec878a77609c3d9d50adefb8f02b75ce1d4aee8a2998d5b9
DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c
-EBUILD compressed_depth_image_transport-1.9.5-r1.ebuild 599 BLAKE2B a522cfae31f5b06a5c71893ec4219a50f108f6cab778cf6af8f819c3bd9929fa4f12825eb9e4dccdaa2679975e4cd30e19ed9057875c9370e847c9761ca4d0bf SHA512 f7e0dbab6bf3f1bd59e90d5569b4df97ba210fafe2883f2125c98da1675b1203d84790ee1e10958f7912eef478d29235735b0d3e246006bc40aedbeaba14583d
+EBUILD compressed_depth_image_transport-1.9.5-r1.ebuild 637 BLAKE2B 1d292d3d1600dd00176be37b0855767ed69d37cb99a96b2cbdab227ae34331cf40e91cad68b0a4967de854b2e20f95598b1fdc44ed35951addb4d7274224d789 SHA512 2eb7fe38a27eb416b12d0de400cac49fd68e475264ef1f2be2fdc5a3051c8ff80626daba2141849d21104f6cf3eecf7e11ab3b2a690e74fdecc089d5d66e8bf0
EBUILD compressed_depth_image_transport-9999.ebuild 599 BLAKE2B a522cfae31f5b06a5c71893ec4219a50f108f6cab778cf6af8f819c3bd9929fa4f12825eb9e4dccdaa2679975e4cd30e19ed9057875c9370e847c9761ca4d0bf SHA512 f7e0dbab6bf3f1bd59e90d5569b4df97ba210fafe2883f2125c98da1675b1203d84790ee1e10958f7912eef478d29235735b0d3e246006bc40aedbeaba14583d
MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild
index d4ef693e9dd2..d3bccdcdc1cc 100644
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,8 +18,9 @@ RDEPEND="
dev-ros/cv_bridge
dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
dev-ros/image_transport
- media-libs/opencv:=
+ >=media-libs/opencv-4:=
dev-libs/boost:=
dev-libs/console_bridge:=
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/compressed_depth_image_transport/files/ocv4.patch b/dev-ros/compressed_depth_image_transport/files/ocv4.patch
new file mode 100644
index 000000000000..9d1c7d79ce62
--- /dev/null
+++ b/dev-ros/compressed_depth_image_transport/files/ocv4.patch
@@ -0,0 +1,13 @@
+Index: compressed_depth_image_transport/src/codec.cpp
+===================================================================
+--- compressed_depth_image_transport.orig/src/codec.cpp
++++ compressed_depth_image_transport/src/codec.cpp
+@@ -135,7 +135,7 @@ sensor_msgs::Image::Ptr decodeCompressed
+ // Decode raw image
+ try
+ {
+- cv_ptr->image = cv::imdecode(imageData, CV_LOAD_IMAGE_UNCHANGED);
++ cv_ptr->image = cv::imdecode(imageData, cv::IMREAD_UNCHANGED);
+ }
+ catch (cv::Exception& e)
+ {
diff --git a/dev-ros/compressed_image_transport/Manifest b/dev-ros/compressed_image_transport/Manifest
index a5521d65dc37..c31e789ccc48 100644
--- a/dev-ros/compressed_image_transport/Manifest
+++ b/dev-ros/compressed_image_transport/Manifest
@@ -1,4 +1,5 @@
+AUX ocv4.patch 823 BLAKE2B e435db081e4fb82fb3ab6a0aa46dc157c06c5d4e89b8f93bca737300b4a34c63a77101907e0ccd4d11764a5aeba084cbba98fa25cd5eb0923217cb6961b207da SHA512 0372e0c4401424dccd6e5e20d9d9eae37a7d38801a2d73a93631545d347569a685d9540a9e73b65db83e8cb6499874e0675b1eed25d0b0a8c9ca5c6557609ccb
DIST image_transport_plugins-1.9.5.tar.gz 26268 BLAKE2B 2d7e71f891bc3ae548193a9671fb10fb4dc6c7a24fda0c0dc52d75d43793d55e35da37155496740624e4ebe34fcf0e8d3926345ca1581fa521096c01b773f551 SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c
-EBUILD compressed_image_transport-1.9.5-r1.ebuild 594 BLAKE2B 0371f8f25fc02e5ce6dc843a2642c0bf9138f1696ec940bff8508a79bc66ccc193f317610a8587720f6c6daf0db53feec6b82bcd8d8d63815dd0b481fc8f82f1 SHA512 f5711ff9ac19b3f2d38627aee4c2e7ea88202d892eff1cd38ef6e256173a81e4e4245034f01cd0c80b4feb01e2a44ea3e8e1b97dfef18882465813ab529c2fc5
+EBUILD compressed_image_transport-1.9.5-r1.ebuild 632 BLAKE2B 5431debfeda9cf204fa8e3213d7524de051885ee2db0e2b5b96e11f1f34ea2a7cfb0b3c6e2d353b07b1539f43448df400374ecb5bf7ba6dbd112cd0b5fd9cc6f SHA512 33dc22784dcc6ab9fd4ce13c17e9cf42342cd2f60f2494b7c0ab1816495a615ada381ae94e12d4c12f05ebc60318ae00a30132693cf9a169d0ff14d18342612c
EBUILD compressed_image_transport-9999.ebuild 594 BLAKE2B 0371f8f25fc02e5ce6dc843a2642c0bf9138f1696ec940bff8508a79bc66ccc193f317610a8587720f6c6daf0db53feec6b82bcd8d8d63815dd0b481fc8f82f1 SHA512 f5711ff9ac19b3f2d38627aee4c2e7ea88202d892eff1cd38ef6e256173a81e4e4245034f01cd0c80b4feb01e2a44ea3e8e1b97dfef18882465813ab529c2fc5
MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild
index 46fc32014194..044d1c361210 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-1.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,8 +18,9 @@ RDEPEND="
dev-ros/cv_bridge
dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
dev-ros/image_transport
- media-libs/opencv:=
+ >=media-libs/opencv-4:=
dev-libs/boost:=
dev-libs/console_bridge:=
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/compressed_image_transport/files/ocv4.patch b/dev-ros/compressed_image_transport/files/ocv4.patch
new file mode 100644
index 000000000000..6b3406b5c006
--- /dev/null
+++ b/dev-ros/compressed_image_transport/files/ocv4.patch
@@ -0,0 +1,22 @@
+Index: compressed_image_transport/src/compressed_publisher.cpp
+===================================================================
+--- compressed_image_transport.orig/src/compressed_publisher.cpp
++++ compressed_image_transport/src/compressed_publisher.cpp
+@@ -97,7 +97,7 @@ void CompressedPublisher::publish(const
+ // JPEG Compression
+ case JPEG:
+ {
+- params[0] = CV_IMWRITE_JPEG_QUALITY;
++ params[0] = cv::IMWRITE_JPEG_QUALITY;
+ params[1] = config_.jpeg_quality;
+
+ // Update ros message format header
+@@ -154,7 +154,7 @@ void CompressedPublisher::publish(const
+ // PNG Compression
+ case PNG:
+ {
+- params[0] = CV_IMWRITE_PNG_COMPRESSION;
++ params[0] = cv::IMWRITE_PNG_COMPRESSION;
+ params[1] = config_.png_level;
+
+ // Update ros message format header
diff --git a/dev-ros/console_bridge_vendor/Manifest b/dev-ros/console_bridge_vendor/Manifest
new file mode 100644
index 000000000000..6822f30b7065
--- /dev/null
+++ b/dev-ros/console_bridge_vendor/Manifest
@@ -0,0 +1,4 @@
+DIST console_bridge_vendor-1.2.0.tar.gz 5640 BLAKE2B d0a2b18c8d4b9259e6c8ba2953a7650e9aaef348345c5651b5a769ec9c2d4346e404688d7e6c60c3c45186d0afa0e3d3a6d9e49baef2ef1da4e0679aa7d5ba06 SHA512 2b5c8ab47554d724665184ae4dfea32a6291d9d2578a489eb81e695cc513c723e934c1dca0e66eaf83b81d656fbc67a4c7e3b4d15eae5d8770ad6ebc700b6d6b
+EBUILD console_bridge_vendor-1.2.0.ebuild 788 BLAKE2B 6013837d97ed10221e6334427df52649d7059c307734beb33908faabe1a60d5670a2c8d6ab0fee665da16805feb5d3acf81b12c9211f76c53587fcd476b6229e SHA512 0e9b0d8620cc81a127af63b4a6536c60b52d6c1cfa3a44148430dabe25cfe4b621ace5360cd18a875dcf087eac51c8020d0d6edd09c389ae89567cde341c9517
+EBUILD console_bridge_vendor-9999.ebuild 788 BLAKE2B 6013837d97ed10221e6334427df52649d7059c307734beb33908faabe1a60d5670a2c8d6ab0fee665da16805feb5d3acf81b12c9211f76c53587fcd476b6229e SHA512 0e9b0d8620cc81a127af63b4a6536c60b52d6c1cfa3a44148430dabe25cfe4b621ace5360cd18a875dcf087eac51c8020d0d6edd09c389ae89567cde341c9517
+MISC metadata.xml 340 BLAKE2B 870056bcba705aba636b787bab5b7418c318794f542a5e9ee3f165dc569e6e69b0e41ea54899150184f4ec5810398f3d2ae9fe33ffac64ddacfcba9b3c9e583f SHA512 7e652e5616c60cf5b77bd6f7a4b120ce26c35885426c87f9d22cc2963c9975f9423f1e2e88c795c55457d386b608ce783cb606a5b02dad1fd92a467373c34169
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild
new file mode 100644
index 000000000000..9d08355634bd
--- /dev/null
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ros2/console_bridge_vendor"
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/ros2/console_bridge_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Wrapper around console_bridge"
+HOMEPAGE="https://github.com/ros2/console_bridge_vendor"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+ >=dev-libs/console_bridge-0.4.1
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ $(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
new file mode 100644
index 000000000000..9d08355634bd
--- /dev/null
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ros2/console_bridge_vendor"
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/ros2/console_bridge_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Wrapper around console_bridge"
+HOMEPAGE="https://github.com/ros2/console_bridge_vendor"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+ >=dev-libs/console_bridge-0.4.1
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ $(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/console_bridge_vendor/metadata.xml b/dev-ros/console_bridge_vendor/metadata.xml
new file mode 100644
index 000000000000..aaf4c6a26a54
--- /dev/null
+++ b/dev-ros/console_bridge_vendor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ros2/console_bridge_vendor</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest
index ed555a37559e..39a92f08d18a 100644
--- a/dev-ros/costmap_2d/Manifest
+++ b/dev-ros/costmap_2d/Manifest
@@ -1,6 +1,8 @@
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD costmap_2d-1.16.1.ebuild 1129 BLAKE2B 9fef526a72f8c74a2f5416f6023b737a98c0c00accfa854dd45997d0f7fe60631a5c637decd882a931d67d1f62f14e6928fbd67e1c4f745c5c5a2e2b1a58f768 SHA512 289558f8f6435ea8dcce6007015d987dfe0ee43f58eb787794d771dc28a039692e1ee323641e53638c81c6d96e02c30f10116fa568ad57da6f7b8c3031b33ddb
EBUILD costmap_2d-1.16.2.ebuild 1142 BLAKE2B f1c97efdafbf3bd401a2dbbe3b412f574ebf8eac3fe31881c4bb4be839ef565e768188395dbddd84c811689965fef423317a043226f6d2d356c74cab2fc04b7f SHA512 e384f914270afb78ff60d2963fa68e47f839970ea57131ec8a09318c530b8a7a544fbc34bfb230a045827128e1e5b91cc4324941249773b12abb9d81f40fab41
+EBUILD costmap_2d-1.16.3.ebuild 1139 BLAKE2B 6f8f93df8bf51709e4bbbe9444cd79d0d91bed2532016063d63d9d6c35e923169a9b752f1832de6ef01a24f3c207b79c5eb8f72d953fbbafcaa353eb330efd14 SHA512 6db86133f72cc7ee4c91b77b62a8ac31675ad5239de75d008d1cff937ef66288892254bf9b24ebf1bf3d31cfb1c13d45836eab50cbbf702e0c31a306242b6c6f
EBUILD costmap_2d-9999.ebuild 1142 BLAKE2B f1c97efdafbf3bd401a2dbbe3b412f574ebf8eac3fe31881c4bb4be839ef565e768188395dbddd84c811689965fef423317a043226f6d2d356c74cab2fc04b7f SHA512 e384f914270afb78ff60d2963fa68e47f839970ea57131ec8a09318c530b8a7a544fbc34bfb230a045827128e1e5b91cc4324941249773b12abb9d81f40fab41
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/navfn/navfn-1.16.2.ebuild b/dev-ros/costmap_2d/costmap_2d-1.16.3.ebuild
index da9427d6977b..e42f534ac4e7 100644
--- a/dev-ros/navfn/navfn-1.16.2.ebuild
+++ b/dev-ros/costmap_2d/costmap_2d-1.16.3.ebuild
@@ -1,39 +1,47 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
ROS_REPO_URI="https://github.com/ros-planning/navigation"
ROS_SUBDIR=${PN}
KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
CATKIN_HAS_MESSAGES=yes
PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
inherit ros-catkin
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
+DESCRIPTION="Creates a 2D costmap from sensor data"
LICENSE="BSD"
SLOT="0"
IUSE=""
+REQUIRED_USE="ros_messages_cxx"
RDEPEND="
- >=dev-ros/costmap_2d-1.16
- dev-ros/nav_core
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+ dev-ros/laser_geometry
+ dev-ros/message_filters
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/pluginlib
- dev-ros/rosconsole
dev-ros/roscpp
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2
dev-ros/tf2_ros
dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/voxel_grid
+
+ dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_sensor_msgs
dev-cpp/eigen:3
- x11-libs/fltk
- media-libs/netpbm
dev-libs/boost:=[threads]
- dev-libs/console_bridge:=
+ dev-libs/tinyxml2:=
"
DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
- dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
+ dev-ros/cmake_modules
+ test? (
+ dev-ros/map_server
+ dev-ros/rosbag
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/rosunit
+ )"
diff --git a/dev-ros/cpp_common/Manifest b/dev-ros/cpp_common/Manifest
index fcbdd713c4c5..a02d845db71f 100644
--- a/dev-ros/cpp_common/Manifest
+++ b/dev-ros/cpp_common/Manifest
@@ -1,12 +1,14 @@
DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
DIST roscpp_core-0.6.12.tar.gz 35606 BLAKE2B 5f249ce576e046b487a12fc1d598429741329b57f4226a6a0fa7b62e0a5a6fa0716814e0c8cd8a4d4378f8994ca1534530d410a8865d666397328047f12f821d SHA512 a84799ee67cf205c9c304433f70aaf80c8f19eac86bc0c9c3207aa0ae255f33b302b4ad9e37feeb5d95d7e2db9210679871548313612f220e06fef3db2357f89
+DIST roscpp_core-0.6.13.tar.gz 35881 BLAKE2B f1eee242ecbda14de4d1b4f92c4552b249398eea0216300933e0ea73d86bce970e7db375b23d5ecb023e8a8a2e75baec8b7c0a935647143f1ff2a1eaf0bcbd5b SHA512 7d81371c383b8b2ae8d31731f21213ac2c5c4d47ed038890214c9da527f27149ce1deeda4a5e67adaabbfb7ff4a6edc53495cfa50625eeb94089eb7615850d2c
DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
EBUILD cpp_common-0.6.10.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
EBUILD cpp_common-0.6.11.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
EBUILD cpp_common-0.6.12.ebuild 417 BLAKE2B a5920f4e5818b7b24d7818db091c73447a3bc4a30f6fbe2393e000e0560ae3696f3bd6cc46343cdf52ab9d25921a789bb40a29db817b841ba2387692fa000eed SHA512 4a53fb67eafb11bfc1610896bee89668ca9237709e3dab4d920f7e249873db90a9e021f6800c4d2807900d7853d0f98d5890c52687959d74bd100846362f430e
+EBUILD cpp_common-0.6.13.ebuild 417 BLAKE2B a5920f4e5818b7b24d7818db091c73447a3bc4a30f6fbe2393e000e0560ae3696f3bd6cc46343cdf52ab9d25921a789bb40a29db817b841ba2387692fa000eed SHA512 4a53fb67eafb11bfc1610896bee89668ca9237709e3dab4d920f7e249873db90a9e021f6800c4d2807900d7853d0f98d5890c52687959d74bd100846362f430e
EBUILD cpp_common-0.6.7-r1.ebuild 420 BLAKE2B b21ab6c6e875b3295217c3c735601d424d86bfca9479e7fc569c5b1c6e3d8b1c1646cb3ca8d41246a6298dc57436ede4efc03f47490367d203d041795e3bf67a SHA512 4f3e377d1cd041b0d7802a182a4182f461d23fcd989c1c89e111702c0679e64a47c48b398b4bf4605052048dae569627091bdf08c4754d95556810bc3ec9158a
EBUILD cpp_common-0.6.8.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
EBUILD cpp_common-0.6.9.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
diff --git a/dev-ros/cpp_common/cpp_common-0.6.13.ebuild b/dev-ros/cpp_common/cpp_common-0.6.13.ebuild
new file mode 100644
index 000000000000..24512c4ae733
--- /dev/null
+++ b/dev-ros/cpp_common/cpp_common-0.6.13.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/console_bridge:=
+ dev-libs/boost:=[threads]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index 9eb6df69e8b0..36cc0262223f 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,5 +1,6 @@
AUX boostpython.patch 551 BLAKE2B f3cecec73fbc584f324da2c1438ca42e283031fdf6df3f8ac458da9f09c3344716e9ca901de9f35edceaf6cc0223f66a1cef2e77ee3106f7b39b8ab96b204ade SHA512 9b306662ccef96aa9eee0b5c244de4919a9f8614502e1d75e63e787b4a0408ca6363c67b4b6eb897ffd8ca90df856444c357acee5f23074e33f7afd985686f7f
+AUX ocv4.patch 12322 BLAKE2B a27a3c0b9303969c2984f283657b6dc9b0d1840183bf9fe875280db7ed9862d16fe44dc3e917d6620431a351cdcadb13000a152b1b49528d90733813ba859d05 SHA512 167a4a3f16e3560c23a354ad2e041e60b5318ee56e9af4d35e9255faa9449cd4d2af3dde9648d8f49fdf64c5d28a66959efd90fbecb5af5a262c3ec090bd7e7f
DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD cv_bridge-1.13.0.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
+EBUILD cv_bridge-1.13.0.ebuild 658 BLAKE2B eda35a1df52c2c743ef76904a92e74ed1fd711785c846f035657270f14ee21dcccff95a428c49c8c430fe9092cfcb820bd74833d5df126b141d487cbee26a6a2 SHA512 9f9dfd0e6af3a4d0ec5ce10ae41f1e4f14e7fde90fe597505e9120dd8f975deec20f5bae0d053e03dd999d46972f9f7ed19517b8c236c1ebada4d922d8201f25
EBUILD cv_bridge-9999.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
index 422225d82b4f..a592d05deeb9 100644
--- a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
@@ -21,4 +21,4 @@ RDEPEND="
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boostpython.patch" )
+PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/cv_bridge/files/ocv4.patch b/dev-ros/cv_bridge/files/ocv4.patch
new file mode 100644
index 000000000000..8a58408c9e8e
--- /dev/null
+++ b/dev-ros/cv_bridge/files/ocv4.patch
@@ -0,0 +1,432 @@
+From b0281a5c844ea0b0d9e0104674474adf50810f49 Mon Sep 17 00:00:00 2001
+From: BrutusTT <brutusthetschiepel@gmail.com>
+Date: Wed, 4 Sep 2019 11:39:30 +0100
+Subject: [PATCH 1/2] add OpenCV4 support addresses
+ ros-perception/vision_opencv#272
+
+---
+ cv_bridge/CMakeLists.txt | 2 +-
+ cv_bridge/src/CMakeLists.txt | 8 +++++---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/cv_bridge/CMakeLists.txt b/cv_bridge/CMakeLists.txt
+index 997bef3e..c203aad1 100644
+--- a/cv_bridge/CMakeLists.txt
++++ b/cv_bridge/CMakeLists.txt
+@@ -13,7 +13,7 @@ if(NOT ANDROID)
+ else()
+ find_package(Boost REQUIRED)
+ endif()
+-find_package(OpenCV 3 REQUIRED
++find_package(OpenCV REQUIRED
+ COMPONENTS
+ opencv_core
+ opencv_imgproc
+diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt
+index 37ba30ee..6d91003b 100644
+--- a/cv_bridge/src/CMakeLists.txt
++++ b/cv_bridge/src/CMakeLists.txt
+@@ -32,10 +32,12 @@ if (PYTHON_VERSION_MAJOR VERSION_EQUAL 3)
+ add_definitions(-DPYTHON3)
+ endif()
+
+-if (OpenCV_VERSION_MAJOR VERSION_EQUAL 3)
+-add_library(${PROJECT_NAME}_boost module.cpp module_opencv3.cpp)
++if (OpenCV_VERSION_MAJOR VERSION_EQUAL 4)
++ add_library(${PROJECT_NAME}_boost module.cpp module_opencv4.cpp)
++elseif(OpenCV_VERSION_MAJOR VERSION_EQUAL 3)
++ add_library(${PROJECT_NAME}_boost module.cpp module_opencv3.cpp)
+ else()
+-add_library(${PROJECT_NAME}_boost module.cpp module_opencv2.cpp)
++ add_library(${PROJECT_NAME}_boost module.cpp module_opencv2.cpp)
+ endif()
+ target_link_libraries(${PROJECT_NAME}_boost ${Boost_LIBRARIES}
+ ${catkin_LIBRARIES}
+
+From 8e01b44c5c1c0003dc91273076f8ca7feb9a8025 Mon Sep 17 00:00:00 2001
+From: BrutusTT <brutusthetschiepel@gmail.com>
+Date: Thu, 17 Oct 2019 14:37:40 +0100
+Subject: [PATCH 2/2] added missig file
+
+---
+ cv_bridge/src/module_opencv4.cpp | 371 +++++++++++++++++++++++++++++++
+ 1 file changed, 371 insertions(+)
+ create mode 100644 cv_bridge/src/module_opencv4.cpp
+
+diff --git a/cv_bridge/src/module_opencv4.cpp b/cv_bridge/src/module_opencv4.cpp
+new file mode 100644
+index 00000000..60a9d05d
+--- /dev/null
++++ b/cv_bridge/src/module_opencv4.cpp
+@@ -0,0 +1,371 @@
++// Taken from opencv/modules/python/src2/cv2.cpp
++
++#include "module.hpp"
++
++#include "opencv2/core/types_c.h"
++
++#include "opencv2/opencv_modules.hpp"
++
++#include "pycompat.hpp"
++
++static PyObject* opencv_error = 0;
++
++static int failmsg(const char *fmt, ...)
++{
++ char str[1000];
++
++ va_list ap;
++ va_start(ap, fmt);
++ vsnprintf(str, sizeof(str), fmt, ap);
++ va_end(ap);
++
++ PyErr_SetString(PyExc_TypeError, str);
++ return 0;
++}
++
++struct ArgInfo
++{
++ const char * name;
++ bool outputarg;
++ // more fields may be added if necessary
++
++ ArgInfo(const char * name_, bool outputarg_)
++ : name(name_)
++ , outputarg(outputarg_) {}
++
++ // to match with older pyopencv_to function signature
++ operator const char *() const { return name; }
++};
++
++class PyAllowThreads
++{
++public:
++ PyAllowThreads() : _state(PyEval_SaveThread()) {}
++ ~PyAllowThreads()
++ {
++ PyEval_RestoreThread(_state);
++ }
++private:
++ PyThreadState* _state;
++};
++
++class PyEnsureGIL
++{
++public:
++ PyEnsureGIL() : _state(PyGILState_Ensure()) {}
++ ~PyEnsureGIL()
++ {
++ PyGILState_Release(_state);
++ }
++private:
++ PyGILState_STATE _state;
++};
++
++#define ERRWRAP2(expr) \
++try \
++{ \
++ PyAllowThreads allowThreads; \
++ expr; \
++} \
++catch (const cv::Exception &e) \
++{ \
++ PyErr_SetString(opencv_error, e.what()); \
++ return 0; \
++}
++
++using namespace cv;
++
++static PyObject* failmsgp(const char *fmt, ...)
++{
++ char str[1000];
++
++ va_list ap;
++ va_start(ap, fmt);
++ vsnprintf(str, sizeof(str), fmt, ap);
++ va_end(ap);
++
++ PyErr_SetString(PyExc_TypeError, str);
++ return 0;
++}
++
++class NumpyAllocator : public MatAllocator
++{
++public:
++ NumpyAllocator() { stdAllocator = Mat::getStdAllocator(); }
++ ~NumpyAllocator() {}
++
++ UMatData* allocate(PyObject* o, int dims, const int* sizes, int type, size_t* step) const
++ {
++ UMatData* u = new UMatData(this);
++ u->data = u->origdata = (uchar*)PyArray_DATA((PyArrayObject*) o);
++ npy_intp* _strides = PyArray_STRIDES((PyArrayObject*) o);
++ for( int i = 0; i < dims - 1; i++ )
++ step[i] = (size_t)_strides[i];
++ step[dims-1] = CV_ELEM_SIZE(type);
++ u->size = sizes[0]*step[0];
++ u->userdata = o;
++ return u;
++ }
++
++ UMatData* allocate(int dims0, const int* sizes, int type, void* data, size_t* step, AccessFlag flags, UMatUsageFlags usageFlags) const
++ {
++ if( data != 0 )
++ {
++ CV_Error(Error::StsAssert, "The data should normally be NULL!");
++ // probably this is safe to do in such extreme case
++ return stdAllocator->allocate(dims0, sizes, type, data, step, flags, usageFlags);
++ }
++ PyEnsureGIL gil;
++
++ int depth = CV_MAT_DEPTH(type);
++ int cn = CV_MAT_CN(type);
++ const int f = (int)(sizeof(size_t)/8);
++ int typenum = depth == CV_8U ? NPY_UBYTE : depth == CV_8S ? NPY_BYTE :
++ depth == CV_16U ? NPY_USHORT : depth == CV_16S ? NPY_SHORT :
++ depth == CV_32S ? NPY_INT : depth == CV_32F ? NPY_FLOAT :
++ depth == CV_64F ? NPY_DOUBLE : f*NPY_ULONGLONG + (f^1)*NPY_UINT;
++ int i, dims = dims0;
++ cv::AutoBuffer<npy_intp> _sizes(dims + 1);
++ for( i = 0; i < dims; i++ )
++ _sizes[i] = sizes[i];
++ if( cn > 1 )
++ _sizes[dims++] = cn;
++ PyObject* o = PyArray_SimpleNew(dims, _sizes.data(), typenum);
++ if(!o)
++ CV_Error_(Error::StsError, ("The numpy array of typenum=%d, ndims=%d can not be created", typenum, dims));
++ return allocate(o, dims0, sizes, type, step);
++ }
++
++ bool allocate(UMatData* u, AccessFlag accessFlags, UMatUsageFlags usageFlags) const CV_OVERRIDE
++ {
++ return stdAllocator->allocate(u, accessFlags, usageFlags);
++ }
++
++ void deallocate(UMatData* u) const CV_OVERRIDE
++ {
++ if(!u)
++ return;
++ PyEnsureGIL gil;
++ CV_Assert(u->urefcount >= 0);
++ CV_Assert(u->refcount >= 0);
++ if(u->refcount == 0)
++ {
++ PyObject* o = (PyObject*)u->userdata;
++ Py_XDECREF(o);
++ delete u;
++ }
++ }
++
++ const MatAllocator* stdAllocator;
++};
++
++NumpyAllocator g_numpyAllocator;
++
++
++template<typename T> static
++bool pyopencv_to(PyObject* obj, T& p, const char* name = "<unknown>");
++
++template<typename T> static
++PyObject* pyopencv_from(const T& src);
++
++enum { ARG_NONE = 0, ARG_MAT = 1, ARG_SCALAR = 2 };
++
++// special case, when the convertor needs full ArgInfo structure
++static bool pyopencv_to(PyObject* o, Mat& m, const ArgInfo info)
++{
++ // to avoid PyArray_Check() to crash even with valid array
++ do_numpy_import( );
++
++
++ bool allowND = true;
++ if(!o || o == Py_None)
++ {
++ if( !m.data )
++ m.allocator = &g_numpyAllocator;
++ return true;
++ }
++
++ if( PyInt_Check(o) )
++ {
++ double v[] = {(double)PyInt_AsLong((PyObject*)o), 0., 0., 0.};
++ m = Mat(4, 1, CV_64F, v).clone();
++ return true;
++ }
++ if( PyFloat_Check(o) )
++ {
++ double v[] = {PyFloat_AsDouble((PyObject*)o), 0., 0., 0.};
++ m = Mat(4, 1, CV_64F, v).clone();
++ return true;
++ }
++ if( PyTuple_Check(o) )
++ {
++ int i, sz = (int)PyTuple_Size((PyObject*)o);
++ m = Mat(sz, 1, CV_64F);
++ for( i = 0; i < sz; i++ )
++ {
++ PyObject* oi = PyTuple_GET_ITEM(o, i);
++ if( PyInt_Check(oi) )
++ m.at<double>(i) = (double)PyInt_AsLong(oi);
++ else if( PyFloat_Check(oi) )
++ m.at<double>(i) = (double)PyFloat_AsDouble(oi);
++ else
++ {
++ failmsg("%s is not a numerical tuple", info.name);
++ m.release();
++ return false;
++ }
++ }
++ return true;
++ }
++
++ if( !PyArray_Check(o) )
++ {
++ failmsg("%s is not a numpy array, neither a scalar", info.name);
++ return false;
++ }
++
++ PyArrayObject* oarr = (PyArrayObject*) o;
++
++ bool needcopy = false, needcast = false;
++ int typenum = PyArray_TYPE(oarr), new_typenum = typenum;
++ int type = typenum == NPY_UBYTE ? CV_8U :
++ typenum == NPY_BYTE ? CV_8S :
++ typenum == NPY_USHORT ? CV_16U :
++ typenum == NPY_SHORT ? CV_16S :
++ typenum == NPY_INT ? CV_32S :
++ typenum == NPY_INT32 ? CV_32S :
++ typenum == NPY_FLOAT ? CV_32F :
++ typenum == NPY_DOUBLE ? CV_64F : -1;
++
++ if( type < 0 )
++ {
++ if( typenum == NPY_INT64 || typenum == NPY_UINT64 || type == NPY_LONG )
++ {
++ needcopy = needcast = true;
++ new_typenum = NPY_INT;
++ type = CV_32S;
++ }
++ else
++ {
++ failmsg("%s data type = %d is not supported", info.name, typenum);
++ return false;
++ }
++ }
++
++#ifndef CV_MAX_DIM
++ const int CV_MAX_DIM = 32;
++#endif
++
++ int ndims = PyArray_NDIM(oarr);
++ if(ndims >= CV_MAX_DIM)
++ {
++ failmsg("%s dimensionality (=%d) is too high", info.name, ndims);
++ return false;
++ }
++
++ int size[CV_MAX_DIM+1];
++ size_t step[CV_MAX_DIM+1];
++ size_t elemsize = CV_ELEM_SIZE1(type);
++ const npy_intp* _sizes = PyArray_DIMS(oarr);
++ const npy_intp* _strides = PyArray_STRIDES(oarr);
++ bool ismultichannel = ndims == 3 && _sizes[2] <= CV_CN_MAX;
++
++ for( int i = ndims-1; i >= 0 && !needcopy; i-- )
++ {
++ // these checks handle cases of
++ // a) multi-dimensional (ndims > 2) arrays, as well as simpler 1- and 2-dimensional cases
++ // b) transposed arrays, where _strides[] elements go in non-descending order
++ // c) flipped arrays, where some of _strides[] elements are negative
++ if( (i == ndims-1 && (size_t)_strides[i] != elemsize) ||
++ (i < ndims-1 && _strides[i] < _strides[i+1]) )
++ needcopy = true;
++ }
++
++ if( ismultichannel && _strides[1] != (npy_intp)elemsize*_sizes[2] )
++ needcopy = true;
++
++ if (needcopy)
++ {
++ if (info.outputarg)
++ {
++ failmsg("Layout of the output array %s is incompatible with cv::Mat (step[ndims-1] != elemsize or step[1] != elemsize*nchannels)", info.name);
++ return false;
++ }
++
++ if( needcast ) {
++ o = PyArray_Cast(oarr, new_typenum);
++ oarr = (PyArrayObject*) o;
++ }
++ else {
++ oarr = PyArray_GETCONTIGUOUS(oarr);
++ o = (PyObject*) oarr;
++ }
++
++ _strides = PyArray_STRIDES(oarr);
++ }
++
++ for(int i = 0; i < ndims; i++)
++ {
++ size[i] = (int)_sizes[i];
++ step[i] = (size_t)_strides[i];
++ }
++
++ // handle degenerate case
++ if( ndims == 0) {
++ size[ndims] = 1;
++ step[ndims] = elemsize;
++ ndims++;
++ }
++
++ if( ismultichannel )
++ {
++ ndims--;
++ type |= CV_MAKETYPE(0, size[2]);
++ }
++
++ if( ndims > 2 && !allowND )
++ {
++ failmsg("%s has more than 2 dimensions", info.name);
++ return false;
++ }
++
++ m = Mat(ndims, size, type, PyArray_DATA(oarr), step);
++ m.u = g_numpyAllocator.allocate(o, ndims, size, type, step);
++ m.addref();
++
++ if( !needcopy )
++ {
++ Py_INCREF(o);
++ }
++ m.allocator = &g_numpyAllocator;
++
++ return true;
++}
++
++template<>
++bool pyopencv_to(PyObject* o, Mat& m, const char* name)
++{
++ return pyopencv_to(o, m, ArgInfo(name, 0));
++}
++
++PyObject* pyopencv_from(const Mat& m)
++{
++ if( !m.data )
++ Py_RETURN_NONE;
++ Mat temp, *p = (Mat*)&m;
++ if(!p->u || p->allocator != &g_numpyAllocator)
++ {
++ temp.allocator = &g_numpyAllocator;
++ ERRWRAP2(m.copyTo(temp));
++ p = &temp;
++ }
++ PyObject* o = (PyObject*)p->u->userdata;
++ Py_INCREF(o);
++ return o;
++}
++
++int convert_to_CvMat2(const PyObject* o, cv::Mat& m)
++{
++ pyopencv_to(const_cast<PyObject*>(o), m, "unknown");
++ return 0;
++}
diff --git a/dev-ros/depth_image_proc/Manifest b/dev-ros/depth_image_proc/Manifest
index e9521d0a8560..d0155ab1382c 100644
--- a/dev-ros/depth_image_proc/Manifest
+++ b/dev-ros/depth_image_proc/Manifest
@@ -1,6 +1,8 @@
DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
+DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
EBUILD depth_image_proc-1.12.22-r1.ebuild 732 BLAKE2B 16cf7f434921ef6754dee1ef95da566b2a13267c9b51f6d8da7515e36e8696da505e1a43650c0536595e0ab12912b7176ad4f0aecaaaf6bd77c9fd957c28f28c SHA512 c81f37aacce8a8ea5a41d735e6411d8a03b8ae834ee76ffc54dffc46296c7afae845cbfadae49bc189d9438e81569bab82eb2e4d0e193bc836e8b47e079e1681
EBUILD depth_image_proc-1.12.23.ebuild 732 BLAKE2B a5ab72714539b5c587ede8dd2a791e45f8016fe934765bb0132555b78ece1174351ef31b1bfed432eda62d5c85e1094bba244a8e3622dcd5487a2956e08fc58c SHA512 87982442ec87ce04625e18f3df7256aceb7fc85130319aebd490e920a144e53370e1dee481d4233d4cbace5477de29dfd12456df7bd33ca18c312abf387a06ea
+EBUILD depth_image_proc-1.13.0.ebuild 729 BLAKE2B 2ed998c7d9bd47c6001459c29bce85d83935ef7896842cfb401879c37f54a46667f3461ff72aad04e4957b094c5b4e4117a09f5cc1250782decb81c527b8f1ae SHA512 a7cd7baf56694ce74e0ff2248ecc49b6c1b7e26614c45961a9c4fdde965565f95a6b8c7e72da7c3c4cfe3acfca7e653efd19a27877b9466306dfd3e9c0e25ad9
EBUILD depth_image_proc-9999.ebuild 732 BLAKE2B 16cf7f434921ef6754dee1ef95da566b2a13267c9b51f6d8da7515e36e8696da505e1a43650c0536595e0ab12912b7176ad4f0aecaaaf6bd77c9fd957c28f28c SHA512 c81f37aacce8a8ea5a41d735e6411d8a03b8ae834ee76ffc54dffc46296c7afae845cbfadae49bc189d9438e81569bab82eb2e4d0e193bc836e8b47e079e1681
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild
new file mode 100644
index 000000000000..6037fd6b4bca
--- /dev/null
+++ b/dev-ros/depth_image_proc/depth_image_proc-1.13.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ media-libs/opencv:=
+ dev-ros/eigen_conversions
+ dev-ros/image_geometry
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2
+ dev-ros/tf2_ros
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/dwa_local_planner/Manifest b/dev-ros/dwa_local_planner/Manifest
index e71106238376..bed07b0da8c9 100644
--- a/dev-ros/dwa_local_planner/Manifest
+++ b/dev-ros/dwa_local_planner/Manifest
@@ -1,6 +1,8 @@
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD dwa_local_planner-1.16.1.ebuild 746 BLAKE2B 8b654dc13b03bc20450717659ec46fdb5aa7feb9c29b7ec53d06a85c3f2823773eaf58f2e2e63f33459ce9ebaacae9d1a49b25e0651e1dff3db2b2d62b70043d SHA512 fcfdb8d8c5899488c71c424c8507db0d6d65e18347b2b0d2d00ff20f6b09fc16f72c87839328c77fa251d2a7e7cb0ea376df819a289021f88a2cbab445c69984
EBUILD dwa_local_planner-1.16.2.ebuild 827 BLAKE2B e82648179639420c67dfe780a59b37dbc4d4f7b14927f28c1a31a5e98ced5a3c057197f55b546a22fe6dcad8cec8e328318ea54660fa554f02f9092921b6cc65 SHA512 6b934ce33bf82f25e59bc498c603aee0f8afdae264b0ebac7b8b04346bd25a75abdd1afb6fa3fafed0a3a1015c7ea6deefe6d7ceacb9bd4beb3068c2f949b2d3
+EBUILD dwa_local_planner-1.16.3.ebuild 824 BLAKE2B 04e195b2d8cf1b215bdbe642bc45e0bf5957ab365f0884ec588305405aa8455b2d008290a78b6899b665884eb4be9974c2394c177dee5784fce2583c5e6dd822 SHA512 0c8bc1ec0aee66a0b59fd6429ca25abfd5ff3712f069458ae70f947f9030a6aa7a2360822d98a6b17650bf903f0139b48422155c0671a67174e2b45989279078
EBUILD dwa_local_planner-9999.ebuild 827 BLAKE2B e82648179639420c67dfe780a59b37dbc4d4f7b14927f28c1a31a5e98ced5a3c057197f55b546a22fe6dcad8cec8e328318ea54660fa554f02f9092921b6cc65 SHA512 6b934ce33bf82f25e59bc498c603aee0f8afdae264b0ebac7b8b04346bd25a75abdd1afb6fa3fafed0a3a1015c7ea6deefe6d7ceacb9bd4beb3068c2f949b2d3
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.16.3.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.16.3.ebuild
new file mode 100644
index 000000000000..de6f8be2fd78
--- /dev/null
+++ b/dev-ros/dwa_local_planner/dwa_local_planner-1.16.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/angles
+ dev-ros/base_local_planner
+ dev-ros/costmap_2d
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+ dev-cpp/eigen:3
+ dev-ros/nav_core
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/pluginlib
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/roscpp
+
+ dev-ros/tf2
+ dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_ros
+
+ dev-libs/boost:=[threads]
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest
index 754740aff10d..d793fd39d12c 100644
--- a/dev-ros/fake_localization/Manifest
+++ b/dev-ros/fake_localization/Manifest
@@ -1,5 +1,7 @@
AUX boost170.patch 378 BLAKE2B 9e9cf95eefc7232744cf165e88b0cd8f9ce6d20db95f375f54acc98c238563acb5a18edd267fe002ddf1341ea0951921e29f3954c2435058a5e4353037346813 SHA512 ca18f9ecb6e382385995dce25851636df9f1edd1b0951b650bb292202e94758a71c820f00947f4edc3c6065e09d828b7c88c325d8a239f425b5aca423157b95a
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD fake_localization-1.16.2.ebuild 803 BLAKE2B e4a4f7e50b2dfedb16e3b6cf64b42f18ad0281e6316c32e301e75ca382b7fa8df4520ca8c4720ce9f5658fabfc489c7d69a3f300623f6fec3e9515a73897e096 SHA512 9c9d3f649d752f6ed4e05d1c50de2caf696d4053a006ac2737b2c2248222c210e0f259bc02c8bfd019d348d201f21d1a5662a94fa9665f040b4012544252e3c1
-EBUILD fake_localization-9999.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
+EBUILD fake_localization-1.16.3.ebuild 803 BLAKE2B e4a4f7e50b2dfedb16e3b6cf64b42f18ad0281e6316c32e301e75ca382b7fa8df4520ca8c4720ce9f5658fabfc489c7d69a3f300623f6fec3e9515a73897e096 SHA512 9c9d3f649d752f6ed4e05d1c50de2caf696d4053a006ac2737b2c2248222c210e0f259bc02c8bfd019d348d201f21d1a5662a94fa9665f040b4012544252e3c1
+EBUILD fake_localization-9999.ebuild 803 BLAKE2B e4a4f7e50b2dfedb16e3b6cf64b42f18ad0281e6316c32e301e75ca382b7fa8df4520ca8c4720ce9f5658fabfc489c7d69a3f300623f6fec3e9515a73897e096 SHA512 9c9d3f649d752f6ed4e05d1c50de2caf696d4053a006ac2737b2c2248222c210e0f259bc02c8bfd019d348d201f21d1a5662a94fa9665f040b4012544252e3c1
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/fake_localization/fake_localization-1.16.3.ebuild b/dev-ros/fake_localization/fake_localization-1.16.3.ebuild
new file mode 100644
index 000000000000..946772aaddd8
--- /dev/null
+++ b/dev-ros/fake_localization/fake_localization-1.16.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="A ROS node that simply forwards odometry information"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-ros/angles
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_ros
+ dev-ros/message_filters
+ dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/fake_localization/fake_localization-9999.ebuild b/dev-ros/fake_localization/fake_localization-9999.ebuild
index 0c7895911491..946772aaddd8 100644
--- a/dev-ros/fake_localization/fake_localization-9999.ebuild
+++ b/dev-ros/fake_localization/fake_localization-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -27,3 +27,4 @@ RDEPEND="
dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index 5acbf46e7172..c5e48222ae71 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -1,13 +1,5 @@
-DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
-DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+AUX ocv4.patch 557 BLAKE2B 65adfeae5045dc21b29193a7bcbbf22cb4649425d551b8710bc557cbcf13f04f00fb319a2ea8962cd4cd4dd08976ad0257897f37a746410c59af12cd2cd4857d SHA512 335f85ee02cc1b54504d33fb8c06b49fb80f1d1e7bbb427870718a0adc92227bff9ba4ecfc7e6e7dc8f4bf95a404ef2d7894305504b4fe9f97ceeda84f4f2a5d
DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-EBUILD gazebo_plugins-2.6.2.ebuild 1425 BLAKE2B 7346eacd043a18ec5f1394c05772a0a662f6461698c35955b8c0bee18bcba98ba213c1633e7c5647c6788df132c02b45bf1017d18a8b8211ffbbf036aa94ee8e SHA512 17b7572dd9e6e26f0eeffee09d301f6c25dfb9a40334f02047d2fabf3f2b6196a5a3e2e8ffdd6753c0f9d908ec9e4bc0a16455bae22de5f46aa335d15be41fd1
-EBUILD gazebo_plugins-2.7.3.ebuild 1698 BLAKE2B 97e8bb62518f3d7fca4e315971a4ebd4a44492ad7a951dc992e3a7b88227a6cecc7293db2fd760911bcd9388dd1644c5f155a5fda1a4d38626e1cf39d2115810 SHA512 e6b11eb60341523338b6c5ec182cd759f9b270c49ced0cb3c3693d254058a42462a5fb94a7eade95e2d920a2a66896921bf5ce6e040f4e3640274843e8e368a8
-EBUILD gazebo_plugins-2.7.4.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
-EBUILD gazebo_plugins-2.8.4.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
-EBUILD gazebo_plugins-2.8.5.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
+EBUILD gazebo_plugins-2.8.5.ebuild 1482 BLAKE2B b86e75c0c0a5b07178e982111bcfb9e6dc4b463ca14287385f391bbc9e52a96b5b4dc1714a8f84676cf5324ded180f16c43eef4fd186aa753dbda7ce0d0d1f06 SHA512 9e5158a1db27535d58bd06aa5398de274e34ad011b5a62aa659a4a57a8622bf0f6bcbed79d4594f21210d9d1b4803a89038fd2d8748a1c5b32a5f6227384d34c
EBUILD gazebo_plugins-9999.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/files/ocv4.patch b/dev-ros/gazebo_plugins/files/ocv4.patch
new file mode 100644
index 000000000000..6d93feac4be9
--- /dev/null
+++ b/dev-ros/gazebo_plugins/files/ocv4.patch
@@ -0,0 +1,17 @@
+Index: gazebo_plugins/src/gazebo_ros_prosilica.cpp
+===================================================================
+--- gazebo_plugins.orig/src/gazebo_ros_prosilica.cpp
++++ gazebo_plugins/src/gazebo_ros_prosilica.cpp
+@@ -44,10 +44,8 @@
+ #include <diagnostic_updater/diagnostic_updater.h>
+ #include <sensor_msgs/RegionOfInterest.h>
+
+-#include <opencv/cv.h>
+-#include <opencv/highgui.h>
+-
+-#include <opencv/cvwimage.h>
++#include <opencv2/core/core_c.h>
++#include <opencv2/highgui/highgui_c.h>
+
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/bind.hpp>
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild
deleted file mode 100644
index da59ee7200ec..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_5} )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/roscpp
- dev-ros/rospy
- dev-ros/nodelet
- dev-ros/angles
- dev-ros/std_srvs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/urdf
- dev-ros/tf
- dev-ros/tf2_ros
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
- dev-ros/driver_base[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/pcl_conversions
- dev-ros/image_transport
- dev-ros/rosconsole
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/polled_camera
- dev-ros/diagnostic_updater
- dev-ros/camera_info_manager
- dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/libxml2
- >=sci-electronics/gazebo-7:=
- dev-libs/protobuf:=
- dev-games/ogre
- sci-libs/pcl
- dev-libs/boost:=
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild
deleted file mode 100644
index 848d517f6367..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_5} )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin eutils
-
-DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/gazebo_dev
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/roscpp
- dev-ros/rospy
- dev-ros/nodelet
- dev-ros/angles
- dev-ros/std_srvs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/urdf
- dev-ros/tf
- dev-ros/tf2_ros
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
- dev-ros/driver_base[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/pcl_conversions
- dev-ros/image_transport
- dev-ros/rosconsole
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/polled_camera
- dev-ros/diagnostic_updater
- dev-ros/camera_info_manager
- dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/libxml2
- >=sci-electronics/gazebo-7:=
- dev-libs/protobuf:=
- dev-games/ogre
- sci-libs/pcl
- dev-libs/boost:=
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-SRC_URI="${SRC_URI}
- mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2"
-
-src_prepare() {
- pushd "${WORKDIR}/gazebo_ros_pkgs-${PV}" || die
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- popd || die
- ros-catkin_src_prepare
-}
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild
deleted file mode 100644
index af125170e28e..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_5} )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/gazebo_dev
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/roscpp
- dev-ros/rospy
- dev-ros/nodelet
- dev-ros/angles
- dev-ros/std_srvs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/urdf
- dev-ros/tf
- dev-ros/tf2_ros
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
- dev-ros/driver_base[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/pcl_conversions
- dev-ros/image_transport
- dev-ros/rosconsole
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/polled_camera
- dev-ros/diagnostic_updater
- dev-ros/camera_info_manager
- dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/libxml2
- >=sci-electronics/gazebo-7:=
- dev-libs/protobuf:=
- dev-games/ogre
- sci-libs/pcl
- dev-libs/boost:=
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.4.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.4.ebuild
deleted file mode 100644
index af125170e28e..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_5} )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/gazebo_dev
- dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/roscpp
- dev-ros/rospy
- dev-ros/nodelet
- dev-ros/angles
- dev-ros/std_srvs
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/urdf
- dev-ros/tf
- dev-ros/tf2_ros
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
- dev-ros/driver_base[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/pcl_conversions
- dev-ros/image_transport
- dev-ros/rosconsole
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/polled_camera
- dev-ros/diagnostic_updater
- dev-ros/camera_info_manager
- dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/libxml2
- >=sci-electronics/gazebo-7:=
- dev-libs/protobuf:=
- dev-games/ogre
- sci-libs/pcl
- dev-libs/boost:=
- dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
index af125170e28e..d2a12c5f8749 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
@@ -51,3 +51,4 @@ RDEPEND="
dev-ros/roslib[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index b4bb6474b88e..ce46ec89f028 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1,8 +1,4 @@
-DIST geometric_shapes-0.5.4.tar.gz 62028 BLAKE2B 6873019c54872077ec88ad6107bdf1a69092d73bd1f73b38dbbdcd88a3e5da9cfffd0782ec2e01f87fd90082ed856e3a2f5161dec606ba08c0510752a813359c SHA512 bd0909fb0feeddebf65793aa77a6803217e39e782767cd2d58b26266ff79018ebb352c77385e20043a069caaa7e00ba63366a703d52605562e8535f1d3af2dac
-DIST geometric_shapes-0.6.0.tar.gz 62152 BLAKE2B ebd2b6260a212e1ba3513d064d69af91fe2141e2ee696b6781829c83a5df44c9de9a9ee68c0c9354adbfc954350cde6c339529955c506e3e2c45e7eaa2a54d52 SHA512 b580f2e2acf864d3d03dd67d088d5c0d04cf8f28c1db8ebb3f4155ff9cf77af92cc268aecc41ad3d983d9e021044404af03309fb94d99162ea84d2d16681b562
DIST geometric_shapes-0.6.1.tar.gz 62249 BLAKE2B 3c28bbe1fb987364f1e7c5b780f22b5927169b49b8d48c2dbe9def262e8f0c7e95799772cd07e6247501e62841c04590b92a58ef2d6b409b974bf259acdadd4e SHA512 bdfd9f0a710bdee0b80e1dbddd545a3e311c992853d9ccff5672c5815ed64f8c7c69cae355e8b91bb89085301e8e9cf0eb27310f3e0a4bd252fb622fc494ef19
-EBUILD geometric_shapes-0.5.4.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
-EBUILD geometric_shapes-0.6.0.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
EBUILD geometric_shapes-0.6.1.ebuild 700 BLAKE2B 565287501a45b3c42bf12d7a5b0ac8177dc34dc41562ca5b3acb7bb21fe675ada2c6cb4a37e97da4c9a653118f73759a38696e31dd2f04b1aaeb0091e5c8d79e SHA512 bc4f6bf9d90570a23b8303d94dce35bf77beaafa5e7de7b66d273f25f26e39cc11d4dbb26d07e5e47c57eb9431ead1eb25856f0c7d2b583056764ff9ca267eb8
EBUILD geometric_shapes-9999.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
MISC metadata.xml 343 BLAKE2B 583ed67450346fcbca09f5714c29d20e728f827c1448ce275683f600b6f87d3f00337dfbf39b694906787b5db9dfc878a316121eb7922494ce631b9a8b9b3e2c SHA512 10c40ddc16c176ed5503b7d098bc133e85973301631878b36f793df95fe2c55576cacaaf2cbfcc9152cb0659394d7ab7c5fca72cbdba32c5310b4a2ce7b365c8
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.5.4.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.5.4.ebuild
deleted file mode 100644
index 80708cfa63ea..000000000000
--- a/dev-ros/geometric_shapes/geometric_shapes-0.5.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Generic definitions of geometric shapes and bodies"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-libs/boost:=
- media-libs/qhull
- media-libs/assimp
- sci-libs/octomap
- dev-ros/random_numbers
- dev-ros/resource_retriever
- dev-ros/eigen_stl_containers
- dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rosunit )
-"
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.6.0.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.6.0.ebuild
deleted file mode 100644
index 80708cfa63ea..000000000000
--- a/dev-ros/geometric_shapes/geometric_shapes-0.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Generic definitions of geometric shapes and bodies"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-libs/boost:=
- media-libs/qhull
- media-libs/assimp
- sci-libs/octomap
- dev-ros/random_numbers
- dev-ros/resource_retriever
- dev-ros/eigen_stl_containers
- dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest dev-ros/rosunit )
-"
diff --git a/dev-ros/global_planner/Manifest b/dev-ros/global_planner/Manifest
index 563218b20f80..2b8f0b17ab5e 100644
--- a/dev-ros/global_planner/Manifest
+++ b/dev-ros/global_planner/Manifest
@@ -3,10 +3,12 @@ DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643
DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD global_planner-1.15.1-r1.ebuild 665 BLAKE2B 2f62de5934ed9a91e6a1e56e8028e2bb09e3166688530461b25cb9a3de23213bcd80b39c8c7ecaffd48b848f6cbaa79d429fabc344cb402e7ea1e1ab0df70ce6 SHA512 12c07e61b53c227e1ba6b4d8866a9e2addaac4bc156b7d4cb5520b07aeb0726f7a7b492cc222f9152d341de11a0f5fc2f9fef600b539ea4227afb2b37ab506a7
EBUILD global_planner-1.15.2.ebuild 665 BLAKE2B 63ee38169ee7c4305119341480e3cb7e654fa060a1f7ef7e0d3260e3f116027cea6810d8e5c1ed90e7df16dc989af05a00a1fe4eb3a8ccbdd1ccb9525485b21a SHA512 695a3bc09081066c1535a42fca547b0367b3c0ebcdba1ba0a0a6e904353ad723d07a9762370103e9c16071b44f8ff5ed2ccefa1536d777097c78efa673516f7b
EBUILD global_planner-1.16.0.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
EBUILD global_planner-1.16.1.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
EBUILD global_planner-1.16.2.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
+EBUILD global_planner-1.16.3.ebuild 750 BLAKE2B ccf5b21111e750c0a47c7c9d4af27177b4157e4035316a630705cc18be947b9a86ec585704d1668235d65620a4e4b7b10da21a2a8ce446635e9adc7bed0a65de SHA512 bc37925e2dcfbbe7f8e59841a96aea4910338cc346e01c5fd251abf13e942201e0d94b04ab0bfb35dea872e8ef2d0479d4029df9acb2fdbc822df4ac27001fa0
EBUILD global_planner-9999.ebuild 753 BLAKE2B c056f8414769bb08204b92aad7fbf2321d6d5c0e1ef72e9ece1c19a28d1ea2edd64e0804d91b8f819cf0e4e7d595b9fd370631d800e5532891d6ca15c1ca133f SHA512 9fc33db22f9273457a1f18af48a3ab70a861ef753460658c1003a51d361b337ab3860f9fe05f33c151776d25dff47faac9bc5c00bb83156d58ff5e8ca05ae8b8
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/amcl/amcl-1.16.2.ebuild b/dev-ros/global_planner/global_planner-1.16.3.ebuild
index 2c9900308d7a..d0530a169af8 100644
--- a/dev-ros/amcl/amcl-1.16.2.ebuild
+++ b/dev-ros/global_planner/global_planner-1.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,25 +9,26 @@ PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
-DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
-LICENSE="LGPL-2.1"
+DESCRIPTION="Path planner library and node"
+LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND="
+ >=dev-ros/costmap_2d-1.16
dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/message_filters
+ dev-ros/nav_core
dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/rosbag
- dev-libs/boost:=
+ dev-ros/navfn
+ dev-ros/pluginlib
dev-ros/roscpp
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf2_ros
+
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+
+ dev-ros/angles
+ dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
-"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_compressed_map_transport/Manifest b/dev-ros/hector_compressed_map_transport/Manifest
index 7ac36d5fe351..8ecc656ebc3e 100644
--- a/dev-ros/hector_compressed_map_transport/Manifest
+++ b/dev-ros/hector_compressed_map_transport/Manifest
@@ -1,4 +1,6 @@
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_compressed_map_transport-0.3.5.ebuild 681 BLAKE2B 9cf4298c6f7ea184628c57b73fc0f75503dffb7045e73baf16b7b1961ee9c1dbf0f4d96e57c6b7c12e408a90f069f63d4e9626106a1756dbd30e7afa8ab25843 SHA512 16ab28ea3883791d0083f78f6b883001f3de49eb381762ab15e56fc64105a5956d7cdb2e4f584dca8a714728f1a2a59d46dd2f36c8cf00c399de10fa97c7476b
+EBUILD hector_compressed_map_transport-0.4.0.ebuild 678 BLAKE2B 2c8bbe5a4fa8a0b325d9c794d27d1aa08b7e3b0f8503f4ac6a9a0ecda294179f87802232f737fe85dc46a133bcb14883acb0d55ed65c50ed0035137b6350bd4c SHA512 5f1692fe97dd8cb1276cd50954bfd18d29f7bfc09a4e72194ffde1fdef60511d3d7281f205dba2a859307845df5722fd41c5ed46069f9b3b5d64aa01c2d66ef7
EBUILD hector_compressed_map_transport-9999.ebuild 681 BLAKE2B 9cf4298c6f7ea184628c57b73fc0f75503dffb7045e73baf16b7b1961ee9c1dbf0f4d96e57c6b7c12e408a90f069f63d4e9626106a1756dbd30e7afa8ab25843 SHA512 16ab28ea3883791d0083f78f6b883001f3de49eb381762ab15e56fc64105a5956d7cdb2e4f584dca8a714728f1a2a59d46dd2f36c8cf00c399de10fa97c7476b
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild
new file mode 100644
index 000000000000..023fcb3fe456
--- /dev/null
+++ b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ media-libs/opencv:=
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/hector_map_tools
+ dev-ros/image_transport
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ media-libs/opencv
+"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff/Manifest b/dev-ros/hector_geotiff/Manifest
index f8b82d41ac30..ac2a5ca1f5a8 100644
--- a/dev-ros/hector_geotiff/Manifest
+++ b/dev-ros/hector_geotiff/Manifest
@@ -1,5 +1,7 @@
AUX qt5.patch 3068 BLAKE2B 0ff205aab12c65b94ee200f770a30c3c34252237d536374f6684606f3cad170fd3045c80b8de021fea538d06f33c4495b5ecc10ebbac2d3a0d470be11cbf148f SHA512 26f6bbcd939f3119cbb6de237c1ba76703cb02ac6af22fa5c7ed1a9022b5c33c785d4891c12e14ddaee949b09283c0500984fd0455b3c69a4cae51192b8b98c1
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_geotiff-0.3.5-r2.ebuild 806 BLAKE2B bc7c9512e331563c0fa96c6fab8691e4a58dced6e79cb73dbfe2a869b4dd894dd3346626f9d901512cbcd5519ec3f21230203fb5e020a681d80887a673d5934d SHA512 68ae0ad97a56b1a6b31a42c2e5d8eee6e03b288c59fb09dd96d5590429bb08ab3c905ffef8a5d84fb8e5f1059a5967185ea941145df3eb18ba9777d595ef5461
+EBUILD hector_geotiff-0.4.0.ebuild 803 BLAKE2B 90d17009fb76b1c51c2f4e7374c34cca46687e97d48c244c9c960a57fec38dcb039e289832f27476322e9dfd37eaa9ff8a5ef198fa83ff71b8fa04d0486483dc SHA512 06835a42b6df6e00ae588e3212c7cd83a26f83a8cade64959bf02b75dac9b7f02dbd286498d7f69ccb3d1541e77c3c4501c58dc3f1b54bf613d24030d2d3e8bc
EBUILD hector_geotiff-9999.ebuild 806 BLAKE2B bc7c9512e331563c0fa96c6fab8691e4a58dced6e79cb73dbfe2a869b4dd894dd3346626f9d901512cbcd5519ec3f21230203fb5e020a681d80887a673d5934d SHA512 68ae0ad97a56b1a6b31a42c2e5d8eee6e03b288c59fb09dd96d5590429bb08ab3c905ffef8a5d84fb8e5f1059a5967185ea941145df3eb18ba9777d595ef5461
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild
new file mode 100644
index 000000000000..7a60491232d1
--- /dev/null
+++ b/dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/hector_map_tools
+ dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/pluginlib
+ dev-libs/tinyxml2:=
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3"
+
+PATCHES=( "${FILESDIR}/qt5.patch" )
diff --git a/dev-ros/hector_geotiff_plugins/Manifest b/dev-ros/hector_geotiff_plugins/Manifest
index eec865bc4828..305c5170fcc7 100644
--- a/dev-ros/hector_geotiff_plugins/Manifest
+++ b/dev-ros/hector_geotiff_plugins/Manifest
@@ -1,4 +1,6 @@
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_geotiff_plugins-0.3.5-r1.ebuild 507 BLAKE2B 2dc90c53ca514069ab636629aa4cc3ca96ed9aaab664390a74efbea09f6f46c43a3434b2e5261ebca899defebd0f05fc3b85ef1c22314ccea1e24539eef9872f SHA512 b1d95ad79cab89a60d68015e8e292b08a792cda394536cef26a35ae8579632e310247084a8cb70ee39003c5f8333cd519e004680b0b2ff640c383047f1b62684
+EBUILD hector_geotiff_plugins-0.4.0.ebuild 504 BLAKE2B 23181f51d227e6eeeb26f5edce792c3d15fcb719c1268709880b895ab165393b8d3980cdc7d7036a5d6cc3b788e5ee44312ca0d05a8e0fd85f4a7dabb1b78c6d SHA512 6ead56c30dc1d48ce29612f441d71580924ce00f32d2b6cca137623a09ded41a3990b25c078de8114cf57696b1082fdb1e76563045ab404b0530a25e623669a5
EBUILD hector_geotiff_plugins-9999.ebuild 507 BLAKE2B 2dc90c53ca514069ab636629aa4cc3ca96ed9aaab664390a74efbea09f6f46c43a3434b2e5261ebca899defebd0f05fc3b85ef1c22314ccea1e24539eef9872f SHA512 b1d95ad79cab89a60d68015e8e292b08a792cda394536cef26a35ae8579632e310247084a8cb70ee39003c5f8333cd519e004680b0b2ff640c383047f1b62684
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild
new file mode 100644
index 000000000000..6aa8740176ca
--- /dev/null
+++ b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/hector_geotiff
+ dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_attitude_to_tf/Manifest b/dev-ros/hector_imu_attitude_to_tf/Manifest
index c172cb00125b..8232956bb62c 100644
--- a/dev-ros/hector_imu_attitude_to_tf/Manifest
+++ b/dev-ros/hector_imu_attitude_to_tf/Manifest
@@ -1,4 +1,6 @@
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_imu_attitude_to_tf-0.3.5.ebuild 491 BLAKE2B d6b54087550587bb06a1d4c60f9b36baac278a5b1c0b6fe1f0d486d5bec63b65edd25b4981c08a426e5c79e6ced4c1beb19ae05e3dc4850d12f96d6013e26ac2 SHA512 02d588f4559b130a0189affd882850b11e88af9a3f736545003d869f0f190855e96ae9841cac89d60ca23256cb51cc75d10da1ca39f7ea26c433059212b6119d
+EBUILD hector_imu_attitude_to_tf-0.4.0.ebuild 488 BLAKE2B 8caef14bf71b85987c5a9547bc954e206ef7b1c6bf2f3f2051fb1a54824f1252392b8ce5f88e49d8204be02411fa7a372444db1e9f63f71643d76ac731b8c380 SHA512 d54ba1635d51a11c5c677e69d92acbc5023120f35d4970df360f159f9e64e63e553c5099354d2d2c2eeee2cb2a06bcb1ec18658a81332fd53bf2a42efd413b56
EBUILD hector_imu_attitude_to_tf-9999.ebuild 491 BLAKE2B d6b54087550587bb06a1d4c60f9b36baac278a5b1c0b6fe1f0d486d5bec63b65edd25b4981c08a426e5c79e6ced4c1beb19ae05e3dc4850d12f96d6013e26ac2 SHA512 02d588f4559b130a0189affd882850b11e88af9a3f736545003d869f0f190855e96ae9841cac89d60ca23256cb51cc75d10da1ca39f7ea26c433059212b6119d
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.3.3.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild
index 2257b6d50ad9..ff3bcfe62c69 100644
--- a/dev-ros/hector_map_tools/hector_map_tools-0.3.3.ebuild
+++ b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,10 +8,15 @@ ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
+DESCRIPTION="Publish the roll/pitch attitude angles reported via a imu message to tf"
LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND="dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]"
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/tf
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-libs/boost:=
+"
DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_tools/Manifest b/dev-ros/hector_imu_tools/Manifest
index 9c4910ff0944..ac80d7808b1a 100644
--- a/dev-ros/hector_imu_tools/Manifest
+++ b/dev-ros/hector_imu_tools/Manifest
@@ -1,4 +1,6 @@
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_imu_tools-0.3.5.ebuild 556 BLAKE2B 8e2177d9ad2f93555f6efca1c4c1755b2f757fe87e7d3e0d13a8727a08f2398d227e50392c339eb3f33874d69251a774f42f63edda162e4dbbb34c64e4a6a93b SHA512 867afdb59941f7c2486c32c330015690818b798286f4f9c2a3e08b65b8d6f7b0e2594d6a4f9657713f8316b4916c11a499b48b07c37742d2a72a7901a12beae5
+EBUILD hector_imu_tools-0.4.0.ebuild 553 BLAKE2B 3724f0fa25ffd770002e76f7c4909f437e7621a4a1798b12d4d3d4ef92b51faf24c07142d37b548d640bd51e08be9fb7f03c479bfb635140a74af76b69ca2e69 SHA512 2c68baa546f2120ca631b1700c13dc39ac1d14b65bf7105ac353279f1f6a7313a5a4697ddee84bf881f826456680852c97c565bf996954c0ef50d6424a19c178
EBUILD hector_imu_tools-9999.ebuild 556 BLAKE2B 8e2177d9ad2f93555f6efca1c4c1755b2f757fe87e7d3e0d13a8727a08f2398d227e50392c339eb3f33874d69251a774f42f63edda162e4dbbb34c64e4a6a93b SHA512 867afdb59941f7c2486c32c330015690818b798286f4f9c2a3e08b65b8d6f7b0e2594d6a4f9657713f8316b4916c11a499b48b07c37742d2a72a7901a12beae5
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild
new file mode 100644
index 000000000000..4b1a7e4f1d0b
--- /dev/null
+++ b/dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for processing IMU messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/tf
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_server/Manifest b/dev-ros/hector_map_server/Manifest
index a75528dac074..b23134c3b2d8 100644
--- a/dev-ros/hector_map_server/Manifest
+++ b/dev-ros/hector_map_server/Manifest
@@ -1,4 +1,6 @@
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_map_server-0.3.5.ebuild 610 BLAKE2B 71437b223d9d430ad2f94398f850feb8e0547a5cadbc1f0fb92c839d867d957168ea2801170b5da8b035a172b63d05a83b5d2cec197c290c1c6854ee91a567d6 SHA512 7c2687184ca357989bead7b3ac30319c14c7768645a1b7f764f7a5953215184fda3c6cd0d689fdf068f4614b061a5dcd3258e9a771b14b94d60de8c2bd7997de
+EBUILD hector_map_server-0.4.0.ebuild 607 BLAKE2B ec9f540ddcb10bd0f34eeeb6deca5e15e8bce6955301385777d369f257cd926480f14950a278c0d958bdfb170afc60f2d016918b85e9a3ff974d0eb46da5fce6 SHA512 ba69e386b6010b74867e84a86c41fb9066e7e73cb6247465584721882ded4f19c6e6b8cf7c61ee3b5b3625b9b330892b1b521f316272dea3a1597ec1966a126d
EBUILD hector_map_server-9999.ebuild 610 BLAKE2B 71437b223d9d430ad2f94398f850feb8e0547a5cadbc1f0fb92c839d867d957168ea2801170b5da8b035a172b63d05a83b5d2cec197c290c1c6854ee91a567d6 SHA512 7c2687184ca357989bead7b3ac30319c14c7768645a1b7f764f7a5953215184fda3c6cd0d689fdf068f4614b061a5dcd3258e9a771b14b94d60de8c2bd7997de
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild b/dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild
new file mode 100644
index 000000000000..906092c6f673
--- /dev/null
+++ b/dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/hector_map_tools
+ dev-ros/hector_marker_drawing
+ dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_tools/Manifest b/dev-ros/hector_map_tools/Manifest
index f12528bb5fe8..32f2d9ea0140 100644
--- a/dev-ros/hector_map_tools/Manifest
+++ b/dev-ros/hector_map_tools/Manifest
@@ -1,8 +1,6 @@
-DIST hector_slam-0.3.3.tar.gz 64368 BLAKE2B 8e046c9b69103c325004139528c12cba61198b4f55074c63fccc1f47df773533190e9bad7e0cf661490b38602e1e4aba00d82c7fe23f8fc4a1092ea50be333ca SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0
-DIST hector_slam-0.3.4.tar.gz 64569 BLAKE2B 17795b9ed735eee07aaa7069c84c1d055ce1f505743c6a33dc8c4bdf96ea7b65174a0b0eeea9c312541769199818d546617917b672f6e38b8cb6e90aa661d38b SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-EBUILD hector_map_tools-0.3.3.ebuild 437 BLAKE2B d421e4b75425373d8b145bb6e30a784e62e8bb2e5a9f6ae0615e8eca4aa65e5a5045855cf959e1b894b255952199177e72b186f53f2bee5db485851bc355da6a SHA512 32343b29c5665ce0734b8358c8ef5a3403a76d44e652ec6b9eaf5d643fe73082499c885fb3dc28dd7e8d08af38d43ca36274435b897abb11a8a25b0f0808a286
-EBUILD hector_map_tools-0.3.4.ebuild 437 BLAKE2B d421e4b75425373d8b145bb6e30a784e62e8bb2e5a9f6ae0615e8eca4aa65e5a5045855cf959e1b894b255952199177e72b186f53f2bee5db485851bc355da6a SHA512 32343b29c5665ce0734b8358c8ef5a3403a76d44e652ec6b9eaf5d643fe73082499c885fb3dc28dd7e8d08af38d43ca36274435b897abb11a8a25b0f0808a286
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_map_tools-0.3.5.ebuild 437 BLAKE2B 7099d5af2df579e685d478f8a4777a968fc27e355ae3368483cf20a70d2e49e0d975bc01fa1a611b63e7ee9da319cecc0dcfc377499fb34619608aca526754ea SHA512 ce40474196c0e6087874b618b7f4860c75f8fdd5311dab544ab380bb2e3b716fe272317f5af57b9afc7065bbedc70ef04ca22b536f47a85e041d4f8fac0812e3
+EBUILD hector_map_tools-0.4.0.ebuild 434 BLAKE2B 42d4b8a06574e5d6f28249638688d2a32f5f89e0f3f2261f45f2b965f29e62a9d21259f54ad3e76baf516b9aa5696020accb7d072599c75a4773f99713962de1 SHA512 4aececefc1b036d432207b7a588e959982e9c1c6657c417848d29bc603cbe72c4b732f66f8f15c5caa2c5e57ed74750f0c634620e2a2afff7fbc105c9b524b05
EBUILD hector_map_tools-9999.ebuild 437 BLAKE2B d421e4b75425373d8b145bb6e30a784e62e8bb2e5a9f6ae0615e8eca4aa65e5a5045855cf959e1b894b255952199177e72b186f53f2bee5db485851bc355da6a SHA512 32343b29c5665ce0734b8358c8ef5a3403a76d44e652ec6b9eaf5d643fe73082499c885fb3dc28dd7e8d08af38d43ca36274435b897abb11a8a25b0f0808a286
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.3.4.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.4.0.ebuild
index 2257b6d50ad9..cafea00cc37b 100644
--- a/dev-ros/hector_map_tools/hector_map_tools-0.3.4.ebuild
+++ b/dev-ros/hector_map_tools/hector_map_tools-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
index 2992de9716ee..7ed07b3e916e 100644
--- a/dev-ros/hector_mapping/Manifest
+++ b/dev-ros/hector_mapping/Manifest
@@ -1,5 +1,7 @@
AUX boost170.patch 631 BLAKE2B 9b1d25a62617b44e6a6f81b4f281ff9331051b242698cc9ae4864237b5a7d18e77298a7f00927a1215982dbec91bb9279878cd5805233d16b9f94caab1db4ab5 SHA512 f61c0def48c65577eace4e2c4bf49b5540f74beb1f54e34f4f75df82325cf0446928e664ce3256205591bac877ae65b371348948e6eea4013a3627b83e97bcdd
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_mapping-0.3.5.ebuild 749 BLAKE2B f65010124e6564265f95eb3a54ebacd4ef2e684f05c3c87fb30fd7ad07fa9968c4d93864065da116be990c1ba1878cf7d23cb1f6d6b63a303cbecf7c522f4bb4 SHA512 018c0e845e93f747e4928105344ba8f05e47fe713a26b40eabe6e44049acd5da2dfba18edd01816f3545137e41f47c69bbe4312632da9e536db74ea2d2fe6b6c
+EBUILD hector_mapping-0.4.0.ebuild 749 BLAKE2B f65010124e6564265f95eb3a54ebacd4ef2e684f05c3c87fb30fd7ad07fa9968c4d93864065da116be990c1ba1878cf7d23cb1f6d6b63a303cbecf7c522f4bb4 SHA512 018c0e845e93f747e4928105344ba8f05e47fe713a26b40eabe6e44049acd5da2dfba18edd01816f3545137e41f47c69bbe4312632da9e536db74ea2d2fe6b6c
EBUILD hector_mapping-9999.ebuild 708 BLAKE2B 208fb91376f6c91beccbe330dfa28112f5017bf83f7ac5c39231bbf85e5a26430fa72e32608bcfb3bc14e81ef77f4ffeb9498d13da55f44a2c80729009250f87 SHA512 d5ce8cb9c597f1e0848423d6f3dfff16bf1a093bdfe06757d69bea9186cfbc21de60fad3cb814e8ec52045d7b02097e745a7c81626a43aaf8eaa3e77a0be0ed2
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild b/dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild
new file mode 100644
index 000000000000..fbcf32d16868
--- /dev/null
+++ b/dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/tf
+ dev-ros/message_filters
+ dev-ros/laser_geometry
+ dev-ros/tf_conversions
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/hector_marker_drawing/Manifest b/dev-ros/hector_marker_drawing/Manifest
index d3eafd5fe01f..7e7ce473d120 100644
--- a/dev-ros/hector_marker_drawing/Manifest
+++ b/dev-ros/hector_marker_drawing/Manifest
@@ -1,8 +1,10 @@
DIST hector_slam-0.3.3.tar.gz 64368 BLAKE2B 8e046c9b69103c325004139528c12cba61198b4f55074c63fccc1f47df773533190e9bad7e0cf661490b38602e1e4aba00d82c7fe23f8fc4a1092ea50be333ca SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0
DIST hector_slam-0.3.4.tar.gz 64569 BLAKE2B 17795b9ed735eee07aaa7069c84c1d055ce1f505743c6a33dc8c4bdf96ea7b65174a0b0eeea9c312541769199818d546617917b672f6e38b8cb6e90aa661d38b SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_marker_drawing-0.3.3.ebuild 482 BLAKE2B 55ba00d612866ab762e88132a1d270ca403f890f454650b057e678c51ae2f3c6d38138d086d0eb4ca39950342fb95c6bc80fcdea72dffa85b8120a54a8562031 SHA512 1ed0c217e83d524fae33c2097c05a43d9bb3411f24bc4cb3a9e95b2937c30c8334d70ebbb9c9e76d61ece77119a35a507bb3e19590d3831e1de37eea3b15eb16
EBUILD hector_marker_drawing-0.3.4.ebuild 482 BLAKE2B 55ba00d612866ab762e88132a1d270ca403f890f454650b057e678c51ae2f3c6d38138d086d0eb4ca39950342fb95c6bc80fcdea72dffa85b8120a54a8562031 SHA512 1ed0c217e83d524fae33c2097c05a43d9bb3411f24bc4cb3a9e95b2937c30c8334d70ebbb9c9e76d61ece77119a35a507bb3e19590d3831e1de37eea3b15eb16
EBUILD hector_marker_drawing-0.3.5.ebuild 482 BLAKE2B 23cb3ff973180b728f90575508b36a76fb806cab36a9abd78806a98b0da0733fa72a55ac23fbb476395ee8fea7efc0f57e954f52c299237ebf96cc2aa73da590 SHA512 5bb1601ced5aec7c25ce1c6dec2750d4c704d020b0b1455a513eb771f2927860e6eb209b7084129b3a6c4af3f03fc584972979be32f877e534f7ba6e219891d2
+EBUILD hector_marker_drawing-0.4.0.ebuild 479 BLAKE2B 471de32a229ede3d85b8fda14dcd02e70ff9502d3541cc6ebfb185d7889a6ca4a423674adc822c1a876831c84ed560f5f24384a6a5ac1e5f67a3ef23f54ea89e SHA512 f9d8a0bb5ce921ab11ed3a41d911b5882bd7e04c7548d1ac0a5bf10e4b60897131002cc9a2f9a7a5132e87e007072692dd033969a5941c172013d04710c2016b
EBUILD hector_marker_drawing-9999.ebuild 482 BLAKE2B 55ba00d612866ab762e88132a1d270ca403f890f454650b057e678c51ae2f3c6d38138d086d0eb4ca39950342fb95c6bc80fcdea72dffa85b8120a54a8562031 SHA512 1ed0c217e83d524fae33c2097c05a43d9bb3411f24bc4cb3a9e95b2937c30c8334d70ebbb9c9e76d61ece77119a35a507bb3e19590d3831e1de37eea3b15eb16
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild
new file mode 100644
index 000000000000..4c95bac38c6d
--- /dev/null
+++ b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Convenience functions for easier publishing of visualization markers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3"
diff --git a/dev-ros/hector_nav_msgs/Manifest b/dev-ros/hector_nav_msgs/Manifest
index 0541b5f395e9..743e5a441b37 100644
--- a/dev-ros/hector_nav_msgs/Manifest
+++ b/dev-ros/hector_nav_msgs/Manifest
@@ -1,4 +1,6 @@
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_nav_msgs-0.3.5.ebuild 513 BLAKE2B f2df85c3857a75420ec35fd1c2bc158e1ba890d78f900e601c74533cfee3cedd231bf325254e584ab65550e8cb8b7bd866f93809c7f8eea7efe69896958403c6 SHA512 05de3693752e258e750cd0e5c921a223052cb736abff70b161a86731485a305db90ea0aa51a679be5bc67ed96accdf477f5851bada3743c5106cf9a9643442a8
+EBUILD hector_nav_msgs-0.4.0.ebuild 513 BLAKE2B f2df85c3857a75420ec35fd1c2bc158e1ba890d78f900e601c74533cfee3cedd231bf325254e584ab65550e8cb8b7bd866f93809c7f8eea7efe69896958403c6 SHA512 05de3693752e258e750cd0e5c921a223052cb736abff70b161a86731485a305db90ea0aa51a679be5bc67ed96accdf477f5851bada3743c5106cf9a9643442a8
EBUILD hector_nav_msgs-9999.ebuild 513 BLAKE2B f2df85c3857a75420ec35fd1c2bc158e1ba890d78f900e601c74533cfee3cedd231bf325254e584ab65550e8cb8b7bd866f93809c7f8eea7efe69896958403c6 SHA512 05de3693752e258e750cd0e5c921a223052cb736abff70b161a86731485a305db90ea0aa51a679be5bc67ed96accdf477f5851bada3743c5106cf9a9643442a8
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/rosparam/rosparam-1.13.2.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.0.ebuild
index bdb18d0b8521..2be3665ca426 100644
--- a/dev-ros/rosparam/rosparam-1.13.2.ebuild
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.0.ebuild
@@ -2,21 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs"
inherit ros-catkin
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
+DESCRIPTION="Messages and services used in the hector_slam stack"
LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
+RDEPEND=""
DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_slam_launch/Manifest b/dev-ros/hector_slam_launch/Manifest
index b8a60bcdfb6c..d8f1a86a0601 100644
--- a/dev-ros/hector_slam_launch/Manifest
+++ b/dev-ros/hector_slam_launch/Manifest
@@ -1,8 +1,10 @@
DIST hector_slam-0.3.3.tar.gz 64368 BLAKE2B 8e046c9b69103c325004139528c12cba61198b4f55074c63fccc1f47df773533190e9bad7e0cf661490b38602e1e4aba00d82c7fe23f8fc4a1092ea50be333ca SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0
DIST hector_slam-0.3.4.tar.gz 64569 BLAKE2B 17795b9ed735eee07aaa7069c84c1d055ce1f505743c6a33dc8c4bdf96ea7b65174a0b0eeea9c312541769199818d546617917b672f6e38b8cb6e90aa661d38b SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_slam_launch-0.3.3.ebuild 552 BLAKE2B 3aff9110e1fbe6f1205e29c20a29cf1ef68b848a91adda5f39beca8c6b50eb00eeef270e79cbc547e633de236981b288abd3ccc980df3717c97364cd039f4f94 SHA512 685fc3fdf3b42f8600dc2d9a289e45bbb4ba028ba75b7d905e4805b2c976f853704fc6c8ad3f055513dfff09863d8e0f5110f24406f1ac9dbd3f3e57d3cc2bd9
EBUILD hector_slam_launch-0.3.4.ebuild 552 BLAKE2B 3aff9110e1fbe6f1205e29c20a29cf1ef68b848a91adda5f39beca8c6b50eb00eeef270e79cbc547e633de236981b288abd3ccc980df3717c97364cd039f4f94 SHA512 685fc3fdf3b42f8600dc2d9a289e45bbb4ba028ba75b7d905e4805b2c976f853704fc6c8ad3f055513dfff09863d8e0f5110f24406f1ac9dbd3f3e57d3cc2bd9
EBUILD hector_slam_launch-0.3.5.ebuild 552 BLAKE2B 7832e18da52086b053d473ffe615f4e1359bf9911f8356112adeb3b802ebeba137547d27c159728ebf080a8c8a4a15ded3553ea132c052c9cd9eaa6ede2cbaa3 SHA512 92c8ba3f878de452948aa4692c5ff8f60d9cf3cc77d17283c3a1fd7a25a232a245c5d8efea2cb2240e17389c7a67cd043b9527cd3f9df64a225a1671cca65d4e
+EBUILD hector_slam_launch-0.4.0.ebuild 549 BLAKE2B aac6563ad3f53b9568e09afad601b6ae092f70339f45036dcfc450e0ada145b56e0a132df0767b9c2ee26d166583e565155156c611c61bef73d19794adf63c4c SHA512 ecc9bca9ed1f757159898123896444591b2c1196fc36412216b03516bf25f85c477e15fb5b9ae7d0bdf02a31d96ba0e7368937f833369f7ad3094140ef18fea4
EBUILD hector_slam_launch-9999.ebuild 552 BLAKE2B 3aff9110e1fbe6f1205e29c20a29cf1ef68b848a91adda5f39beca8c6b50eb00eeef270e79cbc547e633de236981b288abd3ccc980df3717c97364cd039f4f94 SHA512 685fc3fdf3b42f8600dc2d9a289e45bbb4ba028ba75b7d905e4805b2c976f853704fc6c8ad3f055513dfff09863d8e0f5110f24406f1ac9dbd3f3e57d3cc2bd9
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild
new file mode 100644
index 000000000000..04c3c251fa9c
--- /dev/null
+++ b/dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ dev-ros/hector_mapping
+ dev-ros/hector_map_server
+ dev-ros/hector_trajectory_server
+ dev-ros/hector_geotiff
+ dev-ros/hector_geotiff_plugins
+"
diff --git a/dev-ros/hector_trajectory_server/Manifest b/dev-ros/hector_trajectory_server/Manifest
index 00183b6fb96c..8221ac8704b5 100644
--- a/dev-ros/hector_trajectory_server/Manifest
+++ b/dev-ros/hector_trajectory_server/Manifest
@@ -1,4 +1,6 @@
DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
+DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
EBUILD hector_trajectory_server-0.3.5.ebuild 584 BLAKE2B 2d23544a01e6ee3c24900240ba3312ed5d63a1cc04073141a2117b7fe72bf1257f936c9e1c04e28dd3e58c713d53ca19f29865eb8b11c0ca6386acd87f4f3ccc SHA512 573850704ea327f43f3c4ca322c136035fc56f9247e01f38038d60f0ae783fdcce4be273315ad7ab0e6685cd2e37f564052d9b750f590fff3f25a64922ac9b7a
+EBUILD hector_trajectory_server-0.4.0.ebuild 581 BLAKE2B eec09877cb696376880842ca0458308cfa47fa0f406012bcbb3c5dca821a23bcb31f2f3f88bd2805a6cde0b3ea07ed2f62b5a53c2e5d99364e52038c0df9f117 SHA512 f92a42a6779ac4859fe212b48fc1c9b4c416bdb0be37aee3c0674fd9a6d51f065cb794807758790a0867b8d1602375f67dc52cfab10bee46d698f81385b388cd
EBUILD hector_trajectory_server-9999.ebuild 584 BLAKE2B 2d23544a01e6ee3c24900240ba3312ed5d63a1cc04073141a2117b7fe72bf1257f936c9e1c04e28dd3e58c713d53ca19f29865eb8b11c0ca6386acd87f4f3ccc SHA512 573850704ea327f43f3c4ca322c136035fc56f9247e01f38038d60f0ae783fdcce4be273315ad7ab0e6685cd2e37f564052d9b750f590fff3f25a64922ac9b7a
MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild
new file mode 100644
index 000000000000..61596f0891a0
--- /dev/null
+++ b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Keeps track of tf trajectories and makes this data accessible via a service and topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/hector_map_tools
+ dev-ros/tf
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_proc/Manifest b/dev-ros/image_proc/Manifest
index 97cc3c4bc8ba..5480a59ea12e 100644
--- a/dev-ros/image_proc/Manifest
+++ b/dev-ros/image_proc/Manifest
@@ -1,6 +1,8 @@
DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
+DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
EBUILD image_proc-1.12.22-r1.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
EBUILD image_proc-1.12.23.ebuild 651 BLAKE2B d01b42e8fb22054539ad4eb4f55993ddf8887fe1c950eaa8ef6b9264348d73d82d32904984fe65500c2af4c0342e3f70023b8808d8d5a9a09dbafdd11963ffb4 SHA512 4db3b8b9a3ac3dc3e98c9896dceaa8652868bc8818072cb5144749491344dfb8662beb275c4462b5890400217b63c156ebdba9960cbdac0e18000a2a565497bc
+EBUILD image_proc-1.13.0.ebuild 648 BLAKE2B cbb98c94317f93e8b7344a988948d2b8d0eed6e663f9fe97309436f7564d787eecc612ddaae6f7799c028901aa5f44418aef0193cc7a8f6aa14bbc86a4a69e3e SHA512 e5de63d615616bd3ed32106d2118525de6838ac63e30f24cfe66e0b34d98ebbfae5a7c4a1e57b98be24b19665ceae64aa1713b34eac5a4c237e0b4dfe51ed1ac
EBUILD image_proc-9999.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_proc/image_proc-1.13.0.ebuild b/dev-ros/image_proc/image_proc-1.13.0.ebuild
new file mode 100644
index 000000000000..9a57f7096740
--- /dev/null
+++ b/dev-ros/image_proc/image_proc-1.13.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Single image rectification and color processing"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ dev-ros/dynamic_reconfigure
+ dev-ros/image_geometry
+ dev-ros/image_transport
+ dev-ros/nodelet
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ media-libs/opencv:=
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_publisher/Manifest b/dev-ros/image_publisher/Manifest
index d396e8cc8c29..fe1e2186c5bf 100644
--- a/dev-ros/image_publisher/Manifest
+++ b/dev-ros/image_publisher/Manifest
@@ -1,6 +1,9 @@
+AUX ocv4.patch 1826 BLAKE2B 647de2fc507e52734fb9e4c4c13043fd1424c2ab78ddbf2edb876660b5344877b8389ffc1194b20391249fad699c6e50305421f2ce8d58f880953e155de53120 SHA512 ef84c6d0ca37718b025dd570df596f8cd83bf8d5ca6e1bce5ad0725fdf852c55dbae876bea15f3e9534177b13538bfcaef7d6cf693c29e6ca4e99b3276acc7eb
DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
+DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
EBUILD image_publisher-1.12.22-r1.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
EBUILD image_publisher-1.12.23.ebuild 659 BLAKE2B e0fefc67d3680c3bd1e2cf54d32eedd4d1e997de6707f4b77604d776a5b63ef67a423ed0618b3566f2272f94a2500507c5ad0de1d44858de9d0a81fec9f96e1b SHA512 ffd763e3b47a77022e3ee17b180e629e3297fce8f85d34e40997019e3ee4f0a0cb01fe898b1a16b665d91c3d1a60c9312d97cbe6fdb1391796c4e087726f2155
+EBUILD image_publisher-1.13.0.ebuild 697 BLAKE2B 9c613067b2e7b88e45ad4dbe0df663ea785b1ebffb76d3bf146afab6295cb46ca51e5f2c560b66e0222b2cae572b4dfcf643066f4b49fb96a5dd1346508fbdfc SHA512 5e265bdbed1d7a3b89f4d4c1ebdb967ef7052ef7930dc41c7466d3ce002a6beb23aa6b9d201759deb1421c79194278f9894ec8dec623b823d834eb79f0a51368
EBUILD image_publisher-9999.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_publisher/files/ocv4.patch b/dev-ros/image_publisher/files/ocv4.patch
new file mode 100644
index 000000000000..12baac2d8473
--- /dev/null
+++ b/dev-ros/image_publisher/files/ocv4.patch
@@ -0,0 +1,44 @@
+Index: image_publisher/CMakeLists.txt
+===================================================================
+--- image_publisher.orig/CMakeLists.txt
++++ image_publisher/CMakeLists.txt
+@@ -10,7 +10,7 @@ message(STATUS "opencv version ${OpenCV_
+ if(OpenCV_VERSION VERSION_LESS "3.0.0")
+ find_package(OpenCV 2 REQUIRED COMPONENTS ${opencv_2_components})
+ else()
+- find_package(OpenCV 3 REQUIRED COMPONENTS ${opencv_3_components})
++ find_package(OpenCV REQUIRED COMPONENTS ${opencv_3_components})
+ endif()
+
+ # generate the dynamic_reconfigure config file
+Index: image_publisher/src/nodelet/image_publisher_nodelet.cpp
+===================================================================
+--- image_publisher.orig/src/nodelet/image_publisher_nodelet.cpp
++++ image_publisher/src/nodelet/image_publisher_nodelet.cpp
+@@ -95,7 +95,7 @@ class ImagePublisherNodelet : public nod
+ {
+ if ( cap_.isOpened() ) {
+ if ( ! cap_.read(image_) ) {
+- cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
++ cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
+ }
+ }
+ if (flip_image_)
+@@ -136,7 +136,7 @@ public:
+ nh_.param("filename", filename_, std::string(""));
+ NODELET_INFO("File name for publishing image is : %s", filename_.c_str());
+ try {
+- image_ = cv::imread(filename_, CV_LOAD_IMAGE_COLOR);
++ image_ = cv::imread(filename_, cv::IMREAD_COLOR);
+ if ( image_.empty() ) { // if filename is motion file or device file
+ try { // if filename is number
+ int num = boost::lexical_cast<int>(filename_);//num is 1234798797
+@@ -146,7 +146,7 @@ public:
+ }
+ CV_Assert(cap_.isOpened());
+ cap_.read(image_);
+- cap_.set(CV_CAP_PROP_POS_FRAMES, 0);
++ cap_.set(cv::CAP_PROP_POS_FRAMES, 0);
+ }
+ CV_Assert(!image_.empty());
+ }
diff --git a/dev-ros/image_publisher/image_publisher-1.13.0.ebuild b/dev-ros/image_publisher/image_publisher-1.13.0.ebuild
new file mode 100644
index 000000000000..dd6ff1f0df2e
--- /dev/null
+++ b/dev-ros/image_publisher/image_publisher-1.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Publish an image stream from single image file or avi file."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ >=media-libs/opencv-4:=
+ dev-ros/dynamic_reconfigure
+ dev-ros/camera_info_manager
+ dev-ros/image_transport
+ dev-ros/nodelet
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/image_rotate/Manifest b/dev-ros/image_rotate/Manifest
index bc1e6ac9c574..a465c719fd51 100644
--- a/dev-ros/image_rotate/Manifest
+++ b/dev-ros/image_rotate/Manifest
@@ -1,6 +1,8 @@
DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
+DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
EBUILD image_rotate-1.12.22-r1.ebuild 679 BLAKE2B e69271b3169a0e6ee0734c9c00c465df97b9af950a102024546aa52778293e6aa0edf3b33697ffff4a33b439af4957934e1f6fdfb4bade19b798adff2a48d6b4 SHA512 2760cfc1c6408482a26057a7135f5859d4950c166992b8c4505b91018cb0fad4c9d53771542539d91c57386dc9e43a97fcdb7ed98403bdb4bf71fb429a0ae96e
EBUILD image_rotate-1.12.23.ebuild 679 BLAKE2B aef3ad1496da9a3d3a536c4c06d3dfb57608d6684f9b741451fe98edc910ce7bb18b36e647604b280db642ee0d564151b8bd8c36def042d2f0a8730c96dc46ea SHA512 a3663e2ec6ce2dbd65547963c62996c55424cae45f94aaa3adc481f59fc11cb70196df22f9ea7c0ac63f226fb6a0a424d7b27915db58796d48f6f16c67b72cbc
+EBUILD image_rotate-1.13.0.ebuild 676 BLAKE2B 2e706671381494a77564ba69608dcd01085b8118df68557aaefb7aec918a5fb110011852d818c145df0825c582bdce1b31eb431740ab58bb7f653b97a2d16ffa SHA512 ba9276de66392cf8389abe68862bf0fd0a7ba80665a51057ac2cf672d38ecc1c01ebe18950995800eebf5206575b770ff8931e13196e7493fc29b774d9b9d629
EBUILD image_rotate-9999.ebuild 679 BLAKE2B e69271b3169a0e6ee0734c9c00c465df97b9af950a102024546aa52778293e6aa0edf3b33697ffff4a33b439af4957934e1f6fdfb4bade19b798adff2a48d6b4 SHA512 2760cfc1c6408482a26057a7135f5859d4950c166992b8c4505b91018cb0fad4c9d53771542539d91c57386dc9e43a97fcdb7ed98403bdb4bf71fb429a0ae96e
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_rotate/image_rotate-1.13.0.ebuild b/dev-ros/image_rotate/image_rotate-1.13.0.ebuild
new file mode 100644
index 000000000000..1d31862840cd
--- /dev/null
+++ b/dev-ros/image_rotate/image_rotate-1.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ media-libs/opencv:=
+ dev-ros/dynamic_reconfigure
+ dev-ros/eigen_conversions
+ dev-ros/image_transport
+ dev-ros/nodelet
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-ros/tf2
+ dev-ros/tf2_geometry_msgs
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
index 138608fafb2d..ed5c883da3bf 100644
--- a/dev-ros/image_view/Manifest
+++ b/dev-ros/image_view/Manifest
@@ -1,5 +1,7 @@
AUX boost170.patch 513 BLAKE2B c78a511ebf9ec506d75ba5ad639932321ff5542d5812db3e7b448765aff92c9b3e75f299c0ef15626cd5bbd6a34acee9efe202dc2f38dc20478b3f8e2f6b2577 SHA512 15c4024d4de848e06b47d845dd33758cac44c1e2c07982749a523a7d8d852921fff1306aa105f65df6d5152a09e974a0cfb8c1f70859cc415f51b1e1ec9e2b79
DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
+DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
EBUILD image_view-1.12.23.ebuild 879 BLAKE2B fa54faf98131e0639ebfb8b375c3e6d09b7765ec108cdba4a91adfbc20a74a6dc9053d4b09f306329d0f97a675c347ef2363480508bee8e84869221b3c60d002 SHA512 f5ae3c9cdd3297cdea49c0a9ad6083e547bfc4327360e362001a044e26b9fed332465ececc8a3f2ff6c1b63092a65b17b6267274db7c55cbdc10bd5ec182754e
+EBUILD image_view-1.13.0.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83
EBUILD image_view-9999.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_view/image_view-1.13.0.ebuild b/dev-ros/image_view/image_view-1.13.0.ebuild
new file mode 100644
index 000000000000..b9c0dff05bac
--- /dev/null
+++ b/dev-ros/image_view/image_view-1.13.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Simple viewer for ROS image topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ media-libs/opencv:=
+ x11-libs/gtk+:2
+ dev-ros/camera_calibration_parsers
+ >=dev-ros/cv_bridge-1.11.10
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/rosconsole
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index 4b6f47a9e756..a73b200b3d34 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -1,6 +1,7 @@
AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0ae90ec7604c7c08c3f8b9eebdbb4d9bf26f81011f996148db3fd0243b56ad77be7533282f9ecc0b SHA512 d2185960b22b9539f318c452e5bb95612e21156380183ed795142d87c9d1f8ca74c6bb08a2039138729767800cf6592b6bb64bf12db62166c8c3ee2176aec65d
AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
+AUX ocv4.patch 597 BLAKE2B 0b87de52c3a2fed94c32c47500a69f79d6d6861b5881d5ba357aeb9924be8356b204ceaf7ae9e14055048e7ddc6fb74751cadfd7a6e275b4115e793c5723f007 SHA512 711c26a8539facf376686e619c4a90cc77ae26480f3754edf5b04f0a14aaa861f14d58b19172e37fb4e501eb92883ff4173ae93d8ec5b31379eefb4a0fb2c1a1
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD laser_cb_detector-0.10.14.ebuild 754 BLAKE2B 754aa6caa3919022243c83f10857e83ec60befd0f7d2fc6be4fce31eea3884774252bd94ad853fbc9d2ce8df2d283290273ef40c8f6992ccba8328243080d1ed SHA512 823d9e615b926cff6fa41bd911a06e04c7c3afb153d03e75cefc1024ff5fb2a4195eff1f6546f703993f521b6558013c9998254b50c99f73c424b9127dc64898
+EBUILD laser_cb_detector-0.10.14.ebuild 779 BLAKE2B 9a79d3cc8112ff1d5d6d3eb4e41f5a38c494a60270aa44957667dc9f2673d72aaa3003a55643b8d7a56032f496a118c7575395458a5802baa5cc6d06cb7a2bf1 SHA512 34593b76cbf879b9c04ec3d14be9e7f6467302a7d19d347cb2e2d21c6977ae2bd9a635bff5012b35c0ac2b5ee6c996b75d9652c2322969d0d777147837f09d6f
EBUILD laser_cb_detector-9999.ebuild 728 BLAKE2B c5a0e74981b25cacf9618ec4cba8fd7a7d1088f7a9243e0b5ecd005a7737204ce3ea9a1b8bc8bf63b33d3449d099275ed8c3f029a5b93cdcba9f08aafb04a9c0 SHA512 be9fb0ab225811f6878fca22af77defde55502875dee2c9eba8ecb56b9bf34885260552f1568b432c1e51ae277b17983fdbbbc98650e0884de0e99d9de14b1f4
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/laser_cb_detector/files/ocv4.patch b/dev-ros/laser_cb_detector/files/ocv4.patch
new file mode 100644
index 000000000000..4bbb0005fda0
--- /dev/null
+++ b/dev-ros/laser_cb_detector/files/ocv4.patch
@@ -0,0 +1,13 @@
+Index: laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h
+===================================================================
+--- laser_cb_detector.orig/include/laser_cb_detector/laser_cb_detector.h
++++ laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h
+@@ -37,7 +37,7 @@
+ #ifndef LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_
+ #define LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_
+
+-#include <opencv/cv.h>
++#include <opencv2/core/core_c.h>
+ #include <calibration_msgs/DenseLaserSnapshot.h>
+ #include <laser_cb_detector/ConfigAction.h>
+ #include <laser_cb_detector/cv_laser_bridge.h>
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
index 888eec2019d8..6a7531529b40 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
@@ -27,4 +27,4 @@ RDEPEND="
dev-ros/settlerlib
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
index bf9903281a71..20420b08213d 100644
--- a/dev-ros/map_server/Manifest
+++ b/dev-ros/map_server/Manifest
@@ -2,9 +2,11 @@ DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643
DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD map_server-1.15.2-r1.ebuild 570 BLAKE2B 105eb30a5c157083a2811379144364e93cacf7a8de44c132e0712a708edb646a4779464c76bc4f59f7844ea0875e5851950eba733c2b032c8635369b1e8c6575 SHA512 a846dba6800fa08ee1ddaed6543a0632404b02bb3d105a21c9f7a4bc159520e85b6d5578aa7c8945ed3e84cce125474045c2d415e9fc25afc77b3d6a3e63377b
EBUILD map_server-1.16.0.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
EBUILD map_server-1.16.1.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
EBUILD map_server-1.16.2.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
+EBUILD map_server-1.16.3.ebuild 585 BLAKE2B 6bf9a6201ef8cb77f08af1b246f4b2253eb13bab620cfa70255ce9f744faf45762cb377d714ca095d1f6a6ae4a7c94b64951a3081df01c56ef2f443233cae5c6 SHA512 3789e3cb40b87379bddd3c52f3c8771a5b43f1a110a9411637567756cee53b068bec7f1ddeea5c8844cc1f57064e15ea74aac7f7006737ce520ed8bb683f2b71
EBUILD map_server-9999.ebuild 588 BLAKE2B 353a2b597b7b64dc29263cf751c4cb8d3e22fb84da7bd0119222b5799dc1e2d2746b6a9d3696e3c1cd2a9df3f0c762c399934cb2e845316daea754c9fe9cca28 SHA512 74ca672c4709755eb4e0e5245fd05192a3ce0f5f4386998976ef046cdb95016106a0686f0744a155ba3362e03d682a229b6a0601dec978599f0604afb70c0251
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/map_server/map_server-1.16.3.ebuild b/dev-ros/map_server/map_server-1.16.3.ebuild
new file mode 100644
index 000000000000..79bc5cdfa6e3
--- /dev/null
+++ b/dev-ros/map_server/map_server-1.16.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Offers map data as a ROS service"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ sci-physics/bullet:=
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/roscpp
+ media-libs/sdl-image
+ dev-ros/tf2
+ >=dev-cpp/yaml-cpp-0.5:=
+
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit )
+ virtual/pkgconfig"
diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index a1d39e7f9c7b..acdd00cc93e9 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1,6 +1,8 @@
AUX gentoo.patch 708 BLAKE2B ad41a87474f0c542dcab2189e08f744c37ebc0a5993c9ca46633d3f02b3c13b002cd1b1644123694bd0bea756168d29d121eca9cd8071a548ae592f6e81431f1 SHA512 2ab7861c421e630a87924ae4b5f282493be043d1d0a53188ed6ec2938250ac4fb1e402072d4f10afc747271c94cad424bd84ca15d49d38e871b245b5068de698
DIST mavlink-gbp-release-2017.2.7.tar.gz 460082 BLAKE2B 3274be8d0ed28f996d1cb521bdca63c3671b913ef9fb3c4aed98c76a040d2eab719a48da6eea042b7dc59322c05c3a8fe4d193236e49c75d0fc90c8fd2b39501 SHA512 07c21a4d80f1d67657cc824bbd46279620008374af48dfa92547e6373cee5a48509fabf269b55911bdb1d63660c5581cb362b7ea469f0ca00317e5d32084b73c
DIST mavlink-gbp-release-2017.5.5.tar.gz 3943384 BLAKE2B 839ec17ad02b880b392a50a3171da2f8fc6159830ccfa6f383c5535f00599f094a4ee277d3e860bb430462e4df94fc749421ef34989056589676b360f7356165 SHA512 8c4a746187ee3c18cb9f236d77e942fb96ee8fc4ad561f0391290a9113cf0cb018f13916e67030a8ca60bfbc163cb54315747f78230057bc41154afe62c66859
+DIST mavlink-gbp-release-2019.11.11.tar.gz 4101019 BLAKE2B aa2e09fab46d82bbe463b637bc02551ba512c011892663ecc7e187070f2591ec7f7aa249d1b294fadbea86c82a8f02a3a3219e16662f92508c399fd9251df391 SHA512 112a6c0055c68eaaa289237a3d94b89a632ccbe22344a1e923e3ded2273fb32a54515febba8a9e97590af10402cec3e414f286c012ed7605ced98822509eedad
EBUILD mavlink-gbp-release-2017.2.7-r1.ebuild 576 BLAKE2B c3d6a95973c6d07aac79c6bad1a441cff91d690d66e2e29034260f1a84ae3b824a4f0e12171758619985d81f39b475de233410584536ab650ed6dda55b28a295 SHA512 baa6c811db6e77da2a6b1ae92be6414c6bacc853adec848c1788270f3d7f730fa0a9b2581be801c25dfa5a4b5365a6ab9b1fd076aa60f4df2900d96541730eb3
EBUILD mavlink-gbp-release-2017.5.5.ebuild 576 BLAKE2B c3d6a95973c6d07aac79c6bad1a441cff91d690d66e2e29034260f1a84ae3b824a4f0e12171758619985d81f39b475de233410584536ab650ed6dda55b28a295 SHA512 baa6c811db6e77da2a6b1ae92be6414c6bacc853adec848c1788270f3d7f730fa0a9b2581be801c25dfa5a4b5365a6ab9b1fd076aa60f4df2900d96541730eb3
+EBUILD mavlink-gbp-release-2019.11.11.ebuild 573 BLAKE2B d5d788a838d60fed8a941509a923d7a34e388bdf9a3df6aa536e7b9bf47d6920a646db08f168530684ee2e2fe343d7b48773ef0b21c418bd63dbb26b02215c8a SHA512 8c1d6792aa4ffd6ec0b3d532dd33d8d9e9350cccb2d4df5656b58d173cf4ad38ff78deb46e4b0dd00ab6bdc4957f2c762cc5cbef5a89e95a450cabb7f6e0cd3a
MISC metadata.xml 341 BLAKE2B 1292ea0319edc3c3597165f59f246829e6954b5582e623e92227de5503f35d0f61150a0516998dd1d99942c371291ed623a38112210abac7dd0a050cc810b34c SHA512 0b545da2a0f2d6372e63db33fd5f50497c0de04a69fdb3b94e57418ff617fcebaeed515241c474995efc38bbdf1c099ec67ad6a56dd3ae94b2e24be9f1f72d36
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild
new file mode 100644
index 000000000000..a8c6412274a2
--- /dev/null
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
+VER_PREFIX=release/melodic/mavlink/
+VER_SUFFIX=-${PV#*_p}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+EGIT_BRANCH="release/melodic/mavlink"
+DESCRIPTION="MAVLink message marshaling library"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mk/Manifest b/dev-ros/mk/Manifest
index dc52acf5aaf0..6d37d33a7f71 100644
--- a/dev-ros/mk/Manifest
+++ b/dev-ros/mk/Manifest
@@ -1,6 +1,8 @@
DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
EBUILD mk-1.14.4.ebuild 375 BLAKE2B dc9107f8b68fd4c40998b1e25d4d2efb3645a8263dea46f047b2cfb970d811cd5289212a61dbb3d00112f750644b6d6bea7179666807b7a9d2477fc8af9dfc6c SHA512 699f235d01cdc1168d163bf885feba22845f1db03d34a194ea58ff4cb3f3dd414ce3b4111fd672a00d8dc3f0e4fd74ff8e2c572085dbcccddee2e24a344dc539
EBUILD mk-1.14.6.ebuild 427 BLAKE2B 51528c8d113387d5e3b6153c56cab2cad0ad46eea4ef1bec804e575b22e7eae01724ac9948c97024b81246eca8dc56c1b3f8c386f58ffc93d4132cfb0296ae4f SHA512 ad3743209af1ab60d244a8ca3318112c43cce683fea6f056f9e2311f29badd9790fb5ded2f84d3ae2c131c33a063684401b12105e8ace66051ba4fb6f1f0bdcb
+EBUILD mk-1.14.7.ebuild 427 BLAKE2B 51528c8d113387d5e3b6153c56cab2cad0ad46eea4ef1bec804e575b22e7eae01724ac9948c97024b81246eca8dc56c1b3f8c386f58ffc93d4132cfb0296ae4f SHA512 ad3743209af1ab60d244a8ca3318112c43cce683fea6f056f9e2311f29badd9790fb5ded2f84d3ae2c131c33a063684401b12105e8ace66051ba4fb6f1f0bdcb
EBUILD mk-9999.ebuild 427 BLAKE2B 51528c8d113387d5e3b6153c56cab2cad0ad46eea4ef1bec804e575b22e7eae01724ac9948c97024b81246eca8dc56c1b3f8c386f58ffc93d4132cfb0296ae4f SHA512 ad3743209af1ab60d244a8ca3318112c43cce683fea6f056f9e2311f29badd9790fb5ded2f84d3ae2c131c33a063684401b12105e8ace66051ba4fb6f1f0bdcb
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/rosbash-1.14.3.ebuild b/dev-ros/mk/mk-1.14.7.ebuild
index bef22c0c8f54..16db9adc7027 100644
--- a/dev-ros/rosbash/rosbash-1.14.3.ebuild
+++ b/dev-ros/mk/mk-1.14.7.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
ROS_REPO_URI="https://github.com/ros/ros"
KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
+ROS_SUBDIR=core/${PN}
inherit ros-catkin
-DESCRIPTION="Assorted shell commands for using ros with bash"
+DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
+RDEPEND="${DEPEND}
+ dev-ros/rospack
+ dev-ros/rosbuild"
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
index b0913153ad1f..19c106094fb1 100644
--- a/dev-ros/move_base/Manifest
+++ b/dev-ros/move_base/Manifest
@@ -3,10 +3,12 @@ DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643
DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD move_base-1.15.1-r2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
EBUILD move_base-1.15.2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
EBUILD move_base-1.16.0.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
EBUILD move_base-1.16.1.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
EBUILD move_base-1.16.2.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
+EBUILD move_base-1.16.3.ebuild 1091 BLAKE2B ca50db0e50f888dcdfe8b4bcf238a3f9f6d98102c048177369e1f8851ac6970e1c05777cf68a0086e9601bd6bcb3c5b817fe87c216c4f1d60e63911640f03f95 SHA512 4d1bb8f0dbcd9b1605815b13a0a6e8a352640f4f464d6a811725578da1be1d2f1d4c87f2cec5492ceecb42ddbd9820cde1f50e80b34e9d1193cecb97a1528f9f
EBUILD move_base-9999.ebuild 1094 BLAKE2B 8bd5d4eb6d707ad06280de0c5ea5a9c087465f2b00e807d570f3e995c62dedea0b519cfb829853520b2beff289e247cf3df0a24ebf1cf57584382999987a62dd SHA512 7ac41e7141f76fd634f3d39aaa5b3ea4eee2040b2de85bc5877bd0258495483da106482b43d7a7050985ee5906ec5925d1419f94d20beaba0f6f77de6025f4f9
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_base/move_base-1.16.3.ebuild b/dev-ros/move_base/move_base-1.16.3.ebuild
new file mode 100644
index 000000000000..12cfc2825c13
--- /dev/null
+++ b/dev-ros/move_base/move_base-1.16.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib
+ >=dev-ros/costmap_2d-1.15.1
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_core
+ dev-ros/pluginlib
+ dev-libs/tinyxml2:=
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_ros
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+
+ dev-ros/base_local_planner
+ dev-ros/clear_costmap_recovery
+ dev-ros/navfn
+ dev-ros/rotate_recovery
+
+ dev-cpp/eigen:3
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+
+ dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-ros/cmake_modules"
diff --git a/dev-ros/move_slow_and_clear/Manifest b/dev-ros/move_slow_and_clear/Manifest
index 9387d8a2f4dd..a14b60028fb0 100644
--- a/dev-ros/move_slow_and_clear/Manifest
+++ b/dev-ros/move_slow_and_clear/Manifest
@@ -1,6 +1,8 @@
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD move_slow_and_clear-1.16.1.ebuild 563 BLAKE2B 99b547fcd7fa8a3097df4f1dfd4fa17c685d426883d6333743802ce238579dbea95c78004682438b36a5e539a2ae89662c69a3f1ff6488198cff4b9f8ef86fc9 SHA512 9608e344774f9a2d598999f779884b91af623be4bc66ab2d88b925860c5a774356b2e77019f9fefeb4494201d777ae70cf2a5d8c92a638fe5f6c595ff6d88825
EBUILD move_slow_and_clear-1.16.2.ebuild 563 BLAKE2B 99b547fcd7fa8a3097df4f1dfd4fa17c685d426883d6333743802ce238579dbea95c78004682438b36a5e539a2ae89662c69a3f1ff6488198cff4b9f8ef86fc9 SHA512 9608e344774f9a2d598999f779884b91af623be4bc66ab2d88b925860c5a774356b2e77019f9fefeb4494201d777ae70cf2a5d8c92a638fe5f6c595ff6d88825
+EBUILD move_slow_and_clear-1.16.3.ebuild 560 BLAKE2B 9de7599994db223b27a7595a132394bf9f4b0ce759eabd2bc3dfcfd4bfd0a6d64c94d9b7a7115f2b6f6bd358a55f9cf6e207be2d8b42dca5ec7443fc298deebd SHA512 75057b1ebe9dbb65cc516dd0d1c1525afff0be65c9a9782896f6207c01f8287ab27a5c54c1ae2645368518b64d654149d2d9f66d65e1cb52dd40c4ddbbfd9fde
EBUILD move_slow_and_clear-9999.ebuild 563 BLAKE2B 99b547fcd7fa8a3097df4f1dfd4fa17c685d426883d6333743802ce238579dbea95c78004682438b36a5e539a2ae89662c69a3f1ff6488198cff4b9f8ef86fc9 SHA512 9608e344774f9a2d598999f779884b91af623be4bc66ab2d88b925860c5a774356b2e77019f9fefeb4494201d777ae70cf2a5d8c92a638fe5f6c595ff6d88825
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.1.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.3.ebuild
index c88df16826d6..bdd963c4a8b5 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.16.1.ebuild
+++ b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,23 +8,23 @@ KEYWORDS="~amd64 ~arm"
inherit ros-catkin
-DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
+DESCRIPTION="Move slow and clear"
LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND="
>=dev-ros/costmap_2d-1.16
- dev-cpp/eigen:3
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/nav_core
dev-ros/pluginlib
dev-ros/roscpp
- dev-ros/tf2_ros
dev-libs/boost:=[threads]
+ dev-cpp/eigen:3
dev-libs/console_bridge:=
"
DEPEND="${RDEPEND}
dev-ros/cmake_modules
- test? ( dev-ros/rostest dev-cpp/gtest )
+
"
diff --git a/dev-ros/nav_core/Manifest b/dev-ros/nav_core/Manifest
index 189a8658621d..e1f2b21b580d 100644
--- a/dev-ros/nav_core/Manifest
+++ b/dev-ros/nav_core/Manifest
@@ -2,9 +2,11 @@ DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643
DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD nav_core-1.15.2.ebuild 503 BLAKE2B 0d65bb8980f5b01daf85b3b64fe327110859c46da94def8f94b348919b4c23aae46e2705690c8a51548f9f10333271839929595eb2883cf0da1f878dad3813b6 SHA512 e408c2e3a83ab1f1551e387056e4203a14c810c29203528363fdad39a5e9bf30af06351d15075a15b1ce7683f086c31bc82e2bf5f27786f521047768a64736c7
EBUILD nav_core-1.16.0.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
EBUILD nav_core-1.16.1.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
EBUILD nav_core-1.16.2.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
+EBUILD nav_core-1.16.3.ebuild 505 BLAKE2B 5417becf0044ffd379b794a85a2baeb2740a4355708ed73469b93da24309bc21657eccc3e29a9e1e090a123b50f8aef6a0913a854ac2afb2fe293a760f24cc52 SHA512 485966ee93b85a7626bfd3572b668261a9de9f2f322c06334127ec7d17825519baf55c2499f9e44b22015a90f3fbe1fc94eeb11e5a11e6fc514220154da190e2
EBUILD nav_core-9999.ebuild 508 BLAKE2B f7086a542e73a3ff3fad80751d9903f95382b10ddc07c80c8527bbc92deed182e097777f579bcfc5ab753b369fe66548a33eea971c0efbbf32802f58b4ccb98a SHA512 fa04713751839cd08b147de04b9607bcfd17843afd758770ebdd3da0b11c82f3b1acbbf2fe60cd3f50895d013ca9c2203be8f7c6e014375e4a532b427aa67860
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/nav_core/nav_core-1.16.3.ebuild b/dev-ros/nav_core/nav_core-1.16.3.ebuild
new file mode 100644
index 000000000000..eafdab9f4d5e
--- /dev/null
+++ b/dev-ros/nav_core/nav_core-1.16.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Common interfaces for navigation specific robot actions"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/costmap_2d
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_ros
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
index bdb2825030ee..6b7a46b0bc14 100644
--- a/dev-ros/navfn/Manifest
+++ b/dev-ros/navfn/Manifest
@@ -1,9 +1,6 @@
AUX pgm_h_location.patch 900 BLAKE2B 2816bc6803bce70d14f5fcf10161316961ffd265d94a36e90f7d98bd381a4966bd924e352cda2f859e07ea25547e62e0d6381afa1fa3b488364634b20730830c SHA512 4c3286e18d922d292858e8fc574cc440c344ae182133539efca93cb25e16dc78149efe521499024751a46f2b4d1b63516276f1e0510028114357520d4a560d81
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-EBUILD navfn-1.16.0.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
-EBUILD navfn-1.16.1.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
-EBUILD navfn-1.16.2.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
-EBUILD navfn-9999.ebuild 973 BLAKE2B 23e68780a702572cba4e3d806e1bbeecf82fef221152147bc32d2c466ad74f84ca7a2f21a9a7f5a1a2bd26ce3108f398e3b1f6f497828c760beaa3ce41f08448 SHA512 e6f2fde3bc78f3fac9c12d75e18deeb6c5f17772bfadbda92f4391ada8625cac330eee2eef699551784a40b47f9fc72842d95447b30d5c6dbb3f08da62e0d451
+AUX tests.patch 460 BLAKE2B 06814e0e141d4b7b75ef36bcea6dff20aadc324c700e0aa219110efac9b27316829f7faa0b83a99795998428e825568325e87e6ca52fa3696772e6e95b655aa2 SHA512 c02fa62a1446b403a535d028a1b36c1deac8a4cf09f0596ada560e696288412566c5b8e2719fd368e098f9ccfe23dec02c9d6e066cb837ea2cdf5b15523c21a2
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
+EBUILD navfn-1.16.3.ebuild 1130 BLAKE2B a748a50eb55edda7e08aff9f500732246780baf7333df7e8e80e56fe44d6ce5c130095cd069583c9f922c5f43d99834f0f98a85aea46982eddfc847b512e96ec SHA512 f667fac0acb101b32877466ad83b8f84113a2bd3f24e60d298575ecac91ae27fbed39ce1e2a2601c1361c60797fd4347bc43f4721d6f4695f6f420f7e7bbbb3c
+EBUILD navfn-9999.ebuild 1130 BLAKE2B a748a50eb55edda7e08aff9f500732246780baf7333df7e8e80e56fe44d6ce5c130095cd069583c9f922c5f43d99834f0f98a85aea46982eddfc847b512e96ec SHA512 f667fac0acb101b32877466ad83b8f84113a2bd3f24e60d298575ecac91ae27fbed39ce1e2a2601c1361c60797fd4347bc43f4721d6f4695f6f420f7e7bbbb3c
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/navfn/files/tests.patch b/dev-ros/navfn/files/tests.patch
new file mode 100644
index 000000000000..2dcd222f6082
--- /dev/null
+++ b/dev-ros/navfn/files/tests.patch
@@ -0,0 +1,13 @@
+Index: navfn/test/path_calc_test.cpp
+===================================================================
+--- navfn.orig/test/path_calc_test.cpp
++++ navfn/test/path_calc_test.cpp
+@@ -38,7 +38,7 @@
+ navfn::NavFn* make_willow_nav()
+ {
+ int sx,sy;
+- std::string path = ros::package::getPath( ROS_PACKAGE_NAME ) + "/test/willow_costmap.pgm";
++ std::string path = @PGM_PATH@ ;
+
+ COSTTYPE *cmap = readPGM( path.c_str(), &sx, &sy, true );
+ if( cmap == NULL )
diff --git a/dev-ros/navfn/navfn-1.16.0.ebuild b/dev-ros/navfn/navfn-1.16.0.ebuild
deleted file mode 100644
index da9427d6977b..000000000000
--- a/dev-ros/navfn/navfn-1.16.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=dev-ros/costmap_2d-1.16
- dev-ros/nav_core
- dev-ros/pluginlib
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2_ros
- dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
- dev-cpp/eigen:3
- x11-libs/fltk
- media-libs/netpbm
- dev-libs/boost:=[threads]
- dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )
- dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/navfn/navfn-1.16.1.ebuild b/dev-ros/navfn/navfn-1.16.3.ebuild
index da9427d6977b..a65e0eb3f75f 100644
--- a/dev-ros/navfn/navfn-1.16.1.ebuild
+++ b/dev-ros/navfn/navfn-1.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -36,4 +36,9 @@ DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )
dev-ros/cmake_modules"
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
+PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${FILESDIR}/tests.patch" )
+
+src_prepare() {
+ ros-catkin_src_prepare
+ sed -e "s#@PGM_PATH@#\"${S}/test/willow_costmap.pgm\"#" -i test/path_calc_test.cpp || die
+}
diff --git a/dev-ros/navfn/navfn-9999.ebuild b/dev-ros/navfn/navfn-9999.ebuild
index da9427d6977b..a65e0eb3f75f 100644
--- a/dev-ros/navfn/navfn-9999.ebuild
+++ b/dev-ros/navfn/navfn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -36,4 +36,9 @@ DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )
dev-ros/cmake_modules"
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
+PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${FILESDIR}/tests.patch" )
+
+src_prepare() {
+ ros-catkin_src_prepare
+ sed -e "s#@PGM_PATH@#\"${S}/test/willow_costmap.pgm\"#" -i test/path_calc_test.cpp || die
+}
diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
index e06c88af8385..63c2973bd22a 100644
--- a/dev-ros/opencv_apps/Manifest
+++ b/dev-ros/opencv_apps/Manifest
@@ -1,4 +1,5 @@
-DIST opencv_apps-2.0.0.tar.gz 81204 BLAKE2B cd8fbcbde0213b6f5aca61dc1e9aa9740cc9d726c9d139e2888cc42d777e13f5923b4e19d2efd732797cadeb352ea26edbddab58e5d09cd7ba4571fe60649d73 SHA512 5b89ced226bfcd186de94a4bf3a9cf94d80b117a726609f58bf7331b0b3ba62ad9d4b72c4d6f0d1332000665e9aacc0e7f6dd26defda6914fa8696b586996798
-EBUILD opencv_apps-2.0.0-r1.ebuild 684 BLAKE2B 137307ff871a7f5aa7003692e977c6957beb772f0c8f8dfdc43f6c44849b951f4ef434e8063d6130b881b313a2f4f9f07b51112fd77d732b9a2c71438d0988af SHA512 1314179ad9e8f67931fe1f38585a52cb3799436b2f245bbb48b746b154cf8a4ae9eeceb3e174e25f7617ebb5e47ceea6593b48f38b3789c26386e23a273c10d0
+AUX ocv4.patch 5101 BLAKE2B 1f298695f9c0dd46dad07c6495975043e9031ee5e19fdb886a512861a04bfa3029427213db00af9f6e68ef678c1a172e6ffdaf671bfa9a108f17d58204dd5bf9 SHA512 a24a4a510a501caafaa78a9a856724e3bdf8b9ea70cbf41da7b6b96e18a013b08f01660289e4cb0e77567c9ae6fbabf751cbbefef6ba391a37ecb6b09cb1c373
+DIST opencv_apps-2.0.1.tar.gz 83497 BLAKE2B 31d0447696716ba623e64e69dc269491c4a943125c90c33ac2e495ce2a64f417758e0a142f36c5dde9032475abee516fecf9e227bbe977706f1a89ea02a3daad SHA512 db263bb49f1b083cfd84f325911da804c3a2c8b3db7f3a2ce697a4fe2dde2b692a2b1921bd32aecb19d67c93f7bf6809340c418b6bf4619ebd7beed1469838da
+EBUILD opencv_apps-2.0.1.ebuild 718 BLAKE2B ed7aac7cf21fac146d6128c05699646ed4290e425146fbb85e398368155d799581a0e46ef55d6b462a8e626cad8486f773224dd7c1b763495df77dc9fe821061 SHA512 0a17c17195a8bbe8dd61b52f4135413374536f1cf1c271a47623bc2da940a273842e836d0cacba183efa50d1891ee3ad2767393a0090440422a2eb80a8dad679
EBUILD opencv_apps-9999.ebuild 684 BLAKE2B 137307ff871a7f5aa7003692e977c6957beb772f0c8f8dfdc43f6c44849b951f4ef434e8063d6130b881b313a2f4f9f07b51112fd77d732b9a2c71438d0988af SHA512 1314179ad9e8f67931fe1f38585a52cb3799436b2f245bbb48b746b154cf8a4ae9eeceb3e174e25f7617ebb5e47ceea6593b48f38b3789c26386e23a273c10d0
MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/opencv_apps/files/ocv4.patch b/dev-ros/opencv_apps/files/ocv4.patch
new file mode 100644
index 000000000000..48954535e0a0
--- /dev/null
+++ b/dev-ros/opencv_apps/files/ocv4.patch
@@ -0,0 +1,118 @@
+From 357fc3f20d0a2252b6a0a6cab8a6ae6cf79b8565 Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Wed, 23 Oct 2019 22:15:57 +0200
+Subject: [PATCH] Support OpenCV 4
+
+---
+ src/nodelet/face_recognition_nodelet.cpp | 18 +++++++++++++++---
+ src/nodelet/segment_objects_nodelet.cpp | 4 ++++
+ src/nodelet/simple_flow_nodelet.cpp | 4 ++--
+ 3 files changed, 21 insertions(+), 5 deletions(-)
+
+Index: opencv_apps-2.0.1/src/nodelet/face_recognition_nodelet.cpp
+===================================================================
+--- opencv_apps-2.0.1.orig/src/nodelet/face_recognition_nodelet.cpp
++++ opencv_apps-2.0.1/src/nodelet/face_recognition_nodelet.cpp
+@@ -229,7 +229,11 @@ public:
+ fs::path file_path = cit->path();
+ try
+ {
++#if CV_MAJOR_VERSION > 3
++ cv::Mat img = cv::imread(file_path.string(), cv::IMREAD_COLOR);
++#else
+ cv::Mat img = cv::imread(file_path.string(), CV_LOAD_IMAGE_COLOR);
++#endif
+ labels.push_back(label);
+ images.push_back(img);
+ }
+@@ -327,7 +331,11 @@ class FaceRecognitionNodelet : public op
+ int(face.face.height + face.face.height * face_padding_));
+ cv::Scalar color(0.0, 0.0, 255.0);
+ int boldness = 2;
++#if CV_MAJOR_VERSION > 3
++ cv::rectangle(img, r.tl(), r.br(), color, boldness, cv::LINE_AA);
++#else
+ cv::rectangle(img, r.tl(), r.br(), color, boldness, CV_AA);
++#endif
+
+ double font_scale = 1.5;
+ int text_height = 20;
+@@ -338,7 +346,11 @@ class FaceRecognitionNodelet : public op
+ text_bl = r.br() + cv::Point(-r.width, text_height);
+ std::stringstream ss;
+ ss << face.label << " (" << std::fixed << std::setprecision(2) << face.confidence << ")";
++#if CV_MAJOR_VERSION > 3
++ cv::putText(img, ss.str(), text_bl, cv::FONT_HERSHEY_PLAIN, font_scale, color, boldness, cv::LINE_AA);
++#else
+ cv::putText(img, ss.str(), text_bl, cv::FONT_HERSHEY_PLAIN, font_scale, color, boldness, CV_AA);
++#endif
+ }
+
+ void extractImage(const cv::Mat& img, const opencv_apps::Rect& rect, cv::Mat& ret, double padding = 0.0)
+@@ -548,7 +560,7 @@ class FaceRecognitionNodelet : public op
+ if (config.model_method == "eigen")
+ {
+ // https://docs.opencv.org/3.3.1/da/d60/tutorial_face_main.html
+-#if CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3
++#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3)
+ model_ = face::EigenFaceRecognizer::create(config.model_num_components, config.model_threshold);
+ #else
+ model_ = face::createEigenFaceRecognizer(config.model_num_components, config.model_threshold);
+@@ -556,7 +568,7 @@ class FaceRecognitionNodelet : public op
+ }
+ else if (config.model_method == "fisher")
+ {
+-#if CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3
++#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3)
+ model_ = face::FisherFaceRecognizer::create(config.model_num_components, config.model_threshold);
+ #else
+ model_ = face::createFisherFaceRecognizer(config.model_num_components, config.model_threshold);
+@@ -564,7 +576,7 @@ class FaceRecognitionNodelet : public op
+ }
+ else if (config.model_method == "LBPH")
+ {
+-#if CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3
++#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3)
+ model_ = face::LBPHFaceRecognizer::create(config.lbph_radius, config.lbph_neighbors, config.lbph_grid_x,
+ config.lbph_grid_y);
+ #else
+Index: opencv_apps-2.0.1/src/nodelet/segment_objects_nodelet.cpp
+===================================================================
+--- opencv_apps-2.0.1.orig/src/nodelet/segment_objects_nodelet.cpp
++++ opencv_apps-2.0.1/src/nodelet/segment_objects_nodelet.cpp
+@@ -179,7 +179,11 @@ class SegmentObjectsNodelet : public ope
+ }
+ }
+ cv::Scalar color(0, 0, 255);
++#if CV_MAJOR_VERSION > 3
++ cv::drawContours(out_frame, contours, largest_comp, color, cv::FILLED, 8, hierarchy);
++#else
+ cv::drawContours(out_frame, contours, largest_comp, color, CV_FILLED, 8, hierarchy);
++#endif
+
+ std_msgs::Float64 area_msg;
+ area_msg.data = max_area;
+Index: opencv_apps-2.0.1/src/nodelet/simple_flow_nodelet.cpp
+===================================================================
+--- opencv_apps-2.0.1.orig/src/nodelet/simple_flow_nodelet.cpp
++++ opencv_apps-2.0.1/src/nodelet/simple_flow_nodelet.cpp
+@@ -46,7 +46,7 @@
+ #include <opencv2/highgui/highgui.hpp>
+ #include <opencv2/imgproc/imgproc.hpp>
+ #include <opencv2/video/tracking.hpp>
+-#if CV_MAJOR_VERSION == 3
++#if CV_MAJOR_VERSION >= 3
+ #include <opencv2/optflow.hpp>
+ #endif
+
+@@ -163,8 +163,8 @@ class SimpleFlowNodelet : public opencv_
+ }
+
+ float start = (float)cv::getTickCount();
+-#if CV_MAJOR_VERSION == 3
+- cv::optflow::calcOpticalFlowSF(gray, prevGray,
++#if CV_MAJOR_VERSION >= 3
++ cv::optflow::calcOpticalFlowSF(gray, prevGray,
+ #else
+ cv::calcOpticalFlowSF(gray, prevGray,
+ #endif
diff --git a/dev-ros/opencv_apps/opencv_apps-2.0.0-r1.ebuild b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
index ddf09bbd814e..74105169c2d5 100644
--- a/dev-ros/opencv_apps/opencv_apps-2.0.0-r1.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -27,3 +27,4 @@ RDEPEND="
dev-libs/boost:=
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest
index 0bede2080e21..7e733b68697a 100644
--- a/dev-ros/pcl_conversions/Manifest
+++ b/dev-ros/pcl_conversions/Manifest
@@ -1,8 +1,10 @@
DIST pcl_conversions-0.2.1.tar.gz 8450 BLAKE2B a77cf70f751c7d80bcdee1214554aecaf1cd3518266fed75f730c865f3ccff9ba2cb502861084c9792df4850fe411e6606c94afb2bdc490cad396be0b319763e SHA512 a9d8a2b45463d67d858ee9b62f0e895f808c79b3bac3d2833c6ba02bd36bdeec0d4697897446c9e2968559667e1d9c5f93df6b583f13fd3b26220d3cd0a71632
DIST perception_pcl-1.6.1.tar.gz 82552 BLAKE2B a442c9df193e38b6aca9e45ec3a469d6603bc2c909fc8c33ad612b2b6448956863555608cb0a0102593e2e71aa7f54ae88b677c2bfbde7df23b114ff4ca83c8f SHA512 c0b63833dd12f3eee5f5ec1e5d8f8bd9c001f1f1787572717a0845fa9a18862bb49a134638f9f0bde5587ac26ab8fd9e6534fcd5ed6b69842780a6fd3762fb5c
DIST perception_pcl-1.6.2.tar.gz 82896 BLAKE2B dc5d4e25b1841ffde720f7f0231570fcca687d32158da0bb9510f37b7cefbd71dd774bae31a0aa8fdfe7330c98721a7d0df7236bbc9452f9f82c09cd42236695 SHA512 c7c0524a8095fd42b8e12bf2f4453a07d758822ba5a345353df8790e4c22faf250e400fa88a90aea828e80ef4a9992ead04635a5898a45b47245235fec7700ed
+DIST perception_pcl-1.7.0.tar.gz 84987 BLAKE2B de309d013b24f3fb3ad2c1a5531cdee9860c4173cd885d7f294a30153ed1cb1613cd26035ec161879cb3804d75670a6d58096251f867cffaf9fd6eb74741ef40 SHA512 01eee6b2fec2b0be0737adaf8a1347922631edee8466c28815e1b183e9365c632f66544c8f85231a5c81262bcab3e24a3d6bff986262b1cb64dc2e3b27adef67
EBUILD pcl_conversions-0.2.1-r1.ebuild 589 BLAKE2B 06ad0c702cadce3d0bcffcfd896fee9ca843ec12eea2cfd9337e54e7dfdae021de3f19fec58ecf05d3c9b9a1240454f2998c457507be6509998e44e165930c8f SHA512 4a0a6a9e6a4d6fdfe2770476ef76ca9909a664db35d7cac1d3aa7bbddb27d1a2e03c33ae92ad1fe47ba23844469bef88e755048ce1913fcbc67f2dcfbab5da99
EBUILD pcl_conversions-1.6.1.ebuild 605 BLAKE2B 874aa3d03575a1d1496cf8d2ae4b66e23c9ce5c419cac0fe73e1514e39adc460bf81d331331f290d5b3a9caaae31fd505b080b5be4d94814b4057fc5797c129c SHA512 57f71a5744712cbeecb98dc3b55cec7731d5f516c9db9596b48757948d28c37bd43db769921e7217f48453c61df5ebd60c0479e7f49bf1fc2fb714daff9ecd70
EBUILD pcl_conversions-1.6.2.ebuild 605 BLAKE2B 874aa3d03575a1d1496cf8d2ae4b66e23c9ce5c419cac0fe73e1514e39adc460bf81d331331f290d5b3a9caaae31fd505b080b5be4d94814b4057fc5797c129c SHA512 57f71a5744712cbeecb98dc3b55cec7731d5f516c9db9596b48757948d28c37bd43db769921e7217f48453c61df5ebd60c0479e7f49bf1fc2fb714daff9ecd70
+EBUILD pcl_conversions-1.7.0.ebuild 602 BLAKE2B 9fdc1fa55d080c030d528ebfb16a2e8e30e0a52b4e22290fd635d891bb8c3f1257a261eeff46e1b9a5daa2dbf05c45043c580d7777d3eb21a3934f0cc7f75c2c SHA512 fd0783cfb8b94f5eab8c5f28894e4c5f9c7b8f1383751e46fa1c3b4d66e4df1f0c1c3a16e9659f7f78c990487793765bf0ec55d346e3e889840aaeafdcf8977f
EBUILD pcl_conversions-9999.ebuild 605 BLAKE2B 874aa3d03575a1d1496cf8d2ae4b66e23c9ce5c419cac0fe73e1514e39adc460bf81d331331f290d5b3a9caaae31fd505b080b5be4d94814b4057fc5797c129c SHA512 57f71a5744712cbeecb98dc3b55cec7731d5f516c9db9596b48757948d28c37bd43db769921e7217f48453c61df5ebd60c0479e7f49bf1fc2fb714daff9ecd70
MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.0.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.0.ebuild
new file mode 100644
index 000000000000..84ff87429a51
--- /dev/null
+++ b/dev-ros/pcl_conversions/pcl_conversions-1.7.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides conversions from PCL data types and ROS message types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ sci-libs/pcl:=
+ dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 48e62082e9bb..0f70ea378fe3 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,8 +1,10 @@
DIST perception_pcl-1.5.4.tar.gz 73829 BLAKE2B cfc6e964691da42717d134e0b639ef4af4491074de171a84d081bf66c061a51b7c2da750ff539dd784a7a4c34cfdfe18d7d2e38c4e6d0370fbc441f9b3a6196d SHA512 e9da9b2f9b602b67bceec9b0adf515b500d77c9e5c2dbdc1f63bf5a91419bbf7f9f41d602646b8197dffcf7a077b63eb402a507dbc6bb96405a8f4d64576e36e
DIST perception_pcl-1.6.1.tar.gz 82552 BLAKE2B a442c9df193e38b6aca9e45ec3a469d6603bc2c909fc8c33ad612b2b6448956863555608cb0a0102593e2e71aa7f54ae88b677c2bfbde7df23b114ff4ca83c8f SHA512 c0b63833dd12f3eee5f5ec1e5d8f8bd9c001f1f1787572717a0845fa9a18862bb49a134638f9f0bde5587ac26ab8fd9e6534fcd5ed6b69842780a6fd3762fb5c
DIST perception_pcl-1.6.2.tar.gz 82896 BLAKE2B dc5d4e25b1841ffde720f7f0231570fcca687d32158da0bb9510f37b7cefbd71dd774bae31a0aa8fdfe7330c98721a7d0df7236bbc9452f9f82c09cd42236695 SHA512 c7c0524a8095fd42b8e12bf2f4453a07d758822ba5a345353df8790e4c22faf250e400fa88a90aea828e80ef4a9992ead04635a5898a45b47245235fec7700ed
+DIST perception_pcl-1.7.0.tar.gz 84987 BLAKE2B de309d013b24f3fb3ad2c1a5531cdee9860c4173cd885d7f294a30153ed1cb1613cd26035ec161879cb3804d75670a6d58096251f867cffaf9fd6eb74741ef40 SHA512 01eee6b2fec2b0be0737adaf8a1347922631edee8466c28815e1b183e9365c632f66544c8f85231a5c81262bcab3e24a3d6bff986262b1cb64dc2e3b27adef67
EBUILD pcl_ros-1.5.4.ebuild 921 BLAKE2B 7dcd0c3e58fe62dfecac6163907a1034a8a1e3e61660012be8b68ce12ab2177d198f8f737cd73a6b28caf8f6d7c6e0818b8b70d0e0c407e64165358b5027efcf SHA512 ba2210fc75a197d53ac011edae3a5e76e103111bfa1e096498112361797e5d0f3d493fefa9c41fc56c2c317eba3b2896f095212c72d7fa92e5b76f27869b3fe1
EBUILD pcl_ros-1.6.1.ebuild 946 BLAKE2B eda6616fbb42b4ec8684500b87d22ec2476a44d4ef515739a2e42cc9eb14495e6ff445d29fbab51e37dde7538a465fca37c99fa3ecbb7bc7aa240bae8a94c230 SHA512 94f287f1ffa36e7c44801eb48469501649b864eef1960a8d0548d0a8e219e488ced3077a3a13ab730488601c35a926702c77433a1d6c3b52ed9e0f8fe036d3a6
EBUILD pcl_ros-1.6.2.ebuild 946 BLAKE2B eda6616fbb42b4ec8684500b87d22ec2476a44d4ef515739a2e42cc9eb14495e6ff445d29fbab51e37dde7538a465fca37c99fa3ecbb7bc7aa240bae8a94c230 SHA512 94f287f1ffa36e7c44801eb48469501649b864eef1960a8d0548d0a8e219e488ced3077a3a13ab730488601c35a926702c77433a1d6c3b52ed9e0f8fe036d3a6
+EBUILD pcl_ros-1.7.0.ebuild 943 BLAKE2B a111ef4d5cb2f237cced0c6d9c245c2b6e6a65d5c221e15006d163735b8a35bcd8e7ee8840a40a0b76b05e69e080d3915002273bca18a18095fff4293c40d221 SHA512 a78e9444b831417f454feb9e064c2f63d21b92b099943f852a8781f74216fc9b8b42c092b5d39ae727b9ea11ae8cd7d847f532219cb791be14a1314da7374d25
EBUILD pcl_ros-9999.ebuild 946 BLAKE2B eda6616fbb42b4ec8684500b87d22ec2476a44d4ef515739a2e42cc9eb14495e6ff445d29fbab51e37dde7538a465fca37c99fa3ecbb7bc7aa240bae8a94c230 SHA512 94f287f1ffa36e7c44801eb48469501649b864eef1960a8d0548d0a8e219e488ced3077a3a13ab730488601c35a926702c77433a1d6c3b52ed9e0f8fe036d3a6
MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.0.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.0.ebuild
new file mode 100644
index 000000000000..14ce04f55152
--- /dev/null
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rosbag
+ dev-ros/rosconsole
+ dev-ros/roslib
+ dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+ dev-ros/message_filters
+ >=dev-cpp/eigen-3.2.5:3
+ dev-ros/pluginlib
+ dev-libs/console_bridge:=
+ dev-ros/tf
+ dev-ros/tf2
+ dev-ros/tf2_ros
+ dev-ros/tf2_eigen
+ dev-ros/nodelet
+ dev-ros/nodelet_topic_tools
+ sci-libs/pcl:=[qhull]
+ >=dev-ros/pcl_conversions-0.2.1-r1
+ dev-libs/boost:=[threads]
+ dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/poco_vendor/Manifest b/dev-ros/poco_vendor/Manifest
new file mode 100644
index 000000000000..8305f840fa36
--- /dev/null
+++ b/dev-ros/poco_vendor/Manifest
@@ -0,0 +1,4 @@
+DIST poco_vendor-1.2.0.tar.gz 3145 BLAKE2B 6143f73ec9f741ff72147ac43d4876cb17553d8a4ba33d54b60f546cd2988389de4cbc1b3fcb0300f507f91610ba64284515a3d736417f611c3ffa6eb32d5aba SHA512 f38f00028ad1b6b236305761f53748597f1203e267488ba2a08b8c06ad155338a2c413b3e5e5501becdb09aec4600ae700d95765a5b4d0861b163e4f2a9ee413
+EBUILD poco_vendor-1.2.0.ebuild 749 BLAKE2B 740f8b6ee10ae7f50d9dd14d3847cbf3d1ce24d6079f5886f8aeeb1948b0ac9f01dde14bce7c865b0496a24720e2795d0a886cf426642f5353ad6e84b34fa6ff SHA512 180212b1ca13f214c51c20417a27d5fcc930ea5bbece30092c05c031a53ada75bee8dc677f5e8eed1d0664100313266fd4dc5b7069efbb266848db04ad03c5d3
+EBUILD poco_vendor-9999.ebuild 749 BLAKE2B 740f8b6ee10ae7f50d9dd14d3847cbf3d1ce24d6079f5886f8aeeb1948b0ac9f01dde14bce7c865b0496a24720e2795d0a886cf426642f5353ad6e84b34fa6ff SHA512 180212b1ca13f214c51c20417a27d5fcc930ea5bbece30092c05c031a53ada75bee8dc677f5e8eed1d0664100313266fd4dc5b7069efbb266848db04ad03c5d3
+MISC metadata.xml 330 BLAKE2B 7880b16541c752a5d4fb5e729d4305ca3f6430a4fddb36ced24cbf6f2c75964cfbbc34ea8a16cd306b8d49412c822a17d4cf44639f1e2cb7218c437aa2500830 SHA512 b9af45457315c529a21cf6d3ca9711513aa662cf21b9de1eba6a4a0498c28525cd6175878836d5c90c72afcef201bea2ef54e50a2103d4c7c07156b6bbfbc908
diff --git a/dev-ros/poco_vendor/metadata.xml b/dev-ros/poco_vendor/metadata.xml
new file mode 100644
index 000000000000..c3d00f27cbd9
--- /dev/null
+++ b/dev-ros/poco_vendor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ros@gentoo.org</email>
+ <name>Gentoo ROS Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ros2/poco_vendor</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild b/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild
new file mode 100644
index 000000000000..b6214810f35f
--- /dev/null
+++ b/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ros2/poco_vendor"
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/ros2/poco_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="CMake shim over the poco library"
+HOMEPAGE="https://github.com/ros2/poco_vendor"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+ dev-libs/poco
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ $(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/poco_vendor/poco_vendor-9999.ebuild b/dev-ros/poco_vendor/poco_vendor-9999.ebuild
new file mode 100644
index 000000000000..b6214810f35f
--- /dev/null
+++ b/dev-ros/poco_vendor/poco_vendor-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ros2/poco_vendor"
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/ros2/poco_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="CMake shim over the poco library"
+HOMEPAGE="https://github.com/ros2/poco_vendor"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+ dev-libs/poco
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ $(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+"
diff --git a/dev-ros/qt_dotgraph/Manifest b/dev-ros/qt_dotgraph/Manifest
index 61740dc5ad4b..6c276ece205a 100644
--- a/dev-ros/qt_dotgraph/Manifest
+++ b/dev-ros/qt_dotgraph/Manifest
@@ -4,6 +4,7 @@ DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5
DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
+DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
@@ -17,6 +18,7 @@ EBUILD qt_dotgraph-0.3.0.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa
EBUILD qt_dotgraph-0.3.1.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
EBUILD qt_dotgraph-0.3.10.ebuild 553 BLAKE2B d05e4dc3e31ff1773fb74855149781ef396c36e59e1ff5322475ae7fe8bf4b8530473731a9ddfaaa9b69dab8958ef5c483e896cc61562c53180430cd0280e93e SHA512 74b31226705f4dabdfae9565713ecec395a37a18631a7cebb166d7acc04e299ee58eddebe29f09d54b743f82b8283adef3b4dfac0e10ccf5d37a5433916f33e7
EBUILD qt_dotgraph-0.3.11.ebuild 553 BLAKE2B d05e4dc3e31ff1773fb74855149781ef396c36e59e1ff5322475ae7fe8bf4b8530473731a9ddfaaa9b69dab8958ef5c483e896cc61562c53180430cd0280e93e SHA512 74b31226705f4dabdfae9565713ecec395a37a18631a7cebb166d7acc04e299ee58eddebe29f09d54b743f82b8283adef3b4dfac0e10ccf5d37a5433916f33e7
+EBUILD qt_dotgraph-0.3.16.ebuild 550 BLAKE2B 6ceaf06cf9e4618ab8168c1129866c3a0f4fdb7a4f3cb72c52ad0cfde00ff6577549c1ec78cb92498571207c4689c570bbc986b3c7b1c26a375895bd37da6ee7 SHA512 286ead177c5165d1b3d97ad13495c25f76cfe67edf8a70046f1e05f2ec0a55da1e73e9e0e2eeeb83885a0356ea6e061c2bb64be20397cd129df5bd982cc34716
EBUILD qt_dotgraph-0.3.2.ebuild 553 BLAKE2B 4d45e928e4d9e8459a372e23848f84f183aa6ca978533c21e4ee2738dace60c70f9cc7a0f6c3f82bc3e0258d017591e4b313f40a0d31ba3233e62ce306a89b29 SHA512 0d0541f5feed4d30460d34ebf9197b38e90941d07901dc3f675f22b8d2ce2324e76f5676a8d26d464932a0ca92054f3daf7c3f0c6aabfc560f77c766451395c4
EBUILD qt_dotgraph-0.3.3.ebuild 553 BLAKE2B 49b8d54ee7048bbeca3bc612e0cc55dbbcb6f1ffc69e0054f6dac39e5efc875f3af8729351afbe469904d5c0d3ad6e3523310d55fa9de0fef727d21d8d9fd7b4 SHA512 7cc3b353b875b38382df6164d8d94f233c023c3bf2c85871cba156332e508ed4f05b2f485812deeadcb574e0dcf99465bdc2078eb8c415c077d18ff9556163cc
EBUILD qt_dotgraph-0.3.4.ebuild 553 BLAKE2B 6017571f1c49b534b1adb8b1104e11b905731de42e1eae93f815fb63e2ed4d1b993b2ef18a9d9f15cc4b7960d3605d4003f2bf10a6752497b758391c953d2e3d SHA512 011aba5249fb7641b2b876178723ff68410a0519d6494a059555ce4b1c2481ba4faed4ef49c14eae588f889532b5d3586ecdcb678082751db52c5ddfd208f591
diff --git a/dev-ros/qt_dotgraph/qt_dotgraph-0.3.16.ebuild b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.16.ebuild
new file mode 100644
index 000000000000..84ed9c280cf1
--- /dev/null
+++ b/dev-ros/qt_dotgraph/qt_dotgraph-0.3.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Helpers to work with dot graphs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-python/pydot[${PYTHON_USEDEP}]
+ >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pygraphviz[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/qt_gui/Manifest b/dev-ros/qt_gui/Manifest
index 90a3221a8f07..31146d2b0a48 100644
--- a/dev-ros/qt_gui/Manifest
+++ b/dev-ros/qt_gui/Manifest
@@ -1,5 +1,6 @@
DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
+DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
@@ -7,6 +8,7 @@ DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e
DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
EBUILD qt_gui-0.3.10.ebuild 526 BLAKE2B a1d457515990b9a9234232e3904a0e580c6504fd6ee3ad1d0ab807dfe23258de0760635bfd63937ff09d91dbf8071c5ee662031ca46e91fa70de0a3b5b3e90f6 SHA512 b9e7f94bd547af13d2f7663f663351abc824ee5d6438891a6182c56baa5e1a198160434fe48b7e5af66f2bfa1bcf37dc70e08a8c5237d5a7db144f0af3c1662a
EBUILD qt_gui-0.3.11.ebuild 526 BLAKE2B a1d457515990b9a9234232e3904a0e580c6504fd6ee3ad1d0ab807dfe23258de0760635bfd63937ff09d91dbf8071c5ee662031ca46e91fa70de0a3b5b3e90f6 SHA512 b9e7f94bd547af13d2f7663f663351abc824ee5d6438891a6182c56baa5e1a198160434fe48b7e5af66f2bfa1bcf37dc70e08a8c5237d5a7db144f0af3c1662a
+EBUILD qt_gui-0.3.16.ebuild 526 BLAKE2B a1d457515990b9a9234232e3904a0e580c6504fd6ee3ad1d0ab807dfe23258de0760635bfd63937ff09d91dbf8071c5ee662031ca46e91fa70de0a3b5b3e90f6 SHA512 b9e7f94bd547af13d2f7663f663351abc824ee5d6438891a6182c56baa5e1a198160434fe48b7e5af66f2bfa1bcf37dc70e08a8c5237d5a7db144f0af3c1662a
EBUILD qt_gui-0.3.4-r1.ebuild 526 BLAKE2B a1d457515990b9a9234232e3904a0e580c6504fd6ee3ad1d0ab807dfe23258de0760635bfd63937ff09d91dbf8071c5ee662031ca46e91fa70de0a3b5b3e90f6 SHA512 b9e7f94bd547af13d2f7663f663351abc824ee5d6438891a6182c56baa5e1a198160434fe48b7e5af66f2bfa1bcf37dc70e08a8c5237d5a7db144f0af3c1662a
EBUILD qt_gui-0.3.5.ebuild 526 BLAKE2B a1d457515990b9a9234232e3904a0e580c6504fd6ee3ad1d0ab807dfe23258de0760635bfd63937ff09d91dbf8071c5ee662031ca46e91fa70de0a3b5b3e90f6 SHA512 b9e7f94bd547af13d2f7663f663351abc824ee5d6438891a6182c56baa5e1a198160434fe48b7e5af66f2bfa1bcf37dc70e08a8c5237d5a7db144f0af3c1662a
EBUILD qt_gui-0.3.6.ebuild 526 BLAKE2B a1d457515990b9a9234232e3904a0e580c6504fd6ee3ad1d0ab807dfe23258de0760635bfd63937ff09d91dbf8071c5ee662031ca46e91fa70de0a3b5b3e90f6 SHA512 b9e7f94bd547af13d2f7663f663351abc824ee5d6438891a6182c56baa5e1a198160434fe48b7e5af66f2bfa1bcf37dc70e08a8c5237d5a7db144f0af3c1662a
diff --git a/dev-ros/qt_gui/qt_gui-0.3.16.ebuild b/dev-ros/qt_gui/qt_gui-0.3.16.ebuild
new file mode 100644
index 000000000000..ff4adf5533e7
--- /dev/null
+++ b/dev-ros/qt_gui/qt_gui-0.3.16.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_5} )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS infrastructure for an integrated graphical user interface based on Qt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_app/Manifest b/dev-ros/qt_gui_app/Manifest
index b101e7d37419..85e3bff2fd2e 100644
--- a/dev-ros/qt_gui_app/Manifest
+++ b/dev-ros/qt_gui_app/Manifest
@@ -4,6 +4,7 @@ DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5
DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
+DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
@@ -17,6 +18,7 @@ EBUILD qt_gui_app-0.3.0.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d
EBUILD qt_gui_app-0.3.1.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
EBUILD qt_gui_app-0.3.10.ebuild 472 BLAKE2B 10e1f7ed5ad94b8a36a1e8b07a417863968c97dc1429978bdf5559a2bfc23bb40ad077901366866806491bf376d3703f5003a6c29e85e6e7e6b8b1c3c9207206 SHA512 f147ce42b400b464cf7e6cab0be3fccf3eba04330cd270a16595ed31d75fbf77d8625e9f225d5ab24992e64a72a20deecfb2237fe6ee1082043180234990e90e
EBUILD qt_gui_app-0.3.11.ebuild 472 BLAKE2B 10e1f7ed5ad94b8a36a1e8b07a417863968c97dc1429978bdf5559a2bfc23bb40ad077901366866806491bf376d3703f5003a6c29e85e6e7e6b8b1c3c9207206 SHA512 f147ce42b400b464cf7e6cab0be3fccf3eba04330cd270a16595ed31d75fbf77d8625e9f225d5ab24992e64a72a20deecfb2237fe6ee1082043180234990e90e
+EBUILD qt_gui_app-0.3.16.ebuild 469 BLAKE2B 1721c6c097e508af94dcb4dbdb2cf6bb2858a730c63a02a820b64345a76f921efb44c59e135491be7bd99393bd64e9a642598550bfcd2e775fdf850c09ac6037 SHA512 5ba34cee59bc3df2951cd49adb7cf6917e0fdfc7deba729712313b791ac375c4a468c9cd506ea87aba507f770f8fb8c7eaff9b3df6745199e09211419e8287f1
EBUILD qt_gui_app-0.3.2.ebuild 472 BLAKE2B 4c7e357c70fe4a7d2dae3a5601090a20a548d52d71656b01ef406a0b31c903f33e8c7eb1d421e0a7d6ea2ecd9a3cb03b106482157f3261f0f9d514ac889661e7 SHA512 cec9a8da56df0f6e7a39a3f6f91381fce7be71dd4276daa9a1e2a9b52415b0adfa27ca590fe23f0e8c07bfd8192a727e67a011701c1e94a40cb0f3ef119beffa
EBUILD qt_gui_app-0.3.3.ebuild 472 BLAKE2B 976f77da58f76de0c76f2304b6a58cbcd2a2ecf9d4ba87bc1f0c196da66ab990215e4f3a4cbfb8a89a0e332b2f73f2eaabba2c5c4a283c4d912002fe5cf30393 SHA512 dc52f8080944b02eaadcb1367fb257e1409ac4f491a168dab8d99c0b077da13503fcaa5035d4c4631ef4f0ad3d65d4a55d977e1fb3d3a29a3fe605458cec156d
EBUILD qt_gui_app-0.3.4.ebuild 472 BLAKE2B ec44dea14908f5f7218404689b6bb666c2c4c20c226f6de108715f36dacbabed821e574b1ed80be5c293bd55c189506698ce262a05b124b8f71ea868e85939b5 SHA512 0019fd2c42a5cd017cb6d6b800fdc184cb8d87e851c261b3f87e3b11d1ad91bccf72d0b2d912951cec283eb77f8e1db666dd2f960431c83e7c827e81623b8d0a
diff --git a/dev-ros/qt_gui_app/qt_gui_app-0.3.16.ebuild b/dev-ros/qt_gui_app/qt_gui_app-0.3.16.ebuild
new file mode 100644
index 000000000000..ac649ae4f0f2
--- /dev/null
+++ b/dev-ros/qt_gui_app/qt_gui_app-0.3.16.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Main to start an instance of the integrated graphical user interface provided by qt_gui"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
index 49de18ceb811..c9871715b844 100644
--- a/dev-ros/qt_gui_cpp/Manifest
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -1,5 +1,5 @@
-AUX libdir.patch 1151 BLAKE2B f78ed19cff2df00514da0e60b6cfbda581443a0b7b1515a7c40d1a9518391611de3c5ff9eed6091ac2dbbdff168aba14239ac21754657541aa5b6e053e19aa7d SHA512 a6393e452f9a2a2517d35e2edb069f94acc8461dfda631c3183099a9b8bf6aa79bd5747ef1e1275637ad3fbbca67bab0aa9bcb21dce1f3eb67ed2600ceffe657
-DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
-EBUILD qt_gui_cpp-0.3.11.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
+AUX libdir.patch 864 BLAKE2B c104517d108824d13455565cecbeac0886c60cc042bcab4ffd9961be7096117342157a0da0bb4912e18179bca5c40d8391be8d162ac9f07a7b4a5c8a3d65f4c5 SHA512 16960a3224f982cf3b55904d5c5370a715aed2a7dfd6f98ecc21af1f70fd527e84b1ee10f127e45251a149abb165aed06e595c73f7deda88f84548fb4c7cb717
+DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
+EBUILD qt_gui_cpp-0.3.16.ebuild 742 BLAKE2B 1fa243ce03487123a5a13af0887b7431da00461c8f658760c2844b646b2c841d9da83d5ffdcc33ae30c62cfebf2084a65d8a8aba69b746ae8adad94bd8b807d7 SHA512 f48f4e4038f50bcc0e3c5786808898fd228b6ff13624c11d49b465434290faf71cc16c431e65de4e5cec65da5b604efb7dd01ff445c79975bb0f3cce10993e9a
EBUILD qt_gui_cpp-9999.ebuild 745 BLAKE2B 2f7e609d3f4336951307b9ba559969a437bf68f44a4695d333791fb9ccc7057a23c85048060812b232bc9c20ffd1a0c3c96bd341c53fb0bbda12230815c6be1d SHA512 776fa23e75d92cbf557fbcee6742f0fd18dbac87af5aa3640aded8e5775c59eac1294c22403bbf86a8ada2c205ca629e88f627ac82bffcd2f01c3e19f2c87060
MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_cpp/files/libdir.patch b/dev-ros/qt_gui_cpp/files/libdir.patch
index 8c22eed2385c..b2656183de95 100644
--- a/dev-ros/qt_gui_cpp/files/libdir.patch
+++ b/dev-ros/qt_gui_cpp/files/libdir.patch
@@ -1,15 +1,13 @@
-Index: qt_gui_core-0.2.26/qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
+Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
===================================================================
---- qt_gui_core-0.2.26.orig/qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
-+++ qt_gui_core-0.2.26/qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
-@@ -29,8 +29,8 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
+--- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt
++++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
+@@ -29,7 +29,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
# maintain context for different named target
set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS})
set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/lib)
--set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/lib\\")
+set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-+set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\\")
+ set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
find_package(python_qt_binding REQUIRED)
- include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.11.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild
index a52422eff7b2..359593ee4556 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.11.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/dev-ros/qt_gui_py_common/Manifest b/dev-ros/qt_gui_py_common/Manifest
index 3b48b47ec54f..fefdbacf0e6e 100644
--- a/dev-ros/qt_gui_py_common/Manifest
+++ b/dev-ros/qt_gui_py_common/Manifest
@@ -4,6 +4,7 @@ DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5
DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
+DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
@@ -17,6 +18,7 @@ EBUILD qt_gui_py_common-0.3.0.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d
EBUILD qt_gui_py_common-0.3.1.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
EBUILD qt_gui_py_common-0.3.10.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
EBUILD qt_gui_py_common-0.3.11.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
+EBUILD qt_gui_py_common-0.3.16.ebuild 492 BLAKE2B c3f64ebe4c95427f8143091675d9cc2387d07261ccf657ff16960ba150d0c4b307766ff82b510162c66143288fdf089c83701f5b74b3d8114fa7ff7f667fc323 SHA512 4b57439a27235c4bfaffc8507eaee9b3fc337045c4c030868c26a93b32957591960512c67df8c266df0f247b733b0c14b4b1145932c6c3a1fcac2378fe27d603
EBUILD qt_gui_py_common-0.3.2.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
EBUILD qt_gui_py_common-0.3.3.ebuild 495 BLAKE2B c73ccdb054e9a6e657eefe7471a983f8c7b6907b90c61ccab41a07e04647b57b1c8724e974de394caa76460953023783fa68382a683472fad1c986d18880fe4b SHA512 8413e1bf77163b55a3caa9dcf760576db4de7953a2b44aeb20c0940b6ffff103da58fd6fa5f0c57383c566d419ce26076864095507ca4568ebbfe16ac0d942fe
EBUILD qt_gui_py_common-0.3.4.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild
new file mode 100644
index 000000000000..7933e8e1843c
--- /dev/null
+++ b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index 218f0036d998..ccd4b50712b9 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,4 +1,5 @@
+AUX yaml.patch 2142 BLAKE2B 3b42703dc19179852e53bb98e6b450014bfa21d3f253e912ff6ce970b0904ae700b724e761821fa9b5a880789de8c80a2820e9a64bb2e56fb1783b034f4291ad SHA512 a5c41b8b374b33c577375495e6599daa50685664794ffc0c9dd83118b4ea8d74c68e3831ea426a1a3bce585e35f9039a86fab4266840b4eb3302bb4454ac889a
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosbag-1.14.3-r1.ebuild 870 BLAKE2B 0bba05e2e8f023b50eb237ff6f36d6ee7040986467739f876289250c78f24d2a8fce798662b21c2ada4260b8d54faf0ee3c6086e821551b25abcfc0ce29ebe68 SHA512 aeba9668e694a03cb6405e5a8446c3785619a94e2726cd3135a9929d30a7373cac65aac047c2a506b39e4546077fc4827437d6d55741e47b7cc66e230ee953ba
-EBUILD rosbag-9999.ebuild 870 BLAKE2B 0bba05e2e8f023b50eb237ff6f36d6ee7040986467739f876289250c78f24d2a8fce798662b21c2ada4260b8d54faf0ee3c6086e821551b25abcfc0ce29ebe68 SHA512 aeba9668e694a03cb6405e5a8446c3785619a94e2726cd3135a9929d30a7373cac65aac047c2a506b39e4546077fc4827437d6d55741e47b7cc66e230ee953ba
+EBUILD rosbag-1.14.3-r3.ebuild 911 BLAKE2B de87eaebff18c2a72accd257ed44270fae079b8035f0355f0216fbe7222c9df3199fa2f7491416a6e0decfe32a62769d638c49086bbdbfc8cdf96aa6f3559f5a SHA512 5ae601041118b5275d30f3138e591ef22f1174d77e6e870f2995cca06bcd0b58bc6fbd6dd308f88863cf47b7e5f776599c59bb5d644e85fb1b9b7fc4fe83651a
+EBUILD rosbag-9999.ebuild 874 BLAKE2B c1d41aaa13cd380d567130ed9d883fc32410ecc7a8f955016d9b5f197112ebb81af87ed83c794233e206eebd2d5366e7e2ab3bf9f70e8979ca66ebc074217fdf SHA512 615c22f1ba5a370a7068ca05abc6dbd1d28f4fbb32ed486625004a51f85c3892310387e3b00f4404c5d2cf09629ac2f14f5445f777a23197e7f7850afe222886
MISC metadata.xml 418 BLAKE2B 2d84b96bfb428654a9b926100a8bd083afb2addc6db8b2e6fb003fab4bb8c1615df40ee13c863a3ddfe98a1a1f9b72af8310a80a9f610a01fe14366afde2e38d SHA512 d7579d9a25bf9f83513e3d8058ec845ee9b59e5d999128532b63d992cee8ef94922aee88140f044829442077c6f9ae80d6b0b0f554cf677690fdc88a17c9f260
diff --git a/dev-ros/rosbag/files/yaml.patch b/dev-ros/rosbag/files/yaml.patch
new file mode 100644
index 000000000000..aea89788c1ea
--- /dev/null
+++ b/dev-ros/rosbag/files/yaml.patch
@@ -0,0 +1,53 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/tools/rosbag/src/rosbag/bag.py b/tools/rosbag/src/rosbag/bag.py
+index 0578aed91..9bdcb693d 100644
+--- a/tools/rosbag/src/rosbag/bag.py
++++ b/tools/rosbag/src/rosbag/bag.py
+@@ -1250,7 +1250,7 @@ def __init__(self, d):
+ else:
+ setattr(self, a, DictObject(b) if isinstance(b, dict) else b)
+
+- obj = DictObject(yaml.load(s))
++ obj = DictObject(yaml.safe_load(s))
+ try:
+ val = eval('obj.' + key)
+ except Exception as ex:
diff --git a/dev-ros/rosbag/rosbag-1.14.3-r1.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
index f36222bd8660..85bf4e8aee9a 100644
--- a/dev-ros/rosbag/rosbag-1.14.3-r1.ebuild
+++ b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
@@ -28,9 +28,10 @@ RDEPEND="
dev-ros/genpy[${PYTHON_USEDEP}]
dev-ros/rospy[${PYTHON_USEDEP}]
dev-libs/console_bridge:=
- dev-python/pycrypto[${PYTHON_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
dev-python/python-gnupg[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
RDEPEND="${RDEPEND}
lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rosbag/rosbag-9999.ebuild b/dev-ros/rosbag/rosbag-9999.ebuild
index f36222bd8660..e4ca9d626aae 100644
--- a/dev-ros/rosbag/rosbag-9999.ebuild
+++ b/dev-ros/rosbag/rosbag-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
dev-ros/genpy[${PYTHON_USEDEP}]
dev-ros/rospy[${PYTHON_USEDEP}]
dev-libs/console_bridge:=
- dev-python/pycrypto[${PYTHON_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
dev-python/python-gnupg[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
index b3e76c249c92..7fac7a1c5265 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -1,15 +1,5 @@
-AUX catkin_prefix2.patch 484 BLAKE2B 54fbc5a2dee390b46a9beccd804102f390e734ee827ddc986dc99da22140e5f33a1c01d642d30ff994531fdad6ecbc7f8034dd18ab7dec27fca569a2467ed363 SHA512 e85d430451a1679c8c7c401d72fe53c59e7c492ad89d812b212b1916bf098b91a43af1516f4d3a782c2dcb49f1fa9671812e31d466122cef33a4bc9a67fb211e
-DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
-DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-EBUILD rosbash-1.14.0.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
-EBUILD rosbash-1.14.1.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
-EBUILD rosbash-1.14.2.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
-EBUILD rosbash-1.14.3.ebuild 397 BLAKE2B af829f04684903bcd7f53ad019615f0a8357c63e6fca7949322cf945f4bd27352f631488539239a9c7625e6d9fda2df49e17d51c02ef31ea2309851b75d22b4b SHA512 b075932a3f05df7fb8bd3995eb826d4be5ffed44070b321fcd8749ff4433cd3813b563c7bce9e92611cf2c2a2b76caa1bde98d90f26fc0b6450fe072cd20c51d
-EBUILD rosbash-1.14.4.ebuild 397 BLAKE2B af829f04684903bcd7f53ad019615f0a8357c63e6fca7949322cf945f4bd27352f631488539239a9c7625e6d9fda2df49e17d51c02ef31ea2309851b75d22b4b SHA512 b075932a3f05df7fb8bd3995eb826d4be5ffed44070b321fcd8749ff4433cd3813b563c7bce9e92611cf2c2a2b76caa1bde98d90f26fc0b6450fe072cd20c51d
-EBUILD rosbash-1.14.6.ebuild 394 BLAKE2B 295b36b8c3afb1b4678cdecfcb7e46ac522f3b8caf96a89c356ff78a7362e068bf1ad8a01bc7b0b83236c5fe444e763d531119d9e3fa1e090b243dfb86a1e794 SHA512 f338ca82542c9dada42d31d57643943abc468443259e9c181e78c0dd1abdf1c5634498d31be0ee1784fcc28df57b2a066c89bb8e2e06bafb046e3a05ab83afb4
-EBUILD rosbash-9999.ebuild 397 BLAKE2B efc58a8a7f774d0c4c149f7d742532a12d1c20d919657c18c15e5113b9c78cfff54ff1ef248ac18136fe17c4ac867ab017a57c112e984cbded05e79131f580f4 SHA512 2cd1be7424bd28eea9ab74a9af96036be9c401e45d2ed33c9fad290694ceafc5ecb4245de700eacf0c5799324d92df08f7da2978c38e1409b0e7e01fccb01879
+AUX catkin_prefix.patch 443 BLAKE2B 4b366a582a5ebda3cfd644fb0319cd6cd07e9e983db9ed6cdb850bc6ecd393172e7e8dc93c30100470ba8417991e0487a7f85be53556472aa37947bae48ff2b6 SHA512 8662743559045f129a1dd94c7b42491f025b9038dff960f5d5259775760c0d3a0ae7086a6faae8bc6f511e72a0c5552013c88c4a8333043a0af6291b894ec5c1
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
+EBUILD rosbash-1.14.7.ebuild 408 BLAKE2B 64ca5af2d4932ca2acdbb32577dbc53ee8f983228b1b38a7433cfb2664f6400f318cd8634c8095d9f1536aad50b062cc7153b1a33a9875165e0629840aa8d1ac SHA512 0f40731f5c48b036bb6d2b1db284a8c5b96efb362566a3af7da7f3ed52850e47ea21f3a210a3eb29297b978dec87c446093e6ef284b518e1815bb901c3a4eba4
+EBUILD rosbash-9999.ebuild 408 BLAKE2B 64ca5af2d4932ca2acdbb32577dbc53ee8f983228b1b38a7433cfb2664f6400f318cd8634c8095d9f1536aad50b062cc7153b1a33a9875165e0629840aa8d1ac SHA512 0f40731f5c48b036bb6d2b1db284a8c5b96efb362566a3af7da7f3ed52850e47ea21f3a210a3eb29297b978dec87c446093e6ef284b518e1815bb901c3a4eba4
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/files/catkin_prefix.patch b/dev-ros/rosbash/files/catkin_prefix.patch
new file mode 100644
index 000000000000..89877b005f9d
--- /dev/null
+++ b/dev-ros/rosbash/files/catkin_prefix.patch
@@ -0,0 +1,13 @@
+Index: rosbash/scripts/rosrun
+===================================================================
+--- rosbash.orig/scripts/rosrun
++++ rosbash/scripts/rosrun
+@@ -47,7 +47,7 @@ case $2 in
+ ;;
+ esac
+
+-if [[ -n $CMAKE_PREFIX_PATH ]]; then
++if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then
+ _rosrun_IFS="$IFS"
+ IFS=$'\n'
+ catkin_package_libexec_dirs=($(catkin_find --without-underlays --libexec --share "$1" 2> /dev/null))
diff --git a/dev-ros/rosbash/files/catkin_prefix2.patch b/dev-ros/rosbash/files/catkin_prefix2.patch
deleted file mode 100644
index f36a7c7d6f08..000000000000
--- a/dev-ros/rosbash/files/catkin_prefix2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ros-1.12.5/tools/rosbash/scripts/rosrun
-===================================================================
---- ros-1.12.5.orig/tools/rosbash/scripts/rosrun
-+++ ros-1.12.5/tools/rosbash/scripts/rosrun
-@@ -47,7 +47,7 @@ case $2 in
- ;;
- esac
-
--if [[ -n $CMAKE_PREFIX_PATH ]]; then
-+if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then
- IFS=$'\n'
- catkin_package_libexec_dirs=(`catkin_find --without-underlays --libexec --share "$1" 2> /dev/null`)
- unset IFS
diff --git a/dev-ros/rosbash/rosbash-1.14.2.ebuild b/dev-ros/rosbash/rosbash-1.14.2.ebuild
deleted file mode 100644
index 50dcfac83ec6..000000000000
--- a/dev-ros/rosbash/rosbash-1.14.2.ebuild
+++ /dev/null
@@ -1,19 +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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.14.4.ebuild b/dev-ros/rosbash/rosbash-1.14.4.ebuild
deleted file mode 100644
index bef22c0c8f54..000000000000
--- a/dev-ros/rosbash/rosbash-1.14.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.14.6.ebuild b/dev-ros/rosbash/rosbash-1.14.7.ebuild
index 1b7d1d2120d9..52caa3880598 100644
--- a/dev-ros/rosbash/rosbash-1.14.6.ebuild
+++ b/dev-ros/rosbash/rosbash-1.14.7.ebuild
@@ -14,6 +14,6 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND=""
+RDEPEND="dev-ros/rospack"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosbash/rosbash-9999.ebuild b/dev-ros/rosbash/rosbash-9999.ebuild
index f77828f9bf96..52caa3880598 100644
--- a/dev-ros/rosbash/rosbash-9999.ebuild
+++ b/dev-ros/rosbash/rosbash-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,6 +14,6 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND=""
+RDEPEND="dev-ros/rospack"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
index fa661324ce64..da5f49b549c4 100644
--- a/dev-ros/rosboost_cfg/Manifest
+++ b/dev-ros/rosboost_cfg/Manifest
@@ -4,11 +4,13 @@ DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2
DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
EBUILD rosboost_cfg-1.14.0.ebuild 397 BLAKE2B fde8a4b0206cc9319c8e49043fcf72b641228bae01144794d1c88e26558037c0463d2d368d6c2a0baf3b8f3e1ecfb3e9d82f098e847ee9e62a0019675fb99774 SHA512 7481018ecdf4182dfe91c5caa5edc87b7b7d0cf2d7ff810c3bc3086a9d00c4a58e5a64713114184be6724f680fb6d1adc6794304c9b08a895dfddc987429b5b3
EBUILD rosboost_cfg-1.14.1.ebuild 397 BLAKE2B fde8a4b0206cc9319c8e49043fcf72b641228bae01144794d1c88e26558037c0463d2d368d6c2a0baf3b8f3e1ecfb3e9d82f098e847ee9e62a0019675fb99774 SHA512 7481018ecdf4182dfe91c5caa5edc87b7b7d0cf2d7ff810c3bc3086a9d00c4a58e5a64713114184be6724f680fb6d1adc6794304c9b08a895dfddc987429b5b3
EBUILD rosboost_cfg-1.14.2.ebuild 397 BLAKE2B fde8a4b0206cc9319c8e49043fcf72b641228bae01144794d1c88e26558037c0463d2d368d6c2a0baf3b8f3e1ecfb3e9d82f098e847ee9e62a0019675fb99774 SHA512 7481018ecdf4182dfe91c5caa5edc87b7b7d0cf2d7ff810c3bc3086a9d00c4a58e5a64713114184be6724f680fb6d1adc6794304c9b08a895dfddc987429b5b3
EBUILD rosboost_cfg-1.14.3.ebuild 397 BLAKE2B fde8a4b0206cc9319c8e49043fcf72b641228bae01144794d1c88e26558037c0463d2d368d6c2a0baf3b8f3e1ecfb3e9d82f098e847ee9e62a0019675fb99774 SHA512 7481018ecdf4182dfe91c5caa5edc87b7b7d0cf2d7ff810c3bc3086a9d00c4a58e5a64713114184be6724f680fb6d1adc6794304c9b08a895dfddc987429b5b3
EBUILD rosboost_cfg-1.14.4.ebuild 397 BLAKE2B fde8a4b0206cc9319c8e49043fcf72b641228bae01144794d1c88e26558037c0463d2d368d6c2a0baf3b8f3e1ecfb3e9d82f098e847ee9e62a0019675fb99774 SHA512 7481018ecdf4182dfe91c5caa5edc87b7b7d0cf2d7ff810c3bc3086a9d00c4a58e5a64713114184be6724f680fb6d1adc6794304c9b08a895dfddc987429b5b3
EBUILD rosboost_cfg-1.14.6.ebuild 397 BLAKE2B fde8a4b0206cc9319c8e49043fcf72b641228bae01144794d1c88e26558037c0463d2d368d6c2a0baf3b8f3e1ecfb3e9d82f098e847ee9e62a0019675fb99774 SHA512 7481018ecdf4182dfe91c5caa5edc87b7b7d0cf2d7ff810c3bc3086a9d00c4a58e5a64713114184be6724f680fb6d1adc6794304c9b08a895dfddc987429b5b3
+EBUILD rosboost_cfg-1.14.7.ebuild 397 BLAKE2B fde8a4b0206cc9319c8e49043fcf72b641228bae01144794d1c88e26558037c0463d2d368d6c2a0baf3b8f3e1ecfb3e9d82f098e847ee9e62a0019675fb99774 SHA512 7481018ecdf4182dfe91c5caa5edc87b7b7d0cf2d7ff810c3bc3086a9d00c4a58e5a64713114184be6724f680fb6d1adc6794304c9b08a895dfddc987429b5b3
EBUILD rosboost_cfg-9999.ebuild 397 BLAKE2B fde8a4b0206cc9319c8e49043fcf72b641228bae01144794d1c88e26558037c0463d2d368d6c2a0baf3b8f3e1ecfb3e9d82f098e847ee9e62a0019675fb99774 SHA512 7481018ecdf4182dfe91c5caa5edc87b7b7d0cf2d7ff810c3bc3086a9d00c4a58e5a64713114184be6724f680fb6d1adc6794304c9b08a895dfddc987429b5b3
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosmake/rosmake-1.14.2.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.7.ebuild
index 734dd611a6f8..29cf86d395ba 100644
--- a/dev-ros/rosmake/rosmake-1.14.2.ebuild
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.7.ebuild
@@ -5,17 +5,15 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/ros"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_5} )
inherit ros-catkin
-DESCRIPTION="ROS dependency aware build tool"
+DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/Manifest b/dev-ros/rosbridge_server/Manifest
index ce76261e3f0c..0a13f23c2274 100644
--- a/dev-ros/rosbridge_server/Manifest
+++ b/dev-ros/rosbridge_server/Manifest
@@ -1,12 +1,4 @@
-AUX backports-ssl.patch 420 BLAKE2B 0d97fd93631f33867234ca1e7207ab5176c45f6747cc37b97f54b57fe0d10987c02466988c612293072ffe10962c8777ed0723aca8b6f24ded873f7ad7f5b99f SHA512 ed873ddfffb3702d2de62491d76cb829d02f215b09a3c8ce3564d1ccf1aced76939dca26eb22ccb21853ab8ab1a85d654a34bfd48533041c0dbc709c105b296d
-AUX tornado.patch 3361 BLAKE2B 94032b87881cba8bf383729ff260ad34a10fc42d4cfbbf53e5051eb488bfc4a534381445260709566b0fe7d03129cdf7737a9bd952cd2eb3f79181650ee758ef SHA512 6f8768716801dbfd00ef5698b91ea3d949c00895d18b3476d80a4fb09456b23412564d03b7a10eac6ee603dc4747aea8a96e6571164718eb0790f6475de9ee93
-DIST rosbridge_suite-0.10.1.tar.gz 98010 BLAKE2B d634840a68081e7afaba77cff2b0f435392aa061ef6a4d4e75feccaa26811df92e0cd3c1b83973bd7eab534e66a5d5df880428d82fdd7cf20c7997a3427fdcf5 SHA512 455950eb5aebdccd6f173f2b7d1ea0bdf74421172895ab13e3af698a79e49964cb53354f90c396aad596818ecbb36385a3e1c9c373feb3a15aeff13d9e703443
DIST rosbridge_suite-0.11.1.tar.gz 100994 BLAKE2B b6b21e1f8444b969d94ae1c86c70f242075c1494359df062179789920b3c03aa6ed44dd273c301098ed43f6084c656018349022158ec4b9b4672f20262952c05 SHA512 dd89d43b20589ac436cba673b3ee4f229eb14d47aabbe8352e04d6a2691b6f9e156315788178fbe345fa489fa84f86c626647b09ff3632562eb023bca688451c
-DIST rosbridge_suite-0.8.6.tar.gz 378267 BLAKE2B b5e72b7897feef66aa05603bcff00ba213844f700f56be97a7110f33a77e3aa848ca0c583d5509ee205dc01bf001181b1887e20ee89d8348bc5eb43fd5a829b0 SHA512 e935c20466a13cbcf00051a4f32bc981806244aecf314e09e9e0ca9e0e873ab098b14b5ca5839bf14f2d3dfb823ecc62bb4e26027d4d0ff3f52bf0385011fbf3
-DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
-EBUILD rosbridge_server-0.10.1.ebuild 685 BLAKE2B 259375e88c849f71ddf39e6c58aad758dfe2eabb2e91dbf6ced144877b055c1c5c688dc4418b0f1893bcc989f678bb8422852513c31b0f7979ac0d204cbc589e SHA512 566e5972c24df6cd116632c8fd45a4601e2ff1d6c24fdae489d97d39e4efd9fbe7ac06423846e9913d2274f064a63b6e11f89c390333f1d0eeb8b228682e860e
-EBUILD rosbridge_server-0.11.1.ebuild 685 BLAKE2B 74e48c9cf1e3d6c2a5e13d1427debfba83bc90ce573f32ccc94bff14415095c1ce57480b011815d7ed631646e623ed2e9c10ff78abf474dae5ac9116da497934 SHA512 f376293c321e6ba9847c24da86df3ab052b7a4a5b7db3686e1d067395b44f8559990b45118fbbbef79543239956c72cba2ce4d7ffb1be5a418d8ea80ca61f073
-EBUILD rosbridge_server-0.8.6.ebuild 764 BLAKE2B ab514861c12a7d838a821acd2635f9b8b8f6af5f461aa235b60787900dc1a28d86a84e4511eb3968b4fccae216da72262ccc4a4efe2df680748b539fae9019c1 SHA512 e224d013573111dac8f7de49f0a617a42f1b96d474c740823f3506a1e7353ed4d1e15b0d31d122331bbdbe5bb7896d894a9c0be667c5f7caab92bf1d1ddcd331
-EBUILD rosbridge_server-0.9.0.ebuild 688 BLAKE2B 08a4a13cb920cdf49b059c7578d36834d5a26df42ea8dd0edcaf15dc7cab2ec6db571138fdac289f38a3194c7f083149a523806131d10ca54e704fda3115d33c SHA512 a6677d1a786506d9909abb297b58b823588294df9d066cd20ada2db7543a036ce7b32cfaf7f0e87334c6f97e9543c62e010997ce1ed198b46e4738b4a99beb4d
-EBUILD rosbridge_server-9999.ebuild 688 BLAKE2B 08a4a13cb920cdf49b059c7578d36834d5a26df42ea8dd0edcaf15dc7cab2ec6db571138fdac289f38a3194c7f083149a523806131d10ca54e704fda3115d33c SHA512 a6677d1a786506d9909abb297b58b823588294df9d066cd20ada2db7543a036ce7b32cfaf7f0e87334c6f97e9543c62e010997ce1ed198b46e4738b4a99beb4d
+EBUILD rosbridge_server-0.11.1.ebuild 626 BLAKE2B 104fa4df3e03367cbebc619c64066c2ae136a2db915a58955f2aa8be45e305d3c3bdcfadbd7343a2a5cf2ece6f2f68f16a332b240c277e263f24c52a3cb9959e SHA512 071d9c6b45dbcb06ba682b643c9a3fd1aee0dc0d194c6a0ba2ed2f275ffe4bc738c8ac5b840d5d307d1db784f5e1574fb8ded7b11ad602054fcf24f9661483b4
+EBUILD rosbridge_server-9999.ebuild 626 BLAKE2B 104fa4df3e03367cbebc619c64066c2ae136a2db915a58955f2aa8be45e305d3c3bdcfadbd7343a2a5cf2ece6f2f68f16a332b240c277e263f24c52a3cb9959e SHA512 071d9c6b45dbcb06ba682b643c9a3fd1aee0dc0d194c6a0ba2ed2f275ffe4bc738c8ac5b840d5d307d1db784f5e1574fb8ded7b11ad602054fcf24f9661483b4
MISC metadata.xml 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/dev-ros/rosbridge_server/files/backports-ssl.patch b/dev-ros/rosbridge_server/files/backports-ssl.patch
deleted file mode 100644
index b8fc226bde0c..000000000000
--- a/dev-ros/rosbridge_server/files/backports-ssl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rosbridge_server/setup.py
-===================================================================
---- rosbridge_server.orig/setup.py
-+++ rosbridge_server/setup.py
-@@ -11,8 +11,6 @@ from catkin_pkg.python_setup import gene
- d = generate_distutils_setup(
- packages=[
- 'rosbridge_server',
-- 'backports',
-- 'backports.ssl_match_hostname',
- 'tornado',
- 'tornado.platform'
- ],
diff --git a/dev-ros/rosbridge_server/files/tornado.patch b/dev-ros/rosbridge_server/files/tornado.patch
deleted file mode 100644
index ae2391385238..000000000000
--- a/dev-ros/rosbridge_server/files/tornado.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: rosbridge_server/setup.py
-===================================================================
---- rosbridge_server.orig/setup.py
-+++ rosbridge_server/setup.py
-@@ -10,85 +10,9 @@ from catkin_pkg.python_setup import gene
-
- d = generate_distutils_setup(
- packages=[
-- 'rosbridge_server',
-- 'tornado',
-- 'tornado.platform'
-+ 'rosbridge_server'
- ],
- package_dir={'': 'src'}
- )
-
--# The following code is copied from
--# https://github.com/mongodb/mongo-python-driver/blob/master/setup.py
--# to support installing without the extension on platforms where
--# no compiler is available.
--from distutils.command.build_ext import build_ext
--
--class custom_build_ext(build_ext):
-- """Allow C extension building to fail.
--
-- The C extension speeds up websocket masking, but is not essential.
-- """
--
-- warning_message = """
--********************************************************************
--WARNING: %s could not
--be compiled. No C extensions are essential for Tornado to run,
--although they do result in significant speed improvements for
--websockets.
--%s
--
--Here are some hints for popular operating systems:
--
--If you are seeing this message on Linux you probably need to
--install GCC and/or the Python development package for your
--version of Python.
--
--Debian and Ubuntu users should issue the following command:
--
-- $ sudo apt-get install build-essential python-dev
--
--RedHat, CentOS, and Fedora users should issue the following command:
--
-- $ sudo yum install gcc python-devel
--********************************************************************
--"""
--
-- def run(self):
-- try:
-- build_ext.run(self)
-- except Exception:
-- e = sys.exc_info()[1]
-- sys.stdout.write('%s\n' % str(e))
-- warnings.warn(self.warning_message % ("Extension modules",
-- "There was an issue with "
-- "your platform configuration"
-- " - see above."))
--
-- def build_extension(self, ext):
-- name = ext.name
-- try:
-- build_ext.build_extension(self, ext)
-- except Exception:
-- e = sys.exc_info()[1]
-- sys.stdout.write('%s\n' % str(e))
-- warnings.warn(self.warning_message % ("The %s extension "
-- "module" % (name,),
-- "The output above "
-- "this warning shows how "
-- "the compilation "
-- "failed."))
--
--if (platform.python_implementation() == 'CPython' and
-- os.environ.get('TORNADO_EXTENSION') != '0'):
-- # This extension builds and works on pypy as well, although pypy's jit
-- # produces equivalent performance.
-- d['ext_modules'] = [
-- Extension('tornado.speedups', sources=['src/tornado/speedups.c']),
-- ]
--
-- if os.environ.get('TORNADO_EXTENSION') != '1':
-- # Unless the user has specified that the extension is mandatory,
-- # fall back to the pure-python implementation on any build failure.
-- d['cmdclass'] = {'build_ext': custom_build_ext}
--
- setup(**d)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.10.1.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.10.1.ebuild
deleted file mode 100644
index 9fe85a462e1a..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.10.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosauth[${PYTHON_USEDEP}]
- dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
- www-servers/tornado[${PYTHON_USEDEP}]
- "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild
index 703a455899be..cf540ab83cad 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.11.1.ebuild
@@ -19,7 +19,6 @@ RDEPEND="
dev-ros/rospy[${PYTHON_USEDEP}]
dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/rosauth[${PYTHON_USEDEP}]
- dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
www-servers/tornado[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.8.6.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.8.6.ebuild
deleted file mode 100644
index 775590dc7d3b..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.8.6.ebuild
+++ /dev/null
@@ -1,29 +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/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosauth[${PYTHON_USEDEP}]
- dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
- www-servers/tornado[${PYTHON_USEDEP}]
- "
-DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}/backports-ssl.patch"
- "${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.9.0.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.9.0.ebuild
deleted file mode 100644
index 1ea9a841c8fd..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosauth[${PYTHON_USEDEP}]
- dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
- www-servers/tornado[${PYTHON_USEDEP}]
- "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
index 1ea9a841c8fd..cf540ab83cad 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,6 @@ RDEPEND="
dev-ros/rospy[${PYTHON_USEDEP}]
dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/rosauth[${PYTHON_USEDEP}]
- dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
www-servers/tornado[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbuild/Manifest b/dev-ros/rosbuild/Manifest
index 4a1ee0189db4..6eef0657b971 100644
--- a/dev-ros/rosbuild/Manifest
+++ b/dev-ros/rosbuild/Manifest
@@ -2,9 +2,11 @@ DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2
DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
EBUILD rosbuild-1.14.2.ebuild 359 BLAKE2B 5480063e327e04bf680869425ce3f41aca4d046a85b6da58e95af25ce09f6a4d20728bfb8306168036e9f6029e0d5bfbbbb631726fece9356ccb11ef5315d7a4 SHA512 c32f230cb997b196c479113619ef447f2dca26eeccc3f3aad5819641f29adddb3c2a7e6b694fd3f1d91987d401bbfe4b736612dfa767251c7cbd3d117c32c1d7
EBUILD rosbuild-1.14.3.ebuild 359 BLAKE2B 4f06a27d7541789e90b44bdb141bdce321cfa175907435f495b468a131b6bf9fbb12760023c06f2f205a740a26c2f7508e1010c340db44849c342f6575bb5963 SHA512 a81fcf9c6ff5c4255eff7bc0d0a666e479282663477cfc43d6c74bdd8e61108ca05e5fec77511bb70e83c75841ec74b1aa16c850023f81637bcd7528ddcff5c9
EBUILD rosbuild-1.14.4.ebuild 359 BLAKE2B 4f06a27d7541789e90b44bdb141bdce321cfa175907435f495b468a131b6bf9fbb12760023c06f2f205a740a26c2f7508e1010c340db44849c342f6575bb5963 SHA512 a81fcf9c6ff5c4255eff7bc0d0a666e479282663477cfc43d6c74bdd8e61108ca05e5fec77511bb70e83c75841ec74b1aa16c850023f81637bcd7528ddcff5c9
EBUILD rosbuild-1.14.6.ebuild 356 BLAKE2B 8cec4ba8b48e6a749971d2b04ed6b2b3823652415923149f63ab2dc2f49416cc4dd6b09a3705686c08221b3c0a7764a9acce9c71b4850ebedbdc60faee9efea6 SHA512 0d001a892f489a2206f4c3d87017f416fbac618cbeac1ce48ca75996459fe902bcee36497dd062dd5d9568f68286aa6e4b31268816b9bbc07f2e3e583aeb2b35
+EBUILD rosbuild-1.14.7.ebuild 356 BLAKE2B 8cec4ba8b48e6a749971d2b04ed6b2b3823652415923149f63ab2dc2f49416cc4dd6b09a3705686c08221b3c0a7764a9acce9c71b4850ebedbdc60faee9efea6 SHA512 0d001a892f489a2206f4c3d87017f416fbac618cbeac1ce48ca75996459fe902bcee36497dd062dd5d9568f68286aa6e4b31268816b9bbc07f2e3e583aeb2b35
EBUILD rosbuild-9999.ebuild 359 BLAKE2B ad9f9b2884bab7f030013e68e212acf2c4f01a3e7029a9b3970888c7217a286b3801e51b0e07da0a941c67b1faebc754d0740d398f44364b4edced5baa36dcd8 SHA512 9141477396ef5d7dc006c1b6eba58c127a936623c52d4e2ef0da9b47751c56cb2b8eee7f72c255662b98fcec73f32f0c55a0eb8621cee8ef8b22a0d779835611
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/rosbash-1.14.1.ebuild b/dev-ros/rosbuild/rosbuild-1.14.7.ebuild
index 50dcfac83ec6..2d4a4233f3e5 100644
--- a/dev-ros/rosbash/rosbash-1.14.1.ebuild
+++ b/dev-ros/rosbuild/rosbuild-1.14.7.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
ROS_REPO_URI="https://github.com/ros/ros"
KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
+ROS_SUBDIR=core/${PN}
inherit ros-catkin
-DESCRIPTION="Assorted shell commands for using ros with bash"
+DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosclean/Manifest b/dev-ros/rosclean/Manifest
index b0fce523f1f6..76f4f801a189 100644
--- a/dev-ros/rosclean/Manifest
+++ b/dev-ros/rosclean/Manifest
@@ -1,4 +1,6 @@
DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
EBUILD rosclean-1.14.6.ebuild 473 BLAKE2B 4d5d0f66568483834764d791cf04e47c746d4239a637b9bf025ab3aabbeffe292584166f3625023982568367ef19728586d0e1a72af615d738a4c2cad1949677 SHA512 6e63b12cf226dec9ae579aa4755cf33df017d021a9618af558bd53c2705277759fd41826d64dd1f192d3327db98669053d5c51217646bd1b97fb390613e60af0
+EBUILD rosclean-1.14.7.ebuild 473 BLAKE2B 4d5d0f66568483834764d791cf04e47c746d4239a637b9bf025ab3aabbeffe292584166f3625023982568367ef19728586d0e1a72af615d738a4c2cad1949677 SHA512 6e63b12cf226dec9ae579aa4755cf33df017d021a9618af558bd53c2705277759fd41826d64dd1f192d3327db98669053d5c51217646bd1b97fb390613e60af0
EBUILD rosclean-9999.ebuild 473 BLAKE2B 4d5d0f66568483834764d791cf04e47c746d4239a637b9bf025ab3aabbeffe292584166f3625023982568367ef19728586d0e1a72af615d738a4c2cad1949677 SHA512 6e63b12cf226dec9ae579aa4755cf33df017d021a9618af558bd53c2705277759fd41826d64dd1f192d3327db98669053d5c51217646bd1b97fb390613e60af0
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosmake/rosmake-1.14.1.ebuild b/dev-ros/rosclean/rosclean-1.14.7.ebuild
index 734dd611a6f8..8910f969f5e9 100644
--- a/dev-ros/rosmake/rosmake-1.14.1.ebuild
+++ b/dev-ros/rosclean/rosclean-1.14.7.ebuild
@@ -5,12 +5,12 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/ros"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
ROS_SUBDIR=tools/${PN}
inherit ros-catkin
-DESCRIPTION="ROS dependency aware build tool"
+DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
LICENSE="BSD"
SLOT="0"
IUSE=""
diff --git a/dev-ros/roscpp_serialization/Manifest b/dev-ros/roscpp_serialization/Manifest
index 67bb9f950479..f20b642d4794 100644
--- a/dev-ros/roscpp_serialization/Manifest
+++ b/dev-ros/roscpp_serialization/Manifest
@@ -1,6 +1,8 @@
DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
DIST roscpp_core-0.6.12.tar.gz 35606 BLAKE2B 5f249ce576e046b487a12fc1d598429741329b57f4226a6a0fa7b62e0a5a6fa0716814e0c8cd8a4d4378f8994ca1534530d410a8865d666397328047f12f821d SHA512 a84799ee67cf205c9c304433f70aaf80c8f19eac86bc0c9c3207aa0ae255f33b302b4ad9e37feeb5d95d7e2db9210679871548313612f220e06fef3db2357f89
+DIST roscpp_core-0.6.13.tar.gz 35881 BLAKE2B f1eee242ecbda14de4d1b4f92c4552b249398eea0216300933e0ea73d86bce970e7db375b23d5ecb023e8a8a2e75baec8b7c0a935647143f1ff2a1eaf0bcbd5b SHA512 7d81371c383b8b2ae8d31731f21213ac2c5c4d47ed038890214c9da527f27149ce1deeda4a5e67adaabbfb7ff4a6edc53495cfa50625eeb94089eb7615850d2c
EBUILD roscpp_serialization-0.6.11.ebuild 387 BLAKE2B 8c6cce04919a8a1ff197d4518b83da92e5a4e8b72fec4288bae1a0e5a79a26200d5baef7d2f7b33585f453e1082b338c37881601d497134a881139ca4bc3ed5b SHA512 6c11b64d7abcde3b95ae30401a44f183775cedddf083bc50a78dbc2f41e14738315a9b7190fa1f7873f2208eb8227a3a7603235f9c093576cfdd1cc3c2a84b5e
EBUILD roscpp_serialization-0.6.12.ebuild 384 BLAKE2B be4f560014df6e0952625a26b97fb0ffc2a10c64952c3362edc7444148c29c7ecf826183bd1edee31a2d661550ed5e80b3e5dd2aadab7c832eb3247f64c41eef SHA512 99bff10bc01076cba3cdeb7f394fed9ad3f30f3b6b1a94df419d54f68a593c5372c25a1ac881035013e71dc4c55f832d4d354d439c6f61fb943cf8e835cdd786
+EBUILD roscpp_serialization-0.6.13.ebuild 384 BLAKE2B be4f560014df6e0952625a26b97fb0ffc2a10c64952c3362edc7444148c29c7ecf826183bd1edee31a2d661550ed5e80b3e5dd2aadab7c832eb3247f64c41eef SHA512 99bff10bc01076cba3cdeb7f394fed9ad3f30f3b6b1a94df419d54f68a593c5372c25a1ac881035013e71dc4c55f832d4d354d439c6f61fb943cf8e835cdd786
EBUILD roscpp_serialization-9999.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9dd5096827a7cffb2ad977b6f27a07c14d9fb8f87bdf8f763cd726df89b9260398598ff26b0dc0ed680cc319337111465374f3 SHA512 df6d50183e072652d2c3c513bbc3d031289cbcc6391d30ea2ff348c419b507d7b4691cee60ffe5198ece313bc8eaae6351d164288740149c9260c8d51be1f5f9
MISC metadata.xml 329 BLAKE2B 58bfccd5cddfdb91aa5b414646dc07911ab19e1544dc8ac9eabb8d4d8eba138b76b990e017f86854c83efb8f5f6f31f391ad8c03dc8bcf6eef741a70a226ceb6 SHA512 8adfef45e8768b11f9f155e95e1c4b50606aa53abd64b84bc5b24c17134b8daf3536f51ae20a17e871e25db2140181502b62a9ace282872620845412571de89a
diff --git a/dev-ros/roscpp_serialization/roscpp_serialization-0.6.13.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.13.ebuild
new file mode 100644
index 000000000000..29c448abab13
--- /dev/null
+++ b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Code for serialization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cpp_common
+ dev-ros/rostime
+ dev-ros/roscpp_traits
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/Manifest b/dev-ros/roscpp_traits/Manifest
index eb6d55021c9f..62704b2db1a5 100644
--- a/dev-ros/roscpp_traits/Manifest
+++ b/dev-ros/roscpp_traits/Manifest
@@ -5,6 +5,7 @@ DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023
DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
DIST roscpp_core-0.6.12.tar.gz 35606 BLAKE2B 5f249ce576e046b487a12fc1d598429741329b57f4226a6a0fa7b62e0a5a6fa0716814e0c8cd8a4d4378f8994ca1534530d410a8865d666397328047f12f821d SHA512 a84799ee67cf205c9c304433f70aaf80c8f19eac86bc0c9c3207aa0ae255f33b302b4ad9e37feeb5d95d7e2db9210679871548313612f220e06fef3db2357f89
+DIST roscpp_core-0.6.13.tar.gz 35881 BLAKE2B f1eee242ecbda14de4d1b4f92c4552b249398eea0216300933e0ea73d86bce970e7db375b23d5ecb023e8a8a2e75baec8b7c0a935647143f1ff2a1eaf0bcbd5b SHA512 7d81371c383b8b2ae8d31731f21213ac2c5c4d47ed038890214c9da527f27149ce1deeda4a5e67adaabbfb7ff4a6edc53495cfa50625eeb94089eb7615850d2c
DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
@@ -19,6 +20,7 @@ EBUILD roscpp_traits-0.6.1.ebuild 361 BLAKE2B b76fc1310778e384f2bd719b9319a97e24
EBUILD roscpp_traits-0.6.10.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
EBUILD roscpp_traits-0.6.11.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
EBUILD roscpp_traits-0.6.12.ebuild 358 BLAKE2B 74840974f8233de382c8a9de7c209493ccd2e629b69ed4407898cc6ea47bf0f6f530351e9d8ca4e3f3673e624f2f97a4884778599dc87021e5c11eeae2ef994d SHA512 9450166ca9d1cbf7af340892856a078ed2a37f735976994f4446c5a12f2fe3d2c84035a4e1bbcd7ca30be6eb49a616b0815de6ba23b0a602b499879d8641f3d1
+EBUILD roscpp_traits-0.6.13.ebuild 358 BLAKE2B 74840974f8233de382c8a9de7c209493ccd2e629b69ed4407898cc6ea47bf0f6f530351e9d8ca4e3f3673e624f2f97a4884778599dc87021e5c11eeae2ef994d SHA512 9450166ca9d1cbf7af340892856a078ed2a37f735976994f4446c5a12f2fe3d2c84035a4e1bbcd7ca30be6eb49a616b0815de6ba23b0a602b499879d8641f3d1
EBUILD roscpp_traits-0.6.2.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
EBUILD roscpp_traits-0.6.3.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
EBUILD roscpp_traits-0.6.4.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.6.13.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.13.ebuild
new file mode 100644
index 000000000000..a8e2304e4614
--- /dev/null
+++ b/dev-ros/roscpp_traits/roscpp_traits-0.6.13.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Message traits code"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cpp_common
+ dev-ros/rostime
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscreate/Manifest b/dev-ros/roscreate/Manifest
index be1f7c753787..8fd7b5876d2a 100644
--- a/dev-ros/roscreate/Manifest
+++ b/dev-ros/roscreate/Manifest
@@ -1,14 +1,4 @@
-DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
-DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-EBUILD roscreate-1.14.0.ebuild 512 BLAKE2B 8850b229588b8c5e40c4b735b08fa5f546da798afaa61054d26446cd1d152b1043de847a8a8091a5ae3d8cd0e1b736192d7d7694493e64452e1e5e7495e0f53e SHA512 1b405e56b34076b912a571a2f9a96cbd17b6291ffa5f506ab4fbe22a7bb0864d1f55ca3c63cbd8d9952c29e8b3361370340d91599135efce851b8f9a632f8a18
-EBUILD roscreate-1.14.1.ebuild 512 BLAKE2B 8850b229588b8c5e40c4b735b08fa5f546da798afaa61054d26446cd1d152b1043de847a8a8091a5ae3d8cd0e1b736192d7d7694493e64452e1e5e7495e0f53e SHA512 1b405e56b34076b912a571a2f9a96cbd17b6291ffa5f506ab4fbe22a7bb0864d1f55ca3c63cbd8d9952c29e8b3361370340d91599135efce851b8f9a632f8a18
-EBUILD roscreate-1.14.2.ebuild 512 BLAKE2B 8850b229588b8c5e40c4b735b08fa5f546da798afaa61054d26446cd1d152b1043de847a8a8091a5ae3d8cd0e1b736192d7d7694493e64452e1e5e7495e0f53e SHA512 1b405e56b34076b912a571a2f9a96cbd17b6291ffa5f506ab4fbe22a7bb0864d1f55ca3c63cbd8d9952c29e8b3361370340d91599135efce851b8f9a632f8a18
-EBUILD roscreate-1.14.3.ebuild 512 BLAKE2B 8850b229588b8c5e40c4b735b08fa5f546da798afaa61054d26446cd1d152b1043de847a8a8091a5ae3d8cd0e1b736192d7d7694493e64452e1e5e7495e0f53e SHA512 1b405e56b34076b912a571a2f9a96cbd17b6291ffa5f506ab4fbe22a7bb0864d1f55ca3c63cbd8d9952c29e8b3361370340d91599135efce851b8f9a632f8a18
-EBUILD roscreate-1.14.4.ebuild 512 BLAKE2B 8850b229588b8c5e40c4b735b08fa5f546da798afaa61054d26446cd1d152b1043de847a8a8091a5ae3d8cd0e1b736192d7d7694493e64452e1e5e7495e0f53e SHA512 1b405e56b34076b912a571a2f9a96cbd17b6291ffa5f506ab4fbe22a7bb0864d1f55ca3c63cbd8d9952c29e8b3361370340d91599135efce851b8f9a632f8a18
-EBUILD roscreate-1.14.6.ebuild 512 BLAKE2B 8850b229588b8c5e40c4b735b08fa5f546da798afaa61054d26446cd1d152b1043de847a8a8091a5ae3d8cd0e1b736192d7d7694493e64452e1e5e7495e0f53e SHA512 1b405e56b34076b912a571a2f9a96cbd17b6291ffa5f506ab4fbe22a7bb0864d1f55ca3c63cbd8d9952c29e8b3361370340d91599135efce851b8f9a632f8a18
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
+EBUILD roscreate-1.14.7.ebuild 512 BLAKE2B 8850b229588b8c5e40c4b735b08fa5f546da798afaa61054d26446cd1d152b1043de847a8a8091a5ae3d8cd0e1b736192d7d7694493e64452e1e5e7495e0f53e SHA512 1b405e56b34076b912a571a2f9a96cbd17b6291ffa5f506ab4fbe22a7bb0864d1f55ca3c63cbd8d9952c29e8b3361370340d91599135efce851b8f9a632f8a18
EBUILD roscreate-9999.ebuild 512 BLAKE2B 8850b229588b8c5e40c4b735b08fa5f546da798afaa61054d26446cd1d152b1043de847a8a8091a5ae3d8cd0e1b736192d7d7694493e64452e1e5e7495e0f53e SHA512 1b405e56b34076b912a571a2f9a96cbd17b6291ffa5f506ab4fbe22a7bb0864d1f55ca3c63cbd8d9952c29e8b3361370340d91599135efce851b8f9a632f8a18
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roscreate/roscreate-1.14.1.ebuild b/dev-ros/roscreate/roscreate-1.14.1.ebuild
deleted file mode 100644
index 84f7953b46b4..000000000000
--- a/dev-ros/roscreate/roscreate-1.14.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.14.2.ebuild b/dev-ros/roscreate/roscreate-1.14.2.ebuild
deleted file mode 100644
index 84f7953b46b4..000000000000
--- a/dev-ros/roscreate/roscreate-1.14.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.14.4.ebuild b/dev-ros/roscreate/roscreate-1.14.4.ebuild
deleted file mode 100644
index 84f7953b46b4..000000000000
--- a/dev-ros/roscreate/roscreate-1.14.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.14.6.ebuild b/dev-ros/roscreate/roscreate-1.14.6.ebuild
deleted file mode 100644
index 84f7953b46b4..000000000000
--- a/dev-ros/roscreate/roscreate-1.14.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.14.0.ebuild b/dev-ros/roscreate/roscreate-1.14.7.ebuild
index 84f7953b46b4..84f7953b46b4 100644
--- a/dev-ros/roscreate/roscreate-1.14.0.ebuild
+++ b/dev-ros/roscreate/roscreate-1.14.7.ebuild
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 081dd6791258..bf115ceb0ee3 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,18 +1,7 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX py3-2.patch 2357 BLAKE2B a3af95fdd93c1e5540626a529696583c366623a34a056122efde2eccf19219c70528cfcf227ffe96c2e5c90c5d26da5127f5ae3fdbd47a0da045dea4e9b34f08 SHA512 3437178097e04ac0b169a0612579a839f1d1d391859df9e215a3a016b301d1a22cd37a1c25684d55e7af0958a46af0e6d8ed759798a350dd7839a1b2b5bc7783
+AUX py3.patch 1616 BLAKE2B 56b70362a387ca67c97041456f185f4fb10959d32c7a54d825c8ee2a2dc71cc6bef3f2b9883083596f28bd26442d1b6d9bf92e563a5d3a8872a608a676949aa4 SHA512 e12466e7f86252516a7a094fdb6b0bbfeef784cae3a6638683b84aa5ee94c6848ecb1a22121719339f65fecdaa0d25a26c27d986c771ad2a82dc42975dad6118
+AUX yaml.patch 2245 BLAKE2B 2048938c0532efee2bca2cd7bdc5f544670245cd3b647613e8ec1a80588fad33287931ead00fc63c27e03e825bfb5c2b8db5bae75446184f85fc0c09abb26f3d SHA512 6346eb9231152dd91627b67f99f1268fc158136092d62e86fa01c7adb831a31e36844c12dbb3c52f190fbd6b4dbd77b026fe5190496d88ba4326abf55f7339ac
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosgraph-1.13.0.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.1.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.2.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.4.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.5.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.6.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.14.2.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.14.3.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
+EBUILD rosgraph-1.14.3-r1.ebuild 645 BLAKE2B df21262505f554db873790a9f38076e4dd438b1d4178ae2b236f478a6f833448870823fe064d4581536db742add495e89c9dc3b04844d9d2dcc8e6b920ddc14b SHA512 bb235fb4a947eb396cd6987bbadab7201d919b5ea092fcf26fe99c8a15809de967060726c8c9e94f00caecd63a6256648c30f55b619e7a55c76615ebeb4c6b1a
EBUILD rosgraph-9999.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosgraph/files/py3-2.patch b/dev-ros/rosgraph/files/py3-2.patch
new file mode 100644
index 000000000000..b83b349576bd
--- /dev/null
+++ b/dev-ros/rosgraph/files/py3-2.patch
@@ -0,0 +1,52 @@
+From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 16:06:51 -0700
+Subject: [PATCH] more Python 3 compatibility (#1783)
+
+---
+ test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ .../test/test_roslogging_user_logger.py | 8 +++-
+ tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
+ tools/rosmsg/src/rosmsg/__init__.py | 2 +-
+ tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
+ .../test/test_rosmsgproto_command_line.py | 20 ++++----
+ .../test_rostopic_command_line_offline.py | 44 +++++++++---------
+ 8 files changed, 67 insertions(+), 63 deletions(-)
+
+diff --git a/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
+index bbf1d9f49..51c39becd 100644
+--- a/tools/rosgraph/src/rosgraph/roslogging.py
++++ b/tools/rosgraph/src/rosgraph/roslogging.py
+@@ -49,7 +49,7 @@
+ class LoggingException(Exception): pass
+
+ class RospyLogger(logging.getLoggerClass()):
+- def findCaller(self, dummy=False): # Dummy second arg to match Python3 function declaration
++ def findCaller(self, stack_info=False):
+ """
+ Find the stack frame of the caller so that we can note the source
+ file name, line number, and function name with class name if possible.
+diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
+index 4ac4f8291..1c3cb5df5 100644
+--- a/tools/rosgraph/test/test_roslogging_user_logger.py
++++ b/tools/rosgraph/test/test_roslogging_user_logger.py
+@@ -51,12 +51,16 @@
+
+ # set user defined custom logger
+ class UserCustomLogger(logging.Logger):
+- def findCaller(self):
++ def findCaller(self, stack_info=False):
+ """Returns static caller.
+
+ This method is being overwritten in rosgraph.roslogging.
+ """
+- return '<filename>', '<lineno>', '<func_name>'
++ if sys.version_info > (3, 2):
++ # Dummy last argument to match Python3 return type
++ return '<filename>', '<lineno>', '<func_name>', None
++ else:
++ return '<filename>', '<lineno>', '<func_name>'
+
+ def _log(self, level, msg, args, exc_info=None, extra=None):
+ """Write log with ROS_IP.
diff --git a/dev-ros/rosgraph/files/py3.patch b/dev-ros/rosgraph/files/py3.patch
new file mode 100644
index 000000000000..45798c1d618e
--- /dev/null
+++ b/dev-ros/rosgraph/files/py3.patch
@@ -0,0 +1,47 @@
+From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 12:50:24 -0700
+Subject: [PATCH] more Python 3 compatibility (#1782)
+
+---
+ test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +-
+ test/test_rosmaster/test/nodes/testMaster | 2 +-
+ test/test_rosmaster/test/nodes/testSlave | 2 +-
+ test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++-
+ tools/rosgraph/test/test_roslogging.py | 5 ++++-
+ tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
+ tools/roslaunch/src/roslaunch/depends.py | 8 ++++----
+ 7 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/tools/rosgraph/test/test_roslogging.py b/tools/rosgraph/test/test_roslogging.py
+index f9e618f87..ca38c80e8 100644
+--- a/tools/rosgraph/test/test_roslogging.py
++++ b/tools/rosgraph/test/test_roslogging.py
+@@ -32,7 +32,10 @@
+
+ import logging
+ import os
+-from StringIO import StringIO
++try:
++ from cStringIO import StringIO
++except ImportError:
++ from io import StringIO
+ import sys
+
+ import re
+diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
+index 62051638a..4ac4f8291 100644
+--- a/tools/rosgraph/test/test_roslogging_user_logger.py
++++ b/tools/rosgraph/test/test_roslogging_user_logger.py
+@@ -38,7 +38,10 @@
+
+ import logging
+ import os
+-from StringIO import StringIO
++try:
++ from cStringIO import StringIO
++except ImportError:
++ from io import StringIO
+ import sys
+
+ from nose.tools import assert_regexp_matches
diff --git a/dev-ros/rosgraph/files/yaml.patch b/dev-ros/rosgraph/files/yaml.patch
new file mode 100644
index 000000000000..32ea589c8e49
--- /dev/null
+++ b/dev-ros/rosgraph/files/yaml.patch
@@ -0,0 +1,53 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
+index ffe975dab..bbf1d9f49 100644
+--- a/tools/rosgraph/src/rosgraph/roslogging.py
++++ b/tools/rosgraph/src/rosgraph/roslogging.py
+@@ -178,7 +178,7 @@ def configure_logging(logname, level=logging.INFO, filename=None, env=None):
+ os.environ['ROS_LOG_FILENAME'] = log_filename
+ if config_file.endswith(('.yaml', '.yml')):
+ with open(config_file) as f:
+- dict_conf = yaml.load(f)
++ dict_conf = yaml.safe_load(f)
+ dict_conf.setdefault('version', 1)
+ logging.config.dictConfig(dict_conf)
+ else:
diff --git a/dev-ros/rosgraph/rosgraph-1.13.1.ebuild b/dev-ros/rosgraph/rosgraph-1.13.1.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.2.ebuild b/dev-ros/rosgraph/rosgraph-1.13.2.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.4.ebuild b/dev-ros/rosgraph/rosgraph-1.13.4.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.5.ebuild b/dev-ros/rosgraph/rosgraph-1.13.5.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.6.ebuild b/dev-ros/rosgraph/rosgraph-1.13.6.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.14.2.ebuild b/dev-ros/rosgraph/rosgraph-1.14.2.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.14.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.0.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild
index 4922358a7091..4a463741c8fc 100644
--- a/dev-ros/rosgraph/rosgraph-1.13.0.ebuild
+++ b/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild
@@ -20,3 +20,4 @@ RDEPEND="
dev-python/rospkg[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
diff --git a/dev-ros/rosgraph/rosgraph-1.14.3.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/roslang/Manifest b/dev-ros/roslang/Manifest
index 7c8204da57ea..09b356360081 100644
--- a/dev-ros/roslang/Manifest
+++ b/dev-ros/roslang/Manifest
@@ -11,6 +11,7 @@ DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2
DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
EBUILD roslang-1.12.3.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
EBUILD roslang-1.12.5.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
EBUILD roslang-1.13.1.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
@@ -24,5 +25,6 @@ EBUILD roslang-1.14.2.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0
EBUILD roslang-1.14.3.ebuild 345 BLAKE2B abac9fc1ac751a5421d26bc2497de9c7156b80a77c03de6a08d07a7cabf66b6b93fcc76a1da6b9727868682d3f356742ad508dbf10abcb99b8fa73faa5157b44 SHA512 f38c714eb4eff24db349063fb01c53b141a59ada5911569404fc31923252929d5de33111d2e875853b994202537974d36d8d347d07ba93c6a7495daed44ed0c9
EBUILD roslang-1.14.4.ebuild 345 BLAKE2B abac9fc1ac751a5421d26bc2497de9c7156b80a77c03de6a08d07a7cabf66b6b93fcc76a1da6b9727868682d3f356742ad508dbf10abcb99b8fa73faa5157b44 SHA512 f38c714eb4eff24db349063fb01c53b141a59ada5911569404fc31923252929d5de33111d2e875853b994202537974d36d8d347d07ba93c6a7495daed44ed0c9
EBUILD roslang-1.14.6.ebuild 342 BLAKE2B 04b11038683debcdd01e91a2fb8b1ef67bad2c18ffd4f2112ffd589038c0cd91ca31c4326f24dee4e7e14ca22292b43c1eebb9c45242c13563146bae2755bcca SHA512 8e2bcdeb858cc835908a7e4d39cbb6dbaa057b24c18b554e653be243b07a40fd9c699251ef14992ac0cc2099aeb9218d24bfe56a2b255987945f6d2f1ac57247
+EBUILD roslang-1.14.7.ebuild 342 BLAKE2B 04b11038683debcdd01e91a2fb8b1ef67bad2c18ffd4f2112ffd589038c0cd91ca31c4326f24dee4e7e14ca22292b43c1eebb9c45242c13563146bae2755bcca SHA512 8e2bcdeb858cc835908a7e4d39cbb6dbaa057b24c18b554e653be243b07a40fd9c699251ef14992ac0cc2099aeb9218d24bfe56a2b255987945f6d2f1ac57247
EBUILD roslang-9999.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/rosbash-1.14.0.ebuild b/dev-ros/roslang/roslang-1.14.7.ebuild
index 50dcfac83ec6..6cfd17c1b787 100644
--- a/dev-ros/rosbash/rosbash-1.14.0.ebuild
+++ b/dev-ros/roslang/roslang-1.14.7.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
ROS_REPO_URI="https://github.com/ros/ros"
KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
+ROS_SUBDIR=core/${PN}
inherit ros-catkin
-DESCRIPTION="Assorted shell commands for using ros with bash"
+DESCRIPTION="Common package for all ROS client libraries"
LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 8768199645d2..402cba89147f 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -1,25 +1,14 @@
AUX 40roslaunch 41 BLAKE2B a07c8484065add0cec5d9cf2e586a7a1fff3b7df575a904f224eeb20fbf88c707212458e53f45799822703fad633efd944f8c0cab35fb1e22c701d40c17d8efa SHA512 1b32e0967267e2d6f40583f3463e989f52ff2aeb243fd3b96647e946c95bab553a0b969407579ea3b700234fd554ff23a4208562ffb741c0a5a47a42da28525a
+AUX py3-2.patch 1430 BLAKE2B bbb55f75603556a96e4a573039c20aa41caea7c3758a2a994e80d8dd4175c97467c740cc1319d61812301fe74956a63e5385eb2220573e36a6f557e9ba1b97ed SHA512 57c8853bf8130c2c5050d1191e197f37e38937ad524e01de551d0f1d018b507af3bb6de463381f743740ca8c52cdd1ed2ed85a9fa6830960a3c3b6661686c3ad
+AUX py3.patch 1989 BLAKE2B 635135fc80d5f28c7953fd28105793b74ef51384bdc269a3b45c85e5519a700014ff02a2eedc38aa8dc5642ca269421d5521197957f5ccbae8fe42d88bde18a1 SHA512 5ebf4e0bf6d5f814dd9ee4fee868127dd7fb13b78f488bed7875d1a0102ba7ff63b848d843d9a94eeee13aa79694b0f6d8a2a2bbc74294861a27dc3b8255248a
AUX roscore.confd 9 BLAKE2B 89bba6f2d5d004cd5d0e3bb931d039e54e5389f21538c4210924c2e52d9287b2191e1ae5f94641658fb95fef10bf55e261e2d20e702974cc823988609e27781a SHA512 91af98d3c1f567572e0d995b68f268cefe8abaff46b58499fdd11845809947e858c8d133c6b4428115f0a62db6eb847495bf462619a7fa7c233bf3a97dc9f0bc
-AUX roscore.initd 536 BLAKE2B a171ba37652582bace25eba0b027751fc325e6d3c7dfca520603e422206544c78cb5300f47346bd0f8de25e36f78c0eb3f19e1c2427a3568f5a2711e253eae3d SHA512 b46522a0da35f9ad5c009bbb8cedc17b79986ee833042cc3991a1b4f61f89f7065c8c49a48ac5544c06b5c7dbdbcfac197df99b8811d4a9d4a36b0003806572b
+AUX roscore.initd 533 BLAKE2B 2ff10e03a6b75128fd72a98022a040b93c32ddba6782912133e4164e50427a37f77c5911cd1a50082ba33f90cc7cc6983d2d4eff4ca1ef86c07d3e2ebabfbce6 SHA512 8a43dd2ec83c24db1c00f4e849fa3e6193d348c6c3e4cae0317717d1d08cd1da6cbc37dbfdd338b9d2d77d2bf852d93736214c7d3c31e6dba3b46627e3d0b410
AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af930e3e01a32dc3228dfc60aeb4c1d6efe05f8245a948edd2314dcb550f9e80d1acd36461c347ce38 SHA512 fff18b8f4ffdf3f3e6cdc3b33cdb386dabaab769f3bac995cb3c29243c8380b13898cd5892026e9dee459f88f4f05886c052696b2f081fbbb393ade148fda0f6
AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
-AUX roslaunch.initd 918 BLAKE2B 5f87cd89c7083a111e956c1156b51f2a151169e63c221159f3abc127ee95c65b7a22b40c061fcec31dc1527a6f65e71b1133f4f2287983a321b6cc2176708291 SHA512 af14f8f53ce2aba8f430dd244e577832543a632508eb388717671e26b38b139da6312800ce3b71a799dd7ffb5c6f2f8323be3c51c478444aaaa25568c9bcfa52
+AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
AUX timeout.patch 623 BLAKE2B 0889396c4a38d3f62fd928dcd2f8d982a7fb070da0912d16f68ff61bf15c0d10f7b4f8dc70f8df9d946608c6755dbcfeb770d9cbc6e5acc9dfd0e3d509177258 SHA512 56ded8178faab6d74245479afe013fbffc984037263cae502ec411ce5e681efa6a8d11fc3b2083673df3e69a011db0c2e0992c5900fa5409338f7be84b0ea843
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 1951 BLAKE2B cb6a66bb788221cd666d199d28a9844e10e61955e254bbd73e93e4595a1b6f3f9bbd292bf2781c46b5f3a0e4d052b79691a896a4fb922ab7db10918d61c86519 SHA512 964212c13d5cdef7fa0b19a947d1740b0782eac35e62e9bac41bc5e4fa33ebb3e15ca7ba6007ec97df2903237c250cdbc87d438804bdf5648ecec55f24ccd21d
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD roslaunch-1.13.0.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.1.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.2.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.4.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.5.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.6.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.14.2.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.14.3.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-9999.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
+EBUILD roslaunch-1.14.3-r2.ebuild 1507 BLAKE2B 46796b9ca0bdc3c989382224c9480579490859ab09c21101584aace824f2caca1e4a9ebaabe2913f8b2f923b38389c67701a1ff635154a846c85a735b6ac2669 SHA512 aacb052b1e3b3558c6615784d12590eca8e197c480a91d3bbd166c38ac867048898eac973e39fb934712a5fa9ef431ecd609fecc8c479724fc138619c66b818c
+EBUILD roslaunch-9999.ebuild 1457 BLAKE2B 173d7bb2d90bcc0f51bc44ae991e44e621f408e68e8922993bffe02d1c836bd39564d74db62d7eec11c4642fdf41173a426fb12f4d3b5389b7bce87f71de54d5 SHA512 2b0ea20c87e6b58840565267d709010f392defc113ec1220e325cc036fbdc0abdc411359b434a4ebdf5232d609b89ca7e753324aa7a63e1ecbcafd6d95053170
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/files/py3-2.patch b/dev-ros/roslaunch/files/py3-2.patch
new file mode 100644
index 000000000000..d3ae600e4d7e
--- /dev/null
+++ b/dev-ros/roslaunch/files/py3-2.patch
@@ -0,0 +1,29 @@
+From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 16:06:51 -0700
+Subject: [PATCH] more Python 3 compatibility (#1783)
+
+---
+ test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ .../test/test_roslogging_user_logger.py | 8 +++-
+ tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
+ tools/rosmsg/src/rosmsg/__init__.py | 2 +-
+ tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
+ .../test/test_rosmsgproto_command_line.py | 20 ++++----
+ .../test_rostopic_command_line_offline.py | 44 +++++++++---------
+ 8 files changed, 67 insertions(+), 63 deletions(-)
+
+diff --git a/tools/roslaunch/test/unit/test_xmlloader.py b/tools/roslaunch/test/unit/test_xmlloader.py
+index ac30189d0..f582ec230 100644
+--- a/tools/roslaunch/test/unit/test_xmlloader.py
++++ b/tools/roslaunch/test/unit/test_xmlloader.py
+@@ -218,7 +218,7 @@ def test_params(self):
+ p = [p for p in mock.params if p.key == '/configfile'][0]
+ self.assertEquals(contents, p.value, 1)
+ p = [p for p in mock.params if p.key == '/binaryfile'][0]
+- self.assertEquals(Binary(contents), p.value, 1)
++ self.assertEquals(Binary(contents.encode()), p.value, 1)
+
+ f = open(os.path.join(get_example_path(), 'example.launch'))
+ try:
diff --git a/dev-ros/roslaunch/files/py3.patch b/dev-ros/roslaunch/files/py3.patch
new file mode 100644
index 000000000000..8fa2c6e2fab2
--- /dev/null
+++ b/dev-ros/roslaunch/files/py3.patch
@@ -0,0 +1,45 @@
+From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 12:50:24 -0700
+Subject: [PATCH] more Python 3 compatibility (#1782)
+
+---
+ test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +-
+ test/test_rosmaster/test/nodes/testMaster | 2 +-
+ test/test_rosmaster/test/nodes/testSlave | 2 +-
+ test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++-
+ tools/rosgraph/test/test_roslogging.py | 5 ++++-
+ tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
+ tools/roslaunch/src/roslaunch/depends.py | 8 ++++----
+ 7 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/tools/roslaunch/src/roslaunch/depends.py b/tools/roslaunch/src/roslaunch/depends.py
+index a3fbf7a41..91ae26998 100644
+--- a/tools/roslaunch/src/roslaunch/depends.py
++++ b/tools/roslaunch/src/roslaunch/depends.py
+@@ -86,21 +86,21 @@ def __str__(self):
+
+ def _get_arg_value(tag, context):
+ name = tag.attributes['name'].value
+- if tag.attributes.has_key('value'):
++ if 'value' in tag.attributes.keys():
+ return resolve_args(tag.attributes['value'].value, context)
+ elif name in context['arg']:
+ return context['arg'][name]
+- elif tag.attributes.has_key('default'):
++ elif 'default' in tag.attributes.keys():
+ return resolve_args(tag.attributes['default'].value, context)
+ else:
+ raise RoslaunchDepsException("No value for arg [%s]"%(name))
+
+ def _check_ifunless(tag, context):
+- if tag.attributes.has_key('if'):
++ if 'if' in tag.attributes.keys():
+ val = resolve_args(tag.attributes['if'].value, context)
+ if not convert_value(val, 'bool'):
+ return False
+- elif tag.attributes.has_key('unless'):
++ elif 'unless' in tag.attributes.keys():
+ val = resolve_args(tag.attributes['unless'].value, context)
+ if convert_value(val, 'bool'):
+ return False
diff --git a/dev-ros/roslaunch/files/roscore.initd b/dev-ros/roslaunch/files/roscore.initd
index 3df4be4006b9..d05c3fe98a76 100755..100644
--- a/dev-ros/roslaunch/files/roscore.initd
+++ b/dev-ros/roslaunch/files/roscore.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
depend() {
diff --git a/dev-ros/roslaunch/files/roslaunch.initd b/dev-ros/roslaunch/files/roslaunch.initd
index af38d2abbe68..fa0c0ace1c55 100755..100644
--- a/dev-ros/roslaunch/files/roslaunch.initd
+++ b/dev-ros/roslaunch/files/roslaunch.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
depend() {
diff --git a/dev-ros/roslaunch/files/yaml.patch b/dev-ros/roslaunch/files/yaml.patch
new file mode 100644
index 000000000000..135e9927c408
--- /dev/null
+++ b/dev-ros/roslaunch/files/yaml.patch
@@ -0,0 +1,44 @@
+Index: roslaunch/src/roslaunch/loader.py
+===================================================================
+--- roslaunch.orig/src/roslaunch/loader.py
++++ roslaunch/src/roslaunch/loader.py
+@@ -98,7 +98,7 @@ def convert_value(value, type_):
+ raise ValueError("%s is not a '%s' type"%(value, type_))
+ elif type_ == 'yaml':
+ try:
+- return yaml.load(value)
++ return yaml.safe_load(value)
+ except yaml.parser.ParserError as e:
+ raise ValueError(e)
+ else:
+@@ -409,7 +409,7 @@ class Loader(object):
+ if rosparam is None:
+ import rosparam
+ try:
+- data = yaml.load(text)
++ data = yaml.safe_load(text)
+ # #3162: if there is no YAML, load() will return an
+ # empty string. We want an empty dictionary instead
+ # for our representation of empty.
+Index: roslaunch/test/unit/test_roslaunch_dump_params.py
+===================================================================
+--- roslaunch.orig/test/unit/test_roslaunch_dump_params.py
++++ roslaunch/test/unit/test_roslaunch_dump_params.py
+@@ -53,7 +53,7 @@ class TestDumpParams(unittest.TestCase):
+ o, e = p.communicate()
+ self.assert_(p.returncode == 0, "Return code nonzero for param dump! Code: %d" % (p.returncode))
+
+- self.assertEquals({'/noop': 'noop'}, yaml.load(o))
++ self.assertEquals({'/noop': 'noop'}, yaml.safe_load(o))
+
+ p = Popen([cmd, '--dump-params', 'roslaunch', 'test-dump-rosparam.launch'], stdout = PIPE)
+ o, e = p.communicate()
+@@ -95,7 +95,7 @@ class TestDumpParams(unittest.TestCase):
+ '/noparam1': 'value1',
+ '/noparam2': 'value2',
+ }
+- output_val = yaml.load(o)
++ output_val = yaml.safe_load(o)
+ if not val == output_val:
+ for k, v in val.items():
+ if k not in output_val:
diff --git a/dev-ros/roslaunch/roslaunch-1.13.1.ebuild b/dev-ros/roslaunch/roslaunch-1.13.1.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rosclean[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]
- dev-ros/rosout
-"
-DEPEND="${RDEPEND}
- test? (
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/test_rosmaster
- )"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
- rosdep update
- ros-catkin_src_test
-}
-
-src_install() {
- ros-catkin_src_install
-
- dodir /etc/ros
- sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
- newinitd "${FILESDIR}/roscore.initd" roscore
- newconfd "${FILESDIR}/roscore.confd" roscore
-
- newinitd "${FILESDIR}/roslaunch.initd" roslaunch
- newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
- doenvd "${FILESDIR}/40roslaunch"
-
- # Needed by test_roslaunch
- insinto /usr/share/${PN}
- doins test/xml/noop.launch
-}
-
-pkg_preinst() {
- enewgroup ros
- enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.2.ebuild b/dev-ros/roslaunch/roslaunch-1.13.2.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rosclean[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]
- dev-ros/rosout
-"
-DEPEND="${RDEPEND}
- test? (
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/test_rosmaster
- )"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
- rosdep update
- ros-catkin_src_test
-}
-
-src_install() {
- ros-catkin_src_install
-
- dodir /etc/ros
- sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
- newinitd "${FILESDIR}/roscore.initd" roscore
- newconfd "${FILESDIR}/roscore.confd" roscore
-
- newinitd "${FILESDIR}/roslaunch.initd" roslaunch
- newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
- doenvd "${FILESDIR}/40roslaunch"
-
- # Needed by test_roslaunch
- insinto /usr/share/${PN}
- doins test/xml/noop.launch
-}
-
-pkg_preinst() {
- enewgroup ros
- enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.4.ebuild b/dev-ros/roslaunch/roslaunch-1.13.4.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rosclean[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]
- dev-ros/rosout
-"
-DEPEND="${RDEPEND}
- test? (
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/test_rosmaster
- )"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
- rosdep update
- ros-catkin_src_test
-}
-
-src_install() {
- ros-catkin_src_install
-
- dodir /etc/ros
- sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
- newinitd "${FILESDIR}/roscore.initd" roscore
- newconfd "${FILESDIR}/roscore.confd" roscore
-
- newinitd "${FILESDIR}/roslaunch.initd" roslaunch
- newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
- doenvd "${FILESDIR}/40roslaunch"
-
- # Needed by test_roslaunch
- insinto /usr/share/${PN}
- doins test/xml/noop.launch
-}
-
-pkg_preinst() {
- enewgroup ros
- enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.5.ebuild b/dev-ros/roslaunch/roslaunch-1.13.5.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rosclean[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]
- dev-ros/rosout
-"
-DEPEND="${RDEPEND}
- test? (
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/test_rosmaster
- )"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
- rosdep update
- ros-catkin_src_test
-}
-
-src_install() {
- ros-catkin_src_install
-
- dodir /etc/ros
- sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
- newinitd "${FILESDIR}/roscore.initd" roscore
- newconfd "${FILESDIR}/roscore.confd" roscore
-
- newinitd "${FILESDIR}/roslaunch.initd" roslaunch
- newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
- doenvd "${FILESDIR}/40roslaunch"
-
- # Needed by test_roslaunch
- insinto /usr/share/${PN}
- doins test/xml/noop.launch
-}
-
-pkg_preinst() {
- enewgroup ros
- enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.6.ebuild b/dev-ros/roslaunch/roslaunch-1.13.6.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rosclean[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]
- dev-ros/rosout
-"
-DEPEND="${RDEPEND}
- test? (
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/test_rosmaster
- )"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
- rosdep update
- ros-catkin_src_test
-}
-
-src_install() {
- ros-catkin_src_install
-
- dodir /etc/ros
- sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
- newinitd "${FILESDIR}/roscore.initd" roscore
- newconfd "${FILESDIR}/roscore.confd" roscore
-
- newinitd "${FILESDIR}/roslaunch.initd" roslaunch
- newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
- doenvd "${FILESDIR}/40roslaunch"
-
- # Needed by test_roslaunch
- insinto /usr/share/${PN}
- doins test/xml/noop.launch
-}
-
-pkg_preinst() {
- enewgroup ros
- enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.14.2.ebuild b/dev-ros/roslaunch/roslaunch-1.14.2.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.14.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rosclean[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]
- dev-ros/rosout
-"
-DEPEND="${RDEPEND}
- test? (
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/test_rosmaster
- )"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
- rosdep update
- ros-catkin_src_test
-}
-
-src_install() {
- ros-catkin_src_install
-
- dodir /etc/ros
- sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
- newinitd "${FILESDIR}/roscore.initd" roscore
- newconfd "${FILESDIR}/roscore.confd" roscore
-
- newinitd "${FILESDIR}/roslaunch.initd" roslaunch
- newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
- doenvd "${FILESDIR}/40roslaunch"
-
- # Needed by test_roslaunch
- insinto /usr/share/${PN}
- doins test/xml/noop.launch
-}
-
-pkg_preinst() {
- enewgroup ros
- enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.0.ebuild b/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild
index be129d151484..6f8d65622b86 100644
--- a/dev-ros/roslaunch/roslaunch-1.13.0.ebuild
+++ b/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
dev-ros/test_rosmaster
)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
+PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
src_test() {
rosdep update
diff --git a/dev-ros/roslaunch/roslaunch-1.14.3.ebuild b/dev-ros/roslaunch/roslaunch-1.14.3.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.14.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/rosclean[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- dev-ros/rosmaster[${PYTHON_USEDEP}]
- dev-ros/rosout
-"
-DEPEND="${RDEPEND}
- test? (
- dev-util/rosdep[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/test_rosmaster
- )"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
- rosdep update
- ros-catkin_src_test
-}
-
-src_install() {
- ros-catkin_src_install
-
- dodir /etc/ros
- sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
- newinitd "${FILESDIR}/roscore.initd" roscore
- newconfd "${FILESDIR}/roscore.confd" roscore
-
- newinitd "${FILESDIR}/roslaunch.initd" roslaunch
- newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
- doenvd "${FILESDIR}/40roslaunch"
-
- # Needed by test_roslaunch
- insinto /usr/share/${PN}
- doins test/xml/noop.launch
-}
-
-pkg_preinst() {
- enewgroup ros
- enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index be129d151484..cc74b7791b52 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
dev-ros/test_rosmaster
)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
+PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" )
src_test() {
rosdep update
diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
index 5863a70a331a..684a51a2cca5 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -5,11 +5,13 @@ DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2
DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
EBUILD roslib-1.14.0-r1.ebuild 588 BLAKE2B 1e7a13b2bac165734003e58405e90e1e650145212fae0b4424290307b86f010a59cc56cf5dfb4e6f78fdff6c22f93b21cf2fd156fd4aa2f59834e2add5aa7fde SHA512 dafcdb71fa893a709ac0c4d74790e97db9cfa90bd59ffdb05c1d1b0d1229184acced1b1786db2ab6be123fce7411233e4ab458b9cd9d7c9dff77a055db4010b3
EBUILD roslib-1.14.1.ebuild 588 BLAKE2B 1e7a13b2bac165734003e58405e90e1e650145212fae0b4424290307b86f010a59cc56cf5dfb4e6f78fdff6c22f93b21cf2fd156fd4aa2f59834e2add5aa7fde SHA512 dafcdb71fa893a709ac0c4d74790e97db9cfa90bd59ffdb05c1d1b0d1229184acced1b1786db2ab6be123fce7411233e4ab458b9cd9d7c9dff77a055db4010b3
EBUILD roslib-1.14.2.ebuild 588 BLAKE2B 1e7a13b2bac165734003e58405e90e1e650145212fae0b4424290307b86f010a59cc56cf5dfb4e6f78fdff6c22f93b21cf2fd156fd4aa2f59834e2add5aa7fde SHA512 dafcdb71fa893a709ac0c4d74790e97db9cfa90bd59ffdb05c1d1b0d1229184acced1b1786db2ab6be123fce7411233e4ab458b9cd9d7c9dff77a055db4010b3
EBUILD roslib-1.14.3.ebuild 573 BLAKE2B 8d861796b49cd64affc24346a8c53fe19044ed1fd70bd095fcf3cf12f9ff00a680febb41861bfc41496e306d8d3ef8f03bd5524b00be792024634e08932d3f3c SHA512 8c6f0649a80df1d5151e2bb17c63d193d77321a9d44c04f916f0750e45c45eec751d2c5da724db2d0ea2677f81e81dd9163032c8fc2b71603826a87b0228cff0
EBUILD roslib-1.14.4.ebuild 573 BLAKE2B 8d861796b49cd64affc24346a8c53fe19044ed1fd70bd095fcf3cf12f9ff00a680febb41861bfc41496e306d8d3ef8f03bd5524b00be792024634e08932d3f3c SHA512 8c6f0649a80df1d5151e2bb17c63d193d77321a9d44c04f916f0750e45c45eec751d2c5da724db2d0ea2677f81e81dd9163032c8fc2b71603826a87b0228cff0
EBUILD roslib-1.14.6.ebuild 573 BLAKE2B 8d861796b49cd64affc24346a8c53fe19044ed1fd70bd095fcf3cf12f9ff00a680febb41861bfc41496e306d8d3ef8f03bd5524b00be792024634e08932d3f3c SHA512 8c6f0649a80df1d5151e2bb17c63d193d77321a9d44c04f916f0750e45c45eec751d2c5da724db2d0ea2677f81e81dd9163032c8fc2b71603826a87b0228cff0
+EBUILD roslib-1.14.7.ebuild 573 BLAKE2B 8d861796b49cd64affc24346a8c53fe19044ed1fd70bd095fcf3cf12f9ff00a680febb41861bfc41496e306d8d3ef8f03bd5524b00be792024634e08932d3f3c SHA512 8c6f0649a80df1d5151e2bb17c63d193d77321a9d44c04f916f0750e45c45eec751d2c5da724db2d0ea2677f81e81dd9163032c8fc2b71603826a87b0228cff0
EBUILD roslib-9999.ebuild 573 BLAKE2B 8d861796b49cd64affc24346a8c53fe19044ed1fd70bd095fcf3cf12f9ff00a680febb41861bfc41496e306d8d3ef8f03bd5524b00be792024634e08932d3f3c SHA512 8c6f0649a80df1d5151e2bb17c63d193d77321a9d44c04f916f0750e45c45eec751d2c5da724db2d0ea2677f81e81dd9163032c8fc2b71603826a87b0228cff0
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslib/roslib-1.14.7.ebuild b/dev-ros/roslib/roslib-1.14.7.ebuild
new file mode 100644
index 000000000000..78a757a202c1
--- /dev/null
+++ b/dev-ros/roslib/roslib-1.14.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Base dependencies and support libraries for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
+ dev-libs/boost:=[threads]
+ dev-ros/rospack
+ dev-ros/ros_environment
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-cpp/gtest
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/rosmake/Manifest b/dev-ros/rosmake/Manifest
index ae25bce3603c..5dc1d4382a1c 100644
--- a/dev-ros/rosmake/Manifest
+++ b/dev-ros/rosmake/Manifest
@@ -1,14 +1,4 @@
-DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
-DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
-DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
-DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
-DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
-DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
-EBUILD rosmake-1.14.0.ebuild 446 BLAKE2B d9c4bd2f29a202e45f55e6f5725beab419bf96936f583ab949c56ce67a2b09e8b8fd4d50b8421d2beb0f0413adbe48aba1c95581e36b16e0b14b79bc082fcb17 SHA512 3f041a749dcf0d39c1c3a026717f1ea5590163dcf7e5330fba3a27a0b38ef3f7cd60afc9f6921d334c01939e3564056099007d4fc569180b41eff1695b180c4d
-EBUILD rosmake-1.14.1.ebuild 446 BLAKE2B d9c4bd2f29a202e45f55e6f5725beab419bf96936f583ab949c56ce67a2b09e8b8fd4d50b8421d2beb0f0413adbe48aba1c95581e36b16e0b14b79bc082fcb17 SHA512 3f041a749dcf0d39c1c3a026717f1ea5590163dcf7e5330fba3a27a0b38ef3f7cd60afc9f6921d334c01939e3564056099007d4fc569180b41eff1695b180c4d
-EBUILD rosmake-1.14.2.ebuild 446 BLAKE2B d9c4bd2f29a202e45f55e6f5725beab419bf96936f583ab949c56ce67a2b09e8b8fd4d50b8421d2beb0f0413adbe48aba1c95581e36b16e0b14b79bc082fcb17 SHA512 3f041a749dcf0d39c1c3a026717f1ea5590163dcf7e5330fba3a27a0b38ef3f7cd60afc9f6921d334c01939e3564056099007d4fc569180b41eff1695b180c4d
-EBUILD rosmake-1.14.3.ebuild 446 BLAKE2B d9c4bd2f29a202e45f55e6f5725beab419bf96936f583ab949c56ce67a2b09e8b8fd4d50b8421d2beb0f0413adbe48aba1c95581e36b16e0b14b79bc082fcb17 SHA512 3f041a749dcf0d39c1c3a026717f1ea5590163dcf7e5330fba3a27a0b38ef3f7cd60afc9f6921d334c01939e3564056099007d4fc569180b41eff1695b180c4d
-EBUILD rosmake-1.14.4.ebuild 446 BLAKE2B d9c4bd2f29a202e45f55e6f5725beab419bf96936f583ab949c56ce67a2b09e8b8fd4d50b8421d2beb0f0413adbe48aba1c95581e36b16e0b14b79bc082fcb17 SHA512 3f041a749dcf0d39c1c3a026717f1ea5590163dcf7e5330fba3a27a0b38ef3f7cd60afc9f6921d334c01939e3564056099007d4fc569180b41eff1695b180c4d
-EBUILD rosmake-1.14.6.ebuild 446 BLAKE2B d9c4bd2f29a202e45f55e6f5725beab419bf96936f583ab949c56ce67a2b09e8b8fd4d50b8421d2beb0f0413adbe48aba1c95581e36b16e0b14b79bc082fcb17 SHA512 3f041a749dcf0d39c1c3a026717f1ea5590163dcf7e5330fba3a27a0b38ef3f7cd60afc9f6921d334c01939e3564056099007d4fc569180b41eff1695b180c4d
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
+EBUILD rosmake-1.14.7.ebuild 446 BLAKE2B d9c4bd2f29a202e45f55e6f5725beab419bf96936f583ab949c56ce67a2b09e8b8fd4d50b8421d2beb0f0413adbe48aba1c95581e36b16e0b14b79bc082fcb17 SHA512 3f041a749dcf0d39c1c3a026717f1ea5590163dcf7e5330fba3a27a0b38ef3f7cd60afc9f6921d334c01939e3564056099007d4fc569180b41eff1695b180c4d
EBUILD rosmake-9999.ebuild 446 BLAKE2B d9c4bd2f29a202e45f55e6f5725beab419bf96936f583ab949c56ce67a2b09e8b8fd4d50b8421d2beb0f0413adbe48aba1c95581e36b16e0b14b79bc082fcb17 SHA512 3f041a749dcf0d39c1c3a026717f1ea5590163dcf7e5330fba3a27a0b38ef3f7cd60afc9f6921d334c01939e3564056099007d4fc569180b41eff1695b180c4d
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosmake/rosmake-1.14.3.ebuild b/dev-ros/rosmake/rosmake-1.14.3.ebuild
deleted file mode 100644
index 734dd611a6f8..000000000000
--- a/dev-ros/rosmake/rosmake-1.14.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmake/rosmake-1.14.4.ebuild b/dev-ros/rosmake/rosmake-1.14.4.ebuild
deleted file mode 100644
index 734dd611a6f8..000000000000
--- a/dev-ros/rosmake/rosmake-1.14.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmake/rosmake-1.14.6.ebuild b/dev-ros/rosmake/rosmake-1.14.6.ebuild
deleted file mode 100644
index 734dd611a6f8..000000000000
--- a/dev-ros/rosmake/rosmake-1.14.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmake/rosmake-1.14.0.ebuild b/dev-ros/rosmake/rosmake-1.14.7.ebuild
index 734dd611a6f8..734dd611a6f8 100644
--- a/dev-ros/rosmake/rosmake-1.14.0.ebuild
+++ b/dev-ros/rosmake/rosmake-1.14.7.ebuild
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 54d481bf329b..1600cf2f9a91 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,18 +1,7 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX norm.patch 1260 BLAKE2B 09c790fa6d31a76d07a44622c514391a30c855c167aa3598f300754ba24249023efef644c397203e66d25c467b6043a6a6f02d9d19d9a23d1b920619d04e7b9e SHA512 3fe87e224a10bd5b3eaafbb370031ee0ca30f3a968742df78fc6319875f1ae374e06d58dd2d47a499065dba2030914ad5b4221b856b18d340f7119b6435b19cb
+AUX py3.patch 12157 BLAKE2B 13c70122c5b790e9d3f54ed9709d01ec4fbb98ba9b0f912d61d016afe265d81abe19e3e8a1b308536019fb995277e0931a0d1238dd1af128059462d7439a132c SHA512 756d32eef5be6e40564654f0bd8eb66295e02af91e3a6f56b995a593a5687fd5e324a5963e68a44a7f19f7fe98eca5717b272533add90710bea46d05912a1066
+AUX tests.patch 811 BLAKE2B 66d61f39aaa4138f1e4ef60c24724216a698d4c355b6830802a176c74cccddd742849377abdd4773c241cf3096d0023fa6ea98aa0a975376fa02d2ba6ea0510e SHA512 3fca6df07aacb5a8230c5990ded10f18127cd92947b3d263042fe49938a224bce0874bc5bc5924a258b116f88f3176c8aedc0ebc92492329c84320d1e2eb20d4
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosmsg-1.13.0.ebuild 551 BLAKE2B 58a8f698f9f972b705d330d5548158b244fe321284039a6c46257f96cbc9dfac567db68c6cfcd2f8d4457b629ab1e70ee40713d34f634abd436ac146ce217ba9 SHA512 f0180f493380b974c6d51867571903928ec61f37c26471bbef054dcd17e771fbedf7b365c9da8990a60ce98689b8062ccc0bb3ca4f5f934db635321eb4cd5cbd
-EBUILD rosmsg-1.13.1.ebuild 551 BLAKE2B 58a8f698f9f972b705d330d5548158b244fe321284039a6c46257f96cbc9dfac567db68c6cfcd2f8d4457b629ab1e70ee40713d34f634abd436ac146ce217ba9 SHA512 f0180f493380b974c6d51867571903928ec61f37c26471bbef054dcd17e771fbedf7b365c9da8990a60ce98689b8062ccc0bb3ca4f5f934db635321eb4cd5cbd
-EBUILD rosmsg-1.13.2.ebuild 551 BLAKE2B 58a8f698f9f972b705d330d5548158b244fe321284039a6c46257f96cbc9dfac567db68c6cfcd2f8d4457b629ab1e70ee40713d34f634abd436ac146ce217ba9 SHA512 f0180f493380b974c6d51867571903928ec61f37c26471bbef054dcd17e771fbedf7b365c9da8990a60ce98689b8062ccc0bb3ca4f5f934db635321eb4cd5cbd
-EBUILD rosmsg-1.13.4.ebuild 551 BLAKE2B 58a8f698f9f972b705d330d5548158b244fe321284039a6c46257f96cbc9dfac567db68c6cfcd2f8d4457b629ab1e70ee40713d34f634abd436ac146ce217ba9 SHA512 f0180f493380b974c6d51867571903928ec61f37c26471bbef054dcd17e771fbedf7b365c9da8990a60ce98689b8062ccc0bb3ca4f5f934db635321eb4cd5cbd
-EBUILD rosmsg-1.13.5.ebuild 551 BLAKE2B 58a8f698f9f972b705d330d5548158b244fe321284039a6c46257f96cbc9dfac567db68c6cfcd2f8d4457b629ab1e70ee40713d34f634abd436ac146ce217ba9 SHA512 f0180f493380b974c6d51867571903928ec61f37c26471bbef054dcd17e771fbedf7b365c9da8990a60ce98689b8062ccc0bb3ca4f5f934db635321eb4cd5cbd
-EBUILD rosmsg-1.13.6.ebuild 551 BLAKE2B 58a8f698f9f972b705d330d5548158b244fe321284039a6c46257f96cbc9dfac567db68c6cfcd2f8d4457b629ab1e70ee40713d34f634abd436ac146ce217ba9 SHA512 f0180f493380b974c6d51867571903928ec61f37c26471bbef054dcd17e771fbedf7b365c9da8990a60ce98689b8062ccc0bb3ca4f5f934db635321eb4cd5cbd
-EBUILD rosmsg-1.14.2.ebuild 551 BLAKE2B 58a8f698f9f972b705d330d5548158b244fe321284039a6c46257f96cbc9dfac567db68c6cfcd2f8d4457b629ab1e70ee40713d34f634abd436ac146ce217ba9 SHA512 f0180f493380b974c6d51867571903928ec61f37c26471bbef054dcd17e771fbedf7b365c9da8990a60ce98689b8062ccc0bb3ca4f5f934db635321eb4cd5cbd
-EBUILD rosmsg-1.14.3.ebuild 551 BLAKE2B 58a8f698f9f972b705d330d5548158b244fe321284039a6c46257f96cbc9dfac567db68c6cfcd2f8d4457b629ab1e70ee40713d34f634abd436ac146ce217ba9 SHA512 f0180f493380b974c6d51867571903928ec61f37c26471bbef054dcd17e771fbedf7b365c9da8990a60ce98689b8062ccc0bb3ca4f5f934db635321eb4cd5cbd
-EBUILD rosmsg-9999.ebuild 551 BLAKE2B 58a8f698f9f972b705d330d5548158b244fe321284039a6c46257f96cbc9dfac567db68c6cfcd2f8d4457b629ab1e70ee40713d34f634abd436ac146ce217ba9 SHA512 f0180f493380b974c6d51867571903928ec61f37c26471bbef054dcd17e771fbedf7b365c9da8990a60ce98689b8062ccc0bb3ca4f5f934db635321eb4cd5cbd
+EBUILD rosmsg-1.14.3-r1.ebuild 691 BLAKE2B b15481ec4b1f5520725f572743d1a5a49e758b731461c0d2136001dd07271a64d55122b610bc8903d6b25fa629607281ce08227e1cfde0853b651c7b35ecc5ba SHA512 a7a9a81c7daa9c997d044322feff1cd7b1d9cf5f2defbc657a5fcd161e4954b36b119eeedc0d4def4809928601d5e5fe5b6eb3f7a173d51a049d1099f349060a
+EBUILD rosmsg-9999.ebuild 604 BLAKE2B a90404a9fe0c516fb7a8525037a7f65011485342f47bf1c202938036b303ac9058161a17a8873f4dc3f807f3faad1e9cd9d74d8654bcf23e5ac55be351d2990f SHA512 6aae30902dcaed9fa8100368eb6590dc821e401fbe6a0a97ee1888ff843f769fb241a4f359803ae9b79ff53b60f46741b8ee59bca5d1016fd33089fec167a29e
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/files/norm.patch b/dev-ros/rosmsg/files/norm.patch
new file mode 100644
index 000000000000..530da65fcd24
--- /dev/null
+++ b/dev-ros/rosmsg/files/norm.patch
@@ -0,0 +1,31 @@
+From 0648d3019dc2395f61a8a7a3d1bbf790eca98739 Mon Sep 17 00:00:00 2001
+From: James Xu <kejia.xu@microsoft.com>
+Date: Wed, 6 Feb 2019 09:47:54 -0800
+Subject: [PATCH] normalize paths before comparison in rosmsg (#1586)
+
+* normalize paths before comparison in rosmsg
+
+* remove use of normcase and remove path_in_workspaces temp variable
+
+* remove duplicated control
+
+* revert unrelated whitespace changes
+
+* keep order of operands
+---
+ tools/rosmsg/src/rosmsg/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py
+index 83b629e7e..4ed7aa542 100644
+--- a/tools/rosmsg/src/rosmsg/__init__.py
++++ b/tools/rosmsg/src/rosmsg/__init__.py
+@@ -551,7 +551,7 @@ def _get_package_paths(pkgname, rospack):
+ path = rospack.get_path(pkgname)
+ paths.append(path)
+ results = find_in_workspaces(search_dirs=['share'], project=pkgname, first_match_only=True, workspace_to_source_spaces=_catkin_workspace_to_source_spaces, source_path_to_packages=_catkin_source_path_to_packages)
+- if results and results[0] != path:
++ if results and results[0].replace(os.path.sep, '/') != path.replace(os.path.sep, '/'):
+ paths.append(results[0])
+ return paths
+
diff --git a/dev-ros/rosmsg/files/py3.patch b/dev-ros/rosmsg/files/py3.patch
new file mode 100644
index 000000000000..4cfcb77d2a26
--- /dev/null
+++ b/dev-ros/rosmsg/files/py3.patch
@@ -0,0 +1,212 @@
+From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 16:06:51 -0700
+Subject: [PATCH] more Python 3 compatibility (#1783)
+
+---
+ test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ .../test/test_roslogging_user_logger.py | 8 +++-
+ tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
+ tools/rosmsg/src/rosmsg/__init__.py | 2 +-
+ tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
+ .../test/test_rosmsgproto_command_line.py | 20 ++++----
+ .../test_rostopic_command_line_offline.py | 44 +++++++++---------
+ 8 files changed, 67 insertions(+), 63 deletions(-)
+
+diff --git a/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py
+index 4ed7aa542..75f5afcbd 100644
+--- a/tools/rosmsg/src/rosmsg/__init__.py
++++ b/tools/rosmsg/src/rosmsg/__init__.py
+@@ -240,7 +240,7 @@ def create_names_filter(names):
+ """
+ returns a function to use as filter that returns all objects slots except those with names in list.
+ """
+- return lambda obj : filter(lambda slotname : not slotname in names, obj.__slots__)
++ return lambda obj : list(filter(lambda slotname : not slotname in names, obj.__slots__))
+
+
+ def init_rosmsg_proto():
+diff --git a/tools/rosmsg/test/test_rosmsg_command_line.py b/tools/rosmsg/test/test_rosmsg_command_line.py
+index 02e31022e..d5515a3ac 100644
+--- a/tools/rosmsg/test/test_rosmsg_command_line.py
++++ b/tools/rosmsg/test/test_rosmsg_command_line.py
+@@ -54,24 +54,24 @@ def test_cmd_help(self):
+
+ for cmd in ['rosmsg', 'rossrv']:
+ glob_cmd=[os.path.join(_SCRIPT_FOLDER, cmd)]
+- output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0]
++ output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0].decode()
+ self.assert_('Commands' in output)
+- output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0]
++ output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode()
+ self.assert_('Commands' in output)
+ self.assert_('Traceback' not in output)
+ for c in sub:
+ self.assert_("%s %s"%(cmd, c) in output, "%s %s"%(cmd, c) + " not in "+ output + " of " + str(glob_cmd))
+
+ for c in sub:
+- output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0]
++ output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode()
+ self.assert_('Usage' in output)
+ self.assert_("%s %s"%(cmd, c) in output, output)
+
+ def test_cmd_packages(self):
+ # - single line
+- output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0]
++ output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0].decode()
+ # - multi-line
+- output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0]
++ output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0].decode()
+ l1 = [x for x in output1.split() if x]
+ l2 = [x.strip() for x in output2.split('\n') if x.strip()]
+ self.assertEquals(l1, l2)
+@@ -80,8 +80,8 @@ def test_cmd_packages(self):
+ for p in ['std_srvs', 'rosmsg']:
+ self.assert_(p not in l1)
+
+- output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0]
+- output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0]
++ output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0].decode()
++ output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0].decode()
+ l1 = [x for x in output1.split() if x]
+ l2 = [x.strip() for x in output2.split('\n') if x.strip()]
+ self.assertEquals(l1, l2)
+@@ -92,14 +92,14 @@ def test_cmd_packages(self):
+
+ def test_cmd_list(self):
+ # - multi-line
+- output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0]
++ output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0].decode()
+ l1 = [x.strip() for x in output1.split('\n') if x.strip()]
+ for p in ['std_msgs/String', 'test_rosmaster/Floats']:
+ self.assert_(p in l1)
+ for p in ['std_srvs/Empty', 'roscpp/Empty']:
+ self.assert_(p not in l1)
+
+- output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0]
++ output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0].decode()
+ l1 = [x.strip() for x in output1.split('\n') if x.strip()]
+ for p in ['std_srvs/Empty', 'roscpp/Empty']:
+ self.assert_(p in l1)
+@@ -109,9 +109,9 @@ def test_cmd_list(self):
+ def test_cmd_package(self):
+ # this test is obviously very brittle, but should stabilize as the tests stabilize
+ # - single line output
+- output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0]
++ output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
+ # - multi-line output
+- output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0]
++ output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
+ l = set([x for x in output1.split() if x])
+ l2 = set([x.strip() for x in output2.split('\n') if x.strip()])
+ self.assertEquals(l, l2)
+@@ -121,8 +121,8 @@ def test_cmd_package(self):
+ 'test_rosmaster/RosmsgC']:
+ self.assertTrue(m in l, l)
+
+- output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0]
+- output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0]
++ output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
++ output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0].decode()
+ l = set([x for x in output.split() if x])
+ l2 = set([x.strip() for x in output2.split('\n') if x.strip()])
+ self.assertEquals(l, l2)
+@@ -132,14 +132,14 @@ def test_cmd_package(self):
+
+ ## test that the rosmsg/rossrv show command works
+ def test_cmd_show(self):
+- output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0]
++ output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals('string data', output.strip())
+
+- output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0]
++ output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals('---', output.strip())
+- output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0]
++ output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals('---', output.strip())
+- output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0]
++ output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals('int64 a\nint64 b\n---\nint64 sum', output.strip())
+
+ # test against test_rosmsg package
+@@ -159,20 +159,20 @@ def test_cmd_show(self):
+ text = text+'\n' # running command adds one new line
+ text_raw = text_raw+'\n'
+ type_ =test_message_package+'/'+t
+- output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0]
++ output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals(text, output)
+- output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0]
++ output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals(text_raw, output)
+- output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0]
++ output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals(text_raw, output)
+
+ # test as search
+ type_ = t
+ text = "[test_rosmaster/%s]:\n%s"%(t, text)
+ text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw)
+- output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0]
++ output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals(text, output)
+ output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate()
+- self.assertEquals(text_raw, output[0], "Failed: %s"%(str(output)))
+- output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0]
++ self.assertEquals(text_raw, output[0].decode(), "Failed: %s"%(str(output)))
++ output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals(text_raw, output)
+diff --git a/tools/rosmsg/test/test_rosmsgproto_command_line.py b/tools/rosmsg/test/test_rosmsgproto_command_line.py
+index b5b555e78..b4aa0c5b3 100644
+--- a/tools/rosmsg/test/test_rosmsgproto_command_line.py
++++ b/tools/rosmsg/test/test_rosmsgproto_command_line.py
+@@ -67,37 +67,37 @@ def testFail(self):
+ cmd.extend(["msg", "foo123barxyz"])
+ call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
+ (output, erroutput) = call.communicate()
+- self.assertEqual('', output)
+- self.assertTrue('Unknown message name foo123barxyz' in erroutput)
++ self.assertEqual(b'', output)
++ self.assertTrue('Unknown message name foo123barxyz' in erroutput.decode())
+
+ def testSilentFail(self):
+ cmd = copy.copy(ROSMSGPROTO_FN)
+ cmd.extend(["msg", "-s", "foo123barxyz"])
+ call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
+ (output, erroutput) = call.communicate()
+- self.assertEqual('', output)
+- self.assertEqual('', erroutput)
++ self.assertEqual(b'', output)
++ self.assertEqual(b'', erroutput)
+
+ def testSilentFailCpp(self):
+ cmd = copy.copy(ROSMSGPROTO_FN)
+ cmd.extend(["msg", "-s", "foo123barxyz::bar"])
+ call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
+ (output, erroutput) = call.communicate()
+- self.assertEqual('', output)
+- self.assertEqual('', erroutput)
++ self.assertEqual(b'', output)
++ self.assertEqual(b'', erroutput)
+
+ def testSilentFailDot(self):
+ cmd = copy.copy(ROSMSGPROTO_FN)
+ cmd.extend(["msg", "-s", "foo123barxyz.bar"])
+ call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
+ (output, erroutput) = call.communicate()
+- self.assertEqual('', output)
+- self.assertEqual('', erroutput)
++ self.assertEqual(b'', output)
++ self.assertEqual(b'', erroutput)
+
+ def testSilentFailMode(self):
+ cmd = copy.copy(ROSMSGPROTO_FN)
+ cmd.extend(["msgfoobar", "-s", "foo123barxyz.bar"])
+ call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
+ (output, erroutput) = call.communicate()
+- self.assertEqual('', output)
+- self.assertEqual('', erroutput)
++ self.assertEqual(b'', output)
++ self.assertEqual(b'', erroutput)
diff --git a/dev-ros/rosmsg/files/tests.patch b/dev-ros/rosmsg/files/tests.patch
new file mode 100644
index 000000000000..f8b514b4e127
--- /dev/null
+++ b/dev-ros/rosmsg/files/tests.patch
@@ -0,0 +1,15 @@
+Index: rosmsg/test/test_rosmsg_command_line.py
+===================================================================
+--- rosmsg.orig/test/test_rosmsg_command_line.py
++++ rosmsg/test/test_rosmsg_command_line.py
+@@ -168,8 +168,8 @@ class TestRosmsg(unittest.TestCase):
+
+ # test as search
+ type_ = t
+- text = "[test_rosmaster/%s]:\n%s"%(t, text)
+- text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw)
++ text = ("[test_rosmaster/%s]:\n%s"%(t, text))*2
++ text_raw = ("[test_rosmaster/%s]:\n%s"%(t, text_raw))*2
+ output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
+ self.assertEquals(text, output)
+ output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate()
diff --git a/dev-ros/rosmsg/rosmsg-1.13.1.ebuild b/dev-ros/rosmsg/rosmsg-1.13.1.ebuild
deleted file mode 100644
index 8087d80c4e41..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.13.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosmsg/rosmsg-1.13.2.ebuild b/dev-ros/rosmsg/rosmsg-1.13.2.ebuild
deleted file mode 100644
index 8087d80c4e41..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.13.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosmsg/rosmsg-1.13.4.ebuild b/dev-ros/rosmsg/rosmsg-1.13.4.ebuild
deleted file mode 100644
index 8087d80c4e41..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.13.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosmsg/rosmsg-1.13.5.ebuild b/dev-ros/rosmsg/rosmsg-1.13.5.ebuild
deleted file mode 100644
index 8087d80c4e41..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.13.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosmsg/rosmsg-1.13.6.ebuild b/dev-ros/rosmsg/rosmsg-1.13.6.ebuild
deleted file mode 100644
index 8087d80c4e41..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.13.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosmsg/rosmsg-1.14.2.ebuild b/dev-ros/rosmsg/rosmsg-1.14.2.ebuild
deleted file mode 100644
index 8087d80c4e41..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.14.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosmsg/rosmsg-1.13.0.ebuild b/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild
index 8087d80c4e41..116c190ae75e 100644
--- a/dev-ros/rosmsg/rosmsg-1.13.0.ebuild
+++ b/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild
@@ -21,4 +21,7 @@ RDEPEND="
dev-ros/roslib[${PYTHON_USEDEP}]
dev-ros/rosbag[${PYTHON_USEDEP}]
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
+"
+PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/norm.patch" "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/rosmsg/rosmsg-1.14.3.ebuild b/dev-ros/rosmsg/rosmsg-1.14.3.ebuild
deleted file mode 100644
index 8087d80c4e41..000000000000
--- a/dev-ros/rosmsg/rosmsg-1.14.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tools for displaying information about message and services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/genmsg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosbag[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosmsg/rosmsg-9999.ebuild b/dev-ros/rosmsg/rosmsg-9999.ebuild
index 8087d80c4e41..05019766a002 100644
--- a/dev-ros/rosmsg/rosmsg-9999.ebuild
+++ b/dev-ros/rosmsg/rosmsg-9999.ebuild
@@ -21,4 +21,6 @@ RDEPEND="
dev-ros/roslib[${PYTHON_USEDEP}]
dev-ros/rosbag[${PYTHON_USEDEP}]
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index a3e89c70e284..46b869dc3a58 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,18 +1,6 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 895 BLAKE2B 983493cadf83e5eee7646769ddc8560bbcff3756ebdb77f4365e0a3e10d97b104c4a6ec3ceb0d7e3504502c250cc21ee07b3f5582e3521a5eafe7f5925c622a1 SHA512 92a6ba5660b2cc0a490477d4e4fd39ebbd95912804d5c32c76eec5dc4fc5a67e043dc9cce2ee13d44c623b7a7b710d045fabd68ff3968d2e5ea555d97eb219f2
+AUX yaml2.patch 3279 BLAKE2B 8ca2d9dcd99eeefe7ca2c5039a894bfcda02586995a2982c8f6ea6ac61c19c16325e53bd0733b1c3272160f3dd572ed8aa5c754ad7d182adfc8e85f7b39e0c99 SHA512 23856b931f203fc3c0adfddbcc3c94ea1b827eb2a1f8550d130ac25abdb09a2167da5f4ae9aaf9d869326a80f1964e0f5a00e68895133fb101e4accdf6f5a4c4
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosparam-1.13.0.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.1.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.2.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.4.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.5.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.13.6.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.14.2.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
-EBUILD rosparam-1.14.3.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
+EBUILD rosparam-1.14.3-r1.ebuild 569 BLAKE2B 5e8ff4a5aa9b7d866727a832858c0d551ab1b713632ce59e73a85050004cd1b8a7e58f64d3542a829a208fc065dd33956ca17b0c81af316632b49e459bcfe5c9 SHA512 013b49130707f51c08c0deb5bf60e4c64a5c839174f1b7c1fd3605bd8e2e749e499005b147ce0cb119697be31524d813e7a827f22d879eaa8ed31acdbdd32508
EBUILD rosparam-9999.ebuild 506 BLAKE2B 32fcc9ac03bcbda6275f080cc5beec6915f0978ac13d0d0d6b05f1f4c41b017e6f0d3ee11a701efd2cd8676fc54b7d53ebf8f122fbced0834221a20b37e1f61d SHA512 1ed7ef11d4a878df4bbea652c74c8edca42e67104688784286f6c3978a0fb80ecb5a2f1ee441edcb341452a4391bbf1375c151a05d8d2f9ab4e721da5630f114
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosparam/files/yaml.patch b/dev-ros/rosparam/files/yaml.patch
new file mode 100644
index 000000000000..a4ed42758f13
--- /dev/null
+++ b/dev-ros/rosparam/files/yaml.patch
@@ -0,0 +1,22 @@
+From 481ad19689561052afde658ab0c54c91b0e5e04a Mon Sep 17 00:00:00 2001
+From: Maxime St-Pierre <me@maximest-pierre.me>
+Date: Sun, 10 Nov 2019 06:27:40 -0500
+Subject: [PATCH] Fix #1833 change unsafe yaml.load to yaml.safe_load
+
+---
+ tools/rosparam/src/rosparam/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
+index 3279ab97d..fd8b0569f 100644
+--- a/tools/rosparam/src/rosparam/__init__.py
++++ b/tools/rosparam/src/rosparam/__init__.py
+@@ -368,7 +368,7 @@ def set_param(param, value, verbose=False):
+ :param param: parameter name, ``str``
+ :param value: yaml-encoded value, ``str``
+ """
+- set_param_raw(param, yaml.load(value), verbose=verbose)
++ set_param_raw(param, yaml.safe_load(value), verbose=verbose)
+
+ def upload_params(ns, values, verbose=False):
+ """
diff --git a/dev-ros/rosparam/files/yaml2.patch b/dev-ros/rosparam/files/yaml2.patch
new file mode 100644
index 000000000000..1e36844ee38c
--- /dev/null
+++ b/dev-ros/rosparam/files/yaml2.patch
@@ -0,0 +1,76 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
+index 41b806711..3279ab97d 100644
+--- a/tools/rosparam/src/rosparam/__init__.py
++++ b/tools/rosparam/src/rosparam/__init__.py
+@@ -99,6 +99,7 @@ def construct_yaml_binary(loader, node):
+ # register the (de)serializers with pyyaml
+ yaml.add_representer(Binary,represent_xml_binary)
+ yaml.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
++yaml.SafeLoader.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
+
+ def construct_angle_radians(loader, node):
+ """
+@@ -185,7 +186,7 @@ def load_str(str, filename, default_namespace=None, verbose=False):
+ """
+ paramlist = []
+ default_namespace = default_namespace or get_ros_namespace()
+- for doc in yaml.load_all(str):
++ for doc in yaml.safe_load_all(str):
+ if NS in doc:
+ ns = ns_join(default_namespace, doc.get(NS, None))
+ if verbose:
+@@ -633,10 +634,14 @@ def yamlmain(argv=None):
+
+ yaml.add_constructor(u'!radians', construct_angle_radians)
+ yaml.add_constructor(u'!degrees', construct_angle_degrees)
++yaml.SafeLoader.add_constructor(u'!radians', construct_angle_radians)
++yaml.SafeLoader.add_constructor(u'!degrees', construct_angle_degrees)
+
+ # allow both !degrees 180, !radians 2*pi
+ pattern = re.compile(r'^deg\([^\)]*\)$')
+ yaml.add_implicit_resolver(u'!degrees', pattern, first="deg(")
++yaml.SafeLoader.add_implicit_resolver(u'!degrees', pattern, first="deg(")
+ pattern = re.compile(r'^rad\([^\)]*\)$')
+ yaml.add_implicit_resolver(u'!radians', pattern, first="rad(")
++yaml.SafeLoader.add_implicit_resolver(u'!radians', pattern, first="rad(")
+
diff --git a/dev-ros/rosparam/rosparam-1.13.1.ebuild b/dev-ros/rosparam/rosparam-1.13.1.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.13.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.13.4.ebuild b/dev-ros/rosparam/rosparam-1.13.4.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.13.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.13.5.ebuild b/dev-ros/rosparam/rosparam-1.13.5.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.13.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.13.6.ebuild b/dev-ros/rosparam/rosparam-1.13.6.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.13.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.14.2.ebuild b/dev-ros/rosparam/rosparam-1.14.2.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.14.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.13.0.ebuild b/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild
index bdb18d0b8521..844e4cb3b011 100644
--- a/dev-ros/rosparam/rosparam-1.13.0.ebuild
+++ b/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild
@@ -20,3 +20,4 @@ RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/yaml2.patch" )
diff --git a/dev-ros/rosparam/rosparam-1.14.3.ebuild b/dev-ros/rosparam/rosparam-1.14.3.ebuild
deleted file mode 100644
index bdb18d0b8521..000000000000
--- a/dev-ros/rosparam/rosparam-1.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index 0c78462b4f81..834a813dd612 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,18 +1,5 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 2320 BLAKE2B 2b59ccbd08c333df5b6ec603136ac94202da82eec17f13b4b84c1df66636d2fadf22eaacb5d24e7d00543358eb1f539ffa7c09498ed0afeda5ae5e382b17660f SHA512 de3f2c418f5d84f99af771634cca03e5982ca0a828f404fdfe62de2e8fac9cf4dcaf681e1892f37908568fd5b70f527c0f4f860e201ba330dda65b1e7098de30
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rospy-1.13.0.ebuild 727 BLAKE2B 74704a4ad03c3e002d9b8122b42f939db691d365c971ac67d470cc17de2f8fe93f1f31e4d8713d9785a21968eef7cb23ce2bd5e9c8b342460675208db2f9427b SHA512 3d62bd90ee12c0d46a5838f8c979376e7727d5968f88855f7151d6290c85156c12e85d74d4eb305008644e11a4d134c6adccb8badbf4601a909c126303ae308d
-EBUILD rospy-1.13.1.ebuild 727 BLAKE2B 74704a4ad03c3e002d9b8122b42f939db691d365c971ac67d470cc17de2f8fe93f1f31e4d8713d9785a21968eef7cb23ce2bd5e9c8b342460675208db2f9427b SHA512 3d62bd90ee12c0d46a5838f8c979376e7727d5968f88855f7151d6290c85156c12e85d74d4eb305008644e11a4d134c6adccb8badbf4601a909c126303ae308d
-EBUILD rospy-1.13.2.ebuild 727 BLAKE2B 74704a4ad03c3e002d9b8122b42f939db691d365c971ac67d470cc17de2f8fe93f1f31e4d8713d9785a21968eef7cb23ce2bd5e9c8b342460675208db2f9427b SHA512 3d62bd90ee12c0d46a5838f8c979376e7727d5968f88855f7151d6290c85156c12e85d74d4eb305008644e11a4d134c6adccb8badbf4601a909c126303ae308d
-EBUILD rospy-1.13.4.ebuild 727 BLAKE2B 74704a4ad03c3e002d9b8122b42f939db691d365c971ac67d470cc17de2f8fe93f1f31e4d8713d9785a21968eef7cb23ce2bd5e9c8b342460675208db2f9427b SHA512 3d62bd90ee12c0d46a5838f8c979376e7727d5968f88855f7151d6290c85156c12e85d74d4eb305008644e11a4d134c6adccb8badbf4601a909c126303ae308d
-EBUILD rospy-1.13.5.ebuild 727 BLAKE2B 74704a4ad03c3e002d9b8122b42f939db691d365c971ac67d470cc17de2f8fe93f1f31e4d8713d9785a21968eef7cb23ce2bd5e9c8b342460675208db2f9427b SHA512 3d62bd90ee12c0d46a5838f8c979376e7727d5968f88855f7151d6290c85156c12e85d74d4eb305008644e11a4d134c6adccb8badbf4601a909c126303ae308d
-EBUILD rospy-1.13.6.ebuild 727 BLAKE2B 74704a4ad03c3e002d9b8122b42f939db691d365c971ac67d470cc17de2f8fe93f1f31e4d8713d9785a21968eef7cb23ce2bd5e9c8b342460675208db2f9427b SHA512 3d62bd90ee12c0d46a5838f8c979376e7727d5968f88855f7151d6290c85156c12e85d74d4eb305008644e11a4d134c6adccb8badbf4601a909c126303ae308d
-EBUILD rospy-1.14.2.ebuild 727 BLAKE2B 74704a4ad03c3e002d9b8122b42f939db691d365c971ac67d470cc17de2f8fe93f1f31e4d8713d9785a21968eef7cb23ce2bd5e9c8b342460675208db2f9427b SHA512 3d62bd90ee12c0d46a5838f8c979376e7727d5968f88855f7151d6290c85156c12e85d74d4eb305008644e11a4d134c6adccb8badbf4601a909c126303ae308d
-EBUILD rospy-1.14.3.ebuild 727 BLAKE2B 74704a4ad03c3e002d9b8122b42f939db691d365c971ac67d470cc17de2f8fe93f1f31e4d8713d9785a21968eef7cb23ce2bd5e9c8b342460675208db2f9427b SHA512 3d62bd90ee12c0d46a5838f8c979376e7727d5968f88855f7151d6290c85156c12e85d74d4eb305008644e11a4d134c6adccb8badbf4601a909c126303ae308d
+EBUILD rospy-1.14.3-r1.ebuild 764 BLAKE2B 8bad3cc57fd3dafb84749faf8f417dc008f5f32d63d74e8cc244490a376bf2a890c5c98494add2cc3c5fbbe15e745eea672593bbaab7a85cd7f20217ff725826 SHA512 82c21319c1a091b5092eec1baa2a8cd15b88dfa2e712978c68207c4b0316abd9411a540bbca7e5c3abeea23ced7c45a2181481541bd5f9e318ffb853531d11e7
EBUILD rospy-9999.ebuild 727 BLAKE2B 74704a4ad03c3e002d9b8122b42f939db691d365c971ac67d470cc17de2f8fe93f1f31e4d8713d9785a21968eef7cb23ce2bd5e9c8b342460675208db2f9427b SHA512 3d62bd90ee12c0d46a5838f8c979376e7727d5968f88855f7151d6290c85156c12e85d74d4eb305008644e11a4d134c6adccb8badbf4601a909c126303ae308d
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rospy/files/yaml.patch b/dev-ros/rospy/files/yaml.patch
new file mode 100644
index 000000000000..e9e9aa8202a9
--- /dev/null
+++ b/dev-ros/rospy/files/yaml.patch
@@ -0,0 +1,53 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/clients/rospy/src/rospy/client.py b/clients/rospy/src/rospy/client.py
+index d543c53ac..c72d6d6f0 100644
+--- a/clients/rospy/src/rospy/client.py
++++ b/clients/rospy/src/rospy/client.py
+@@ -101,7 +101,7 @@ def load_command_line_node_params(argv):
+ src, dst = [x.strip() for x in arg.split(rosgraph.names.REMAP)]
+ if src and dst:
+ if len(src) > 1 and src[0] == '_' and src[1] != '_':
+- mappings[src[1:]] = yaml.load(dst)
++ mappings[src[1:]] = yaml.safe_load(dst)
+ return mappings
+ except Exception as e:
+ raise rospy.exceptions.ROSInitException("invalid command-line parameters: %s"%(str(e)))
diff --git a/dev-ros/rospy/rospy-1.13.1.ebuild b/dev-ros/rospy/rospy-1.13.1.ebuild
deleted file mode 100644
index 86a76ec40b17..000000000000
--- a/dev-ros/rospy/rospy-1.13.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roscpp[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- ros-catkin_src_install
- # Other tests need these nodes
- exeinto /usr/share/${PN}
- doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.13.2.ebuild b/dev-ros/rospy/rospy-1.13.2.ebuild
deleted file mode 100644
index 86a76ec40b17..000000000000
--- a/dev-ros/rospy/rospy-1.13.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roscpp[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- ros-catkin_src_install
- # Other tests need these nodes
- exeinto /usr/share/${PN}
- doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.13.4.ebuild b/dev-ros/rospy/rospy-1.13.4.ebuild
deleted file mode 100644
index 86a76ec40b17..000000000000
--- a/dev-ros/rospy/rospy-1.13.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roscpp[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- ros-catkin_src_install
- # Other tests need these nodes
- exeinto /usr/share/${PN}
- doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.13.5.ebuild b/dev-ros/rospy/rospy-1.13.5.ebuild
deleted file mode 100644
index 86a76ec40b17..000000000000
--- a/dev-ros/rospy/rospy-1.13.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roscpp[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- ros-catkin_src_install
- # Other tests need these nodes
- exeinto /usr/share/${PN}
- doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.13.6.ebuild b/dev-ros/rospy/rospy-1.13.6.ebuild
deleted file mode 100644
index 86a76ec40b17..000000000000
--- a/dev-ros/rospy/rospy-1.13.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roscpp[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- ros-catkin_src_install
- # Other tests need these nodes
- exeinto /usr/share/${PN}
- doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.14.2.ebuild b/dev-ros/rospy/rospy-1.14.2.ebuild
deleted file mode 100644
index 86a76ec40b17..000000000000
--- a/dev-ros/rospy/rospy-1.14.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roscpp[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- ros-catkin_src_install
- # Other tests need these nodes
- exeinto /usr/share/${PN}
- doexe test_nodes/*
-}
diff --git a/dev-ros/rospy/rospy-1.13.0.ebuild b/dev-ros/rospy/rospy-1.14.3-r1.ebuild
index 86a76ec40b17..b82942391322 100644
--- a/dev-ros/rospy/rospy-1.13.0.ebuild
+++ b/dev-ros/rospy/rospy-1.14.3-r1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/yaml.patch" )
src_install() {
ros-catkin_src_install
diff --git a/dev-ros/rospy/rospy-1.14.3.ebuild b/dev-ros/rospy/rospy-1.14.3.ebuild
deleted file mode 100644
index 86a76ec40b17..000000000000
--- a/dev-ros/rospy/rospy-1.14.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python client library for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roscpp[${PYTHON_USEDEP}]
- dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- ros-catkin_src_install
- # Other tests need these nodes
- exeinto /usr/share/${PN}
- doexe test_nodes/*
-}
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index 7fb2cc40b7d0..59a11cfa76fb 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,18 +1,5 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 2657 BLAKE2B 16f9cc5cafd8306d06f64370bf334f68038e3b2e7feb6d48110cdddb12e00fb27b8f36492bd6ddca8eb0902da727d371266b3cd65440c82c3b9785c9823e1ad3 SHA512 3b71ccb1b3579bb16c86a0dbbc0708e7417461a91b31d1ab166ed38a3e75f117df355d91d9c1644d9c5da19c29b61ea208e6eed31ae6dfdd74bc6f057b0c1908
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosservice-1.13.0.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.1.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.2.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.4.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.5.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.13.6.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.14.2.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
-EBUILD rosservice-1.14.3.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
+EBUILD rosservice-1.14.3-r1.ebuild 569 BLAKE2B 6f14e98a38f340d36f2103cf1741a82ba3045bdaa6eb43fd572a88089d230c0b5b12b4f55324483896cd2206aa2aa185dd86f7b0930a6de448b923f14ebe275d SHA512 34831de6a2ccbb552cd4a984d4c779d512db1839b2f9e7179b9dcad9e63aaf07bf4b1f68c5290ae5963ccccb621c8ad090ce0ef1c74432991b0b68cc42e541c1
EBUILD rosservice-9999.ebuild 532 BLAKE2B 16a162684fb8b8648b814dbb03c968941d2d2674e83028f0cb7986d5b8de97920e5c0791a378b715779649ac5c34493f219a136dca812c3bf33a95cd23cba548 SHA512 483b05bd74f46c167c45862eaccfb22cf2076db719add97e12b081c4c018e507dc3208d93bcb835422e4d13bb09c99325cd3ad2539385e4494b7f73042eeda82
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosservice/files/yaml.patch b/dev-ros/rosservice/files/yaml.patch
new file mode 100644
index 000000000000..f5dfcd3553fe
--- /dev/null
+++ b/dev-ros/rosservice/files/yaml.patch
@@ -0,0 +1,62 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/tools/rosservice/src/rosservice/__init__.py b/tools/rosservice/src/rosservice/__init__.py
+index 6d58807a4..e6c41a73d 100644
+--- a/tools/rosservice/src/rosservice/__init__.py
++++ b/tools/rosservice/src/rosservice/__init__.py
+@@ -607,7 +607,7 @@ def _rosservice_cmd_call(argv):
+ # convert empty args to YAML-empty strings
+ if arg == '':
+ arg = "''"
+- service_args.append(yaml.load(arg))
++ service_args.append(yaml.safe_load(arg))
+ if not service_args and has_service_args(service_name, service_class=service_class):
+ if sys.stdin.isatty():
+ parser.error("Please specify service arguments")
+@@ -650,7 +650,7 @@ def _stdin_yaml_arg():
+ elif arg.strip() != '---':
+ buff = buff + arg
+ try:
+- loaded = yaml.load(buff.rstrip())
++ loaded = yaml.safe_load(buff.rstrip())
+ except Exception as e:
+ print("Invalid YAML: %s"%str(e), file=sys.stderr)
+ if loaded is not None:
diff --git a/dev-ros/rosservice/rosservice-1.13.1.ebuild b/dev-ros/rosservice/rosservice-1.13.1.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.2.ebuild b/dev-ros/rosservice/rosservice-1.13.2.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.4.ebuild b/dev-ros/rosservice/rosservice-1.13.4.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.5.ebuild b/dev-ros/rosservice/rosservice-1.13.5.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.6.ebuild b/dev-ros/rosservice/rosservice-1.13.6.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.13.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.14.2.ebuild b/dev-ros/rosservice/rosservice-1.14.2.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.14.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/rosservice-1.13.0.ebuild b/dev-ros/rosservice/rosservice-1.14.3-r1.ebuild
index 6372e787748f..ae68b95f7321 100644
--- a/dev-ros/rosservice/rosservice-1.13.0.ebuild
+++ b/dev-ros/rosservice/rosservice-1.14.3-r1.ebuild
@@ -22,3 +22,4 @@ RDEPEND="
dev-ros/rosmsg[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rosservice/rosservice-1.14.3.ebuild b/dev-ros/rosservice/rosservice-1.14.3.ebuild
deleted file mode 100644
index 6372e787748f..000000000000
--- a/dev-ros/rosservice/rosservice-1.14.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for listing and querying ROS Services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rosmsg[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostime/Manifest b/dev-ros/rostime/Manifest
index 5ca0b901a8b9..f3633182f66e 100644
--- a/dev-ros/rostime/Manifest
+++ b/dev-ros/rostime/Manifest
@@ -5,6 +5,7 @@ DIST roscpp_core-0.6.1.tar.gz 32611 BLAKE2B 387e17dfdc87af8880ee7b17c99e43558023
DIST roscpp_core-0.6.10.tar.gz 35139 BLAKE2B 2f95e27d2986e777b65964959e0b94f2e3a01f055c781375718decfbb149c998713400d2e78f03e4983f5b303a3610a2e14ae049bf518608cc582c542c912bcd SHA512 a485f6cd536850002def9cf331a593c8d2b7406eb7235dbb6da8d571ce337e0d588adc61e0fb1dbc82b867cadf5ec9905e8966c018489bbec7eea738b2a4de1b
DIST roscpp_core-0.6.11.tar.gz 35153 BLAKE2B 2e13d5100851a0882b2027f7a7b7f4a6c7e8e74fb7ea01bd46ce32daf4a8791fc15f8757dc7298832cca5d0e7389c4702ae9dabcffe1f24902f9b6252a08c47f SHA512 a7d0b6148e0e284b95d12accdb06cba7ab0e7367ee0a88fff4e686af2a065cd92574fd8ec724599e23f5fdd13af5d1b084a453bdd10871e1539f2f7769b92e23
DIST roscpp_core-0.6.12.tar.gz 35606 BLAKE2B 5f249ce576e046b487a12fc1d598429741329b57f4226a6a0fa7b62e0a5a6fa0716814e0c8cd8a4d4378f8994ca1534530d410a8865d666397328047f12f821d SHA512 a84799ee67cf205c9c304433f70aaf80c8f19eac86bc0c9c3207aa0ae255f33b302b4ad9e37feeb5d95d7e2db9210679871548313612f220e06fef3db2357f89
+DIST roscpp_core-0.6.13.tar.gz 35881 BLAKE2B f1eee242ecbda14de4d1b4f92c4552b249398eea0216300933e0ea73d86bce970e7db375b23d5ecb023e8a8a2e75baec8b7c0a935647143f1ff2a1eaf0bcbd5b SHA512 7d81371c383b8b2ae8d31731f21213ac2c5c4d47ed038890214c9da527f27149ce1deeda4a5e67adaabbfb7ff4a6edc53495cfa50625eeb94089eb7615850d2c
DIST roscpp_core-0.6.2.tar.gz 32730 BLAKE2B db7bbdf9252a821fe65e20cc81f01b5b55aff5bc2729664a150a6213636190201d059a0dfd25a0d523bb1fd1d6655d69b6cf7deb88845edafcd176c593d10fa2 SHA512 34e5442648fed7cebf694480d40825d4e5b1791409741b0a13aad7daa0d7f5190d6509d73780ba4e02620f789f9b0c7474b97772abba1dbea3bee98fe8d1ae59
DIST roscpp_core-0.6.3.tar.gz 33419 BLAKE2B b2b44b6f696f200aab52f267ba4defb5ae54db7af61eed7c69046da2fdf6d68c5713f2b0ca9e4e4e36634597ecb2e501b29d7b96d825713be9533401940d9862 SHA512 2e512d26c29ffc3d7d4431f6153d273ddf26334390c972c9a95bca97536102e1a03ae82369d4804de31854df7ad471eb60c5a97c47465611c76562c083ce7c7d
DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d83c82c9991d583fcaa7e49d3679c2f9eaa6efb1a8b1b5b44718ac80bde66a7931fb6e616394e0e33c5674ac710de4 SHA512 134d3bc1a928416e6fa6afdbcedb83fa546a47d2ead407d5c6e82275d4b3a21a228813d84bb17a23b071d6cd88dc4f53f670e9f1971e28049b97b56167c93217
@@ -19,6 +20,7 @@ EBUILD rostime-0.6.1.ebuild 429 BLAKE2B cc3affe89fc8cc3d6166feddede76c4062ed16d3
EBUILD rostime-0.6.10.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
EBUILD rostime-0.6.11.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
EBUILD rostime-0.6.12.ebuild 426 BLAKE2B f05fbd8bd09bab22104de90c3a5c44f6b57d8006bc8520e9c4916901837d7ff91234b388f7883772ad7dcce06849919f1e1705d78b4139572e7509fbb2d7bb06 SHA512 c4c109836cbe0146a3c17265ca1ef058e644164ecc4ac1b3d08dad07d5c368fb5420166f4f60782155bbe97e1177d941dac8ad9399988c23c41bc23fd3f5d9ed
+EBUILD rostime-0.6.13.ebuild 426 BLAKE2B f05fbd8bd09bab22104de90c3a5c44f6b57d8006bc8520e9c4916901837d7ff91234b388f7883772ad7dcce06849919f1e1705d78b4139572e7509fbb2d7bb06 SHA512 c4c109836cbe0146a3c17265ca1ef058e644164ecc4ac1b3d08dad07d5c368fb5420166f4f60782155bbe97e1177d941dac8ad9399988c23c41bc23fd3f5d9ed
EBUILD rostime-0.6.2.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
EBUILD rostime-0.6.3.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
EBUILD rostime-0.6.4.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
diff --git a/dev-ros/rostime/rostime-0.6.13.ebuild b/dev-ros/rostime/rostime-0.6.13.ebuild
new file mode 100644
index 000000000000..70aeab4aa2c0
--- /dev/null
+++ b/dev-ros/rostime/rostime-0.6.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Time and Duration implementations for C++ libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/cpp_common
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index 8da9eebafc5f..1bdfc8437e09 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,18 +1,6 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX py3.patch 4958 BLAKE2B c441bee4b3ae1095b32aecb9618120d41d2cda53062ba4ce7c85f539840be27ed035a4f3da87f643217a650c1766b6b9c94f48d44116a753ddc6ab44a5a0fd43 SHA512 b576a41c69680df1a388b30b3588ef0a94609b6338820a08deaa2ed3f29b05816bbb68db256cb843ae394f12723674a485e1b933caa2a19729a3c610de5c8345
+AUX yaml.patch 2816 BLAKE2B ecd4c4047f009dcc9c2417efa8a2233220dc002ede217beee75f88af111b1bab26423aba8796027f60e73887c0926e5099fa9db114b8a7f5144e25a5acf04789 SHA512 f3d197fec12c9df46eb488398c3149c36f0b7581a2a2c7ae7052bc0c37ed27302405b1aba81a140463ffe52fd8a9f65789371bbb697e0d09867b0ca02ce35340
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rostopic-1.13.0.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.1.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.2.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.4.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.5.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.6.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.14.2.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.14.3.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
+EBUILD rostopic-1.14.3-r1.ebuild 620 BLAKE2B ec9207dee43c1fe77fedcb6571e8ebd264cf425e25b0dcb3140f52fc479a962fd5604075b793bfb7e5ea89a069cedb7434a67ffcd46945bb55f76d383c8761d9 SHA512 eab5569f7be770b6f1908d2eb7ac649fe2ebb82edba1c5b2aea154f96f3aec3520a5292edd64db6c8e915e53891a4543c18b8e1b7128389c7be6cdb7d09428f3
EBUILD rostopic-9999.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostopic/files/py3.patch b/dev-ros/rostopic/files/py3.patch
new file mode 100644
index 000000000000..51f5da5aa778
--- /dev/null
+++ b/dev-ros/rostopic/files/py3.patch
@@ -0,0 +1,89 @@
+From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 16:06:51 -0700
+Subject: [PATCH] more Python 3 compatibility (#1783)
+
+---
+ test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ .../test/test_roslogging_user_logger.py | 8 +++-
+ tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
+ tools/rosmsg/src/rosmsg/__init__.py | 2 +-
+ tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
+ .../test/test_rosmsgproto_command_line.py | 20 ++++----
+ .../test_rostopic_command_line_offline.py | 44 +++++++++---------
+ 8 files changed, 67 insertions(+), 63 deletions(-)
+
+diff --git a/tools/rostopic/test/test_rostopic_command_line_offline.py b/tools/rostopic/test/test_rostopic_command_line_offline.py
+index 5dab1ad16..37a81faaa 100644
+--- a/tools/rostopic/test/test_rostopic_command_line_offline.py
++++ b/tools/rostopic/test/test_rostopic_command_line_offline.py
+@@ -48,9 +48,9 @@ def test_cmd_help(self):
+ cmd = 'rostopic'
+
+ sub = ['bw', 'echo', 'hz', 'delay', 'info', 'list', 'pub', 'type','find']
+- output = Popen([cmd], stdout=PIPE).communicate()[0]
++ output = Popen([cmd], stdout=PIPE).communicate()[0].decode()
+ self.assert_('Commands' in output)
+- output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0]
++ output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0].decode()
+ self.assert_('Commands' in output)
+ # make sure all the commands are in the usage
+ for c in sub:
+@@ -59,16 +59,16 @@ def test_cmd_help(self):
+
+ for c in sub:
+ output = Popen([cmd, c, '-h'], stdout=PIPE, stderr=PIPE).communicate()
+- self.assert_("usage:" in output[0].lower(), output)
++ self.assert_("usage:" in output[0].decode().lower(), output)
+ # make sure usage refers to the command
+- self.assert_("%s %s"%(cmd, c) in output[0], output)
++ self.assert_("%s %s"%(cmd, c) in output[0].decode(), output)
+
+ # test no args on commands that require args
+ for c in ['bw', 'echo', 'hz', 'delay', 'info', 'pub', 'type', 'find']:
+ output = Popen([cmd, c], stdout=PIPE, stderr=PIPE).communicate()
+- self.assert_("usage:" in output[0].lower() or "usage:" in output[1].lower(), output)
++ self.assert_("usage:" in output[0].decode().lower() or "usage:" in output[1].decode().lower(), output)
+ # make sure usage refers to the command
+- self.assert_("%s %s"%(cmd, c) in output[1], output)
++ self.assert_("%s %s"%(cmd, c) in output[1].decode(), output)
+
+ def test_offline(self):
+ cmd = 'rostopic'
+@@ -80,19 +80,19 @@ def test_offline(self):
+
+ msg = "ERROR: Unable to communicate with master!\n"
+
+- output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate()
+- self.assert_(output[1].endswith(msg))
+- output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate()
+- self.assert_(output[1].endswith(msg))
+- output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate()
+- self.assert_(output[1].endswith(msg))
+- output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate()
+- self.assert_(output[1].endswith(msg))
+- output = Popen([cmd, 'list'], **kwds).communicate()
+- self.assert_(output[1].endswith(msg))
+- output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate()
+- self.assert_(output[1].endswith(msg))
+- output = Popen([cmd, 'type', 'chatter'], **kwds).communicate()
+- self.assert_(output[1].endswith(msg))
+- output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate()
+- self.assert_(output[1].endswith(msg))
++ output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate()[1].decode()
++ self.assert_(output.endswith(msg))
++ output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate()[1].decode()
++ self.assert_(output.endswith(msg))
++ output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate()[1].decode()
++ self.assert_(output.endswith(msg))
++ output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate()[1].decode()
++ self.assert_(output.endswith(msg))
++ output = Popen([cmd, 'list'], **kwds).communicate()[1].decode()
++ self.assert_(output.endswith(msg))
++ output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate()[1].decode()
++ self.assert_(output.endswith(msg))
++ output = Popen([cmd, 'type', 'chatter'], **kwds).communicate()[1].decode()
++ self.assert_(output.endswith(msg))
++ output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate()[1].decode()
++ self.assert_(output.endswith(msg))
diff --git a/dev-ros/rostopic/files/yaml.patch b/dev-ros/rostopic/files/yaml.patch
new file mode 100644
index 000000000000..e96337b50546
--- /dev/null
+++ b/dev-ros/rostopic/files/yaml.patch
@@ -0,0 +1,71 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/tools/rostopic/src/rostopic/__init__.py b/tools/rostopic/src/rostopic/__init__.py
+index ad244b0f0..41138562e 100644
+--- a/tools/rostopic/src/rostopic/__init__.py
++++ b/tools/rostopic/src/rostopic/__init__.py
+@@ -1779,7 +1779,7 @@ def _rostopic_cmd_pub(argv):
+ try:
+ pub_args = []
+ for arg in args[2:]:
+- pub_args.append(yaml.load(arg))
++ pub_args.append(yaml.safe_load(arg))
+ except Exception as e:
+ parser.error("Argument error: "+str(e))
+
+@@ -1822,7 +1822,7 @@ def bagy_iter():
+ try:
+ with open(filename, 'r') as f:
+ # load all documents
+- data = yaml.load_all(f)
++ data = yaml.safe_load_all(f)
+ for d in data:
+ yield [d]
+ except yaml.YAMLError as e:
+@@ -2014,7 +2014,7 @@ def stdin_yaml_arg():
+
+ if arg.strip() == '---': # End of document
+ try:
+- loaded = yaml.load(buff.rstrip())
++ loaded = yaml.safe_load(buff.rstrip())
+ except Exception as e:
+ sys.stderr.write("Invalid YAML: %s\n"%str(e))
+ if loaded is not None:
diff --git a/dev-ros/rostopic/rostopic-1.13.1.ebuild b/dev-ros/rostopic/rostopic-1.13.1.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.2.ebuild b/dev-ros/rostopic/rostopic-1.13.2.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.4.ebuild b/dev-ros/rostopic/rostopic-1.13.4.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.5.ebuild b/dev-ros/rostopic/rostopic-1.13.5.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.6.ebuild b/dev-ros/rostopic/rostopic-1.13.6.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/rostopic/rostopic-1.14.2.ebuild b/dev-ros/rostopic/rostopic-1.14.2.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.14.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.0.ebuild b/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild
index bc869fd3fbe8..db7295a22db1 100644
--- a/dev-ros/rostopic/rostopic-1.13.0.ebuild
+++ b/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild
@@ -25,3 +25,4 @@ DEPEND="${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
)
"
+PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/rostopic/rostopic-1.14.3.ebuild b/dev-ros/rostopic/rostopic-1.14.3.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.14.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/rosunit/Manifest b/dev-ros/rosunit/Manifest
index 399c8f968d31..09bb873d833d 100644
--- a/dev-ros/rosunit/Manifest
+++ b/dev-ros/rosunit/Manifest
@@ -4,11 +4,13 @@ DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2
DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
DIST ros-1.14.4.tar.gz 166818 BLAKE2B cbe56006ba8e318a9b94e67ea2035b209d206b6f2783c9a923c227ad92f932879a14d08cb076168159a5eb190e82e3375a70474ffae6305887086f8c0aaf3599 SHA512 ba6a25b5aae6786a9033ada747293b10e5aab2cf55b68fd8f40090f13dac7615b332993201795d6dac729dce0dcc4438df22f520bdca16c5ed127ad33eca1e9c
DIST ros-1.14.6.tar.gz 174375 BLAKE2B bb3c7b60c1d89ff2b219802c60fbb39ad54cb15250f6c17ef27f64a66e148bbf8da5b836ff38f0a83cf3e2fa3615ce298ef888c95607f6f33d8511a1bb04e6a5 SHA512 f30f33553aeae267b608b705b4e8b2502260ed47e3461c36da265318b5d78369a857e3fb67fc55f20f2dd9010bac6eda213bbe0442a142fbe223ebf34a48ea38
+DIST ros-1.14.7.tar.gz 175854 BLAKE2B 713ad5036a14a27556c9cc68f12b737562148f786c5d5ac32ba8328a05d63df3154222762af1fba7db34b11123a2cdc6f3a23770f9ddf1f30a7d14ef47a26ecc SHA512 b4ea471586630754c5d212ec32c5d5d20b4bb25b707c69249bf976384eb23ad6e2fa95906167ce48c916ca4ab12747a031184073c70fe6986efcc3258a1f5498
EBUILD rosunit-1.14.0.ebuild 493 BLAKE2B 30da91eefea4b6b107ebdf48e81e98608327c07442298f803259bba8af7c0e1bcfdae3ecfb0efa7e30f72e1e7281cf2377add029da38f559b70dc3683cfde451 SHA512 a78e6610e2b59573b8470559f5b7106ab2c053492fd77a86f5fbe23e2551536e2e1571153a2e0b00aea58da545a74e62f94958b660e7c5156fde9854e069f5d3
EBUILD rosunit-1.14.1.ebuild 493 BLAKE2B 30da91eefea4b6b107ebdf48e81e98608327c07442298f803259bba8af7c0e1bcfdae3ecfb0efa7e30f72e1e7281cf2377add029da38f559b70dc3683cfde451 SHA512 a78e6610e2b59573b8470559f5b7106ab2c053492fd77a86f5fbe23e2551536e2e1571153a2e0b00aea58da545a74e62f94958b660e7c5156fde9854e069f5d3
EBUILD rosunit-1.14.2.ebuild 493 BLAKE2B 30da91eefea4b6b107ebdf48e81e98608327c07442298f803259bba8af7c0e1bcfdae3ecfb0efa7e30f72e1e7281cf2377add029da38f559b70dc3683cfde451 SHA512 a78e6610e2b59573b8470559f5b7106ab2c053492fd77a86f5fbe23e2551536e2e1571153a2e0b00aea58da545a74e62f94958b660e7c5156fde9854e069f5d3
EBUILD rosunit-1.14.3.ebuild 493 BLAKE2B 30da91eefea4b6b107ebdf48e81e98608327c07442298f803259bba8af7c0e1bcfdae3ecfb0efa7e30f72e1e7281cf2377add029da38f559b70dc3683cfde451 SHA512 a78e6610e2b59573b8470559f5b7106ab2c053492fd77a86f5fbe23e2551536e2e1571153a2e0b00aea58da545a74e62f94958b660e7c5156fde9854e069f5d3
EBUILD rosunit-1.14.4.ebuild 493 BLAKE2B 30da91eefea4b6b107ebdf48e81e98608327c07442298f803259bba8af7c0e1bcfdae3ecfb0efa7e30f72e1e7281cf2377add029da38f559b70dc3683cfde451 SHA512 a78e6610e2b59573b8470559f5b7106ab2c053492fd77a86f5fbe23e2551536e2e1571153a2e0b00aea58da545a74e62f94958b660e7c5156fde9854e069f5d3
EBUILD rosunit-1.14.6.ebuild 493 BLAKE2B 30da91eefea4b6b107ebdf48e81e98608327c07442298f803259bba8af7c0e1bcfdae3ecfb0efa7e30f72e1e7281cf2377add029da38f559b70dc3683cfde451 SHA512 a78e6610e2b59573b8470559f5b7106ab2c053492fd77a86f5fbe23e2551536e2e1571153a2e0b00aea58da545a74e62f94958b660e7c5156fde9854e069f5d3
+EBUILD rosunit-1.14.7.ebuild 493 BLAKE2B 30da91eefea4b6b107ebdf48e81e98608327c07442298f803259bba8af7c0e1bcfdae3ecfb0efa7e30f72e1e7281cf2377add029da38f559b70dc3683cfde451 SHA512 a78e6610e2b59573b8470559f5b7106ab2c053492fd77a86f5fbe23e2551536e2e1571153a2e0b00aea58da545a74e62f94958b660e7c5156fde9854e069f5d3
EBUILD rosunit-9999.ebuild 493 BLAKE2B 30da91eefea4b6b107ebdf48e81e98608327c07442298f803259bba8af7c0e1bcfdae3ecfb0efa7e30f72e1e7281cf2377add029da38f559b70dc3683cfde451 SHA512 a78e6610e2b59573b8470559f5b7106ab2c053492fd77a86f5fbe23e2551536e2e1571153a2e0b00aea58da545a74e62f94958b660e7c5156fde9854e069f5d3
MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roscreate/roscreate-1.14.3.ebuild b/dev-ros/rosunit/rosunit-1.14.7.ebuild
index 84f7953b46b4..af7d4b220e08 100644
--- a/dev-ros/roscreate/roscreate-1.14.3.ebuild
+++ b/dev-ros/rosunit/rosunit-1.14.7.ebuild
@@ -5,19 +5,20 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/ros"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
ROS_SUBDIR=tools/${PN}
inherit ros-catkin
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
+DESCRIPTION="Unit-testing package for ROS"
LICENSE="BSD"
SLOT="0"
IUSE=""
RDEPEND="
dev-python/rospkg[${PYTHON_USEDEP}]
- dev-ros/roslib[${PYTHON_USEDEP}]"
+ dev-ros/roslib[${PYTHON_USEDEP}]
+"
DEPEND="${RDEPEND}
test? ( dev-python/nose[${PYTHON_USEDEP}] )
"
diff --git a/dev-ros/rotate_recovery/Manifest b/dev-ros/rotate_recovery/Manifest
index fae7998f5e95..262a544c7e5f 100644
--- a/dev-ros/rotate_recovery/Manifest
+++ b/dev-ros/rotate_recovery/Manifest
@@ -1,6 +1,8 @@
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD rotate_recovery-1.16.1.ebuild 619 BLAKE2B 5723dbe95ee96665120dbcb68cd68c695ac184ba7385f1c807d275c0a942c5dff6f4718c41273e9a443d393b799065dea6908e204b595954cddc43e0704a1595 SHA512 90d51fe0c9b43cbfa3c346d409ec5b7e1fd86e405fb0696c9be1d577a799d60264cb4db8ff9bed3f92b3ac8e9d299143cd56c651f4ae23452583f665c444a20c
EBUILD rotate_recovery-1.16.2.ebuild 760 BLAKE2B 2e5378e83e91a8c6cc30e86a00eb8e1990da41cc6bed2afa1504e881c4a610e585d0de77c79ded7272870676e63c646531ebac94579e52b1d7199792312807d7 SHA512 d3fea07c581de06f3c5febd5ed6f37ce3d266cb0bc277311f371d65f42082354ae053813fd0c73993466b693e70420c8bccf01550a40b46c5663a0de45ae0092
+EBUILD rotate_recovery-1.16.3.ebuild 757 BLAKE2B 5e676f5defb57ac17ca8b9ad741cc39100b9a83ced4dbec8246ee3c01f33c10cdfba4af61b8d273daa4e7242963de6b1570cd249baf308b653f152b7cfb55a54 SHA512 e753f0085a148e0ef59f522b3b1ea8f56c2472756c95aaa1520cfccc47c2e2dc721adacf3327e73a351e307abe16c2dbe9c756bbd4b4cb3c5f8cda060fd86145
EBUILD rotate_recovery-9999.ebuild 760 BLAKE2B 2e5378e83e91a8c6cc30e86a00eb8e1990da41cc6bed2afa1504e881c4a610e585d0de77c79ded7272870676e63c646531ebac94579e52b1d7199792312807d7 SHA512 d3fea07c581de06f3c5febd5ed6f37ce3d266cb0bc277311f371d65f42082354ae053813fd0c73993466b693e70420c8bccf01550a40b46c5663a0de45ae0092
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.16.3.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.16.3.ebuild
new file mode 100644
index 000000000000..cb2089298da7
--- /dev/null
+++ b/dev-ros/rotate_recovery/rotate_recovery-1.16.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/angles
+ dev-ros/base_local_planner
+ dev-ros/costmap_2d
+ dev-cpp/eigen:3
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ >=dev-ros/nav_core-1.16
+ dev-ros/pluginlib
+ dev-ros/roscpp
+ dev-ros/tf2
+ dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_ros
+
+ dev-libs/boost:=
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+ dev-ros/cmake_modules"
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 218fd42bf8ca..3fd4c21d3d5d 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,6 +1,8 @@
DIST rviz-1.13.1.tar.gz 5094089 BLAKE2B 7f4c106bf51b2465177107f5eb19602323045423b3ee5149f70b177170af9eea1cea0d4069f859c3c9bf3a2bdbe7feb91b802c758a66f6b990bd890b124d2a52 SHA512 cace4d41341647a8e4d5ab3be64ca71a4b41134a15a4df8556f35824c550c5fb7024f7338d0ffac1ea9c7f574c10757b773a8df37625d6e616eafdcd7f0aab09
DIST rviz-1.13.3.tar.gz 5085813 BLAKE2B da1f12c1ab9e7306bcd5762311948f0e4af355c80b1f0ffac521c64e62250c11c48f52659c187137c27209616a7564086bc84a3cc81f88ded2c6d3c65847774b SHA512 90d319342e16735629a3aa8229b0f8b55b6b8f863fba719aeed0a6b06cee5fd269dc852b4bfa861422b44840d57e8030c98da09b046a378a36fdac58f5782f96
+DIST rviz-1.13.6.tar.gz 5096543 BLAKE2B f51750803ca2e133dd225de5b28bf3730b89fd6df9650b662fdbf9ab28551eaadbbd8bab50fd17e8a980702fc9d162ea41b1a3319c14309fdcb15714b8103e3c SHA512 d9f462cf25cc1386a6bfad4dee27e6963ba15e3714f7556df6f79db7eeaa1b43f60461630e6e8d354fd0c56755b7a2b8b38d98fcee4343dd30559a771b0cd157
EBUILD rviz-1.13.1-r1.ebuild 1681 BLAKE2B ce51638542b6abbebb13d647552646d5e8cd797845a386a347733acc02ab585d451e0fcfff19a7d798e99f79e37238751167d2331b83bc89ec03e76e56ca9a39 SHA512 19569262319e122cc37f572429315302b31da5b5f7de520cd9b60c8841fbdc617aaae0ff25d1e0b6dd9b007e0d49e735cd5ddded586efb4750d6a87c3e211f34
EBUILD rviz-1.13.3.ebuild 1678 BLAKE2B 0fa86998b709d83a21be63fdde597107e54be94487d98a6b58be8768be50fa17804c4ee2a3d44e0b8a546d0e7519da9951138e6dee7ff1ee2ab7bf012d917563 SHA512 e9bcd8aa8a72010f34b439b273fd367a53af0c743b7e80f817be2bbbff551310411793badc7b194ca18630694b04000f430abe5f0d9726df8685215dfccf28c4
-EBUILD rviz-9999.ebuild 1681 BLAKE2B ce51638542b6abbebb13d647552646d5e8cd797845a386a347733acc02ab585d451e0fcfff19a7d798e99f79e37238751167d2331b83bc89ec03e76e56ca9a39 SHA512 19569262319e122cc37f572429315302b31da5b5f7de520cd9b60c8841fbdc617aaae0ff25d1e0b6dd9b007e0d49e735cd5ddded586efb4750d6a87c3e211f34
+EBUILD rviz-1.13.6.ebuild 1730 BLAKE2B 0c376a9574f637050337c23c476785ec06768876a505c076afa2351b3e2526d62b113e1f31079a2f41df01fb3a8a958c79f139f03f1c77ebc89641382bc7de43 SHA512 d1aacd39332373f9cdde1ae3e0ec045e7359f5d792eab7ed78cffd4c98851e8e2840b9157684510a0e37f2640c89663386dc6e368da0970cd64cd89cf7862fea
+EBUILD rviz-9999.ebuild 1730 BLAKE2B 0c376a9574f637050337c23c476785ec06768876a505c076afa2351b3e2526d62b113e1f31079a2f41df01fb3a8a958c79f139f03f1c77ebc89641382bc7de43 SHA512 d1aacd39332373f9cdde1ae3e0ec045e7359f5d792eab7ed78cffd4c98851e8e2840b9157684510a0e37f2640c89663386dc6e368da0970cd64cd89cf7862fea
MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.13.6.ebuild b/dev-ros/rviz/rviz-1.13.6.ebuild
new file mode 100644
index 000000000000..358973db8678
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.13.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/rviz"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin virtualx
+
+DESCRIPTION="3D visualization tool for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ media-libs/assimp
+ <dev-games/ogre-1.10:=
+ virtual/opengl
+ dev-qt/qtwidgets:5
+ dev-qt/qtcore:5
+ dev-qt/qtopengl:5
+ dev-cpp/eigen:3
+ dev-cpp/yaml-cpp:=
+ dev-libs/urdfdom:=
+ dev-libs/tinyxml2:=
+
+ dev-ros/angles
+ dev-ros/image_geometry
+ dev-ros/image_transport
+ dev-ros/interactive_markers
+ dev-ros/laser_geometry
+ dev-ros/message_filters
+ dev-ros/pluginlib
+ >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+ dev-ros/resource_retriever
+ dev-ros/rosbag[${PYTHON_USEDEP}]
+ dev-ros/rosconsole
+ dev-libs/console_bridge:=
+ dev-ros/roscpp
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf
+ dev-ros/urdf
+ dev-ros/media_export
+
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-ros/cmake_modules
+ virtual/pkgconfig
+ test? (
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-cpp/gtest
+ )"
+
+src_configure() {
+ local mycatkincmakeargs=( "-DUseQt5=ON" )
+ ros-catkin_src_configure
+}
+
+src_test() {
+ virtx ros-catkin_src_test
+}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 46cc11490699..358973db8678 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ ROS_REPO_URI="https://github.com/ros-visualization/rviz"
KEYWORDS="~amd64"
PYTHON_COMPAT=( python2_7 )
-inherit ros-catkin
+inherit ros-catkin virtualx
DESCRIPTION="3D visualization tool for ROS"
LICENSE="BSD"
@@ -66,3 +66,7 @@ src_configure() {
local mycatkincmakeargs=( "-DUseQt5=ON" )
ros-catkin_src_configure
}
+
+src_test() {
+ virtx ros-catkin_src_test
+}
diff --git a/dev-ros/stereo_image_proc/Manifest b/dev-ros/stereo_image_proc/Manifest
index 891ef1518fca..9015839bec67 100644
--- a/dev-ros/stereo_image_proc/Manifest
+++ b/dev-ros/stereo_image_proc/Manifest
@@ -1,6 +1,8 @@
DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
+DIST image_pipeline-1.13.0.tar.gz 143194 BLAKE2B 618f95271196e37126f158e3454ffb81b1543af1fd87db281f6b8ec00bcf37a812139063318b576c7d39cde7828fc45e3caec24fcbb3e6b4a047d16907427ad2 SHA512 91aeb8e7a14090679e639a65de434c51e8d67f9a9c53bde69f9a5b4f3ae64e5fb1470baf5d2ba33debd2f46cd1699cf69bec53ef2160ea405c46c0e19bb3c3af
EBUILD stereo_image_proc-1.12.22-r1.ebuild 747 BLAKE2B c261006449b87dafd168ab81b5cd5391beffa44bd3a276ae50fbf2554865fa28d1abe945b3ba6a206ac46653d2371d0e9be37a864c705becabdde5a0fe8f8760 SHA512 d566dfb75d9bddff8a6b3cf18a79cb067469720bdc0206495e5b14e0ff2ec9460e973970d08a97c14915760eac924cc1ceddc0ca089b391812b7176453bae3a6
EBUILD stereo_image_proc-1.12.23.ebuild 747 BLAKE2B e1b45ffc21bfdc2a06f87bfdd71de506b8379b6b17b6ee4b3d0fcb7b89e31346e955174698ba037f8de2adfee5f1df0db8221b408954be1a2b9106f1f8dcaba4 SHA512 1e0e9a8373864a500588ec2e78e76400fc8b39b8af80644e4392f75a6c05c56a12d3ccd2c6aef96c6679d2e0873a45ac13f4c92d0e269312a714eae245c05088
+EBUILD stereo_image_proc-1.13.0.ebuild 744 BLAKE2B a723f23aa38a6cb34c99d2ad820d4250d6d6d19319d4a6dcaf75739b308d56e7b5780d091761d95a9e2705af81caafeabddc327c49d5b69220a136f8bd0d2571 SHA512 d5de26a40f7f11feed5ef9f0cf3900c3997822bdb32bb89195ce74d1f2a32a73f8b91579b68d62999cc43db69ea5e4cedb34eae593ccb1482fdbff92192e2e09
EBUILD stereo_image_proc-9999.ebuild 747 BLAKE2B c261006449b87dafd168ab81b5cd5391beffa44bd3a276ae50fbf2554865fa28d1abe945b3ba6a206ac46653d2371d0e9be37a864c705becabdde5a0fe8f8760 SHA512 d566dfb75d9bddff8a6b3cf18a79cb067469720bdc0206495e5b14e0ff2ec9460e973970d08a97c14915760eac924cc1ceddc0ca089b391812b7176453bae3a6
MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild
new file mode 100644
index 000000000000..7b954876330c
--- /dev/null
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-1.13.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Stereo and single image rectification and disparity processing"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/cv_bridge
+ dev-ros/dynamic_reconfigure
+ dev-ros/image_geometry
+ dev-ros/image_proc
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ media-libs/opencv:=
+ dev-libs/boost:=[threads]
+ dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
index 7057537ba5a7..0a968be1ad60 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,18 +1,5 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 2213 BLAKE2B 28dc462a0861c30a9916dd3a42a44a78b411fdb81f2ae8e646f0fb6fe8f1653e5ffcb8a23d6e96bebcebb9073413496338d18cdfd94a25fe54564702e0f86687 SHA512 0cc5bc3627d012b82b5a07a1c24bc997c7c9a9a388cec32732e6b33f2d4e619eeb2f9c404f050ff129592235a73ffe27c2b63b1985108150a2033d504d37b246
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD test_roslib_comm-1.13.0.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
-EBUILD test_roslib_comm-1.13.1.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
-EBUILD test_roslib_comm-1.13.2.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
-EBUILD test_roslib_comm-1.13.4.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
-EBUILD test_roslib_comm-1.13.5.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
-EBUILD test_roslib_comm-1.13.6.ebuild 556 BLAKE2B ba0100b4680795f137e8d40d567c1b8de599bf1fefeaec049426ac6156c9548f9d194b7c06c24872361fe11342574028b0aa48037c1d98cebf3822593c640148 SHA512 20767eb40a897f75beff6cab033ee24a70a1971c41d83fab04a9160e6e2f1fe536b319017736ac40fc8930320bcf8efdc77913bea0cc8bf367ea590399730c2a
-EBUILD test_roslib_comm-1.14.2.ebuild 556 BLAKE2B ba0100b4680795f137e8d40d567c1b8de599bf1fefeaec049426ac6156c9548f9d194b7c06c24872361fe11342574028b0aa48037c1d98cebf3822593c640148 SHA512 20767eb40a897f75beff6cab033ee24a70a1971c41d83fab04a9160e6e2f1fe536b319017736ac40fc8930320bcf8efdc77913bea0cc8bf367ea590399730c2a
-EBUILD test_roslib_comm-1.14.3.ebuild 556 BLAKE2B ba0100b4680795f137e8d40d567c1b8de599bf1fefeaec049426ac6156c9548f9d194b7c06c24872361fe11342574028b0aa48037c1d98cebf3822593c640148 SHA512 20767eb40a897f75beff6cab033ee24a70a1971c41d83fab04a9160e6e2f1fe536b319017736ac40fc8930320bcf8efdc77913bea0cc8bf367ea590399730c2a
+EBUILD test_roslib_comm-1.14.3-r1.ebuild 590 BLAKE2B b7451505b22995f0bc79b667e066fadf17ce14e1abac26bf65f72f5cf0af30726a4090f2417ea1f9fb1c48114b6c916333bdbbc688b4949c4ff77dea17e3d305 SHA512 56b579a588a93dcd88cbad7235a281c98219a291bf8b0de1313a97a2ae82342328ba186a12475f48cccfde8232191bd2efb7dc1433b71cc3c9ca428edf89694a
EBUILD test_roslib_comm-9999.ebuild 556 BLAKE2B 500e11a34be014312a1e6432df777843bafb425e09d976cf3c7e4aa86eb8a8c1f085f76d48841aad243b97f1fdf87b79fbdd84b2294089bb6520701923c92939 SHA512 34db49c0d2de9f563da46e1ec3b87a0b4adfe9b99e6b6bbfce2b2b176320ce6f27d9f05c8c47346d07088b23d9f7771a56b7f346bbefc340c8ff5d116523def8
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslib_comm/files/yaml.patch b/dev-ros/test_roslib_comm/files/yaml.patch
new file mode 100644
index 000000000000..a72173c32b8a
--- /dev/null
+++ b/dev-ros/test_roslib_comm/files/yaml.patch
@@ -0,0 +1,53 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/test/test_roslib_comm/test/test_roslib_message.py b/test/test_roslib_comm/test/test_roslib_message.py
+index 3d4e7a6fa..288cc375b 100644
+--- a/test/test_roslib_comm/test/test_roslib_message.py
++++ b/test/test_roslib_comm/test/test_roslib_message.py
+@@ -61,7 +61,7 @@ def test_strify_message(self):
+ def roundtrip(m):
+ yaml_text = strify_message(m)
+ print(yaml_text)
+- loaded = yaml.load(yaml_text)
++ loaded = yaml.safe_load(yaml_text)
+ print("loaded", loaded)
+ new_inst = m.__class__()
+ if loaded is not None:
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.1.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.1.ebuild
deleted file mode 100644
index cc727786c8e9..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.1.ebuild
+++ /dev/null
@@ -1,24 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.2.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.2.ebuild
deleted file mode 100644
index cc727786c8e9..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.2.ebuild
+++ /dev/null
@@ -1,24 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.4.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.4.ebuild
deleted file mode 100644
index cc727786c8e9..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.4.ebuild
+++ /dev/null
@@ -1,24 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.5.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.5.ebuild
deleted file mode 100644
index cc727786c8e9..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.5.ebuild
+++ /dev/null
@@ -1,24 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild
deleted file mode 100644
index 25cb9086d149..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.2.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.2.ebuild
deleted file mode 100644
index 25cb9086d149..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.0.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild
index cc727786c8e9..4790aa7d9cba 100644
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.0.ebuild
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,3 +22,4 @@ RDEPEND=""
DEPEND="${RDEPEND}
test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild
deleted file mode 100644
index 25cb9086d149..000000000000
--- a/dev-ros/test_roslib_comm/test_roslib_comm-1.14.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslib"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
-"
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 4c7fdda4e82a..279a76bddead 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,20 +1,7 @@
-DIST ros_comm-1.12.7.tar.gz 974568 BLAKE2B 8c3ece3a200de84fc9557468de87dddad145f3412655fe082a4efa3a0701c98646d098c72f3da0cf5cbbd901c52e70d0dc19c19485f11f564eeb2c089615a949 SHA512 7cfc5bf231e8e388102f192d46bd902a2b92d4620938379b362efd250c48f317f5ba6e0aee7398c841392f56c2b79f933ad5ec60eb69492add90fa2ca86a3a8f
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX empty.patch 389 BLAKE2B 7ff08d2bd3cc7c14a4e93cc2ff4a89029f8e922f545c707d14b604a207170a1bbe8f0321c64882d6cc0f614670a8fe6f173e787c7b672a60afb1f8a3a289fe11 SHA512 c6ae83e53ec66fe390647e04c0ddf4ab8a7fcd20dfc6ab4c26012011f8033d3f5120f05eb7f6a71da361592058bcea521ca7839f3158c2fb63b68961c01ef9e6
+AUX py3.patch 2361 BLAKE2B 778987cf4fa20faf2bc883f6715f6c05a0631037bcab799e73e842c18ca1aa2cdbe1ac483d1e160a41eb24c6cac17ae9aff7c14ab86813d348281191948445b2 SHA512 f4f53a5caed1a11c1d0619d2f9a883fc30c35f4f431461074a4e1c79b478be41de7702299fa10ab0c187662aaa1531f184a3748a6944c9eb44130899b0222d6c
+AUX yaml.patch 2233 BLAKE2B 174e7417282c07960ddb76381f79d4cae9ccfd3c9c99add5f0e5dfa610b84fb437b8d6410937bfe048640e082fba23c0544df1dbfd5422b74d9500b5f21468e2 SHA512 ef38c5408dc694bef305746f31b6e0a2b5711968dd5f54a290d5d7eec4c09631fd5773a22443d7c02bc0ef5e275986c7b3755d9acbfa971085e2b67e37f53103
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD test_rosmaster-1.12.7.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.0.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.1.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.2.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.4.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.5.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.6.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
-EBUILD test_rosmaster-1.14.2.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
-EBUILD test_rosmaster-1.14.3.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
+EBUILD test_rosmaster-1.14.3-r2.ebuild 782 BLAKE2B 55c8a2d6a8323107a49e6877989a037a57e9e7807816fdef4d57c0a458909df2fee6d689d27d5fe8ed8142bd4fe4b3732f4019ecc90dfc24950d175d12733649 SHA512 6c280c81ac9c8fe6d362fc34ad9c119adef908be96dbffa0f8fe272f7b344b1aef573a698238b1f3cae01390d98830ed54d44ac1768b8c12f6ce2b213dc2a402
EBUILD test_rosmaster-9999.ebuild 698 BLAKE2B d5b4d4a9029b5fb5d967a146d22f056f48bab5c55d71db031322feadd8dbd11cccd46dfb8bba77bf70328e24b329e3bdb7df824c9706f30c5dd7e40f1d5c9eb0 SHA512 99dc926c24a752cedb957d9322d1f9a76ca3eb1855ef485ba81fe12fcca2641ecebc960279dbc04739a14cdb77e807cc012233419d6d7c7466b4778c2f5d9498
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosmaster/files/empty.patch b/dev-ros/test_rosmaster/files/empty.patch
new file mode 100644
index 000000000000..8ec371c917c0
--- /dev/null
+++ b/dev-ros/test_rosmaster/files/empty.patch
@@ -0,0 +1,12 @@
+Index: test_rosmaster/CMakeLists.txt
+===================================================================
+--- test_rosmaster.orig/CMakeLists.txt
++++ test_rosmaster/CMakeLists.txt
+@@ -10,6 +10,7 @@ if(CATKIN_ENABLE_TESTING)
+ String.msg
+ Arrays.msg
+ CompositeA.msg CompositeB.msg Composite.msg
++ Empty.msg
+ Embed.msg Floats.msg Simple.msg
+ RosmsgA.msg
+ RosmsgB.msg
diff --git a/dev-ros/test_rosmaster/files/py3.patch b/dev-ros/test_rosmaster/files/py3.patch
new file mode 100644
index 000000000000..579d24f9f0b5
--- /dev/null
+++ b/dev-ros/test_rosmaster/files/py3.patch
@@ -0,0 +1,54 @@
+From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 12:50:24 -0700
+Subject: [PATCH] more Python 3 compatibility (#1782)
+
+---
+ test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +-
+ test/test_rosmaster/test/nodes/testMaster | 2 +-
+ test/test_rosmaster/test/nodes/testSlave | 2 +-
+ test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++-
+ tools/rosgraph/test/test_roslogging.py | 5 ++++-
+ tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
+ tools/roslaunch/src/roslaunch/depends.py | 8 ++++----
+ 7 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/test/test_rosmaster/test/nodes/testAllCommonFlows b/test/test_rosmaster/test/nodes/testAllCommonFlows
+index 4d3e053f8..a22ffb8d8 100755
+--- a/test/test_rosmaster/test/nodes/testAllCommonFlows
++++ b/test/test_rosmaster/test/nodes/testAllCommonFlows
+@@ -12,7 +12,7 @@ import sys, os
+ BOOTSTRAP_VERSION = "0.1"
+
+ # Read in ROS_ROOT
+-if not os.environ.has_key('ROS_ROOT'):
++if 'ROS_ROOT' not in os.environ:
+ print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the
+ location of your ROS install.\n"""
+ sys.exit(-1)
+diff --git a/test/test_rosmaster/test/nodes/testMaster b/test/test_rosmaster/test/nodes/testMaster
+index f3ec36be4..4dca1cb4a 100755
+--- a/test/test_rosmaster/test/nodes/testMaster
++++ b/test/test_rosmaster/test/nodes/testMaster
+@@ -12,7 +12,7 @@ import sys, os
+ BOOTSTRAP_VERSION = "0.1"
+
+ # Read in ROS_ROOT
+-if not os.environ.has_key('ROS_ROOT'):
++if 'ROS_ROOT' not in os.environ:
+ print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the
+ location of your ROS install.\n"""
+ sys.exit(-1)
+diff --git a/test/test_rosmaster/test/nodes/testSlave b/test/test_rosmaster/test/nodes/testSlave
+index cf70af08b..f8ea7cb47 100755
+--- a/test/test_rosmaster/test/nodes/testSlave
++++ b/test/test_rosmaster/test/nodes/testSlave
+@@ -12,7 +12,7 @@ import sys, os
+ BOOTSTRAP_VERSION = "0.1"
+
+ # Read in ROS_ROOT
+-if not os.environ.has_key('ROS_ROOT'):
++if 'ROS_ROOT' not in os.environ:
+ print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the
+ location of your ROS install.\n"""
+ sys.exit(-1)
diff --git a/dev-ros/test_rosmaster/files/yaml.patch b/dev-ros/test_rosmaster/files/yaml.patch
new file mode 100644
index 000000000000..2eb9c086b7e4
--- /dev/null
+++ b/dev-ros/test_rosmaster/files/yaml.patch
@@ -0,0 +1,53 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/test/test_rosmaster/test/client_verification/test_slave_api.py b/test/test_rosmaster/test/client_verification/test_slave_api.py
+index 63d919c72..8614c045d 100755
+--- a/test/test_rosmaster/test/client_verification/test_slave_api.py
++++ b/test/test_rosmaster/test/client_verification/test_slave_api.py
+@@ -106,7 +106,7 @@ def __init__(self, *args, **kwds):
+ def load_profile(self, filename):
+ import yaml
+ with open(filename) as f:
+- d = yaml.load(f)
++ d = yaml.safe_load(f)
+ self.required_pubs = d.get('pubs', {})
+ self.required_subs = d.get('subs', {})
+
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.0.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.0.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.0.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.1.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.1.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.1.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.2.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.2.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.4.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.4.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.4.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.5.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.5.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.5.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild
deleted file mode 100644
index f9547e8381b1..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.2.ebuild
deleted file mode 100644
index f9547e8381b1..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.14.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.12.7.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
index 69bbd047e7b9..d09c050ee2a7 100644
--- a/dev-ros/test_rosmaster/test_rosmaster-1.12.7.ebuild
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -23,6 +23,7 @@ RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
DEPEND="${RDEPEND}
test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
"
+PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/empty.patch" "${FILESDIR}/py3.patch" )
mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild
deleted file mode 100644
index f9547e8381b1..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
- ros-catkin_src_install
- dodir /usr/share/${PN}
- cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index 6e8c9d663cf3..c160f3ae5207 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,18 +1,5 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 3286 BLAKE2B ff83da906b271b957a63e89b26b7ab8b30abf8464635ac773a23d86a82d304ad09fcb9f78eba4f599655231ba59bb509fa89f146529f927742480eb4b777ca37 SHA512 85c1674cc7de77b08e8f632df97e772a325b5595086153690a289f8c2f33e9392ade4a17ab198969baf21f17f2e0414df4aefc2eb758866fa0da2ffe069f5ed0
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD test_rosparam-1.13.0.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.1.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.2.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.4.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.5.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.6.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
-EBUILD test_rosparam-1.14.2.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
-EBUILD test_rosparam-1.14.3.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
+EBUILD test_rosparam-1.14.3.ebuild 537 BLAKE2B ee1b480b906b2606b85c128dfe22e364187bb6866606623bb524e82d2be666bb59d5da501493dfe7fd0933a1c2037cc406802bd9fd2d020b2edce336b5a0dcb4 SHA512 7f6700c3584b8500757db238544252360b1426b7a1b863b15f33fde7a50f87e52f3915181df6db8ea80d7e8a353b1003bc0ca29c0689bfdf83ee2460349eb85e
EBUILD test_rosparam-9999.ebuild 503 BLAKE2B e065bfcfa421c3de64ad8840a544eb4f427c3b2753b38b64960b51e4a9f432d7d3a6e8f2f4ef5303e47c0005e533deea5f34cd63369febb1f05ea3ac0bfb460f SHA512 a36d13dae004b782d566d5c7edf5ebe551c6e6a4d5213904824b1ccacfb61b24c437d01765fe96d584ffcc497fee7a3a630c3bbd45d0849fd0b460289ba8a654
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosparam/files/yaml.patch b/dev-ros/test_rosparam/files/yaml.patch
new file mode 100644
index 000000000000..48f2c1d5bb19
--- /dev/null
+++ b/dev-ros/test_rosparam/files/yaml.patch
@@ -0,0 +1,75 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/test/test_rosparam/test/check_rosparam.py b/test/test_rosparam/test/check_rosparam.py
+index 52ed976b5..fe8c03fb4 100755
+--- a/test/test_rosparam/test/check_rosparam.py
++++ b/test/test_rosparam/test/check_rosparam.py
+@@ -227,7 +227,7 @@ def test_rosparam_get(self):
+ with fakestdout() as b:
+ rosparam.yamlmain([cmd, 'get', "g1"])
+ import yaml
+- d = yaml.load(b.getvalue())
++ d = yaml.safe_load(b.getvalue())
+ self.assertEquals(d['float'], 10.0)
+ self.assertEquals(d['int'], 10.0)
+ self.assertEquals(d['string'], "g1-foo-value")
+@@ -346,18 +346,18 @@ def test_rosparam_dump(self):
+ import yaml
+ with open(f_out) as b:
+ with open(f) as b2:
+- self.assertEquals(yaml.load(b.read()), yaml.load(b2.read()))
++ self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read()))
+
+ rosparam.yamlmain([cmd, 'dump', '-v', f_out, 'rosparam_dump'])
+ with open(f_out) as b:
+ with open(f) as b2:
+- self.assertEquals(yaml.load(b.read()), yaml.load(b2.read()))
++ self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read()))
+
+ # yaml file and std_out should be the same
+ with fakestdout() as b:
+ rosparam.yamlmain([cmd, 'dump'])
+ with open(f) as b2:
+- self.assertEquals(yaml.load(b.getvalue())['rosparam_dump'], yaml.load(b2.read()))
++ self.assertEquals(yaml.safe_load(b.getvalue())['rosparam_dump'], yaml.safe_load(b2.read()))
+
+ def test_fullusage(self):
+ import rosparam
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.0.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.0.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.0.ebuild
+++ /dev/null
@@ -1,26 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.1.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.1.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.1.ebuild
+++ /dev/null
@@ -1,26 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.2.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.2.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.2.ebuild
+++ /dev/null
@@ -1,26 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.4.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.4.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.4.ebuild
+++ /dev/null
@@ -1,26 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.5.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.5.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.5.ebuild
+++ /dev/null
@@ -1,26 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild
deleted file mode 100644
index 1c24d77d5702..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.14.2.ebuild b/dev-ros/test_rosparam/test_rosparam-1.14.2.ebuild
deleted file mode 100644
index 1c24d77d5702..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.14.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-ros/rosparam[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild b/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
index 1c24d77d5702..9deec865fa13 100644
--- a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
+++ b/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -24,3 +24,4 @@ DEPEND="${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
dev-ros/rosparam[${PYTHON_USEDEP}]
)"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index a7ab34d2dc1a..e2f5304a2be0 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,20 +1,6 @@
-DIST ros_comm-1.12.7.tar.gz 974568 BLAKE2B 8c3ece3a200de84fc9557468de87dddad145f3412655fe082a4efa3a0701c98646d098c72f3da0cf5cbbd901c52e70d0dc19c19485f11f564eeb2c089615a949 SHA512 7cfc5bf231e8e388102f192d46bd902a2b92d4620938379b362efd250c48f317f5ba6e0aee7398c841392f56c2b79f933ad5ec60eb69492add90fa2ca86a3a8f
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX py3-2.patch 2077 BLAKE2B 76b3289eb5a54e085d8ed2b687b70f53c047625a9b4216f4972f62702604192996b89d0469a5d927515c510f00a032919b40b9cd76db8e9e011c61fc37c50e28 SHA512 8b554bbc2a38e3d64a88e05921a8e0ed8271126e86f85f04bf0903224304a25df07530614435247a861b193c0a02a2fd0280488696f9196e6f3bf88b8e89da9e
+AUX py3.patch 1169 BLAKE2B e73fa2afdde33f8fc921118b4bc1189b5f976a2dcc56f498890e1925c698b975c38dec6c6be24f7269e0dce83d2630eaba89b9aa925c249037720d15928d7a9d SHA512 8b5475d81200b724701e3f7312646105295f99d084e324f8990cc494609166d77b834309e19f36452133379682f33174d923d8fbb05f95a75306147c3bac154d
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD test_rospy-1.12.7.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.0.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.1.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.2.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.4.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.5.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
-EBUILD test_rospy-1.13.6.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
-EBUILD test_rospy-1.14.2.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
-EBUILD test_rospy-1.14.3.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
+EBUILD test_rospy-1.14.3-r1.ebuild 902 BLAKE2B cc2d72203d6026d6c2fc9694bbbfe92f8af379ec3e0284b67684d30e432757834869710db15e0f546a8c817ccdd6f1cf6e145e68a4a2700ad694c6ca2a6d53bd SHA512 38ecb314607a3db7c111a889f885238a383208f89a8ee952356f44ece4669540f353e81be2d3c45fb3e5aef0c5b3a20c62f9c2db4316e91352caf601560998cb
EBUILD test_rospy-9999.ebuild 843 BLAKE2B 95bee07029a08cc289842cab2529c1854f1af6ea706853c51725ae88e6e50cad233090f48dfb4c203747a3e4d1fb7849caaf7daa3865730bc6bcb02e295cb77f SHA512 0351a18324e0c5c13cb36af850383a9c904ac8d5bd8f005dfafa6fa1e84a7a9377aaa8fd760036cc7057ee2d4f210f924fed6e65147da9a6c7676f31c75d54a0
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rospy/files/py3-2.patch b/dev-ros/test_rospy/files/py3-2.patch
new file mode 100644
index 000000000000..18ac23d16866
--- /dev/null
+++ b/dev-ros/test_rospy/files/py3-2.patch
@@ -0,0 +1,40 @@
+From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 16:06:51 -0700
+Subject: [PATCH] more Python 3 compatibility (#1783)
+
+---
+ test/test_rospy/test/unit/test_genmsg_py.py | 6 +--
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ .../test/test_roslogging_user_logger.py | 8 +++-
+ tools/roslaunch/test/unit/test_xmlloader.py | 2 +-
+ tools/rosmsg/src/rosmsg/__init__.py | 2 +-
+ tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
+ .../test/test_rosmsgproto_command_line.py | 20 ++++----
+ .../test_rostopic_command_line_offline.py | 44 +++++++++---------
+ 8 files changed, 67 insertions(+), 63 deletions(-)
+
+diff --git a/test/test_rospy/test/unit/test_genmsg_py.py b/test/test_rospy/test/unit/test_genmsg_py.py
+index 397b35cee..38be1648e 100644
+--- a/test/test_rospy/test/unit/test_genmsg_py.py
++++ b/test/test_rospy/test/unit/test_genmsg_py.py
+@@ -95,8 +95,8 @@ def test_test_rospy_TestFixedArray(self):
+ self.assertEquals([0., 0., 0.], m.f64_3)
+ self.assertEquals([0], m.i8_1)
+ self.assertEquals([0, 0, 0], m.i8_3)
+- self.assertEquals(chr(0), m.u8_1)
+- self.assertEquals(chr(0)*3, m.u8_3)
++ self.assertEquals(chr(0).encode(), m.u8_1)
++ self.assertEquals((chr(0)*3).encode(), m.u8_3)
+ self.assertEquals([0], m.i32_1)
+ self.assertEquals([0, 0, 0], m.i32_3)
+ self.assertEquals([0], m.u32_1)
+@@ -358,7 +358,7 @@ def test_std_msgs_MultiArray(self):
+ # test. the buff was with the uint8[] type consistency
+ buff = StringIO()
+ self.assertEquals(UInt8MultiArray(),UInt8MultiArray())
+- self.assertEquals('',UInt8MultiArray().data)
++ self.assertEquals(b'', UInt8MultiArray().data)
+ UInt8MultiArray().serialize(buff)
+ self.assertEquals(UInt8MultiArray(layout=MultiArrayLayout()),UInt8MultiArray())
+ UInt8MultiArray(layout=MultiArrayLayout()).serialize(buff)
diff --git a/dev-ros/test_rospy/files/py3.patch b/dev-ros/test_rospy/files/py3.patch
new file mode 100644
index 000000000000..d7ed0f9c9606
--- /dev/null
+++ b/dev-ros/test_rospy/files/py3.patch
@@ -0,0 +1,34 @@
+From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 12:50:24 -0700
+Subject: [PATCH] more Python 3 compatibility (#1782)
+
+---
+ test/test_rosmaster/test/nodes/testAllCommonFlows | 2 +-
+ test/test_rosmaster/test/nodes/testMaster | 2 +-
+ test/test_rosmaster/test/nodes/testSlave | 2 +-
+ test/test_rospy/test/unit/test_genmsg_py.py | 8 +++++++-
+ tools/rosgraph/test/test_roslogging.py | 5 ++++-
+ tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
+ tools/roslaunch/src/roslaunch/depends.py | 8 ++++----
+ 7 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/test/test_rospy/test/unit/test_genmsg_py.py b/test/test_rospy/test/unit/test_genmsg_py.py
+index aebf95b22..397b35cee 100644
+--- a/test/test_rospy/test/unit/test_genmsg_py.py
++++ b/test/test_rospy/test/unit/test_genmsg_py.py
+@@ -44,7 +44,13 @@
+ import math
+
+ from roslib.message import SerializationError
+-
++
++try:
++ long
++except NameError:
++ long = int
++
++
+ class TestGenmsgPy(unittest.TestCase):
+
+ def test_PythonKeyword(self):
diff --git a/dev-ros/test_rospy/test_rospy-1.13.0.ebuild b/dev-ros/test_rospy/test_rospy-1.13.0.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.0.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rospy/test_rospy-1.13.1.ebuild b/dev-ros/test_rospy/test_rospy-1.13.1.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.1.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rospy/test_rospy-1.13.2.ebuild b/dev-ros/test_rospy/test_rospy-1.13.2.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.2.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rospy/test_rospy-1.13.4.ebuild b/dev-ros/test_rospy/test_rospy-1.13.4.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.4.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rospy/test_rospy-1.13.5.ebuild b/dev-ros/test_rospy/test_rospy-1.13.5.ebuild
deleted file mode 100644
index 2c8306c903de..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.5.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rospy/test_rospy-1.13.6.ebuild b/dev-ros/test_rospy/test_rospy-1.13.6.ebuild
deleted file mode 100644
index c681d244b919..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.13.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rospy/test_rospy-1.14.2.ebuild b/dev-ros/test_rospy/test_rospy-1.14.2.ebuild
deleted file mode 100644
index c681d244b919..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.14.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rospy/test_rospy-1.12.7.ebuild b/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild
index 2c8306c903de..2cf6f2717553 100644
--- a/dev-ros/test_rospy/test_rospy-1.12.7.ebuild
+++ b/dev-ros/test_rospy/test_rospy-1.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -31,3 +31,4 @@ DEPEND="${RDEPEND}
dev-ros/rospy[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
)"
+PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
diff --git a/dev-ros/test_rospy/test_rospy-1.14.3.ebuild b/dev-ros/test_rospy/test_rospy-1.14.3.ebuild
deleted file mode 100644
index c681d244b919..000000000000
--- a/dev-ros/test_rospy/test_rospy-1.14.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-ros/rosbuild
- dev-ros/rosgraph[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
index a9d556ff5668..0b574b9acc4e 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,18 +1,5 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 2877 BLAKE2B af708d68c805323af1e337789798c0318f49e7805cc3b6a52a895edff40fcb71a48c467c2e009c04f19e5ad75231f07e60d94cbfe2baa7a47a5d3d4cd78bd379 SHA512 cd3099ed89f475603151e290dbdddcc170bad5a01002ce51e5a44ceed0ab864480e8daf1eaaf3ab5fbf4fec550f6a0e91ec7dc6400b2fb227abc2bdadc3d64b2
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD test_rosservice-1.13.0.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
-EBUILD test_rosservice-1.13.1.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
-EBUILD test_rosservice-1.13.2.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
-EBUILD test_rosservice-1.13.4.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
-EBUILD test_rosservice-1.13.5.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
-EBUILD test_rosservice-1.13.6.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33
-EBUILD test_rosservice-1.14.2.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33
-EBUILD test_rosservice-1.14.3.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33
+EBUILD test_rosservice-1.14.3-r1.ebuild 713 BLAKE2B faacb0d4583af8cde634e608012ed3d1d89a0cd912a54f3c8931a109d3e2ab06965c85c123e7bd92cc83a1a86bc222e5f6648e079dc9e2644ae19268bf96d2b5 SHA512 8604ba792e6a01dc7f085061889d278d48474da3ad21a2580f560ba771dafb3041afd2fe9a797c886bc01af8f04c7f4108f0c8387c25501d5ef3d1667813373a
EBUILD test_rosservice-9999.ebuild 679 BLAKE2B d8c7decce6abc14a7e9c0d9b36a40a001c282333d0e50e8caf7c8598b646adb458bce1aadd01a2a97639dac10d2ec7a232f8145c6fb6a904eb83311bbb47afae SHA512 36c5673453deb431ee1e5816af18510e7bfd9d324089e6bf05af963ef4d769ddc2d8d1d04796f849b75a8d0aeb0dc9663fa9747c07ad20c68934e258e0d273cc
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosservice/files/yaml.patch b/dev-ros/test_rosservice/files/yaml.patch
new file mode 100644
index 000000000000..e8d089cbfd09
--- /dev/null
+++ b/dev-ros/test_rosservice/files/yaml.patch
@@ -0,0 +1,62 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/test/test_rosservice/test/check_rosservice_command_line_online.py b/test/test_rosservice/test/check_rosservice_command_line_online.py
+index dc696adba..c75a52c15 100755
+--- a/test/test_rosservice/test/check_rosservice_command_line_online.py
++++ b/test/test_rosservice/test/check_rosservice_command_line_online.py
+@@ -122,7 +122,7 @@ def test_rosservice(self):
+ output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0]
+ output = output.strip()
+ self.assert_(output, output)
+- val = yaml.load(output)['header']
++ val = yaml.safe_load(output)['header']
+ self.assertEquals('', val['frame_id'])
+ self.assert_(val['seq'] >= 0)
+ self.assertEquals(0, val['stamp']['secs'])
+@@ -131,7 +131,7 @@ def test_rosservice(self):
+ # test with auto headers
+ for v in ['{header: auto}', '{header: {stamp: now}}']:
+ output = Popen([cmd, 'call', name, v], stdout=PIPE).communicate()[0]
+- val = yaml.load(output.strip())['header']
++ val = yaml.safe_load(output.strip())['header']
+ self.assertEquals('', val['frame_id'])
+ self.assert_(val['seq'] >= 0)
+ self.assert_(val['stamp']['secs'] >= int(t))
diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild
deleted file mode 100644
index 36347c5c5286..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.13.1.ebuild
+++ /dev/null
@@ -1,30 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- test? (
- dev-ros/test_rosmaster[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild
deleted file mode 100644
index 36347c5c5286..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.13.2.ebuild
+++ /dev/null
@@ -1,30 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- test? (
- dev-ros/test_rosmaster[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild
deleted file mode 100644
index 36347c5c5286..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.13.4.ebuild
+++ /dev/null
@@ -1,30 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- test? (
- dev-ros/test_rosmaster[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild
deleted file mode 100644
index 36347c5c5286..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.13.5.ebuild
+++ /dev/null
@@ -1,30 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- test? (
- dev-ros/test_rosmaster[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild
deleted file mode 100644
index e129fbdc99eb..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- test? (
- dev-ros/test_rosmaster[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild
deleted file mode 100644
index e129fbdc99eb..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.14.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- test? (
- dev-ros/test_rosmaster[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.0.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild
index 36347c5c5286..eb480554239e 100644
--- a/dev-ros/test_rosservice/test_rosservice-1.13.0.ebuild
+++ b/dev-ros/test_rosservice/test_rosservice-1.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -28,3 +28,4 @@ DEPEND="${RDEPEND}
dev-ros/rostest[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
)"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild b/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild
deleted file mode 100644
index e129fbdc99eb..000000000000
--- a/dev-ros/test_rosservice/test_rosservice-1.14.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rospy"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
- test? (
- dev-ros/test_rosmaster[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index d2d32a93f321..994ab40dbb58 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,18 +1,5 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 2150 BLAKE2B 5620056ff8c1da96f7f5e42bf4fccff73763211051d7c39c35c3dd6181aba3059dcbe9e32b5b6edb6ba4f074601dee7937e6093c321e3b236a7de2bcd7f9252d SHA512 4b9b884c1b29987bff911a945daec6841fb19b5fa34d0b6ffd81c3c338412c3faf5787240c39e7ff5a952841131aeb3f2994161eddc5c3a9b4173c099660e9bd
DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD topic_tools-1.13.0.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
-EBUILD topic_tools-1.13.1.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
-EBUILD topic_tools-1.13.2.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
-EBUILD topic_tools-1.13.4.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
-EBUILD topic_tools-1.13.5.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
-EBUILD topic_tools-1.13.6.ebuild 695 BLAKE2B efb0405deee55dc5f573debd35e7f6e03f6bd0e1e89c022d64e108d6f790f1c7ce6271b027557ed0dc2d36b48d4958320d1d4f9cbeb5d51b6c038e9aec2c4271 SHA512 5efbd84f924cded65cce7323e67a1246b0564c7e903913a437cbdcd3632683338083f1e01d8689f0e2b0af6444eb0cca8f6274487917b6c0fd2a7b238e046fba
-EBUILD topic_tools-1.14.2.ebuild 695 BLAKE2B efb0405deee55dc5f573debd35e7f6e03f6bd0e1e89c022d64e108d6f790f1c7ce6271b027557ed0dc2d36b48d4958320d1d4f9cbeb5d51b6c038e9aec2c4271 SHA512 5efbd84f924cded65cce7323e67a1246b0564c7e903913a437cbdcd3632683338083f1e01d8689f0e2b0af6444eb0cca8f6274487917b6c0fd2a7b238e046fba
-EBUILD topic_tools-1.14.3.ebuild 695 BLAKE2B efb0405deee55dc5f573debd35e7f6e03f6bd0e1e89c022d64e108d6f790f1c7ce6271b027557ed0dc2d36b48d4958320d1d4f9cbeb5d51b6c038e9aec2c4271 SHA512 5efbd84f924cded65cce7323e67a1246b0564c7e903913a437cbdcd3632683338083f1e01d8689f0e2b0af6444eb0cca8f6274487917b6c0fd2a7b238e046fba
+EBUILD topic_tools-1.14.3-r1.ebuild 729 BLAKE2B ccc071e3a6170f559e3e9dce6886621f4c7c1c72b11ce1f66e83cd04092cd6cc999e7e0526baf9c8a6336c976f27ebcf213d01186aae486cfcdb80a4eeef58dd SHA512 5181892055fbb64cba30d9467d30639c3f23435b805be1c9ea32fd8f19aeafa0a3b152a0106398e69b45134f5f317a3ca2b96f1e2e04e164bee52fa2dc619a40
EBUILD topic_tools-9999.ebuild 695 BLAKE2B 63c6c776011923217856c1392fb0d292d0bb44bebd000c7fa6530371a237aefda1a18c07bd78d9352d0f4dc7608a1c9dd335710cc6860485678dd2da4fa621df SHA512 918f548657eeab6f571e371dde921b0cdc374890b3f4a80b9eb51ece52e3404ce750a9447d1139e15a60409054f8f3e6d829f75ad538e6c80ffa8617eaca646a
MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/files/yaml.patch b/dev-ros/topic_tools/files/yaml.patch
new file mode 100644
index 000000000000..e783e321b7fb
--- /dev/null
+++ b/dev-ros/topic_tools/files/yaml.patch
@@ -0,0 +1,53 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py | 2 +-
+ .../test/test_roslib_message.py | 2 +-
+ .../client_verification/test_slave_api.py | 2 +-
+ test/test_rosparam/test/check_rosparam.py | 8 ++---
+ .../check_rosparam_command_line_online.py | 2 +-
+ .../check_rosservice_command_line_online.py | 4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py | 2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py | 2 +-
+ tools/roslaunch/src/roslaunch/loader.py | 4 +--
+ .../test/unit/test_roslaunch_dump_params.py | 4 +--
+ tools/rosparam/src/rosparam/__init__.py | 7 ++++-
+ tools/rosservice/src/rosservice/__init__.py | 4 +--
+ tools/rostopic/src/rostopic/__init__.py | 6 ++--
+ tools/topic_tools/scripts/relay_field | 2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/tools/topic_tools/scripts/relay_field b/tools/topic_tools/scripts/relay_field
+index 6630b685d..cc73ac443 100755
+--- a/tools/topic_tools/scripts/relay_field
++++ b/tools/topic_tools/scripts/relay_field
+@@ -98,7 +98,7 @@ class RelayField(object):
+ if self.input_fn is not None:
+ m = self.input_fn(m)
+
+- msg_generation = yaml.load(self.expression)
++ msg_generation = yaml.safe_load(self.expression)
+ pub_args = _eval_in_dict_impl(msg_generation, None, {'m': m})
+
+ now = rospy.get_rostime()
diff --git a/dev-ros/topic_tools/topic_tools-1.13.1.ebuild b/dev-ros/topic_tools/topic_tools-1.13.1.ebuild
deleted file mode 100644
index 22160468f6ca..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.13.1.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-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
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/topic_tools/topic_tools-1.13.2.ebuild b/dev-ros/topic_tools/topic_tools-1.13.2.ebuild
deleted file mode 100644
index 22160468f6ca..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.13.2.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-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
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/topic_tools/topic_tools-1.13.4.ebuild b/dev-ros/topic_tools/topic_tools-1.13.4.ebuild
deleted file mode 100644
index 22160468f6ca..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.13.4.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-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
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/topic_tools/topic_tools-1.13.5.ebuild b/dev-ros/topic_tools/topic_tools-1.13.5.ebuild
deleted file mode 100644
index 22160468f6ca..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.13.5.ebuild
+++ /dev/null
@@ -1,33 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-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
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/topic_tools/topic_tools-1.13.6.ebuild b/dev-ros/topic_tools/topic_tools-1.13.6.ebuild
deleted file mode 100644
index 227b9521dac4..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.13.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-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
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/topic_tools/topic_tools-1.14.2.ebuild b/dev-ros/topic_tools/topic_tools-1.14.2.ebuild
deleted file mode 100644
index 227b9521dac4..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.14.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-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
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/topic_tools/topic_tools-1.13.0.ebuild b/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild
index 22160468f6ca..ecddea9d6441 100644
--- a/dev-ros/topic_tools/topic_tools-1.13.0.ebuild
+++ b/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -31,3 +31,4 @@ DEPEND="${RDEPEND}
dev-cpp/gtest
dev-python/nose[${PYTHON_USEDEP}]
)"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/topic_tools/topic_tools-1.14.3.ebuild b/dev-ros/topic_tools/topic_tools-1.14.3.ebuild
deleted file mode 100644
index 227b9521dac4..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.14.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-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
-"
-DEPEND="${RDEPEND}
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-ros/rosunit[${PYTHON_USEDEP}]
- dev-cpp/gtest
- dev-python/nose[${PYTHON_USEDEP}]
- )"
diff --git a/dev-ros/visp_auto_tracker/Manifest b/dev-ros/visp_auto_tracker/Manifest
index 2be54bfb5b7f..af811209270c 100644
--- a/dev-ros/visp_auto_tracker/Manifest
+++ b/dev-ros/visp_auto_tracker/Manifest
@@ -1,7 +1,8 @@
AUX boost170.patch 497 BLAKE2B 3ff7f23fe562d9597bd379123721a24a6b949d38ceddce49c4dd0a12d4e6597704511c31fc133ce4d3bb8897c725c6ab207d9330482287ecb44830fb16765e65 SHA512 489454810cb6fa313ac24668c655e59e9a520c32548f9df3b7d0529f0e6a7fc83691a0f2b48d9b1f3f74fc77738e79e06fb0f32fce427c3aff3fa76886b71be7
+AUX ocv4.patch 980 BLAKE2B 9e2ab8f0bb49c3f18191ecba66853ac23de278069c0493b74db0d1f368959d91499a57a36cd8ccac85fd7c86ed0a828da4f857785c9ea9951ac23b54e9739aab SHA512 f9f5b2060e0a780dc4ef09a79685c0698c097b248cfa0bd651572f7446f3e382913a9040ec3209991fc5b641cb1c482597ad8cd84ab7f4d88d42c14e78bf11c2
DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
EBUILD visp_auto_tracker-0.10.0.ebuild 823 BLAKE2B 057ac6a5573c0d918d421bc327d516fdce3102e8b45d9f7b82ab493b1155cde822a18a181d717939c54f556910cecc0fa62c11141a338b48b9431b5de4209a39 SHA512 e022bf96aa850a4c687ce12d66d695d8e4d26fe569cd79ec8ace67e9fad25b61ca080a8db156e98a082bff56aff6a338da04f6bfc1b0df1e9f9d4bac0ad26719
-EBUILD visp_auto_tracker-0.11.1.ebuild 862 BLAKE2B 3676e0cffd02b7a817e56f65daf927dade01accc138e9613ffb3ce792ba8c00b9b8986fc3258b3ad4fb2f153a1b281fa9bfcc078e1d9f6124974038fd323cd4e SHA512 22294bd0393d4e07a44d93ed52c30121ed98356851e9c73a46939cb623662671c3840f13f3192ae69f5e97419aafa5bb594c1ef1fe677697b252b5b84da480ba
-EBUILD visp_auto_tracker-9999.ebuild 823 BLAKE2B 057ac6a5573c0d918d421bc327d516fdce3102e8b45d9f7b82ab493b1155cde822a18a181d717939c54f556910cecc0fa62c11141a338b48b9431b5de4209a39 SHA512 e022bf96aa850a4c687ce12d66d695d8e4d26fe569cd79ec8ace67e9fad25b61ca080a8db156e98a082bff56aff6a338da04f6bfc1b0df1e9f9d4bac0ad26719
+EBUILD visp_auto_tracker-0.11.1-r1.ebuild 908 BLAKE2B 54925dbd07c0159740c7c6297ba140bc0a09f79df04b62e02591611415174afdef8c525932b22d5d4ac838384fa6478ffd334d7889e8237999e6567e4009eaf9 SHA512 610095acfeba612c23e531041cc0778aa39aac7d4b93829d4cf3e5172e85566f308aba2404c1d8d489b35d30da7e57d9b09162f50d3e1852701574cac631f360
+EBUILD visp_auto_tracker-9999.ebuild 908 BLAKE2B 54925dbd07c0159740c7c6297ba140bc0a09f79df04b62e02591611415174afdef8c525932b22d5d4ac838384fa6478ffd334d7889e8237999e6567e4009eaf9 SHA512 610095acfeba612c23e531041cc0778aa39aac7d4b93829d4cf3e5172e85566f308aba2404c1d8d489b35d30da7e57d9b09162f50d3e1852701574cac631f360
MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_auto_tracker/files/ocv4.patch b/dev-ros/visp_auto_tracker/files/ocv4.patch
new file mode 100644
index 000000000000..79a6970af9f7
--- /dev/null
+++ b/dev-ros/visp_auto_tracker/files/ocv4.patch
@@ -0,0 +1,25 @@
+Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp
+===================================================================
+--- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/states.hpp
++++ visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp
+@@ -1,6 +1,6 @@
+ #ifndef __EVENTS_H__
+ #define __EVENTS_H__
+-#include "cv.h"
++#include <opencv2/core/core_c.h>
+ // back-end
+ #include <boost/msm/back/state_machine.hpp>
+ //front-end
+Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp
+===================================================================
+--- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/tracking.cpp
++++ visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp
+@@ -1,6 +1,6 @@
+ #include "ros/ros.h"
+-#include "cv.h"
+-#include "highgui.h"
++#include <opencv2/core/core_c.h>
++#include <opencv2/highgui/highgui_c.h>
+ #include "tracking.h"
+ #include <visp3/core/vpImageConvert.h>
+ #include <visp3/core/vpPixelMeterConversion.h>
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r1.ebuild
index dcd584eb2644..0b8d39209953 100644
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r1.ebuild
@@ -25,10 +25,11 @@ RDEPEND="
dev-ros/visp_tracker
sci-libs/ViSP:=[dmtx,zbar]
dev-libs/boost:=[threads]
+ media-libs/opencv:=
"
DEPEND="${RDEPEND}"
if [ "${PV#9999}" = "${PV}" ] ; then
S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
fi
-PATCHES=( "${FILESDIR}/boost170.patch" )
+PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
index 119d92d4d319..0b8d39209953 100644
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -25,8 +25,11 @@ RDEPEND="
dev-ros/visp_tracker
sci-libs/ViSP:=[dmtx,zbar]
dev-libs/boost:=[threads]
+ media-libs/opencv:=
"
DEPEND="${RDEPEND}"
if [ "${PV#9999}" = "${PV}" ] ; then
S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
fi
+
+PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/voxel_grid/Manifest b/dev-ros/voxel_grid/Manifest
index c30b8d0c346b..ce39de131d55 100644
--- a/dev-ros/voxel_grid/Manifest
+++ b/dev-ros/voxel_grid/Manifest
@@ -2,9 +2,11 @@ DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643
DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
EBUILD voxel_grid-1.15.2.ebuild 395 BLAKE2B 83874df4d5d10255cc78efa4b0df9f0ee182acf21a166b7ec1897fd271b14c5f8971eee84358a1bd5a0720e582476f28b3794d21be37417bf028697d5406e34f SHA512 9fff1d5091009da26d447f633bb30e7dce527481ec506500546ea55579d17d37bd1e597a39e658829694fdccbeb0500e2f08b2c9af34ad2bd2e9ee4f0758e05e
EBUILD voxel_grid-1.16.0.ebuild 395 BLAKE2B 83874df4d5d10255cc78efa4b0df9f0ee182acf21a166b7ec1897fd271b14c5f8971eee84358a1bd5a0720e582476f28b3794d21be37417bf028697d5406e34f SHA512 9fff1d5091009da26d447f633bb30e7dce527481ec506500546ea55579d17d37bd1e597a39e658829694fdccbeb0500e2f08b2c9af34ad2bd2e9ee4f0758e05e
EBUILD voxel_grid-1.16.1.ebuild 395 BLAKE2B 83874df4d5d10255cc78efa4b0df9f0ee182acf21a166b7ec1897fd271b14c5f8971eee84358a1bd5a0720e582476f28b3794d21be37417bf028697d5406e34f SHA512 9fff1d5091009da26d447f633bb30e7dce527481ec506500546ea55579d17d37bd1e597a39e658829694fdccbeb0500e2f08b2c9af34ad2bd2e9ee4f0758e05e
EBUILD voxel_grid-1.16.2.ebuild 395 BLAKE2B 83874df4d5d10255cc78efa4b0df9f0ee182acf21a166b7ec1897fd271b14c5f8971eee84358a1bd5a0720e582476f28b3794d21be37417bf028697d5406e34f SHA512 9fff1d5091009da26d447f633bb30e7dce527481ec506500546ea55579d17d37bd1e597a39e658829694fdccbeb0500e2f08b2c9af34ad2bd2e9ee4f0758e05e
+EBUILD voxel_grid-1.16.3.ebuild 392 BLAKE2B 9adc5c8250f99aac832502e4ad551a96aeec87cd085dedd6d7e91a5efbe6836bd9452006ff93242726e91750079fa0abf59ff50ba36c359d2a0a43b55eadec88 SHA512 6f9a66ed6db49c7cb727dac1fe4127dc9797f83b86de890af031040bfe1f83fef57b7ebb368ddd54e90c0ccf5324f7c577924f30c27809b77b1137b83fe9ee7b
EBUILD voxel_grid-9999.ebuild 395 BLAKE2B aaa80f5692268540023d6b98161e92fd5f9376e2835f40699601cc08873412c38586c3a7d70d717680ef70976f22f1542a9fdc2c3660c66183c21e18a9905b36 SHA512 d79c9dbd9f28164ccd0945f2dd8a53e317369a372d254dadefe8e4b72867474b5b9a708fe78950ca469b69e90497c68dcb54d575df9acfa93412cad351dce8cf
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/voxel_grid/voxel_grid-1.16.3.ebuild b/dev-ros/voxel_grid/voxel_grid-1.16.3.ebuild
new file mode 100644
index 000000000000..4e399db3ffc2
--- /dev/null
+++ b/dev-ros/voxel_grid/voxel_grid-1.16.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Implementation of an efficient 3D voxel grid"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roscpp"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"