summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ros')
-rw-r--r--dev-ros/actionlib/metadata.xml7
-rw-r--r--dev-ros/actionlib_msgs/metadata.xml7
-rw-r--r--dev-ros/actionlib_tutorials/metadata.xml7
-rw-r--r--dev-ros/amcl/metadata.xml7
-rw-r--r--dev-ros/angles/metadata.xml7
-rw-r--r--dev-ros/audio_capture/metadata.xml7
-rw-r--r--dev-ros/audio_common_msgs/metadata.xml7
-rw-r--r--dev-ros/audio_play/metadata.xml7
-rw-r--r--dev-ros/base_local_planner/metadata.xml7
-rw-r--r--dev-ros/bond/metadata.xml7
-rw-r--r--dev-ros/bondcpp/metadata.xml7
-rw-r--r--dev-ros/bondpy/metadata.xml7
-rw-r--r--dev-ros/calibration_estimation/metadata.xml7
-rw-r--r--dev-ros/calibration_launch/metadata.xml7
-rw-r--r--dev-ros/calibration_msgs/metadata.xml7
-rw-r--r--dev-ros/calibration_setup_helper/metadata.xml7
-rw-r--r--dev-ros/camera_calibration/metadata.xml7
-rw-r--r--dev-ros/camera_calibration_parsers/metadata.xml7
-rw-r--r--dev-ros/camera_info_manager/metadata.xml7
-rw-r--r--dev-ros/carrot_planner/metadata.xml7
-rw-r--r--dev-ros/class_loader/metadata.xml7
-rw-r--r--dev-ros/clear_costmap_recovery/metadata.xml7
-rw-r--r--dev-ros/cmake_modules/metadata.xml7
-rw-r--r--dev-ros/collada_parser/metadata.xml7
-rw-r--r--dev-ros/collada_urdf/metadata.xml7
-rw-r--r--dev-ros/compressed_depth_image_transport/metadata.xml7
-rw-r--r--dev-ros/compressed_image_transport/metadata.xml7
-rw-r--r--dev-ros/control_msgs/metadata.xml7
-rw-r--r--dev-ros/control_toolbox/metadata.xml7
-rw-r--r--dev-ros/controller_interface/metadata.xml7
-rw-r--r--dev-ros/controller_manager/metadata.xml7
-rw-r--r--dev-ros/controller_manager_msgs/metadata.xml7
-rw-r--r--dev-ros/controller_manager_tests/metadata.xml7
-rw-r--r--dev-ros/convex_decomposition/metadata.xml7
-rw-r--r--dev-ros/costmap_2d/metadata.xml7
-rw-r--r--dev-ros/cpp_common/metadata.xml7
-rw-r--r--dev-ros/cv_bridge/metadata.xml7
-rw-r--r--dev-ros/depth_image_proc/metadata.xml7
-rw-r--r--dev-ros/diagnostic_aggregator/metadata.xml7
-rw-r--r--dev-ros/diagnostic_analysis/metadata.xml7
-rw-r--r--dev-ros/diagnostic_common_diagnostics/metadata.xml7
-rw-r--r--dev-ros/diagnostic_msgs/metadata.xml7
-rw-r--r--dev-ros/diagnostic_updater/metadata.xml7
-rw-r--r--dev-ros/driver_base/metadata.xml7
-rw-r--r--dev-ros/dwa_local_planner/metadata.xml7
-rw-r--r--dev-ros/dynamic_reconfigure/metadata.xml7
-rw-r--r--dev-ros/eigen_conversions/metadata.xml7
-rw-r--r--dev-ros/eigen_stl_containers/metadata.xml7
-rw-r--r--dev-ros/fake_localization/metadata.xml7
-rw-r--r--dev-ros/filters/metadata.xml7
-rw-r--r--dev-ros/gazebo_msgs/metadata.xml7
-rw-r--r--dev-ros/gazebo_plugins/metadata.xml7
-rw-r--r--dev-ros/gazebo_ros/metadata.xml7
-rw-r--r--dev-ros/gazebo_ros_control/metadata.xml7
-rw-r--r--dev-ros/gencpp/metadata.xml7
-rw-r--r--dev-ros/geneus/metadata.xml7
-rw-r--r--dev-ros/genlisp/metadata.xml7
-rw-r--r--dev-ros/genmsg/metadata.xml7
-rw-r--r--dev-ros/genpy/metadata.xml7
-rw-r--r--dev-ros/geodesy/metadata.xml7
-rw-r--r--dev-ros/geographic_msgs/metadata.xml7
-rw-r--r--dev-ros/geometric_shapes/metadata.xml7
-rw-r--r--dev-ros/geometry_msgs/metadata.xml7
-rw-r--r--dev-ros/global_planner/metadata.xml7
-rw-r--r--dev-ros/gmapping/metadata.xml7
-rw-r--r--dev-ros/hardware_interface/metadata.xml7
-rw-r--r--dev-ros/hector_compressed_map_transport/metadata.xml7
-rw-r--r--dev-ros/hector_geotiff/metadata.xml7
-rw-r--r--dev-ros/hector_geotiff_plugins/metadata.xml7
-rw-r--r--dev-ros/hector_imu_attitude_to_tf/metadata.xml7
-rw-r--r--dev-ros/hector_imu_tools/metadata.xml7
-rw-r--r--dev-ros/hector_map_server/metadata.xml7
-rw-r--r--dev-ros/hector_map_tools/metadata.xml7
-rw-r--r--dev-ros/hector_mapping/metadata.xml7
-rw-r--r--dev-ros/hector_marker_drawing/metadata.xml7
-rw-r--r--dev-ros/hector_nav_msgs/metadata.xml7
-rw-r--r--dev-ros/hector_pose_estimation/metadata.xml7
-rw-r--r--dev-ros/hector_pose_estimation_core/metadata.xml7
-rw-r--r--dev-ros/hector_slam_launch/metadata.xml7
-rw-r--r--dev-ros/hector_trajectory_server/metadata.xml7
-rw-r--r--dev-ros/image_cb_detector/metadata.xml7
-rw-r--r--dev-ros/image_geometry/metadata.xml7
-rw-r--r--dev-ros/image_proc/metadata.xml7
-rw-r--r--dev-ros/image_rotate/metadata.xml7
-rw-r--r--dev-ros/image_transport/metadata.xml7
-rw-r--r--dev-ros/image_view/metadata.xml7
-rw-r--r--dev-ros/imu_processors/metadata.xml7
-rw-r--r--dev-ros/imu_transformer/metadata.xml7
-rw-r--r--dev-ros/interactive_marker_tutorials/metadata.xml7
-rw-r--r--dev-ros/interactive_markers/metadata.xml7
-rw-r--r--dev-ros/interval_intersection/metadata.xml7
-rw-r--r--dev-ros/ivcon/metadata.xml7
-rw-r--r--dev-ros/joint_limits_interface/metadata.xml7
-rw-r--r--dev-ros/joint_state_publisher/metadata.xml7
-rw-r--r--dev-ros/joint_states_settler/metadata.xml7
-rw-r--r--dev-ros/kdl_conversions/metadata.xml7
-rw-r--r--dev-ros/kdl_parser/metadata.xml7
-rw-r--r--dev-ros/laser_assembler/metadata.xml7
-rw-r--r--dev-ros/laser_cb_detector/metadata.xml7
-rw-r--r--dev-ros/laser_filters/metadata.xml7
-rw-r--r--dev-ros/laser_geometry/metadata.xml7
-rw-r--r--dev-ros/librviz_tutorial/metadata.xml7
-rw-r--r--dev-ros/map_msgs/metadata.xml7
-rw-r--r--dev-ros/map_server/metadata.xml7
-rw-r--r--dev-ros/message_filters/metadata.xml7
-rw-r--r--dev-ros/message_generation/metadata.xml7
-rw-r--r--dev-ros/message_runtime/metadata.xml7
-rw-r--r--dev-ros/message_to_tf/metadata.xml7
-rw-r--r--dev-ros/mk/metadata.xml7
-rw-r--r--dev-ros/monocam_settler/metadata.xml7
-rw-r--r--dev-ros/move_base/metadata.xml7
-rw-r--r--dev-ros/move_base_msgs/metadata.xml7
-rw-r--r--dev-ros/move_slow_and_clear/metadata.xml7
-rw-r--r--dev-ros/moveit_msgs/metadata.xml7
-rw-r--r--dev-ros/nav_core/metadata.xml7
-rw-r--r--dev-ros/nav_msgs/metadata.xml7
-rw-r--r--dev-ros/navfn/metadata.xml7
-rw-r--r--dev-ros/nodelet/metadata.xml7
-rw-r--r--dev-ros/nodelet_topic_tools/metadata.xml7
-rw-r--r--dev-ros/nodelet_tutorial_math/metadata.xml7
-rw-r--r--dev-ros/object_recognition_msgs/metadata.xml7
-rw-r--r--dev-ros/octomap_msgs/metadata.xml7
-rw-r--r--dev-ros/octomap_ros/metadata.xml7
-rw-r--r--dev-ros/opencv_apps/metadata.xml7
-rw-r--r--dev-ros/opencv_tests/metadata.xml7
-rw-r--r--dev-ros/openslam_gmapping/metadata.xml7
-rw-r--r--dev-ros/pcl_conversions/metadata.xml7
-rw-r--r--dev-ros/pcl_msgs/metadata.xml7
-rw-r--r--dev-ros/pcl_ros/metadata.xml7
-rw-r--r--dev-ros/pluginlib/metadata.xml7
-rw-r--r--dev-ros/pluginlib_tutorials/metadata.xml7
-rw-r--r--dev-ros/pointcloud_to_laserscan/metadata.xml7
-rw-r--r--dev-ros/polled_camera/metadata.xml7
-rw-r--r--dev-ros/pr2_dashboard_aggregator/metadata.xml7
-rw-r--r--dev-ros/pr2_description/metadata.xml7
-rw-r--r--dev-ros/pr2_machine/metadata.xml7
-rw-r--r--dev-ros/pr2_msgs/metadata.xml7
-rw-r--r--dev-ros/python_qt_binding/metadata.xml7
-rw-r--r--dev-ros/qt_dotgraph/metadata.xml7
-rw-r--r--dev-ros/qt_gui/metadata.xml7
-rw-r--r--dev-ros/qt_gui_app/metadata.xml7
-rw-r--r--dev-ros/qt_gui_cpp/metadata.xml7
-rw-r--r--dev-ros/qt_gui_py_common/metadata.xml7
-rw-r--r--dev-ros/random_numbers/metadata.xml7
-rw-r--r--dev-ros/realtime_tools/metadata.xml7
-rw-r--r--dev-ros/resource_retriever/metadata.xml7
-rw-r--r--dev-ros/robot_pose_ekf/metadata.xml7
-rw-r--r--dev-ros/robot_state_publisher/metadata.xml7
-rw-r--r--dev-ros/rosapi/metadata.xml7
-rw-r--r--dev-ros/rosauth/metadata.xml7
-rw-r--r--dev-ros/rosbag/metadata.xml9
-rw-r--r--dev-ros/rosbag_storage/metadata.xml7
-rw-r--r--dev-ros/rosbash/metadata.xml7
-rw-r--r--dev-ros/rosboost_cfg/metadata.xml7
-rw-r--r--dev-ros/rosbridge_library/metadata.xml7
-rw-r--r--dev-ros/rosbridge_server/metadata.xml7
-rw-r--r--dev-ros/rosbuild/metadata.xml7
-rw-r--r--dev-ros/rosclean/metadata.xml7
-rw-r--r--dev-ros/rosconsole/metadata.xml11
-rw-r--r--dev-ros/rosconsole_bridge/metadata.xml7
-rw-r--r--dev-ros/roscpp/metadata.xml7
-rw-r--r--dev-ros/roscpp_serialization/metadata.xml7
-rw-r--r--dev-ros/roscpp_traits/metadata.xml7
-rw-r--r--dev-ros/roscpp_tutorials/metadata.xml7
-rw-r--r--dev-ros/roscreate/metadata.xml7
-rw-r--r--dev-ros/rosgraph/metadata.xml7
-rw-r--r--dev-ros/rosgraph_msgs/metadata.xml7
-rw-r--r--dev-ros/roslang/metadata.xml7
-rw-r--r--dev-ros/roslaunch/metadata.xml7
-rw-r--r--dev-ros/roslib/metadata.xml7
-rw-r--r--dev-ros/roslint/metadata.xml7
-rw-r--r--dev-ros/roslisp/metadata.xml7
-rw-r--r--dev-ros/roslz4/metadata.xml7
-rw-r--r--dev-ros/rosmake/metadata.xml7
-rw-r--r--dev-ros/rosmaster/metadata.xml7
-rw-r--r--dev-ros/rosmsg/metadata.xml7
-rw-r--r--dev-ros/rosnode/metadata.xml7
-rw-r--r--dev-ros/rosout/metadata.xml7
-rw-r--r--dev-ros/rospack/metadata.xml7
-rw-r--r--dev-ros/rosparam/metadata.xml7
-rw-r--r--dev-ros/rospy/metadata.xml7
-rw-r--r--dev-ros/rospy_tutorials/metadata.xml7
-rw-r--r--dev-ros/rosserial_arduino/metadata.xml7
-rw-r--r--dev-ros/rosserial_client/metadata.xml7
-rw-r--r--dev-ros/rosserial_embeddedlinux/metadata.xml7
-rw-r--r--dev-ros/rosserial_msgs/metadata.xml7
-rw-r--r--dev-ros/rosserial_python/metadata.xml7
-rw-r--r--dev-ros/rosserial_server/metadata.xml7
-rw-r--r--dev-ros/rosserial_windows/metadata.xml7
-rw-r--r--dev-ros/rosserial_xbee/metadata.xml7
-rw-r--r--dev-ros/rosservice/metadata.xml7
-rw-r--r--dev-ros/rostest/metadata.xml7
-rw-r--r--dev-ros/rostime/metadata.xml7
-rw-r--r--dev-ros/rostopic/metadata.xml7
-rw-r--r--dev-ros/rosunit/metadata.xml7
-rw-r--r--dev-ros/roswtf/metadata.xml7
-rw-r--r--dev-ros/rotate_recovery/metadata.xml7
-rw-r--r--dev-ros/rqt_action/metadata.xml7
-rw-r--r--dev-ros/rqt_bag/metadata.xml7
-rw-r--r--dev-ros/rqt_bag_plugins/metadata.xml7
-rw-r--r--dev-ros/rqt_console/metadata.xml7
-rw-r--r--dev-ros/rqt_controller_manager/metadata.xml7
-rw-r--r--dev-ros/rqt_dep/metadata.xml7
-rw-r--r--dev-ros/rqt_graph/metadata.xml7
-rw-r--r--dev-ros/rqt_gui/metadata.xml7
-rw-r--r--dev-ros/rqt_gui_cpp/metadata.xml7
-rw-r--r--dev-ros/rqt_gui_py/metadata.xml7
-rw-r--r--dev-ros/rqt_image_view/metadata.xml7
-rw-r--r--dev-ros/rqt_launch/metadata.xml7
-rw-r--r--dev-ros/rqt_logger_level/metadata.xml7
-rw-r--r--dev-ros/rqt_moveit/metadata.xml7
-rw-r--r--dev-ros/rqt_msg/metadata.xml7
-rw-r--r--dev-ros/rqt_nav_view/metadata.xml7
-rw-r--r--dev-ros/rqt_plot/metadata.xml7
-rw-r--r--dev-ros/rqt_pose_view/metadata.xml7
-rw-r--r--dev-ros/rqt_publisher/metadata.xml7
-rw-r--r--dev-ros/rqt_py_common/metadata.xml7
-rw-r--r--dev-ros/rqt_py_console/metadata.xml7
-rw-r--r--dev-ros/rqt_reconfigure/metadata.xml7
-rw-r--r--dev-ros/rqt_robot_dashboard/metadata.xml7
-rw-r--r--dev-ros/rqt_robot_monitor/metadata.xml7
-rw-r--r--dev-ros/rqt_robot_steering/metadata.xml7
-rw-r--r--dev-ros/rqt_runtime_monitor/metadata.xml7
-rw-r--r--dev-ros/rqt_rviz/metadata.xml7
-rw-r--r--dev-ros/rqt_service_caller/metadata.xml7
-rw-r--r--dev-ros/rqt_shell/metadata.xml7
-rw-r--r--dev-ros/rqt_srv/metadata.xml7
-rw-r--r--dev-ros/rqt_tf_tree/metadata.xml7
-rw-r--r--dev-ros/rqt_top/metadata.xml7
-rw-r--r--dev-ros/rqt_topic/metadata.xml7
-rw-r--r--dev-ros/rqt_web/metadata.xml7
-rw-r--r--dev-ros/rviz/metadata.xml7
-rw-r--r--dev-ros/rviz_plugin_tutorials/metadata.xml7
-rw-r--r--dev-ros/rviz_python_tutorial/metadata.xml7
-rw-r--r--dev-ros/self_test/metadata.xml7
-rw-r--r--dev-ros/sensor_msgs/metadata.xml7
-rw-r--r--dev-ros/settlerlib/metadata.xml7
-rw-r--r--dev-ros/shape_msgs/metadata.xml7
-rw-r--r--dev-ros/smach/metadata.xml7
-rw-r--r--dev-ros/smach_msgs/metadata.xml7
-rw-r--r--dev-ros/smach_ros/metadata.xml7
-rw-r--r--dev-ros/smclib/metadata.xml7
-rw-r--r--dev-ros/sound_play/metadata.xml7
-rw-r--r--dev-ros/stage_ros/metadata.xml7
-rw-r--r--dev-ros/std_msgs/metadata.xml7
-rw-r--r--dev-ros/std_srvs/metadata.xml7
-rw-r--r--dev-ros/stereo_image_proc/metadata.xml7
-rw-r--r--dev-ros/stereo_msgs/metadata.xml7
-rw-r--r--dev-ros/test_bond/metadata.xml7
-rw-r--r--dev-ros/test_diagnostic_aggregator/metadata.xml7
-rw-r--r--dev-ros/test_nodelet/metadata.xml7
-rw-r--r--dev-ros/test_nodelet_topic_tools/metadata.xml7
-rw-r--r--dev-ros/test_rosbag/metadata.xml7
-rw-r--r--dev-ros/test_rosbag_storage/metadata.xml7
-rw-r--r--dev-ros/test_roscpp/metadata.xml7
-rw-r--r--dev-ros/test_rosgraph/metadata.xml7
-rw-r--r--dev-ros/test_roslaunch/metadata.xml7
-rw-r--r--dev-ros/test_roslib_comm/metadata.xml7
-rw-r--r--dev-ros/test_rosmaster/metadata.xml7
-rw-r--r--dev-ros/test_rosparam/metadata.xml7
-rw-r--r--dev-ros/test_rospy/metadata.xml7
-rw-r--r--dev-ros/test_rosservice/metadata.xml7
-rw-r--r--dev-ros/test_tf2/metadata.xml7
-rw-r--r--dev-ros/tf/metadata.xml7
-rw-r--r--dev-ros/tf2/metadata.xml7
-rw-r--r--dev-ros/tf2_bullet/metadata.xml7
-rw-r--r--dev-ros/tf2_geometry_msgs/metadata.xml7
-rw-r--r--dev-ros/tf2_kdl/metadata.xml7
-rw-r--r--dev-ros/tf2_msgs/metadata.xml7
-rw-r--r--dev-ros/tf2_py/metadata.xml7
-rw-r--r--dev-ros/tf2_ros/metadata.xml7
-rw-r--r--dev-ros/tf2_sensor_msgs/metadata.xml7
-rw-r--r--dev-ros/tf2_tools/metadata.xml7
-rw-r--r--dev-ros/tf_conversions/metadata.xml7
-rw-r--r--dev-ros/theora_image_transport/metadata.xml7
-rw-r--r--dev-ros/timestamp_tools/metadata.xml7
-rw-r--r--dev-ros/topic_tools/metadata.xml7
-rw-r--r--dev-ros/trajectory_msgs/metadata.xml7
-rw-r--r--dev-ros/transmission_interface/metadata.xml7
-rw-r--r--dev-ros/turtle_actionlib/metadata.xml7
-rw-r--r--dev-ros/turtle_tf/metadata.xml7
-rw-r--r--dev-ros/turtle_tf2/metadata.xml7
-rw-r--r--dev-ros/turtlesim/metadata.xml7
-rw-r--r--dev-ros/unique_id/metadata.xml7
-rw-r--r--dev-ros/urdf/metadata.xml7
-rw-r--r--dev-ros/urdf_parser_plugin/metadata.xml7
-rw-r--r--dev-ros/urdf_tutorial/metadata.xml7
-rw-r--r--dev-ros/uuid_msgs/metadata.xml7
-rw-r--r--dev-ros/visp_auto_tracker/metadata.xml7
-rw-r--r--dev-ros/visp_bridge/metadata.xml7
-rw-r--r--dev-ros/visp_camera_calibration/metadata.xml7
-rw-r--r--dev-ros/visp_hand2eye_calibration/metadata.xml7
-rw-r--r--dev-ros/visp_tracker/metadata.xml7
-rw-r--r--dev-ros/visualization_marker_tutorials/metadata.xml7
-rw-r--r--dev-ros/visualization_msgs/metadata.xml7
-rw-r--r--dev-ros/voxel_grid/metadata.xml7
-rw-r--r--dev-ros/xacro/metadata.xml7
-rw-r--r--dev-ros/xmlrpcpp/metadata.xml7
298 files changed, 1493 insertions, 599 deletions
diff --git a/dev-ros/actionlib/metadata.xml b/dev-ros/actionlib/metadata.xml
index c42ea5b15cf6..088b4e86906c 100644
--- a/dev-ros/actionlib/metadata.xml
+++ b/dev-ros/actionlib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/actionlib</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/actionlib_msgs/metadata.xml b/dev-ros/actionlib_msgs/metadata.xml
index c42ea5b15cf6..2d3b5cc254bd 100644
--- a/dev-ros/actionlib_msgs/metadata.xml
+++ b/dev-ros/actionlib_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/actionlib_tutorials/metadata.xml b/dev-ros/actionlib_tutorials/metadata.xml
index c42ea5b15cf6..38abe1f090cd 100644
--- a/dev-ros/actionlib_tutorials/metadata.xml
+++ b/dev-ros/actionlib_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/amcl/metadata.xml b/dev-ros/amcl/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/amcl/metadata.xml
+++ b/dev-ros/amcl/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/angles/metadata.xml b/dev-ros/angles/metadata.xml
index c42ea5b15cf6..7c9325957917 100644
--- a/dev-ros/angles/metadata.xml
+++ b/dev-ros/angles/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/angles</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/audio_capture/metadata.xml b/dev-ros/audio_capture/metadata.xml
index c42ea5b15cf6..11ebb410b524 100644
--- a/dev-ros/audio_capture/metadata.xml
+++ b/dev-ros/audio_capture/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/audio_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/audio_common_msgs/metadata.xml b/dev-ros/audio_common_msgs/metadata.xml
index c42ea5b15cf6..11ebb410b524 100644
--- a/dev-ros/audio_common_msgs/metadata.xml
+++ b/dev-ros/audio_common_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/audio_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/audio_play/metadata.xml b/dev-ros/audio_play/metadata.xml
index c42ea5b15cf6..11ebb410b524 100644
--- a/dev-ros/audio_play/metadata.xml
+++ b/dev-ros/audio_play/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/audio_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/base_local_planner/metadata.xml b/dev-ros/base_local_planner/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/base_local_planner/metadata.xml
+++ b/dev-ros/base_local_planner/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/bond/metadata.xml b/dev-ros/bond/metadata.xml
index c42ea5b15cf6..500c8eba4fcc 100644
--- a/dev-ros/bond/metadata.xml
+++ b/dev-ros/bond/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/bond_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/bondcpp/metadata.xml b/dev-ros/bondcpp/metadata.xml
index c42ea5b15cf6..500c8eba4fcc 100644
--- a/dev-ros/bondcpp/metadata.xml
+++ b/dev-ros/bondcpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/bond_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/bondpy/metadata.xml b/dev-ros/bondpy/metadata.xml
index c42ea5b15cf6..500c8eba4fcc 100644
--- a/dev-ros/bondpy/metadata.xml
+++ b/dev-ros/bondpy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/bond_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/calibration_estimation/metadata.xml b/dev-ros/calibration_estimation/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/calibration_estimation/metadata.xml
+++ b/dev-ros/calibration_estimation/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/calibration_launch/metadata.xml b/dev-ros/calibration_launch/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/calibration_launch/metadata.xml
+++ b/dev-ros/calibration_launch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/calibration_msgs/metadata.xml b/dev-ros/calibration_msgs/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/calibration_msgs/metadata.xml
+++ b/dev-ros/calibration_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/calibration_setup_helper/metadata.xml b/dev-ros/calibration_setup_helper/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/calibration_setup_helper/metadata.xml
+++ b/dev-ros/calibration_setup_helper/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/camera_calibration/metadata.xml b/dev-ros/camera_calibration/metadata.xml
index c42ea5b15cf6..90c35a2ace13 100644
--- a/dev-ros/camera_calibration/metadata.xml
+++ b/dev-ros/camera_calibration/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_pipeline</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/camera_calibration_parsers/metadata.xml b/dev-ros/camera_calibration_parsers/metadata.xml
index c42ea5b15cf6..b01f287fe9e1 100644
--- a/dev-ros/camera_calibration_parsers/metadata.xml
+++ b/dev-ros/camera_calibration_parsers/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/camera_info_manager/metadata.xml b/dev-ros/camera_info_manager/metadata.xml
index c42ea5b15cf6..b01f287fe9e1 100644
--- a/dev-ros/camera_info_manager/metadata.xml
+++ b/dev-ros/camera_info_manager/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/carrot_planner/metadata.xml b/dev-ros/carrot_planner/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/carrot_planner/metadata.xml
+++ b/dev-ros/carrot_planner/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/class_loader/metadata.xml b/dev-ros/class_loader/metadata.xml
index c42ea5b15cf6..9c5e3a9ddde3 100644
--- a/dev-ros/class_loader/metadata.xml
+++ b/dev-ros/class_loader/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/class_loader</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/clear_costmap_recovery/metadata.xml b/dev-ros/clear_costmap_recovery/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/clear_costmap_recovery/metadata.xml
+++ b/dev-ros/clear_costmap_recovery/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/cmake_modules/metadata.xml b/dev-ros/cmake_modules/metadata.xml
index c42ea5b15cf6..9ceae0aebb1c 100644
--- a/dev-ros/cmake_modules/metadata.xml
+++ b/dev-ros/cmake_modules/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/cmake_modules</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/collada_parser/metadata.xml b/dev-ros/collada_parser/metadata.xml
index c42ea5b15cf6..b2ab0e6da652 100644
--- a/dev-ros/collada_parser/metadata.xml
+++ b/dev-ros/collada_parser/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/robot_model</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/collada_urdf/metadata.xml b/dev-ros/collada_urdf/metadata.xml
index c42ea5b15cf6..b2ab0e6da652 100644
--- a/dev-ros/collada_urdf/metadata.xml
+++ b/dev-ros/collada_urdf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/robot_model</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/compressed_depth_image_transport/metadata.xml b/dev-ros/compressed_depth_image_transport/metadata.xml
index c42ea5b15cf6..97c7091fc40e 100644
--- a/dev-ros/compressed_depth_image_transport/metadata.xml
+++ b/dev-ros/compressed_depth_image_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_transport_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/compressed_image_transport/metadata.xml b/dev-ros/compressed_image_transport/metadata.xml
index c42ea5b15cf6..97c7091fc40e 100644
--- a/dev-ros/compressed_image_transport/metadata.xml
+++ b/dev-ros/compressed_image_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_transport_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/control_msgs/metadata.xml b/dev-ros/control_msgs/metadata.xml
index c42ea5b15cf6..da1d5da525e3 100644
--- a/dev-ros/control_msgs/metadata.xml
+++ b/dev-ros/control_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/control_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/control_toolbox/metadata.xml b/dev-ros/control_toolbox/metadata.xml
index c42ea5b15cf6..82c7f05bf5c4 100644
--- a/dev-ros/control_toolbox/metadata.xml
+++ b/dev-ros/control_toolbox/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/control_toolbox</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/controller_interface/metadata.xml b/dev-ros/controller_interface/metadata.xml
index c42ea5b15cf6..2b50e8aa45e1 100644
--- a/dev-ros/controller_interface/metadata.xml
+++ b/dev-ros/controller_interface/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/ros_control</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/controller_manager/metadata.xml b/dev-ros/controller_manager/metadata.xml
index c42ea5b15cf6..2b50e8aa45e1 100644
--- a/dev-ros/controller_manager/metadata.xml
+++ b/dev-ros/controller_manager/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/ros_control</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/controller_manager_msgs/metadata.xml b/dev-ros/controller_manager_msgs/metadata.xml
index c42ea5b15cf6..2b50e8aa45e1 100644
--- a/dev-ros/controller_manager_msgs/metadata.xml
+++ b/dev-ros/controller_manager_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/ros_control</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/controller_manager_tests/metadata.xml b/dev-ros/controller_manager_tests/metadata.xml
index c42ea5b15cf6..2b50e8aa45e1 100644
--- a/dev-ros/controller_manager_tests/metadata.xml
+++ b/dev-ros/controller_manager_tests/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/ros_control</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/convex_decomposition/metadata.xml b/dev-ros/convex_decomposition/metadata.xml
index c42ea5b15cf6..6d154386cbe3 100644
--- a/dev-ros/convex_decomposition/metadata.xml
+++ b/dev-ros/convex_decomposition/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/convex_decomposition</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/costmap_2d/metadata.xml b/dev-ros/costmap_2d/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/costmap_2d/metadata.xml
+++ b/dev-ros/costmap_2d/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/cpp_common/metadata.xml b/dev-ros/cpp_common/metadata.xml
index c42ea5b15cf6..d41b871a0507 100644
--- a/dev-ros/cpp_common/metadata.xml
+++ b/dev-ros/cpp_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/roscpp_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/cv_bridge/metadata.xml b/dev-ros/cv_bridge/metadata.xml
index c42ea5b15cf6..266dc38ae125 100644
--- a/dev-ros/cv_bridge/metadata.xml
+++ b/dev-ros/cv_bridge/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/vision_opencv</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/depth_image_proc/metadata.xml b/dev-ros/depth_image_proc/metadata.xml
index c42ea5b15cf6..90c35a2ace13 100644
--- a/dev-ros/depth_image_proc/metadata.xml
+++ b/dev-ros/depth_image_proc/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_pipeline</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/diagnostic_aggregator/metadata.xml b/dev-ros/diagnostic_aggregator/metadata.xml
index c42ea5b15cf6..7403d8edf061 100644
--- a/dev-ros/diagnostic_aggregator/metadata.xml
+++ b/dev-ros/diagnostic_aggregator/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/diagnostics</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/diagnostic_analysis/metadata.xml b/dev-ros/diagnostic_analysis/metadata.xml
index c42ea5b15cf6..7403d8edf061 100644
--- a/dev-ros/diagnostic_analysis/metadata.xml
+++ b/dev-ros/diagnostic_analysis/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/diagnostics</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/diagnostic_common_diagnostics/metadata.xml b/dev-ros/diagnostic_common_diagnostics/metadata.xml
index c42ea5b15cf6..7403d8edf061 100644
--- a/dev-ros/diagnostic_common_diagnostics/metadata.xml
+++ b/dev-ros/diagnostic_common_diagnostics/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/diagnostics</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/diagnostic_msgs/metadata.xml b/dev-ros/diagnostic_msgs/metadata.xml
index c42ea5b15cf6..2d3b5cc254bd 100644
--- a/dev-ros/diagnostic_msgs/metadata.xml
+++ b/dev-ros/diagnostic_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/diagnostic_updater/metadata.xml b/dev-ros/diagnostic_updater/metadata.xml
index c42ea5b15cf6..7403d8edf061 100644
--- a/dev-ros/diagnostic_updater/metadata.xml
+++ b/dev-ros/diagnostic_updater/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/diagnostics</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/driver_base/metadata.xml b/dev-ros/driver_base/metadata.xml
index c42ea5b15cf6..9e7fdee55fb4 100644
--- a/dev-ros/driver_base/metadata.xml
+++ b/dev-ros/driver_base/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/driver_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/dwa_local_planner/metadata.xml b/dev-ros/dwa_local_planner/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/dwa_local_planner/metadata.xml
+++ b/dev-ros/dwa_local_planner/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/dynamic_reconfigure/metadata.xml b/dev-ros/dynamic_reconfigure/metadata.xml
index c42ea5b15cf6..6d2512b4ec92 100644
--- a/dev-ros/dynamic_reconfigure/metadata.xml
+++ b/dev-ros/dynamic_reconfigure/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/dynamic_reconfigure</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/eigen_conversions/metadata.xml b/dev-ros/eigen_conversions/metadata.xml
index c42ea5b15cf6..2d8e130aac8b 100644
--- a/dev-ros/eigen_conversions/metadata.xml
+++ b/dev-ros/eigen_conversions/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/eigen_stl_containers/metadata.xml b/dev-ros/eigen_stl_containers/metadata.xml
index c42ea5b15cf6..62e93bb3fc6b 100644
--- a/dev-ros/eigen_stl_containers/metadata.xml
+++ b/dev-ros/eigen_stl_containers/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/eigen_stl_containers</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/fake_localization/metadata.xml b/dev-ros/fake_localization/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/fake_localization/metadata.xml
+++ b/dev-ros/fake_localization/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/filters/metadata.xml b/dev-ros/filters/metadata.xml
index c42ea5b15cf6..8d40320ae419 100644
--- a/dev-ros/filters/metadata.xml
+++ b/dev-ros/filters/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/filters</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/gazebo_msgs/metadata.xml b/dev-ros/gazebo_msgs/metadata.xml
index c42ea5b15cf6..2cda80683bbb 100644
--- a/dev-ros/gazebo_msgs/metadata.xml
+++ b/dev-ros/gazebo_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/gazebo_plugins/metadata.xml b/dev-ros/gazebo_plugins/metadata.xml
index c42ea5b15cf6..2cda80683bbb 100644
--- a/dev-ros/gazebo_plugins/metadata.xml
+++ b/dev-ros/gazebo_plugins/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/gazebo_ros/metadata.xml b/dev-ros/gazebo_ros/metadata.xml
index c42ea5b15cf6..2cda80683bbb 100644
--- a/dev-ros/gazebo_ros/metadata.xml
+++ b/dev-ros/gazebo_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/gazebo_ros_control/metadata.xml b/dev-ros/gazebo_ros_control/metadata.xml
index c42ea5b15cf6..2cda80683bbb 100644
--- a/dev-ros/gazebo_ros_control/metadata.xml
+++ b/dev-ros/gazebo_ros_control/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/gencpp/metadata.xml b/dev-ros/gencpp/metadata.xml
index c42ea5b15cf6..957630630878 100644
--- a/dev-ros/gencpp/metadata.xml
+++ b/dev-ros/gencpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/gencpp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/geneus/metadata.xml b/dev-ros/geneus/metadata.xml
index c42ea5b15cf6..38009a31b5f2 100644
--- a/dev-ros/geneus/metadata.xml
+++ b/dev-ros/geneus/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">jsk-ros-pkg/geneus</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/genlisp/metadata.xml b/dev-ros/genlisp/metadata.xml
index c42ea5b15cf6..f0319057ebea 100644
--- a/dev-ros/genlisp/metadata.xml
+++ b/dev-ros/genlisp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/genlisp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/genmsg/metadata.xml b/dev-ros/genmsg/metadata.xml
index c42ea5b15cf6..9e675a227677 100644
--- a/dev-ros/genmsg/metadata.xml
+++ b/dev-ros/genmsg/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/genmsg</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/genpy/metadata.xml b/dev-ros/genpy/metadata.xml
index c42ea5b15cf6..a588e784e399 100644
--- a/dev-ros/genpy/metadata.xml
+++ b/dev-ros/genpy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/genpy</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/geodesy/metadata.xml b/dev-ros/geodesy/metadata.xml
index c42ea5b15cf6..15ed56b3dd5e 100644
--- a/dev-ros/geodesy/metadata.xml
+++ b/dev-ros/geodesy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-geographic-info/geographic_info</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/geographic_msgs/metadata.xml b/dev-ros/geographic_msgs/metadata.xml
index c42ea5b15cf6..15ed56b3dd5e 100644
--- a/dev-ros/geographic_msgs/metadata.xml
+++ b/dev-ros/geographic_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-geographic-info/geographic_info</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/geometric_shapes/metadata.xml b/dev-ros/geometric_shapes/metadata.xml
index c42ea5b15cf6..520964c41636 100644
--- a/dev-ros/geometric_shapes/metadata.xml
+++ b/dev-ros/geometric_shapes/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/geometric_shapes</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/geometry_msgs/metadata.xml b/dev-ros/geometry_msgs/metadata.xml
index c42ea5b15cf6..2d3b5cc254bd 100644
--- a/dev-ros/geometry_msgs/metadata.xml
+++ b/dev-ros/geometry_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/global_planner/metadata.xml b/dev-ros/global_planner/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/global_planner/metadata.xml
+++ b/dev-ros/global_planner/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/gmapping/metadata.xml b/dev-ros/gmapping/metadata.xml
index c42ea5b15cf6..2787121df32a 100644
--- a/dev-ros/gmapping/metadata.xml
+++ b/dev-ros/gmapping/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/slam_gmapping</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hardware_interface/metadata.xml b/dev-ros/hardware_interface/metadata.xml
index c42ea5b15cf6..2b50e8aa45e1 100644
--- a/dev-ros/hardware_interface/metadata.xml
+++ b/dev-ros/hardware_interface/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/ros_control</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_compressed_map_transport/metadata.xml b/dev-ros/hector_compressed_map_transport/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_compressed_map_transport/metadata.xml
+++ b/dev-ros/hector_compressed_map_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_geotiff/metadata.xml b/dev-ros/hector_geotiff/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_geotiff/metadata.xml
+++ b/dev-ros/hector_geotiff/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_geotiff_plugins/metadata.xml b/dev-ros/hector_geotiff_plugins/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_geotiff_plugins/metadata.xml
+++ b/dev-ros/hector_geotiff_plugins/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_imu_attitude_to_tf/metadata.xml b/dev-ros/hector_imu_attitude_to_tf/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_imu_attitude_to_tf/metadata.xml
+++ b/dev-ros/hector_imu_attitude_to_tf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_imu_tools/metadata.xml b/dev-ros/hector_imu_tools/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_imu_tools/metadata.xml
+++ b/dev-ros/hector_imu_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_map_server/metadata.xml b/dev-ros/hector_map_server/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_map_server/metadata.xml
+++ b/dev-ros/hector_map_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_map_tools/metadata.xml b/dev-ros/hector_map_tools/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_map_tools/metadata.xml
+++ b/dev-ros/hector_map_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_mapping/metadata.xml b/dev-ros/hector_mapping/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_mapping/metadata.xml
+++ b/dev-ros/hector_mapping/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_marker_drawing/metadata.xml b/dev-ros/hector_marker_drawing/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_marker_drawing/metadata.xml
+++ b/dev-ros/hector_marker_drawing/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_nav_msgs/metadata.xml b/dev-ros/hector_nav_msgs/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_nav_msgs/metadata.xml
+++ b/dev-ros/hector_nav_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_pose_estimation/metadata.xml b/dev-ros/hector_pose_estimation/metadata.xml
index c42ea5b15cf6..017b91773a4a 100644
--- a/dev-ros/hector_pose_estimation/metadata.xml
+++ b/dev-ros/hector_pose_estimation/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_pose_estimation_core/metadata.xml b/dev-ros/hector_pose_estimation_core/metadata.xml
index c42ea5b15cf6..017b91773a4a 100644
--- a/dev-ros/hector_pose_estimation_core/metadata.xml
+++ b/dev-ros/hector_pose_estimation_core/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_slam_launch/metadata.xml b/dev-ros/hector_slam_launch/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_slam_launch/metadata.xml
+++ b/dev-ros/hector_slam_launch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/hector_trajectory_server/metadata.xml b/dev-ros/hector_trajectory_server/metadata.xml
index c42ea5b15cf6..d3cf71ef1650 100644
--- a/dev-ros/hector_trajectory_server/metadata.xml
+++ b/dev-ros/hector_trajectory_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/image_cb_detector/metadata.xml b/dev-ros/image_cb_detector/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/image_cb_detector/metadata.xml
+++ b/dev-ros/image_cb_detector/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/image_geometry/metadata.xml b/dev-ros/image_geometry/metadata.xml
index c42ea5b15cf6..266dc38ae125 100644
--- a/dev-ros/image_geometry/metadata.xml
+++ b/dev-ros/image_geometry/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/vision_opencv</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/image_proc/metadata.xml b/dev-ros/image_proc/metadata.xml
index c42ea5b15cf6..90c35a2ace13 100644
--- a/dev-ros/image_proc/metadata.xml
+++ b/dev-ros/image_proc/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_pipeline</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/image_rotate/metadata.xml b/dev-ros/image_rotate/metadata.xml
index c42ea5b15cf6..90c35a2ace13 100644
--- a/dev-ros/image_rotate/metadata.xml
+++ b/dev-ros/image_rotate/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_pipeline</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/image_transport/metadata.xml b/dev-ros/image_transport/metadata.xml
index c42ea5b15cf6..b01f287fe9e1 100644
--- a/dev-ros/image_transport/metadata.xml
+++ b/dev-ros/image_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/image_view/metadata.xml b/dev-ros/image_view/metadata.xml
index c42ea5b15cf6..90c35a2ace13 100644
--- a/dev-ros/image_view/metadata.xml
+++ b/dev-ros/image_view/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_pipeline</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/imu_processors/metadata.xml b/dev-ros/imu_processors/metadata.xml
index c42ea5b15cf6..59d1d9e7a3c0 100644
--- a/dev-ros/imu_processors/metadata.xml
+++ b/dev-ros/imu_processors/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/imu_pipeline</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/imu_transformer/metadata.xml b/dev-ros/imu_transformer/metadata.xml
index c42ea5b15cf6..59d1d9e7a3c0 100644
--- a/dev-ros/imu_transformer/metadata.xml
+++ b/dev-ros/imu_transformer/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/imu_pipeline</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/interactive_marker_tutorials/metadata.xml b/dev-ros/interactive_marker_tutorials/metadata.xml
index c42ea5b15cf6..e1ee2063b890 100644
--- a/dev-ros/interactive_marker_tutorials/metadata.xml
+++ b/dev-ros/interactive_marker_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/interactive_markers/metadata.xml b/dev-ros/interactive_markers/metadata.xml
index c42ea5b15cf6..06342c0bf988 100644
--- a/dev-ros/interactive_markers/metadata.xml
+++ b/dev-ros/interactive_markers/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/interactive_markers</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/interval_intersection/metadata.xml b/dev-ros/interval_intersection/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/interval_intersection/metadata.xml
+++ b/dev-ros/interval_intersection/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/ivcon/metadata.xml b/dev-ros/ivcon/metadata.xml
index c42ea5b15cf6..01a9af489860 100644
--- a/dev-ros/ivcon/metadata.xml
+++ b/dev-ros/ivcon/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ivcon</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/joint_limits_interface/metadata.xml b/dev-ros/joint_limits_interface/metadata.xml
index c42ea5b15cf6..2b50e8aa45e1 100644
--- a/dev-ros/joint_limits_interface/metadata.xml
+++ b/dev-ros/joint_limits_interface/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/ros_control</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/joint_state_publisher/metadata.xml b/dev-ros/joint_state_publisher/metadata.xml
index c42ea5b15cf6..b2ab0e6da652 100644
--- a/dev-ros/joint_state_publisher/metadata.xml
+++ b/dev-ros/joint_state_publisher/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/robot_model</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/joint_states_settler/metadata.xml b/dev-ros/joint_states_settler/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/joint_states_settler/metadata.xml
+++ b/dev-ros/joint_states_settler/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/kdl_conversions/metadata.xml b/dev-ros/kdl_conversions/metadata.xml
index c42ea5b15cf6..2d8e130aac8b 100644
--- a/dev-ros/kdl_conversions/metadata.xml
+++ b/dev-ros/kdl_conversions/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/kdl_parser/metadata.xml b/dev-ros/kdl_parser/metadata.xml
index c42ea5b15cf6..b2ab0e6da652 100644
--- a/dev-ros/kdl_parser/metadata.xml
+++ b/dev-ros/kdl_parser/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/robot_model</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/laser_assembler/metadata.xml b/dev-ros/laser_assembler/metadata.xml
index c42ea5b15cf6..3dbf9bfaa070 100644
--- a/dev-ros/laser_assembler/metadata.xml
+++ b/dev-ros/laser_assembler/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/laser_assembler</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/laser_cb_detector/metadata.xml b/dev-ros/laser_cb_detector/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/laser_cb_detector/metadata.xml
+++ b/dev-ros/laser_cb_detector/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/laser_filters/metadata.xml b/dev-ros/laser_filters/metadata.xml
index c42ea5b15cf6..a51d14a861c6 100644
--- a/dev-ros/laser_filters/metadata.xml
+++ b/dev-ros/laser_filters/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/laser_filters</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/laser_geometry/metadata.xml b/dev-ros/laser_geometry/metadata.xml
index c42ea5b15cf6..46f29bebc628 100644
--- a/dev-ros/laser_geometry/metadata.xml
+++ b/dev-ros/laser_geometry/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/laser_geometry</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/librviz_tutorial/metadata.xml b/dev-ros/librviz_tutorial/metadata.xml
index c42ea5b15cf6..e1ee2063b890 100644
--- a/dev-ros/librviz_tutorial/metadata.xml
+++ b/dev-ros/librviz_tutorial/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/map_msgs/metadata.xml b/dev-ros/map_msgs/metadata.xml
index c42ea5b15cf6..8a5ed026c5d1 100644
--- a/dev-ros/map_msgs/metadata.xml
+++ b/dev-ros/map_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/map_server/metadata.xml b/dev-ros/map_server/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/map_server/metadata.xml
+++ b/dev-ros/map_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/message_filters/metadata.xml b/dev-ros/message_filters/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/message_filters/metadata.xml
+++ b/dev-ros/message_filters/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/message_generation/metadata.xml b/dev-ros/message_generation/metadata.xml
index c42ea5b15cf6..bf725cc29995 100644
--- a/dev-ros/message_generation/metadata.xml
+++ b/dev-ros/message_generation/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/message_generation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/message_runtime/metadata.xml b/dev-ros/message_runtime/metadata.xml
index c42ea5b15cf6..f82115797462 100644
--- a/dev-ros/message_runtime/metadata.xml
+++ b/dev-ros/message_runtime/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/message_runtime</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/message_to_tf/metadata.xml b/dev-ros/message_to_tf/metadata.xml
index c42ea5b15cf6..017b91773a4a 100644
--- a/dev-ros/message_to_tf/metadata.xml
+++ b/dev-ros/message_to_tf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/mk/metadata.xml b/dev-ros/mk/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/mk/metadata.xml
+++ b/dev-ros/mk/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/monocam_settler/metadata.xml b/dev-ros/monocam_settler/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/monocam_settler/metadata.xml
+++ b/dev-ros/monocam_settler/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/move_base/metadata.xml b/dev-ros/move_base/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/move_base/metadata.xml
+++ b/dev-ros/move_base/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/move_base_msgs/metadata.xml b/dev-ros/move_base_msgs/metadata.xml
index c42ea5b15cf6..8a5ed026c5d1 100644
--- a/dev-ros/move_base_msgs/metadata.xml
+++ b/dev-ros/move_base_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/move_slow_and_clear/metadata.xml b/dev-ros/move_slow_and_clear/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/move_slow_and_clear/metadata.xml
+++ b/dev-ros/move_slow_and_clear/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/moveit_msgs/metadata.xml b/dev-ros/moveit_msgs/metadata.xml
index c42ea5b15cf6..9e33b27d1d89 100644
--- a/dev-ros/moveit_msgs/metadata.xml
+++ b/dev-ros/moveit_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/moveit_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/nav_core/metadata.xml b/dev-ros/nav_core/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/nav_core/metadata.xml
+++ b/dev-ros/nav_core/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/nav_msgs/metadata.xml b/dev-ros/nav_msgs/metadata.xml
index c42ea5b15cf6..2d3b5cc254bd 100644
--- a/dev-ros/nav_msgs/metadata.xml
+++ b/dev-ros/nav_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/navfn/metadata.xml b/dev-ros/navfn/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/navfn/metadata.xml
+++ b/dev-ros/navfn/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/nodelet/metadata.xml b/dev-ros/nodelet/metadata.xml
index c42ea5b15cf6..33bcb0c55d1d 100644
--- a/dev-ros/nodelet/metadata.xml
+++ b/dev-ros/nodelet/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/nodelet_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/nodelet_topic_tools/metadata.xml b/dev-ros/nodelet_topic_tools/metadata.xml
index c42ea5b15cf6..33bcb0c55d1d 100644
--- a/dev-ros/nodelet_topic_tools/metadata.xml
+++ b/dev-ros/nodelet_topic_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/nodelet_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/nodelet_tutorial_math/metadata.xml b/dev-ros/nodelet_tutorial_math/metadata.xml
index c42ea5b15cf6..38abe1f090cd 100644
--- a/dev-ros/nodelet_tutorial_math/metadata.xml
+++ b/dev-ros/nodelet_tutorial_math/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/object_recognition_msgs/metadata.xml b/dev-ros/object_recognition_msgs/metadata.xml
index c42ea5b15cf6..eb59c0a6f9f0 100644
--- a/dev-ros/object_recognition_msgs/metadata.xml
+++ b/dev-ros/object_recognition_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">wg-perception/object_recognition_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/octomap_msgs/metadata.xml b/dev-ros/octomap_msgs/metadata.xml
index c42ea5b15cf6..4be018a5527c 100644
--- a/dev-ros/octomap_msgs/metadata.xml
+++ b/dev-ros/octomap_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">OctoMap/octomap_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/octomap_ros/metadata.xml b/dev-ros/octomap_ros/metadata.xml
index c42ea5b15cf6..9d69b3c3c5b3 100644
--- a/dev-ros/octomap_ros/metadata.xml
+++ b/dev-ros/octomap_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">OctoMap/octomap_ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/opencv_apps/metadata.xml b/dev-ros/opencv_apps/metadata.xml
index c42ea5b15cf6..266dc38ae125 100644
--- a/dev-ros/opencv_apps/metadata.xml
+++ b/dev-ros/opencv_apps/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/vision_opencv</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/opencv_tests/metadata.xml b/dev-ros/opencv_tests/metadata.xml
index c42ea5b15cf6..266dc38ae125 100644
--- a/dev-ros/opencv_tests/metadata.xml
+++ b/dev-ros/opencv_tests/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/vision_opencv</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/openslam_gmapping/metadata.xml b/dev-ros/openslam_gmapping/metadata.xml
index c42ea5b15cf6..c248b9611dc6 100644
--- a/dev-ros/openslam_gmapping/metadata.xml
+++ b/dev-ros/openslam_gmapping/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/openslam_gmapping</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pcl_conversions/metadata.xml b/dev-ros/pcl_conversions/metadata.xml
index c42ea5b15cf6..b19e3638face 100644
--- a/dev-ros/pcl_conversions/metadata.xml
+++ b/dev-ros/pcl_conversions/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/pcl_conversions</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pcl_msgs/metadata.xml b/dev-ros/pcl_msgs/metadata.xml
index c42ea5b15cf6..a765a41bbefb 100644
--- a/dev-ros/pcl_msgs/metadata.xml
+++ b/dev-ros/pcl_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/pcl_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pcl_ros/metadata.xml b/dev-ros/pcl_ros/metadata.xml
index c42ea5b15cf6..3fbdb8f97ecb 100644
--- a/dev-ros/pcl_ros/metadata.xml
+++ b/dev-ros/pcl_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/perception_pcl</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pluginlib/metadata.xml b/dev-ros/pluginlib/metadata.xml
index c42ea5b15cf6..2d4844b1515b 100644
--- a/dev-ros/pluginlib/metadata.xml
+++ b/dev-ros/pluginlib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/pluginlib</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pluginlib_tutorials/metadata.xml b/dev-ros/pluginlib_tutorials/metadata.xml
index c42ea5b15cf6..38abe1f090cd 100644
--- a/dev-ros/pluginlib_tutorials/metadata.xml
+++ b/dev-ros/pluginlib_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pointcloud_to_laserscan/metadata.xml b/dev-ros/pointcloud_to_laserscan/metadata.xml
index c42ea5b15cf6..73f0102b59c9 100644
--- a/dev-ros/pointcloud_to_laserscan/metadata.xml
+++ b/dev-ros/pointcloud_to_laserscan/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/pointcloud_to_laserscan</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/polled_camera/metadata.xml b/dev-ros/polled_camera/metadata.xml
index c42ea5b15cf6..b01f287fe9e1 100644
--- a/dev-ros/polled_camera/metadata.xml
+++ b/dev-ros/polled_camera/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pr2_dashboard_aggregator/metadata.xml b/dev-ros/pr2_dashboard_aggregator/metadata.xml
index c42ea5b15cf6..88a4cd6839ec 100644
--- a/dev-ros/pr2_dashboard_aggregator/metadata.xml
+++ b/dev-ros/pr2_dashboard_aggregator/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">pr2/pr2_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pr2_description/metadata.xml b/dev-ros/pr2_description/metadata.xml
index c42ea5b15cf6..88a4cd6839ec 100644
--- a/dev-ros/pr2_description/metadata.xml
+++ b/dev-ros/pr2_description/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">pr2/pr2_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pr2_machine/metadata.xml b/dev-ros/pr2_machine/metadata.xml
index c42ea5b15cf6..88a4cd6839ec 100644
--- a/dev-ros/pr2_machine/metadata.xml
+++ b/dev-ros/pr2_machine/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">pr2/pr2_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/pr2_msgs/metadata.xml b/dev-ros/pr2_msgs/metadata.xml
index c42ea5b15cf6..88a4cd6839ec 100644
--- a/dev-ros/pr2_msgs/metadata.xml
+++ b/dev-ros/pr2_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">pr2/pr2_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/python_qt_binding/metadata.xml b/dev-ros/python_qt_binding/metadata.xml
index c42ea5b15cf6..51aa73b52a66 100644
--- a/dev-ros/python_qt_binding/metadata.xml
+++ b/dev-ros/python_qt_binding/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/python_qt_binding</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/qt_dotgraph/metadata.xml b/dev-ros/qt_dotgraph/metadata.xml
index c42ea5b15cf6..2d881113931f 100644
--- a/dev-ros/qt_dotgraph/metadata.xml
+++ b/dev-ros/qt_dotgraph/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/qt_gui/metadata.xml b/dev-ros/qt_gui/metadata.xml
index c42ea5b15cf6..2d881113931f 100644
--- a/dev-ros/qt_gui/metadata.xml
+++ b/dev-ros/qt_gui/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/qt_gui_app/metadata.xml b/dev-ros/qt_gui_app/metadata.xml
index c42ea5b15cf6..2d881113931f 100644
--- a/dev-ros/qt_gui_app/metadata.xml
+++ b/dev-ros/qt_gui_app/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/qt_gui_cpp/metadata.xml b/dev-ros/qt_gui_cpp/metadata.xml
index c42ea5b15cf6..2d881113931f 100644
--- a/dev-ros/qt_gui_cpp/metadata.xml
+++ b/dev-ros/qt_gui_cpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/qt_gui_py_common/metadata.xml b/dev-ros/qt_gui_py_common/metadata.xml
index c42ea5b15cf6..2d881113931f 100644
--- a/dev-ros/qt_gui_py_common/metadata.xml
+++ b/dev-ros/qt_gui_py_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/qt_gui_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/random_numbers/metadata.xml b/dev-ros/random_numbers/metadata.xml
index c42ea5b15cf6..9eecefd8f1b7 100644
--- a/dev-ros/random_numbers/metadata.xml
+++ b/dev-ros/random_numbers/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/random_numbers</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/realtime_tools/metadata.xml b/dev-ros/realtime_tools/metadata.xml
index c42ea5b15cf6..1b548334eaff 100644
--- a/dev-ros/realtime_tools/metadata.xml
+++ b/dev-ros/realtime_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/realtime_tools</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/resource_retriever/metadata.xml b/dev-ros/resource_retriever/metadata.xml
index c42ea5b15cf6..5469bd615381 100644
--- a/dev-ros/resource_retriever/metadata.xml
+++ b/dev-ros/resource_retriever/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/resource_retriever</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/robot_pose_ekf/metadata.xml b/dev-ros/robot_pose_ekf/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/robot_pose_ekf/metadata.xml
+++ b/dev-ros/robot_pose_ekf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/robot_state_publisher/metadata.xml b/dev-ros/robot_state_publisher/metadata.xml
index c42ea5b15cf6..1d107f4f7c60 100644
--- a/dev-ros/robot_state_publisher/metadata.xml
+++ b/dev-ros/robot_state_publisher/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/robot_state_publisher</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosapi/metadata.xml b/dev-ros/rosapi/metadata.xml
index c42ea5b15cf6..d54818544305 100644
--- a/dev-ros/rosapi/metadata.xml
+++ b/dev-ros/rosapi/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosauth/metadata.xml b/dev-ros/rosauth/metadata.xml
index c42ea5b15cf6..ade7f22372e8 100644
--- a/dev-ros/rosauth/metadata.xml
+++ b/dev-ros/rosauth/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">WPI-RAIL/rosauth</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosbag/metadata.xml b/dev-ros/rosbag/metadata.xml
index 265847ded060..c75640d3c3e6 100644
--- a/dev-ros/rosbag/metadata.xml
+++ b/dev-ros/rosbag/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
<use>
- <flag name="lz4">Add support for lz4 compressed bags.</flag>
+ <flag name="lz4">Add support for lz4 compressed bags.</flag>
</use>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosbag_storage/metadata.xml b/dev-ros/rosbag_storage/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rosbag_storage/metadata.xml
+++ b/dev-ros/rosbag_storage/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosbash/metadata.xml b/dev-ros/rosbash/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/rosbash/metadata.xml
+++ b/dev-ros/rosbash/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosboost_cfg/metadata.xml b/dev-ros/rosboost_cfg/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/rosboost_cfg/metadata.xml
+++ b/dev-ros/rosboost_cfg/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosbridge_library/metadata.xml b/dev-ros/rosbridge_library/metadata.xml
index c42ea5b15cf6..d54818544305 100644
--- a/dev-ros/rosbridge_library/metadata.xml
+++ b/dev-ros/rosbridge_library/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosbridge_server/metadata.xml b/dev-ros/rosbridge_server/metadata.xml
index c42ea5b15cf6..d54818544305 100644
--- a/dev-ros/rosbridge_server/metadata.xml
+++ b/dev-ros/rosbridge_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosbuild/metadata.xml b/dev-ros/rosbuild/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/rosbuild/metadata.xml
+++ b/dev-ros/rosbuild/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosclean/metadata.xml b/dev-ros/rosclean/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/rosclean/metadata.xml
+++ b/dev-ros/rosclean/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosconsole/metadata.xml b/dev-ros/rosconsole/metadata.xml
index deb6fce6c1ff..d8ccd39aa163 100644
--- a/dev-ros/rosconsole/metadata.xml
+++ b/dev-ros/rosconsole/metadata.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
<use>
- <flag name="glog">Use <pkg>dev-cpp/glog</pkg> as log backend.</flag>
- <flag name="log4cxx">Use <pkg>dev-libs/log4cxx</pkg> as log backend.</flag>
+ <flag name="glog">Use <pkg>dev-cpp/glog</pkg> as log backend.</flag>
+ <flag name="log4cxx">Use <pkg>dev-libs/log4cxx</pkg> as log backend.</flag>
</use>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosconsole_bridge/metadata.xml b/dev-ros/rosconsole_bridge/metadata.xml
index c42ea5b15cf6..f90c61aa8676 100644
--- a/dev-ros/rosconsole_bridge/metadata.xml
+++ b/dev-ros/rosconsole_bridge/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/rosconsole_bridge</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roscpp/metadata.xml b/dev-ros/roscpp/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/roscpp/metadata.xml
+++ b/dev-ros/roscpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roscpp_serialization/metadata.xml b/dev-ros/roscpp_serialization/metadata.xml
index c42ea5b15cf6..d41b871a0507 100644
--- a/dev-ros/roscpp_serialization/metadata.xml
+++ b/dev-ros/roscpp_serialization/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/roscpp_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roscpp_traits/metadata.xml b/dev-ros/roscpp_traits/metadata.xml
index c42ea5b15cf6..d41b871a0507 100644
--- a/dev-ros/roscpp_traits/metadata.xml
+++ b/dev-ros/roscpp_traits/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/roscpp_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roscpp_tutorials/metadata.xml b/dev-ros/roscpp_tutorials/metadata.xml
index c42ea5b15cf6..1360d75ec0b1 100644
--- a/dev-ros/roscpp_tutorials/metadata.xml
+++ b/dev-ros/roscpp_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roscreate/metadata.xml b/dev-ros/roscreate/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/roscreate/metadata.xml
+++ b/dev-ros/roscreate/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosgraph/metadata.xml b/dev-ros/rosgraph/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rosgraph/metadata.xml
+++ b/dev-ros/rosgraph/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosgraph_msgs/metadata.xml b/dev-ros/rosgraph_msgs/metadata.xml
index c42ea5b15cf6..d101ce6019b0 100644
--- a/dev-ros/rosgraph_msgs/metadata.xml
+++ b/dev-ros/rosgraph_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roslang/metadata.xml b/dev-ros/roslang/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/roslang/metadata.xml
+++ b/dev-ros/roslang/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roslaunch/metadata.xml b/dev-ros/roslaunch/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/roslaunch/metadata.xml
+++ b/dev-ros/roslaunch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roslib/metadata.xml b/dev-ros/roslib/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/roslib/metadata.xml
+++ b/dev-ros/roslib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roslint/metadata.xml b/dev-ros/roslint/metadata.xml
index c42ea5b15cf6..3605109845ea 100644
--- a/dev-ros/roslint/metadata.xml
+++ b/dev-ros/roslint/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/roslint</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roslisp/metadata.xml b/dev-ros/roslisp/metadata.xml
index c42ea5b15cf6..10cafb5e9703 100644
--- a/dev-ros/roslisp/metadata.xml
+++ b/dev-ros/roslisp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/roslisp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roslz4/metadata.xml b/dev-ros/roslz4/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/roslz4/metadata.xml
+++ b/dev-ros/roslz4/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosmake/metadata.xml b/dev-ros/rosmake/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/rosmake/metadata.xml
+++ b/dev-ros/rosmake/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosmaster/metadata.xml b/dev-ros/rosmaster/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rosmaster/metadata.xml
+++ b/dev-ros/rosmaster/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosmsg/metadata.xml b/dev-ros/rosmsg/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rosmsg/metadata.xml
+++ b/dev-ros/rosmsg/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosnode/metadata.xml b/dev-ros/rosnode/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rosnode/metadata.xml
+++ b/dev-ros/rosnode/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosout/metadata.xml b/dev-ros/rosout/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rosout/metadata.xml
+++ b/dev-ros/rosout/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rospack/metadata.xml b/dev-ros/rospack/metadata.xml
index c42ea5b15cf6..34042c30d17d 100644
--- a/dev-ros/rospack/metadata.xml
+++ b/dev-ros/rospack/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/rospack</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosparam/metadata.xml b/dev-ros/rosparam/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rosparam/metadata.xml
+++ b/dev-ros/rosparam/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rospy/metadata.xml b/dev-ros/rospy/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rospy/metadata.xml
+++ b/dev-ros/rospy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rospy_tutorials/metadata.xml b/dev-ros/rospy_tutorials/metadata.xml
index c42ea5b15cf6..1360d75ec0b1 100644
--- a/dev-ros/rospy_tutorials/metadata.xml
+++ b/dev-ros/rospy_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosserial_arduino/metadata.xml b/dev-ros/rosserial_arduino/metadata.xml
index c42ea5b15cf6..853c4a1812bd 100644
--- a/dev-ros/rosserial_arduino/metadata.xml
+++ b/dev-ros/rosserial_arduino/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/rosserial</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosserial_client/metadata.xml b/dev-ros/rosserial_client/metadata.xml
index c42ea5b15cf6..853c4a1812bd 100644
--- a/dev-ros/rosserial_client/metadata.xml
+++ b/dev-ros/rosserial_client/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/rosserial</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosserial_embeddedlinux/metadata.xml b/dev-ros/rosserial_embeddedlinux/metadata.xml
index c42ea5b15cf6..853c4a1812bd 100644
--- a/dev-ros/rosserial_embeddedlinux/metadata.xml
+++ b/dev-ros/rosserial_embeddedlinux/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/rosserial</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosserial_msgs/metadata.xml b/dev-ros/rosserial_msgs/metadata.xml
index c42ea5b15cf6..853c4a1812bd 100644
--- a/dev-ros/rosserial_msgs/metadata.xml
+++ b/dev-ros/rosserial_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/rosserial</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosserial_python/metadata.xml b/dev-ros/rosserial_python/metadata.xml
index c42ea5b15cf6..853c4a1812bd 100644
--- a/dev-ros/rosserial_python/metadata.xml
+++ b/dev-ros/rosserial_python/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/rosserial</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosserial_server/metadata.xml b/dev-ros/rosserial_server/metadata.xml
index c42ea5b15cf6..853c4a1812bd 100644
--- a/dev-ros/rosserial_server/metadata.xml
+++ b/dev-ros/rosserial_server/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/rosserial</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosserial_windows/metadata.xml b/dev-ros/rosserial_windows/metadata.xml
index c42ea5b15cf6..853c4a1812bd 100644
--- a/dev-ros/rosserial_windows/metadata.xml
+++ b/dev-ros/rosserial_windows/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/rosserial</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosserial_xbee/metadata.xml b/dev-ros/rosserial_xbee/metadata.xml
index c42ea5b15cf6..853c4a1812bd 100644
--- a/dev-ros/rosserial_xbee/metadata.xml
+++ b/dev-ros/rosserial_xbee/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/rosserial</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosservice/metadata.xml b/dev-ros/rosservice/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rosservice/metadata.xml
+++ b/dev-ros/rosservice/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rostest/metadata.xml b/dev-ros/rostest/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rostest/metadata.xml
+++ b/dev-ros/rostest/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rostime/metadata.xml b/dev-ros/rostime/metadata.xml
index c42ea5b15cf6..d41b871a0507 100644
--- a/dev-ros/rostime/metadata.xml
+++ b/dev-ros/rostime/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/roscpp_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rostopic/metadata.xml b/dev-ros/rostopic/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/rostopic/metadata.xml
+++ b/dev-ros/rostopic/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rosunit/metadata.xml b/dev-ros/rosunit/metadata.xml
index c42ea5b15cf6..d0c10cf146b2 100644
--- a/dev-ros/rosunit/metadata.xml
+++ b/dev-ros/rosunit/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/roswtf/metadata.xml b/dev-ros/roswtf/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/roswtf/metadata.xml
+++ b/dev-ros/roswtf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rotate_recovery/metadata.xml b/dev-ros/rotate_recovery/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/rotate_recovery/metadata.xml
+++ b/dev-ros/rotate_recovery/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_action/metadata.xml b/dev-ros/rqt_action/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_action/metadata.xml
+++ b/dev-ros/rqt_action/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_bag/metadata.xml b/dev-ros/rqt_bag/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_bag/metadata.xml
+++ b/dev-ros/rqt_bag/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_bag_plugins/metadata.xml b/dev-ros/rqt_bag_plugins/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_bag_plugins/metadata.xml
+++ b/dev-ros/rqt_bag_plugins/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_console/metadata.xml b/dev-ros/rqt_console/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_console/metadata.xml
+++ b/dev-ros/rqt_console/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_controller_manager/metadata.xml b/dev-ros/rqt_controller_manager/metadata.xml
index c42ea5b15cf6..2b50e8aa45e1 100644
--- a/dev-ros/rqt_controller_manager/metadata.xml
+++ b/dev-ros/rqt_controller_manager/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/ros_control</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_dep/metadata.xml b/dev-ros/rqt_dep/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_dep/metadata.xml
+++ b/dev-ros/rqt_dep/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_graph/metadata.xml b/dev-ros/rqt_graph/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_graph/metadata.xml
+++ b/dev-ros/rqt_graph/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_gui/metadata.xml b/dev-ros/rqt_gui/metadata.xml
index c42ea5b15cf6..1274b6f76ebe 100644
--- a/dev-ros/rqt_gui/metadata.xml
+++ b/dev-ros/rqt_gui/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_gui_cpp/metadata.xml b/dev-ros/rqt_gui_cpp/metadata.xml
index c42ea5b15cf6..1274b6f76ebe 100644
--- a/dev-ros/rqt_gui_cpp/metadata.xml
+++ b/dev-ros/rqt_gui_cpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_gui_py/metadata.xml b/dev-ros/rqt_gui_py/metadata.xml
index c42ea5b15cf6..1274b6f76ebe 100644
--- a/dev-ros/rqt_gui_py/metadata.xml
+++ b/dev-ros/rqt_gui_py/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_image_view/metadata.xml b/dev-ros/rqt_image_view/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_image_view/metadata.xml
+++ b/dev-ros/rqt_image_view/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_launch/metadata.xml b/dev-ros/rqt_launch/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_launch/metadata.xml
+++ b/dev-ros/rqt_launch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_logger_level/metadata.xml b/dev-ros/rqt_logger_level/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_logger_level/metadata.xml
+++ b/dev-ros/rqt_logger_level/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_moveit/metadata.xml b/dev-ros/rqt_moveit/metadata.xml
index c42ea5b15cf6..28fc5efee913 100644
--- a/dev-ros/rqt_moveit/metadata.xml
+++ b/dev-ros/rqt_moveit/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_msg/metadata.xml b/dev-ros/rqt_msg/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_msg/metadata.xml
+++ b/dev-ros/rqt_msg/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_nav_view/metadata.xml b/dev-ros/rqt_nav_view/metadata.xml
index c42ea5b15cf6..28fc5efee913 100644
--- a/dev-ros/rqt_nav_view/metadata.xml
+++ b/dev-ros/rqt_nav_view/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_plot/metadata.xml b/dev-ros/rqt_plot/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_plot/metadata.xml
+++ b/dev-ros/rqt_plot/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_pose_view/metadata.xml b/dev-ros/rqt_pose_view/metadata.xml
index c42ea5b15cf6..28fc5efee913 100644
--- a/dev-ros/rqt_pose_view/metadata.xml
+++ b/dev-ros/rqt_pose_view/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_publisher/metadata.xml b/dev-ros/rqt_publisher/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_publisher/metadata.xml
+++ b/dev-ros/rqt_publisher/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_py_common/metadata.xml b/dev-ros/rqt_py_common/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_py_common/metadata.xml
+++ b/dev-ros/rqt_py_common/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_py_console/metadata.xml b/dev-ros/rqt_py_console/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_py_console/metadata.xml
+++ b/dev-ros/rqt_py_console/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_reconfigure/metadata.xml b/dev-ros/rqt_reconfigure/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_reconfigure/metadata.xml
+++ b/dev-ros/rqt_reconfigure/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_robot_dashboard/metadata.xml b/dev-ros/rqt_robot_dashboard/metadata.xml
index c42ea5b15cf6..28fc5efee913 100644
--- a/dev-ros/rqt_robot_dashboard/metadata.xml
+++ b/dev-ros/rqt_robot_dashboard/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_robot_monitor/metadata.xml b/dev-ros/rqt_robot_monitor/metadata.xml
index c42ea5b15cf6..28fc5efee913 100644
--- a/dev-ros/rqt_robot_monitor/metadata.xml
+++ b/dev-ros/rqt_robot_monitor/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_robot_steering/metadata.xml b/dev-ros/rqt_robot_steering/metadata.xml
index c42ea5b15cf6..28fc5efee913 100644
--- a/dev-ros/rqt_robot_steering/metadata.xml
+++ b/dev-ros/rqt_robot_steering/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_runtime_monitor/metadata.xml b/dev-ros/rqt_runtime_monitor/metadata.xml
index c42ea5b15cf6..28fc5efee913 100644
--- a/dev-ros/rqt_runtime_monitor/metadata.xml
+++ b/dev-ros/rqt_runtime_monitor/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_rviz/metadata.xml b/dev-ros/rqt_rviz/metadata.xml
index c42ea5b15cf6..28fc5efee913 100644
--- a/dev-ros/rqt_rviz/metadata.xml
+++ b/dev-ros/rqt_rviz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_service_caller/metadata.xml b/dev-ros/rqt_service_caller/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_service_caller/metadata.xml
+++ b/dev-ros/rqt_service_caller/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_shell/metadata.xml b/dev-ros/rqt_shell/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_shell/metadata.xml
+++ b/dev-ros/rqt_shell/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_srv/metadata.xml b/dev-ros/rqt_srv/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_srv/metadata.xml
+++ b/dev-ros/rqt_srv/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_tf_tree/metadata.xml b/dev-ros/rqt_tf_tree/metadata.xml
index c42ea5b15cf6..28fc5efee913 100644
--- a/dev-ros/rqt_tf_tree/metadata.xml
+++ b/dev-ros/rqt_tf_tree/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_top/metadata.xml b/dev-ros/rqt_top/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_top/metadata.xml
+++ b/dev-ros/rqt_top/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_topic/metadata.xml b/dev-ros/rqt_topic/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_topic/metadata.xml
+++ b/dev-ros/rqt_topic/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rqt_web/metadata.xml b/dev-ros/rqt_web/metadata.xml
index c42ea5b15cf6..36b263a84a83 100644
--- a/dev-ros/rqt_web/metadata.xml
+++ b/dev-ros/rqt_web/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rviz/metadata.xml b/dev-ros/rviz/metadata.xml
index c42ea5b15cf6..a54bf1710444 100644
--- a/dev-ros/rviz/metadata.xml
+++ b/dev-ros/rviz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/rviz</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rviz_plugin_tutorials/metadata.xml b/dev-ros/rviz_plugin_tutorials/metadata.xml
index c42ea5b15cf6..e1ee2063b890 100644
--- a/dev-ros/rviz_plugin_tutorials/metadata.xml
+++ b/dev-ros/rviz_plugin_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/rviz_python_tutorial/metadata.xml b/dev-ros/rviz_python_tutorial/metadata.xml
index c42ea5b15cf6..e1ee2063b890 100644
--- a/dev-ros/rviz_python_tutorial/metadata.xml
+++ b/dev-ros/rviz_python_tutorial/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/self_test/metadata.xml b/dev-ros/self_test/metadata.xml
index c42ea5b15cf6..7403d8edf061 100644
--- a/dev-ros/self_test/metadata.xml
+++ b/dev-ros/self_test/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/diagnostics</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/sensor_msgs/metadata.xml b/dev-ros/sensor_msgs/metadata.xml
index c42ea5b15cf6..2d3b5cc254bd 100644
--- a/dev-ros/sensor_msgs/metadata.xml
+++ b/dev-ros/sensor_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/settlerlib/metadata.xml b/dev-ros/settlerlib/metadata.xml
index c42ea5b15cf6..11ffa2327be3 100644
--- a/dev-ros/settlerlib/metadata.xml
+++ b/dev-ros/settlerlib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/calibration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/shape_msgs/metadata.xml b/dev-ros/shape_msgs/metadata.xml
index c42ea5b15cf6..2d3b5cc254bd 100644
--- a/dev-ros/shape_msgs/metadata.xml
+++ b/dev-ros/shape_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/smach/metadata.xml b/dev-ros/smach/metadata.xml
index c42ea5b15cf6..df9f6c976f07 100644
--- a/dev-ros/smach/metadata.xml
+++ b/dev-ros/smach/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/executive_smach</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/smach_msgs/metadata.xml b/dev-ros/smach_msgs/metadata.xml
index c42ea5b15cf6..df9f6c976f07 100644
--- a/dev-ros/smach_msgs/metadata.xml
+++ b/dev-ros/smach_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/executive_smach</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/smach_ros/metadata.xml b/dev-ros/smach_ros/metadata.xml
index c42ea5b15cf6..df9f6c976f07 100644
--- a/dev-ros/smach_ros/metadata.xml
+++ b/dev-ros/smach_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/executive_smach</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/smclib/metadata.xml b/dev-ros/smclib/metadata.xml
index c42ea5b15cf6..500c8eba4fcc 100644
--- a/dev-ros/smclib/metadata.xml
+++ b/dev-ros/smclib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/bond_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/sound_play/metadata.xml b/dev-ros/sound_play/metadata.xml
index c42ea5b15cf6..11ebb410b524 100644
--- a/dev-ros/sound_play/metadata.xml
+++ b/dev-ros/sound_play/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/audio_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/stage_ros/metadata.xml b/dev-ros/stage_ros/metadata.xml
index c42ea5b15cf6..c5c1aaa47aea 100644
--- a/dev-ros/stage_ros/metadata.xml
+++ b/dev-ros/stage_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-simulation/stage_ros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/std_msgs/metadata.xml b/dev-ros/std_msgs/metadata.xml
index c42ea5b15cf6..f81a27a8cb38 100644
--- a/dev-ros/std_msgs/metadata.xml
+++ b/dev-ros/std_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/std_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/std_srvs/metadata.xml b/dev-ros/std_srvs/metadata.xml
index c42ea5b15cf6..d101ce6019b0 100644
--- a/dev-ros/std_srvs/metadata.xml
+++ b/dev-ros/std_srvs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/stereo_image_proc/metadata.xml b/dev-ros/stereo_image_proc/metadata.xml
index c42ea5b15cf6..90c35a2ace13 100644
--- a/dev-ros/stereo_image_proc/metadata.xml
+++ b/dev-ros/stereo_image_proc/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_pipeline</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/stereo_msgs/metadata.xml b/dev-ros/stereo_msgs/metadata.xml
index c42ea5b15cf6..2d3b5cc254bd 100644
--- a/dev-ros/stereo_msgs/metadata.xml
+++ b/dev-ros/stereo_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_bond/metadata.xml b/dev-ros/test_bond/metadata.xml
index c42ea5b15cf6..500c8eba4fcc 100644
--- a/dev-ros/test_bond/metadata.xml
+++ b/dev-ros/test_bond/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/bond_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_diagnostic_aggregator/metadata.xml b/dev-ros/test_diagnostic_aggregator/metadata.xml
index c42ea5b15cf6..7403d8edf061 100644
--- a/dev-ros/test_diagnostic_aggregator/metadata.xml
+++ b/dev-ros/test_diagnostic_aggregator/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/diagnostics</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_nodelet/metadata.xml b/dev-ros/test_nodelet/metadata.xml
index c42ea5b15cf6..33bcb0c55d1d 100644
--- a/dev-ros/test_nodelet/metadata.xml
+++ b/dev-ros/test_nodelet/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/nodelet_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_nodelet_topic_tools/metadata.xml b/dev-ros/test_nodelet_topic_tools/metadata.xml
index c42ea5b15cf6..33bcb0c55d1d 100644
--- a/dev-ros/test_nodelet_topic_tools/metadata.xml
+++ b/dev-ros/test_nodelet_topic_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/nodelet_core</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_rosbag/metadata.xml b/dev-ros/test_rosbag/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_rosbag/metadata.xml
+++ b/dev-ros/test_rosbag/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_rosbag_storage/metadata.xml b/dev-ros/test_rosbag_storage/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_rosbag_storage/metadata.xml
+++ b/dev-ros/test_rosbag_storage/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_roscpp/metadata.xml b/dev-ros/test_roscpp/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_roscpp/metadata.xml
+++ b/dev-ros/test_roscpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_rosgraph/metadata.xml b/dev-ros/test_rosgraph/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_rosgraph/metadata.xml
+++ b/dev-ros/test_rosgraph/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_roslaunch/metadata.xml b/dev-ros/test_roslaunch/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_roslaunch/metadata.xml
+++ b/dev-ros/test_roslaunch/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_roslib_comm/metadata.xml b/dev-ros/test_roslib_comm/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_roslib_comm/metadata.xml
+++ b/dev-ros/test_roslib_comm/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_rosmaster/metadata.xml b/dev-ros/test_rosmaster/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_rosmaster/metadata.xml
+++ b/dev-ros/test_rosmaster/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_rosparam/metadata.xml b/dev-ros/test_rosparam/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_rosparam/metadata.xml
+++ b/dev-ros/test_rosparam/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_rospy/metadata.xml b/dev-ros/test_rospy/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_rospy/metadata.xml
+++ b/dev-ros/test_rospy/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_rosservice/metadata.xml b/dev-ros/test_rosservice/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/test_rosservice/metadata.xml
+++ b/dev-ros/test_rosservice/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/test_tf2/metadata.xml b/dev-ros/test_tf2/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/test_tf2/metadata.xml
+++ b/dev-ros/test_tf2/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf/metadata.xml b/dev-ros/tf/metadata.xml
index c42ea5b15cf6..2d8e130aac8b 100644
--- a/dev-ros/tf/metadata.xml
+++ b/dev-ros/tf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf2/metadata.xml b/dev-ros/tf2/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/tf2/metadata.xml
+++ b/dev-ros/tf2/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf2_bullet/metadata.xml b/dev-ros/tf2_bullet/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/tf2_bullet/metadata.xml
+++ b/dev-ros/tf2_bullet/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf2_geometry_msgs/metadata.xml b/dev-ros/tf2_geometry_msgs/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/tf2_geometry_msgs/metadata.xml
+++ b/dev-ros/tf2_geometry_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf2_kdl/metadata.xml b/dev-ros/tf2_kdl/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/tf2_kdl/metadata.xml
+++ b/dev-ros/tf2_kdl/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf2_msgs/metadata.xml b/dev-ros/tf2_msgs/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/tf2_msgs/metadata.xml
+++ b/dev-ros/tf2_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf2_py/metadata.xml b/dev-ros/tf2_py/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/tf2_py/metadata.xml
+++ b/dev-ros/tf2_py/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf2_ros/metadata.xml b/dev-ros/tf2_ros/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/tf2_ros/metadata.xml
+++ b/dev-ros/tf2_ros/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf2_sensor_msgs/metadata.xml b/dev-ros/tf2_sensor_msgs/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/tf2_sensor_msgs/metadata.xml
+++ b/dev-ros/tf2_sensor_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf2_tools/metadata.xml b/dev-ros/tf2_tools/metadata.xml
index c42ea5b15cf6..51f204d769fa 100644
--- a/dev-ros/tf2_tools/metadata.xml
+++ b/dev-ros/tf2_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_experimental</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/tf_conversions/metadata.xml b/dev-ros/tf_conversions/metadata.xml
index c42ea5b15cf6..2d8e130aac8b 100644
--- a/dev-ros/tf_conversions/metadata.xml
+++ b/dev-ros/tf_conversions/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/theora_image_transport/metadata.xml b/dev-ros/theora_image_transport/metadata.xml
index c42ea5b15cf6..97c7091fc40e 100644
--- a/dev-ros/theora_image_transport/metadata.xml
+++ b/dev-ros/theora_image_transport/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-perception/image_transport_plugins</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/timestamp_tools/metadata.xml b/dev-ros/timestamp_tools/metadata.xml
index c42ea5b15cf6..9e7fdee55fb4 100644
--- a/dev-ros/timestamp_tools/metadata.xml
+++ b/dev-ros/timestamp_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-drivers/driver_common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/topic_tools/metadata.xml b/dev-ros/topic_tools/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/topic_tools/metadata.xml
+++ b/dev-ros/topic_tools/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/trajectory_msgs/metadata.xml b/dev-ros/trajectory_msgs/metadata.xml
index c42ea5b15cf6..2d3b5cc254bd 100644
--- a/dev-ros/trajectory_msgs/metadata.xml
+++ b/dev-ros/trajectory_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/transmission_interface/metadata.xml b/dev-ros/transmission_interface/metadata.xml
index c42ea5b15cf6..2b50e8aa45e1 100644
--- a/dev-ros/transmission_interface/metadata.xml
+++ b/dev-ros/transmission_interface/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-controls/ros_control</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/turtle_actionlib/metadata.xml b/dev-ros/turtle_actionlib/metadata.xml
index c42ea5b15cf6..38abe1f090cd 100644
--- a/dev-ros/turtle_actionlib/metadata.xml
+++ b/dev-ros/turtle_actionlib/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/turtle_tf/metadata.xml b/dev-ros/turtle_tf/metadata.xml
index c42ea5b15cf6..c02c459af36f 100644
--- a/dev-ros/turtle_tf/metadata.xml
+++ b/dev-ros/turtle_tf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/turtle_tf2/metadata.xml b/dev-ros/turtle_tf2/metadata.xml
index c42ea5b15cf6..c02c459af36f 100644
--- a/dev-ros/turtle_tf2/metadata.xml
+++ b/dev-ros/turtle_tf2/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/geometry_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/turtlesim/metadata.xml b/dev-ros/turtlesim/metadata.xml
index c42ea5b15cf6..1360d75ec0b1 100644
--- a/dev-ros/turtlesim/metadata.xml
+++ b/dev-ros/turtlesim/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/unique_id/metadata.xml b/dev-ros/unique_id/metadata.xml
index c42ea5b15cf6..b274068148e0 100644
--- a/dev-ros/unique_id/metadata.xml
+++ b/dev-ros/unique_id/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/urdf/metadata.xml b/dev-ros/urdf/metadata.xml
index c42ea5b15cf6..b2ab0e6da652 100644
--- a/dev-ros/urdf/metadata.xml
+++ b/dev-ros/urdf/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/robot_model</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/urdf_parser_plugin/metadata.xml b/dev-ros/urdf_parser_plugin/metadata.xml
index c42ea5b15cf6..b2ab0e6da652 100644
--- a/dev-ros/urdf_parser_plugin/metadata.xml
+++ b/dev-ros/urdf_parser_plugin/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/robot_model</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/urdf_tutorial/metadata.xml b/dev-ros/urdf_tutorial/metadata.xml
index c42ea5b15cf6..1d606bfa047c 100644
--- a/dev-ros/urdf_tutorial/metadata.xml
+++ b/dev-ros/urdf_tutorial/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/urdf_tutorial</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/uuid_msgs/metadata.xml b/dev-ros/uuid_msgs/metadata.xml
index c42ea5b15cf6..b274068148e0 100644
--- a/dev-ros/uuid_msgs/metadata.xml
+++ b/dev-ros/uuid_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/visp_auto_tracker/metadata.xml b/dev-ros/visp_auto_tracker/metadata.xml
index c42ea5b15cf6..f279d19298cc 100644
--- a/dev-ros/visp_auto_tracker/metadata.xml
+++ b/dev-ros/visp_auto_tracker/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">lagadic/vision_visp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/visp_bridge/metadata.xml b/dev-ros/visp_bridge/metadata.xml
index c42ea5b15cf6..f279d19298cc 100644
--- a/dev-ros/visp_bridge/metadata.xml
+++ b/dev-ros/visp_bridge/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">lagadic/vision_visp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/visp_camera_calibration/metadata.xml b/dev-ros/visp_camera_calibration/metadata.xml
index c42ea5b15cf6..f279d19298cc 100644
--- a/dev-ros/visp_camera_calibration/metadata.xml
+++ b/dev-ros/visp_camera_calibration/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">lagadic/vision_visp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/visp_hand2eye_calibration/metadata.xml b/dev-ros/visp_hand2eye_calibration/metadata.xml
index c42ea5b15cf6..f279d19298cc 100644
--- a/dev-ros/visp_hand2eye_calibration/metadata.xml
+++ b/dev-ros/visp_hand2eye_calibration/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">lagadic/vision_visp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/visp_tracker/metadata.xml b/dev-ros/visp_tracker/metadata.xml
index c42ea5b15cf6..f279d19298cc 100644
--- a/dev-ros/visp_tracker/metadata.xml
+++ b/dev-ros/visp_tracker/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">lagadic/vision_visp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/visualization_marker_tutorials/metadata.xml b/dev-ros/visualization_marker_tutorials/metadata.xml
index c42ea5b15cf6..e1ee2063b890 100644
--- a/dev-ros/visualization_marker_tutorials/metadata.xml
+++ b/dev-ros/visualization_marker_tutorials/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/visualization_msgs/metadata.xml b/dev-ros/visualization_msgs/metadata.xml
index c42ea5b15cf6..2d3b5cc254bd 100644
--- a/dev-ros/visualization_msgs/metadata.xml
+++ b/dev-ros/visualization_msgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/common_msgs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/voxel_grid/metadata.xml b/dev-ros/voxel_grid/metadata.xml
index c42ea5b15cf6..8694432aa162 100644
--- a/dev-ros/voxel_grid/metadata.xml
+++ b/dev-ros/voxel_grid/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros-planning/navigation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/xacro/metadata.xml b/dev-ros/xacro/metadata.xml
index c42ea5b15cf6..fe41d2145f7b 100644
--- a/dev-ros/xacro/metadata.xml
+++ b/dev-ros/xacro/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/xacro</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ros/xmlrpcpp/metadata.xml b/dev-ros/xmlrpcpp/metadata.xml
index c42ea5b15cf6..bcf2b81aab17 100644
--- a/dev-ros/xmlrpcpp/metadata.xml
+++ b/dev-ros/xmlrpcpp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ros</herd>
+ <herd>ros</herd>
+ <upstream>
+ <remote-id type="github">ros/ros_comm</remote-id>
+ </upstream>
</pkgmetadata>