public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/test-unit/, dev-ros/test_rospy/, dev-ros/timestamp_tools/, ...
@ 2015-10-16 13:31 Justin Lecher
  0 siblings, 0 replies; only message in thread
From: Justin Lecher @ 2015-10-16 13:31 UTC (permalink / raw
  To: gentoo-commits

commit:     67064ef687e8b3a61f5a4698ae1b029e2e70822c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 13:31:39 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 13:31:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67064ef6

Update remote-ids

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-admin/consul/metadata.xml                      |  5 ++-
 app-admin/r10k/metadata.xml                        |  5 +--
 app-admin/salt/metadata.xml                        |  5 ++-
 app-admin/vault/metadata.xml                       |  5 ++-
 app-crypt/loop-aes-losetup/metadata.xml            |  5 ++-
 app-dicts/freedict-deu-eng/metadata.xml            |  9 ++++-
 app-dicts/freedict-eng-fra/metadata.xml            |  9 ++++-
 app-dicts/freedict-eng-ita/metadata.xml            |  9 ++++-
 app-dicts/freedict-eng-swe/metadata.xml            |  9 ++++-
 app-dicts/freedict-fra-eng/metadata.xml            |  9 ++++-
 app-dicts/freedict-ita-eng/metadata.xml            |  9 ++++-
 app-dicts/hunspell-kk/metadata.xml                 |  6 ++-
 app-dicts/prime-dict/metadata.xml                  |  7 +++-
 app-doc/root-docs/metadata.xml                     | 31 +++++++++-------
 app-editors/retext/metadata.xml                    |  3 +-
 app-emacs/doctest-mode/metadata.xml                |  7 +++-
 app-emacs/mmm-mode/metadata.xml                    | 11 +++---
 app-i18n/imsettings/metadata.xml                   | 17 +++++----
 app-i18n/transifex-client/metadata.xml             |  3 +-
 app-leechcraft/liblaretz/metadata.xml              |  5 ++-
 app-misc/dateutils/metadata.xml                    |  5 ++-
 app-misc/sleepyhead/metadata.xml                   | 13 ++++---
 app-misc/subsurface/metadata.xml                   |  7 +++-
 app-misc/tmux/metadata.xml                         |  5 ++-
 app-mobilephone/freesmee/metadata.xml              |  5 ++-
 app-office/unoconv/metadata.xml                    |  5 ++-
 app-text/calibre/metadata.xml                      |  5 ++-
 app-text/liblangtag/metadata.xml                   |  5 ++-
 app-text/lodgeit/metadata.xml                      |  7 +++-
 app-text/pdf2djvu/metadata.xml                     |  7 +++-
 app-vim/cctree/metadata.xml                        |  5 ++-
 app-vim/colorv/metadata.xml                        |  5 ++-
 app-vim/neocomplcache/metadata.xml                 |  5 ++-
 app-vim/perl-support/metadata.xml                  |  5 ++-
 app-vim/slimv/metadata.xml                         |  5 ++-
 app-vim/vimclojure/metadata.xml                    |  5 ++-
 app-vim/vimpress/metadata.xml                      |  5 ++-
 dev-cpp/eigen/metadata.xml                         |  5 ++-
 dev-db/barman/metadata.xml                         |  5 ++-
 dev-db/mycli/metadata.xml                          |  9 +++--
 dev-db/mysql-udf-ipv6/metadata.xml                 |  5 ++-
 dev-embedded/sunxi-tools/metadata.xml              |  5 ++-
 dev-games/aseprite/metadata.xml                    |  3 ++
 dev-games/ogre/metadata.xml                        | 15 +++++---
 dev-java/jansi/metadata.xml                        |  5 ++-
 dev-lang/ats/metadata.xml                          |  5 ++-
 dev-lang/crystal/metadata.xml                      |  5 ++-
 dev-lang/lazarus/metadata.xml                      |  8 ++--
 dev-libs/libRocket/metadata.xml                    |  8 ++--
 dev-libs/libdbh/metadata.xml                       |  5 ++-
 dev-libs/liblogging/metadata.xml                   |  5 ++-
 dev-libs/libtubo/metadata.xml                      |  5 ++-
 dev-libs/qqwing/metadata.xml                       |  7 +++-
 dev-ml/camlimages/metadata.xml                     |  7 +++-
 dev-ml/ocamldap/metadata.xml                       |  7 +++-
 dev-python/castellan/metadata.xml                  |  5 ++-
 dev-python/doc8/metadata.xml                       |  5 ++-
 dev-python/enzyme/metadata.xml                     |  3 +-
 dev-python/logutils/metadata.xml                   |  6 ++-
 dev-python/mamba/metadata.xml                      |  3 +-
 dev-python/os-brick/metadata.xml                   |  6 ++-
 dev-python/oslo-reports/metadata.xml               |  5 ++-
 dev-python/oslo-versionedobjects/metadata.xml      |  5 ++-
 dev-python/pecan/metadata.xml                      |  5 ++-
 dev-python/ply/metadata.xml                        |  9 +++--
 dev-python/pycollada/metadata.xml                  | 13 ++++---
 dev-python/pycurl/metadata.xml                     |  7 ++--
 dev-python/pygments/metadata.xml                   |  3 +-
 dev-python/pypy-bin/metadata.xml                   |  5 ++-
 dev-python/pypy/metadata.xml                       |  5 ++-
 dev-python/pypy3-bin/metadata.xml                  |  5 ++-
 dev-python/pypy3/metadata.xml                      |  5 ++-
 dev-python/python-editor/metadata.xml              |  6 ++-
 dev-python/restructuredtext-lint/metadata.xml      |  5 ++-
 dev-python/ryu/metadata.xml                        |  5 ++-
 dev-python/uhashring/metadata.xml                  |  3 +-
 dev-ros/actionlib/metadata.xml                     |  7 +++-
 dev-ros/actionlib_msgs/metadata.xml                |  7 +++-
 dev-ros/actionlib_tutorials/metadata.xml           |  7 +++-
 dev-ros/amcl/metadata.xml                          |  7 +++-
 dev-ros/angles/metadata.xml                        |  7 +++-
 dev-ros/audio_capture/metadata.xml                 |  7 +++-
 dev-ros/audio_common_msgs/metadata.xml             |  7 +++-
 dev-ros/audio_play/metadata.xml                    |  7 +++-
 dev-ros/base_local_planner/metadata.xml            |  7 +++-
 dev-ros/bond/metadata.xml                          |  7 +++-
 dev-ros/bondcpp/metadata.xml                       |  7 +++-
 dev-ros/bondpy/metadata.xml                        |  7 +++-
 dev-ros/calibration_estimation/metadata.xml        |  7 +++-
 dev-ros/calibration_launch/metadata.xml            |  7 +++-
 dev-ros/calibration_msgs/metadata.xml              |  7 +++-
 dev-ros/calibration_setup_helper/metadata.xml      |  7 +++-
 dev-ros/camera_calibration/metadata.xml            |  7 +++-
 dev-ros/camera_calibration_parsers/metadata.xml    |  7 +++-
 dev-ros/camera_info_manager/metadata.xml           |  7 +++-
 dev-ros/carrot_planner/metadata.xml                |  7 +++-
 dev-ros/class_loader/metadata.xml                  |  7 +++-
 dev-ros/clear_costmap_recovery/metadata.xml        |  7 +++-
 dev-ros/cmake_modules/metadata.xml                 |  7 +++-
 dev-ros/collada_parser/metadata.xml                |  7 +++-
 dev-ros/collada_urdf/metadata.xml                  |  7 +++-
 .../compressed_depth_image_transport/metadata.xml  |  7 +++-
 dev-ros/compressed_image_transport/metadata.xml    |  7 +++-
 dev-ros/control_msgs/metadata.xml                  |  7 +++-
 dev-ros/control_toolbox/metadata.xml               |  7 +++-
 dev-ros/controller_interface/metadata.xml          |  7 +++-
 dev-ros/controller_manager/metadata.xml            |  7 +++-
 dev-ros/controller_manager_msgs/metadata.xml       |  7 +++-
 dev-ros/controller_manager_tests/metadata.xml      |  7 +++-
 dev-ros/convex_decomposition/metadata.xml          |  7 +++-
 dev-ros/costmap_2d/metadata.xml                    |  7 +++-
 dev-ros/cpp_common/metadata.xml                    |  7 +++-
 dev-ros/cv_bridge/metadata.xml                     |  7 +++-
 dev-ros/depth_image_proc/metadata.xml              |  7 +++-
 dev-ros/diagnostic_aggregator/metadata.xml         |  7 +++-
 dev-ros/diagnostic_analysis/metadata.xml           |  7 +++-
 dev-ros/diagnostic_common_diagnostics/metadata.xml |  7 +++-
 dev-ros/diagnostic_msgs/metadata.xml               |  7 +++-
 dev-ros/diagnostic_updater/metadata.xml            |  7 +++-
 dev-ros/driver_base/metadata.xml                   |  7 +++-
 dev-ros/dwa_local_planner/metadata.xml             |  7 +++-
 dev-ros/dynamic_reconfigure/metadata.xml           |  7 +++-
 dev-ros/eigen_conversions/metadata.xml             |  7 +++-
 dev-ros/eigen_stl_containers/metadata.xml          |  7 +++-
 dev-ros/fake_localization/metadata.xml             |  7 +++-
 dev-ros/filters/metadata.xml                       |  7 +++-
 dev-ros/gazebo_msgs/metadata.xml                   |  7 +++-
 dev-ros/gazebo_plugins/metadata.xml                |  7 +++-
 dev-ros/gazebo_ros/metadata.xml                    |  7 +++-
 dev-ros/gazebo_ros_control/metadata.xml            |  7 +++-
 dev-ros/gencpp/metadata.xml                        |  7 +++-
 dev-ros/geneus/metadata.xml                        |  7 +++-
 dev-ros/genlisp/metadata.xml                       |  7 +++-
 dev-ros/genmsg/metadata.xml                        |  7 +++-
 dev-ros/genpy/metadata.xml                         |  7 +++-
 dev-ros/geodesy/metadata.xml                       |  7 +++-
 dev-ros/geographic_msgs/metadata.xml               |  7 +++-
 dev-ros/geometric_shapes/metadata.xml              |  7 +++-
 dev-ros/geometry_msgs/metadata.xml                 |  7 +++-
 dev-ros/global_planner/metadata.xml                |  7 +++-
 dev-ros/gmapping/metadata.xml                      |  7 +++-
 dev-ros/hardware_interface/metadata.xml            |  7 +++-
 .../hector_compressed_map_transport/metadata.xml   |  7 +++-
 dev-ros/hector_geotiff/metadata.xml                |  7 +++-
 dev-ros/hector_geotiff_plugins/metadata.xml        |  7 +++-
 dev-ros/hector_imu_attitude_to_tf/metadata.xml     |  7 +++-
 dev-ros/hector_imu_tools/metadata.xml              |  7 +++-
 dev-ros/hector_map_server/metadata.xml             |  7 +++-
 dev-ros/hector_map_tools/metadata.xml              |  7 +++-
 dev-ros/hector_mapping/metadata.xml                |  7 +++-
 dev-ros/hector_marker_drawing/metadata.xml         |  7 +++-
 dev-ros/hector_nav_msgs/metadata.xml               |  7 +++-
 dev-ros/hector_pose_estimation/metadata.xml        |  7 +++-
 dev-ros/hector_pose_estimation_core/metadata.xml   |  7 +++-
 dev-ros/hector_slam_launch/metadata.xml            |  7 +++-
 dev-ros/hector_trajectory_server/metadata.xml      |  7 +++-
 dev-ros/image_cb_detector/metadata.xml             |  7 +++-
 dev-ros/image_geometry/metadata.xml                |  7 +++-
 dev-ros/image_proc/metadata.xml                    |  7 +++-
 dev-ros/image_rotate/metadata.xml                  |  7 +++-
 dev-ros/image_transport/metadata.xml               |  7 +++-
 dev-ros/image_view/metadata.xml                    |  7 +++-
 dev-ros/imu_processors/metadata.xml                |  7 +++-
 dev-ros/imu_transformer/metadata.xml               |  7 +++-
 dev-ros/interactive_marker_tutorials/metadata.xml  |  7 +++-
 dev-ros/interactive_markers/metadata.xml           |  7 +++-
 dev-ros/interval_intersection/metadata.xml         |  7 +++-
 dev-ros/ivcon/metadata.xml                         |  7 +++-
 dev-ros/joint_limits_interface/metadata.xml        |  7 +++-
 dev-ros/joint_state_publisher/metadata.xml         |  7 +++-
 dev-ros/joint_states_settler/metadata.xml          |  7 +++-
 dev-ros/kdl_conversions/metadata.xml               |  7 +++-
 dev-ros/kdl_parser/metadata.xml                    |  7 +++-
 dev-ros/laser_assembler/metadata.xml               |  7 +++-
 dev-ros/laser_cb_detector/metadata.xml             |  7 +++-
 dev-ros/laser_filters/metadata.xml                 |  7 +++-
 dev-ros/laser_geometry/metadata.xml                |  7 +++-
 dev-ros/librviz_tutorial/metadata.xml              |  7 +++-
 dev-ros/map_msgs/metadata.xml                      |  7 +++-
 dev-ros/map_server/metadata.xml                    |  7 +++-
 dev-ros/message_filters/metadata.xml               |  7 +++-
 dev-ros/message_generation/metadata.xml            |  7 +++-
 dev-ros/message_runtime/metadata.xml               |  7 +++-
 dev-ros/message_to_tf/metadata.xml                 |  7 +++-
 dev-ros/mk/metadata.xml                            |  7 +++-
 dev-ros/monocam_settler/metadata.xml               |  7 +++-
 dev-ros/move_base/metadata.xml                     |  7 +++-
 dev-ros/move_base_msgs/metadata.xml                |  7 +++-
 dev-ros/move_slow_and_clear/metadata.xml           |  7 +++-
 dev-ros/moveit_msgs/metadata.xml                   |  7 +++-
 dev-ros/nav_core/metadata.xml                      |  7 +++-
 dev-ros/nav_msgs/metadata.xml                      |  7 +++-
 dev-ros/navfn/metadata.xml                         |  7 +++-
 dev-ros/nodelet/metadata.xml                       |  7 +++-
 dev-ros/nodelet_topic_tools/metadata.xml           |  7 +++-
 dev-ros/nodelet_tutorial_math/metadata.xml         |  7 +++-
 dev-ros/object_recognition_msgs/metadata.xml       |  7 +++-
 dev-ros/octomap_msgs/metadata.xml                  |  7 +++-
 dev-ros/octomap_ros/metadata.xml                   |  7 +++-
 dev-ros/opencv_apps/metadata.xml                   |  7 +++-
 dev-ros/opencv_tests/metadata.xml                  |  7 +++-
 dev-ros/openslam_gmapping/metadata.xml             |  7 +++-
 dev-ros/pcl_conversions/metadata.xml               |  7 +++-
 dev-ros/pcl_msgs/metadata.xml                      |  7 +++-
 dev-ros/pcl_ros/metadata.xml                       |  7 +++-
 dev-ros/pluginlib/metadata.xml                     |  7 +++-
 dev-ros/pluginlib_tutorials/metadata.xml           |  7 +++-
 dev-ros/pointcloud_to_laserscan/metadata.xml       |  7 +++-
 dev-ros/polled_camera/metadata.xml                 |  7 +++-
 dev-ros/pr2_dashboard_aggregator/metadata.xml      |  7 +++-
 dev-ros/pr2_description/metadata.xml               |  7 +++-
 dev-ros/pr2_machine/metadata.xml                   |  7 +++-
 dev-ros/pr2_msgs/metadata.xml                      |  7 +++-
 dev-ros/python_qt_binding/metadata.xml             |  7 +++-
 dev-ros/qt_dotgraph/metadata.xml                   |  7 +++-
 dev-ros/qt_gui/metadata.xml                        |  7 +++-
 dev-ros/qt_gui_app/metadata.xml                    |  7 +++-
 dev-ros/qt_gui_cpp/metadata.xml                    |  7 +++-
 dev-ros/qt_gui_py_common/metadata.xml              |  7 +++-
 dev-ros/random_numbers/metadata.xml                |  7 +++-
 dev-ros/realtime_tools/metadata.xml                |  7 +++-
 dev-ros/resource_retriever/metadata.xml            |  7 +++-
 dev-ros/robot_pose_ekf/metadata.xml                |  7 +++-
 dev-ros/robot_state_publisher/metadata.xml         |  7 +++-
 dev-ros/rosapi/metadata.xml                        |  7 +++-
 dev-ros/rosauth/metadata.xml                       |  7 +++-
 dev-ros/rosbag/metadata.xml                        |  9 +++--
 dev-ros/rosbag_storage/metadata.xml                |  7 +++-
 dev-ros/rosbash/metadata.xml                       |  7 +++-
 dev-ros/rosboost_cfg/metadata.xml                  |  7 +++-
 dev-ros/rosbridge_library/metadata.xml             |  7 +++-
 dev-ros/rosbridge_server/metadata.xml              |  7 +++-
 dev-ros/rosbuild/metadata.xml                      |  7 +++-
 dev-ros/rosclean/metadata.xml                      |  7 +++-
 dev-ros/rosconsole/metadata.xml                    | 11 ++++--
 dev-ros/rosconsole_bridge/metadata.xml             |  7 +++-
 dev-ros/roscpp/metadata.xml                        |  7 +++-
 dev-ros/roscpp_serialization/metadata.xml          |  7 +++-
 dev-ros/roscpp_traits/metadata.xml                 |  7 +++-
 dev-ros/roscpp_tutorials/metadata.xml              |  7 +++-
 dev-ros/roscreate/metadata.xml                     |  7 +++-
 dev-ros/rosgraph/metadata.xml                      |  7 +++-
 dev-ros/rosgraph_msgs/metadata.xml                 |  7 +++-
 dev-ros/roslang/metadata.xml                       |  7 +++-
 dev-ros/roslaunch/metadata.xml                     |  7 +++-
 dev-ros/roslib/metadata.xml                        |  7 +++-
 dev-ros/roslint/metadata.xml                       |  7 +++-
 dev-ros/roslisp/metadata.xml                       |  7 +++-
 dev-ros/roslz4/metadata.xml                        |  7 +++-
 dev-ros/rosmake/metadata.xml                       |  7 +++-
 dev-ros/rosmaster/metadata.xml                     |  7 +++-
 dev-ros/rosmsg/metadata.xml                        |  7 +++-
 dev-ros/rosnode/metadata.xml                       |  7 +++-
 dev-ros/rosout/metadata.xml                        |  7 +++-
 dev-ros/rospack/metadata.xml                       |  7 +++-
 dev-ros/rosparam/metadata.xml                      |  7 +++-
 dev-ros/rospy/metadata.xml                         |  7 +++-
 dev-ros/rospy_tutorials/metadata.xml               |  7 +++-
 dev-ros/rosserial_arduino/metadata.xml             |  7 +++-
 dev-ros/rosserial_client/metadata.xml              |  7 +++-
 dev-ros/rosserial_embeddedlinux/metadata.xml       |  7 +++-
 dev-ros/rosserial_msgs/metadata.xml                |  7 +++-
 dev-ros/rosserial_python/metadata.xml              |  7 +++-
 dev-ros/rosserial_server/metadata.xml              |  7 +++-
 dev-ros/rosserial_windows/metadata.xml             |  7 +++-
 dev-ros/rosserial_xbee/metadata.xml                |  7 +++-
 dev-ros/rosservice/metadata.xml                    |  7 +++-
 dev-ros/rostest/metadata.xml                       |  7 +++-
 dev-ros/rostime/metadata.xml                       |  7 +++-
 dev-ros/rostopic/metadata.xml                      |  7 +++-
 dev-ros/rosunit/metadata.xml                       |  7 +++-
 dev-ros/roswtf/metadata.xml                        |  7 +++-
 dev-ros/rotate_recovery/metadata.xml               |  7 +++-
 dev-ros/rqt_action/metadata.xml                    |  7 +++-
 dev-ros/rqt_bag/metadata.xml                       |  7 +++-
 dev-ros/rqt_bag_plugins/metadata.xml               |  7 +++-
 dev-ros/rqt_console/metadata.xml                   |  7 +++-
 dev-ros/rqt_controller_manager/metadata.xml        |  7 +++-
 dev-ros/rqt_dep/metadata.xml                       |  7 +++-
 dev-ros/rqt_graph/metadata.xml                     |  7 +++-
 dev-ros/rqt_gui/metadata.xml                       |  7 +++-
 dev-ros/rqt_gui_cpp/metadata.xml                   |  7 +++-
 dev-ros/rqt_gui_py/metadata.xml                    |  7 +++-
 dev-ros/rqt_image_view/metadata.xml                |  7 +++-
 dev-ros/rqt_launch/metadata.xml                    |  7 +++-
 dev-ros/rqt_logger_level/metadata.xml              |  7 +++-
 dev-ros/rqt_moveit/metadata.xml                    |  7 +++-
 dev-ros/rqt_msg/metadata.xml                       |  7 +++-
 dev-ros/rqt_nav_view/metadata.xml                  |  7 +++-
 dev-ros/rqt_plot/metadata.xml                      |  7 +++-
 dev-ros/rqt_pose_view/metadata.xml                 |  7 +++-
 dev-ros/rqt_publisher/metadata.xml                 |  7 +++-
 dev-ros/rqt_py_common/metadata.xml                 |  7 +++-
 dev-ros/rqt_py_console/metadata.xml                |  7 +++-
 dev-ros/rqt_reconfigure/metadata.xml               |  7 +++-
 dev-ros/rqt_robot_dashboard/metadata.xml           |  7 +++-
 dev-ros/rqt_robot_monitor/metadata.xml             |  7 +++-
 dev-ros/rqt_robot_steering/metadata.xml            |  7 +++-
 dev-ros/rqt_runtime_monitor/metadata.xml           |  7 +++-
 dev-ros/rqt_rviz/metadata.xml                      |  7 +++-
 dev-ros/rqt_service_caller/metadata.xml            |  7 +++-
 dev-ros/rqt_shell/metadata.xml                     |  7 +++-
 dev-ros/rqt_srv/metadata.xml                       |  7 +++-
 dev-ros/rqt_tf_tree/metadata.xml                   |  7 +++-
 dev-ros/rqt_top/metadata.xml                       |  7 +++-
 dev-ros/rqt_topic/metadata.xml                     |  7 +++-
 dev-ros/rqt_web/metadata.xml                       |  7 +++-
 dev-ros/rviz/metadata.xml                          |  7 +++-
 dev-ros/rviz_plugin_tutorials/metadata.xml         |  7 +++-
 dev-ros/rviz_python_tutorial/metadata.xml          |  7 +++-
 dev-ros/self_test/metadata.xml                     |  7 +++-
 dev-ros/sensor_msgs/metadata.xml                   |  7 +++-
 dev-ros/settlerlib/metadata.xml                    |  7 +++-
 dev-ros/shape_msgs/metadata.xml                    |  7 +++-
 dev-ros/smach/metadata.xml                         |  7 +++-
 dev-ros/smach_msgs/metadata.xml                    |  7 +++-
 dev-ros/smach_ros/metadata.xml                     |  7 +++-
 dev-ros/smclib/metadata.xml                        |  7 +++-
 dev-ros/sound_play/metadata.xml                    |  7 +++-
 dev-ros/stage_ros/metadata.xml                     |  7 +++-
 dev-ros/std_msgs/metadata.xml                      |  7 +++-
 dev-ros/std_srvs/metadata.xml                      |  7 +++-
 dev-ros/stereo_image_proc/metadata.xml             |  7 +++-
 dev-ros/stereo_msgs/metadata.xml                   |  7 +++-
 dev-ros/test_bond/metadata.xml                     |  7 +++-
 dev-ros/test_diagnostic_aggregator/metadata.xml    |  7 +++-
 dev-ros/test_nodelet/metadata.xml                  |  7 +++-
 dev-ros/test_nodelet_topic_tools/metadata.xml      |  7 +++-
 dev-ros/test_rosbag/metadata.xml                   |  7 +++-
 dev-ros/test_rosbag_storage/metadata.xml           |  7 +++-
 dev-ros/test_roscpp/metadata.xml                   |  7 +++-
 dev-ros/test_rosgraph/metadata.xml                 |  7 +++-
 dev-ros/test_roslaunch/metadata.xml                |  7 +++-
 dev-ros/test_roslib_comm/metadata.xml              |  7 +++-
 dev-ros/test_rosmaster/metadata.xml                |  7 +++-
 dev-ros/test_rosparam/metadata.xml                 |  7 +++-
 dev-ros/test_rospy/metadata.xml                    |  7 +++-
 dev-ros/test_rosservice/metadata.xml               |  7 +++-
 dev-ros/test_tf2/metadata.xml                      |  7 +++-
 dev-ros/tf/metadata.xml                            |  7 +++-
 dev-ros/tf2/metadata.xml                           |  7 +++-
 dev-ros/tf2_bullet/metadata.xml                    |  7 +++-
 dev-ros/tf2_geometry_msgs/metadata.xml             |  7 +++-
 dev-ros/tf2_kdl/metadata.xml                       |  7 +++-
 dev-ros/tf2_msgs/metadata.xml                      |  7 +++-
 dev-ros/tf2_py/metadata.xml                        |  7 +++-
 dev-ros/tf2_ros/metadata.xml                       |  7 +++-
 dev-ros/tf2_sensor_msgs/metadata.xml               |  7 +++-
 dev-ros/tf2_tools/metadata.xml                     |  7 +++-
 dev-ros/tf_conversions/metadata.xml                |  7 +++-
 dev-ros/theora_image_transport/metadata.xml        |  7 +++-
 dev-ros/timestamp_tools/metadata.xml               |  7 +++-
 dev-ros/topic_tools/metadata.xml                   |  7 +++-
 dev-ros/trajectory_msgs/metadata.xml               |  7 +++-
 dev-ros/transmission_interface/metadata.xml        |  7 +++-
 dev-ros/turtle_actionlib/metadata.xml              |  7 +++-
 dev-ros/turtle_tf/metadata.xml                     |  7 +++-
 dev-ros/turtle_tf2/metadata.xml                    |  7 +++-
 dev-ros/turtlesim/metadata.xml                     |  7 +++-
 dev-ros/unique_id/metadata.xml                     |  7 +++-
 dev-ros/urdf/metadata.xml                          |  7 +++-
 dev-ros/urdf_parser_plugin/metadata.xml            |  7 +++-
 dev-ros/urdf_tutorial/metadata.xml                 |  7 +++-
 dev-ros/uuid_msgs/metadata.xml                     |  7 +++-
 dev-ros/visp_auto_tracker/metadata.xml             |  7 +++-
 dev-ros/visp_bridge/metadata.xml                   |  7 +++-
 dev-ros/visp_camera_calibration/metadata.xml       |  7 +++-
 dev-ros/visp_hand2eye_calibration/metadata.xml     |  7 +++-
 dev-ros/visp_tracker/metadata.xml                  |  7 +++-
 .../visualization_marker_tutorials/metadata.xml    |  7 +++-
 dev-ros/visualization_msgs/metadata.xml            |  7 +++-
 dev-ros/voxel_grid/metadata.xml                    |  7 +++-
 dev-ros/xacro/metadata.xml                         |  7 +++-
 dev-ros/xmlrpcpp/metadata.xml                      |  7 +++-
 dev-ruby/actionpack/metadata.xml                   |  1 -
 dev-ruby/activerecord/metadata.xml                 |  1 -
 dev-ruby/activeresource/metadata.xml               |  3 +-
 dev-ruby/activesupport/metadata.xml                |  1 -
 dev-ruby/archive-tar-minitar/metadata.xml          |  3 +-
 dev-ruby/aws-s3/metadata.xml                       |  3 --
 dev-ruby/builder/metadata.xml                      |  5 +--
 dev-ruby/classifier/metadata.xml                   |  1 -
 dev-ruby/color/metadata.xml                        |  1 -
 dev-ruby/curb/metadata.xml                         |  1 -
 dev-ruby/deprecated/metadata.xml                   |  3 +-
 dev-ruby/diff-lcs/metadata.xml                     |  3 +-
 dev-ruby/dnsruby/metadata.xml                      |  3 --
 dev-ruby/dust/metadata.xml                         |  3 --
 dev-ruby/extlib/metadata.xml                       |  3 --
 dev-ruby/fattr/metadata.xml                        |  3 --
 dev-ruby/gnuplot/metadata.xml                      |  3 --
 dev-ruby/gruff/metadata.xml                        |  3 +-
 dev-ruby/highline/metadata.xml                     |  1 -
 dev-ruby/hoe-seattlerb/metadata.xml                |  3 --
 dev-ruby/hoe/metadata.xml                          |  3 --
 dev-ruby/htmlentities/metadata.xml                 |  1 -
 dev-ruby/imagesize/metadata.xml                    |  1 -
 dev-ruby/jruby-openssl/metadata.xml                |  3 --
 dev-ruby/json/metadata.xml                         |  1 -
 dev-ruby/kramdown/metadata.xml                     |  3 --
 dev-ruby/launchy/metadata.xml                      |  3 --
 dev-ruby/mocha/metadata.xml                        |  3 --
 dev-ruby/narray/metadata.xml                       |  3 +-
 dev-ruby/net-scp/metadata.xml                      |  1 -
 dev-ruby/net-sftp/metadata.xml                     |  1 -
 dev-ruby/net-ssh-gateway/metadata.xml              |  1 -
 dev-ruby/net-ssh-multi/metadata.xml                |  1 -
 dev-ruby/net-ssh/metadata.xml                      |  1 -
 dev-ruby/oauth/metadata.xml                        |  3 --
 dev-ruby/open4/metadata.xml                        |  1 -
 dev-ruby/plist/metadata.xml                        |  3 --
 dev-ruby/png/metadata.xml                          |  3 --
 dev-ruby/podcast/metadata.xml                      |  3 --
 dev-ruby/polyglot/metadata.xml                     |  3 --
 dev-ruby/rack-cache/metadata.xml                   |  7 +++-
 dev-ruby/rack/metadata.xml                         |  5 +--
 dev-ruby/radius/metadata.xml                       |  1 -
 dev-ruby/rake/metadata.xml                         |  3 +-
 dev-ruby/rdoc/metadata.xml                         |  3 +-
 dev-ruby/right_http_connection/metadata.xml        |  1 -
 dev-ruby/rjb/metadata.xml                          |  3 --
 dev-ruby/rmagick/metadata.xml                      |  3 +-
 dev-ruby/rspec-core/metadata.xml                   |  1 -
 dev-ruby/rspec-expectations/metadata.xml           |  1 -
 dev-ruby/rspec-mocks/metadata.xml                  |  1 -
 dev-ruby/rspec/metadata.xml                        |  1 -
 dev-ruby/ruby-atk/metadata.xml                     |  1 +
 dev-ruby/ruby-cairo-gobject/metadata.xml           |  1 +
 dev-ruby/ruby-clutter-gstreamer/metadata.xml       |  1 +
 dev-ruby/ruby-clutter-gtk/metadata.xml             |  1 +
 dev-ruby/ruby-clutter/metadata.xml                 |  1 +
 dev-ruby/ruby-elf/metadata.xml                     |  3 +-
 dev-ruby/ruby-filemagic/metadata.xml               |  1 -
 dev-ruby/ruby-gdk3/metadata.xml                    |  1 +
 dev-ruby/ruby-gdkpixbuf2/metadata.xml              |  1 +
 dev-ruby/ruby-gio2/metadata.xml                    |  1 +
 dev-ruby/ruby-glib2/metadata.xml                   |  1 +
 dev-ruby/ruby-gobject-introspection/metadata.xml   |  1 +
 dev-ruby/ruby-gstreamer/metadata.xml               |  1 +
 dev-ruby/ruby-gtk2/metadata.xml                    |  1 +
 dev-ruby/ruby-gtk3/metadata.xml                    |  1 +
 dev-ruby/ruby-gtksourceview/metadata.xml           |  1 +
 dev-ruby/ruby-gtksourceview3/metadata.xml          |  1 +
 dev-ruby/ruby-hmac/metadata.xml                    |  3 --
 dev-ruby/ruby-mp3info/metadata.xml                 |  1 -
 dev-ruby/ruby-oci8/metadata.xml                    |  1 -
 dev-ruby/ruby-opengl/metadata.xml                  |  1 -
 dev-ruby/ruby-openid/metadata.xml                  |  1 -
 dev-ruby/ruby-pango/metadata.xml                   |  1 +
 dev-ruby/ruby-poppler/metadata.xml                 |  1 +
 dev-ruby/ruby-rsvg/metadata.xml                    |  1 +
 dev-ruby/ruby-vte/metadata.xml                     |  1 +
 dev-ruby/ruby-vte3/metadata.xml                    |  1 +
 dev-ruby/ruby-webkit-gtk/metadata.xml              |  1 +
 dev-ruby/ruby-webkit-gtk2/metadata.xml             |  1 +
 dev-ruby/ruby-yadis/metadata.xml                   |  3 --
 dev-ruby/ruby2ruby/metadata.xml                    |  1 -
 dev-ruby/rubygems/metadata.xml                     |  5 +--
 dev-ruby/serialport/metadata.xml                   |  3 --
 dev-ruby/shorturl/metadata.xml                     |  3 --
 dev-ruby/simple-rss/metadata.xml                   |  3 --
 dev-ruby/snmplib/metadata.xml                      |  3 --
 dev-ruby/sparklines/metadata.xml                   |  3 --
 dev-ruby/sqlite3/metadata.xml                      |  2 +-
 dev-ruby/syntax/metadata.xml                       |  1 -
 dev-ruby/term-ansicolor/metadata.xml               |  3 --
 dev-ruby/termcolor/metadata.xml                    |  3 --
 dev-ruby/test-unit-rr/metadata.xml                 |  3 --
 dev-ruby/test-unit/metadata.xml                    |  1 -
 dev-ruby/text-hyphen/metadata.xml                  |  5 +--
 dev-ruby/textpow/metadata.xml                      |  1 -
 dev-ruby/treetop/metadata.xml                      |  1 -
 dev-ruby/trollop/metadata.xml                      |  3 --
 dev-ruby/tzinfo/metadata.xml                       |  5 +--
 dev-ruby/uuidtools/metadata.xml                    |  3 +-
 dev-util/abi-compliance-checker/metadata.xml       |  5 ++-
 dev-util/cligh/metadata.xml                        |  5 ++-
 dev-util/sysdig/metadata.xml                       |  5 ++-
 dev-util/xdelta/metadata.xml                       |  3 +-
 games-board/holdingnuts/metadata.xml               |  5 ++-
 games-emulation/dolphin/metadata.xml               | 23 +++++++-----
 games-strategy/freeorion/metadata.xml              |  9 +++--
 games-util/xqf/metadata.xml                        |  3 +-
 kde-misc/chromi/metadata.xml                       |  5 ++-
 kde-misc/systemd-kcm/metadata.xml                  |  3 +-
 mail-filter/policyd/metadata.xml                   |  5 ++-
 mail-mta/postfix/metadata.xml                      | 17 +++++----
 mail-mta/qpsmtpd/metadata.xml                      | 13 ++++---
 media-fonts/eb-garamond/metadata.xml               |  5 ++-
 media-libs/SoXt/metadata.xml                       | 19 ++++++----
 media-libs/chromaprint/metadata.xml                |  5 ++-
 media-libs/imlib2/metadata.xml                     | 11 ++++--
 media-libs/libyami/metadata.xml                    | 19 ++++++----
 media-libs/simage/metadata.xml                     | 11 ++++--
 media-libs/vigra/metadata.xml                      |  5 ++-
 media-libs/x265/metadata.xml                       | 13 ++++---
 media-plugins/imlib2_loaders/metadata.xml          | 25 +++++++------
 media-plugins/quodlibet-plugins/metadata.xml       |  3 +-
 media-sound/podcatcher/metadata.xml                |  3 --
 media-sound/quodlibet/metadata.xml                 |  3 +-
 media-sound/shoutcast-search/metadata.xml          |  5 ++-
 media-tv/tvheadend/metadata.xml                    | 33 +++++++++--------
 media-video/atomicparsley-wez/metadata.xml         |  3 +-
 media-video/harvid/metadata.xml                    |  5 ++-
 media-video/mkclean/metadata.xml                   |  5 ++-
 media-video/mkvalidator/metadata.xml               |  5 ++-
 net-analyzer/fail2ban/metadata.xml                 |  5 ++-
 net-analyzer/icinga-web/metadata.xml               |  3 +-
 net-analyzer/icinga2/metadata.xml                  | 13 ++++---
 net-analyzer/sancp/metadata.xml                    | 11 ++++--
 net-analyzer/testssl/metadata.xml                  |  5 ++-
 net-analyzer/zabbix/metadata.xml                   | 43 ++++++++++++----------
 net-analyzer/zmap/metadata.xml                     |  7 +++-
 net-dns/avahi/metadata.xml                         | 29 ++++++++-------
 net-dns/namecoin-qt/metadata.xml                   |  5 ++-
 net-dns/namecoind/metadata.xml                     |  5 ++-
 net-fs/cvmfs/metadata.xml                          | 23 +++++++-----
 net-libs/onion/metadata.xml                        | 11 ++++--
 net-mail/mu/metadata.xml                           |  3 +-
 net-misc/hotot/metadata.xml                        | 17 ++++++---
 net-misc/iputils/metadata.xml                      |  3 +-
 net-misc/libteam/metadata.xml                      |  7 +++-
 net-misc/sparkleshare/metadata.xml                 |  7 +++-
 net-misc/youtube-viewer/metadata.xml               | 37 ++++++++++---------
 net-news/liferea/metadata.xml                      |  3 +-
 net-p2p/bitcoinxtd/metadata.xml                    | 13 ++++---
 net-p2p/vuze-coreplugins/metadata.xml              |  5 ++-
 ros-meta/audio_common/metadata.xml                 |  7 +++-
 ros-meta/bond_core/metadata.xml                    |  7 +++-
 ros-meta/calibration/metadata.xml                  |  7 +++-
 ros-meta/common_msgs/metadata.xml                  |  7 +++-
 ros-meta/common_tutorials/metadata.xml             |  7 +++-
 ros-meta/desktop/metadata.xml                      |  7 +++-
 ros-meta/desktop_full/metadata.xml                 |  7 +++-
 ros-meta/diagnostics/metadata.xml                  |  7 +++-
 ros-meta/driver_common/metadata.xml                |  7 +++-
 ros-meta/executive_smach/metadata.xml              |  7 +++-
 ros-meta/gazebo_ros_pkgs/metadata.xml              |  7 +++-
 ros-meta/geographic_info/metadata.xml              |  7 +++-
 ros-meta/geometry/metadata.xml                     |  7 +++-
 ros-meta/geometry_experimental/metadata.xml        |  7 +++-
 ros-meta/geometry_tutorials/metadata.xml           |  7 +++-
 ros-meta/hector_localization/metadata.xml          |  7 +++-
 ros-meta/hector_slam/metadata.xml                  |  7 +++-
 ros-meta/image_common/metadata.xml                 |  7 +++-
 ros-meta/image_pipeline/metadata.xml               |  7 +++-
 ros-meta/image_transport_plugins/metadata.xml      |  7 +++-
 ros-meta/imu_pipeline/metadata.xml                 |  7 +++-
 ros-meta/laser_pipeline/metadata.xml               |  7 +++-
 ros-meta/navigation/metadata.xml                   |  7 +++-
 ros-meta/nodelet_core/metadata.xml                 |  7 +++-
 ros-meta/perception/metadata.xml                   |  7 +++-
 ros-meta/perception_pcl/metadata.xml               |  7 +++-
 ros-meta/pr2_common/metadata.xml                   |  7 +++-
 ros-meta/qt_gui_core/metadata.xml                  |  7 +++-
 ros-meta/robot/metadata.xml                        |  7 +++-
 ros-meta/robot_model/metadata.xml                  |  7 +++-
 ros-meta/ros/metadata.xml                          |  7 +++-
 ros-meta/ros_base/metadata.xml                     |  7 +++-
 ros-meta/ros_comm/metadata.xml                     |  7 +++-
 ros-meta/ros_control/metadata.xml                  |  7 +++-
 ros-meta/ros_core/metadata.xml                     |  7 +++-
 ros-meta/ros_tutorials/metadata.xml                |  7 +++-
 ros-meta/rosbridge_suite/metadata.xml              |  7 +++-
 ros-meta/roscpp_core/metadata.xml                  |  7 +++-
 ros-meta/rosserial/metadata.xml                    |  7 +++-
 ros-meta/rqt/metadata.xml                          |  7 +++-
 ros-meta/rqt_common_plugins/metadata.xml           |  7 +++-
 ros-meta/rqt_robot_plugins/metadata.xml            |  7 +++-
 ros-meta/simulators/metadata.xml                   |  7 +++-
 ros-meta/slam_gmapping/metadata.xml                |  7 +++-
 ros-meta/unique_identifier/metadata.xml            |  7 +++-
 ros-meta/vision_opencv/metadata.xml                |  7 +++-
 ros-meta/vision_visp/metadata.xml                  |  7 +++-
 ros-meta/visualization_tutorials/metadata.xml      |  7 +++-
 ros-meta/viz/metadata.xml                          |  7 +++-
 sci-biology/gatk/metadata.xml                      |  5 ++-
 sci-chemistry/prody/metadata.xml                   |  5 ++-
 sci-chemistry/votca-csg/metadata.xml               |  9 +++--
 sci-chemistry/votca-csgapps/metadata.xml           |  3 +-
 sci-geosciences/mapnik/metadata.xml                | 19 ++++++----
 sci-geosciences/osm2pgsql/metadata.xml             |  5 ++-
 sci-libs/ignition-math/metadata.xml                | 13 ++++---
 sci-libs/netcdf-cxx/metadata.xml                   | 11 ++++--
 sci-libs/openfoam/metadata.xml                     | 33 +++++++++--------
 sci-libs/scikits_learn/metadata.xml                |  5 ++-
 sci-libs/votca-tools/metadata.xml                  |  5 ++-
 sci-physics/espresso++/metadata.xml                |  5 ++-
 sci-physics/hoomd-blue/metadata.xml                |  5 ++-
 sci-physics/sassena/metadata.xml                   |  6 ++-
 sys-devel/bin86/metadata.xml                       |  5 ++-
 sys-devel/gcc/metadata.xml                         |  3 +-
 sys-fs/bcache-tools/metadata.xml                   |  5 ++-
 www-apache/mod_slotlimit/metadata.xml              |  3 ++
 www-apache/modsec-flameeyes/metadata.xml           |  5 ++-
 www-apache/passenger/metadata.xml                  |  7 +---
 www-apps/novnc/metadata.xml                        |  5 ++-
 www-client/otter/metadata.xml                      | 13 ++++---
 www-client/phantomjs/metadata.xml                  |  3 +-
 www-misc/fcgiwrap/metadata.xml                     | 21 ++++++-----
 www-plugins/pipelight/metadata.xml                 |  3 +-
 www-servers/nginx/metadata.xml                     |  5 ++-
 www-servers/tornado/metadata.xml                   |  3 +-
 x11-libs/libgxim/metadata.xml                      |  3 +-
 x11-libs/librfm/metadata.xml                       |  5 ++-
 x11-misc/autocutsel/metadata.xml                   |  5 ++-
 x11-misc/fireflies/metadata.xml                    |  7 +++-
 x11-misc/openbox-menu/metadata.xml                 | 26 ++++++-------
 x11-misc/screengrab/metadata.xml                   | 15 ++++----
 x11-misc/x11vnc/metadata.xml                       |  3 +-
 x11-themes/clearlooks-phenix/metadata.xml          |  8 ++--
 x11-themes/experience/metadata.xml                 |  7 +++-
 x11-themes/gtk-engines-quartz/metadata.xml         |  5 ++-
 x11-wm/notion/metadata.xml                         |  1 +
 x11-wm/stumpwm/metadata.xml                        | 31 +++++++++-------
 615 files changed, 2676 insertions(+), 1323 deletions(-)

diff --git a/app-admin/consul/metadata.xml b/app-admin/consul/metadata.xml
index fb27472..a5f3be1 100644
--- a/app-admin/consul/metadata.xml
+++ b/app-admin/consul/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -10,4 +10,7 @@
   <use>
     <flag name="web">Build the web UI.</flag>
   </use>
+  <upstream>
+    <remote-id type="github">ryanuber/columnize</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-admin/r10k/metadata.xml b/app-admin/r10k/metadata.xml
index 300319a..bf6926e 100644
--- a/app-admin/r10k/metadata.xml
+++ b/app-admin/r10k/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -8,9 +8,8 @@
   <herd>sysadmin</herd>
   <longdescription lang="en">
 			r10k provides a general purpose toolset for deploying Puppet environments and modules. It implements the Puppetfile format and provides a native implementation of Puppet dynamic environments.
-        </longdescription>
+  </longdescription>
   <upstream>
-    <remote-id type="rubyforge">r10k</remote-id>
     <remote-id type="github">adrienthebo/r10k</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 7b86f45..77f5bb2 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -19,7 +19,7 @@ files to define the state a server needs to be in.
 
 Between the remote execution system, and state management Salt addresses the
 backbone of cloud and data center management.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="api">Enable support for salt-api.</flag>
     <flag name="cherrypy">Enable support for using cherrypy.</flag>
@@ -39,5 +39,6 @@ backbone of cloud and data center management.
   </use>
   <upstream>
     <remote-id type="pypi">salt</remote-id>
+    <remote-id type="github">saltstack/salt-vim</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/app-admin/vault/metadata.xml b/app-admin/vault/metadata.xml
index 059d713..aace583 100644
--- a/app-admin/vault/metadata.xml
+++ b/app-admin/vault/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>zmedico@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">mitchellh/iochan</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
index b02ffbb..cdbc35f 100644
--- a/app-crypt/loop-aes-losetup/metadata.xml
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>
+	<upstream>
+		<remote-id type="sourceforge">loop-aes</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-dicts/freedict-deu-eng/metadata.xml b/app-dicts/freedict-deu-eng/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-deu-eng/metadata.xml
+++ b/app-dicts/freedict-deu-eng/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-dicts/freedict-eng-fra/metadata.xml b/app-dicts/freedict-eng-fra/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-eng-fra/metadata.xml
+++ b/app-dicts/freedict-eng-fra/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-dicts/freedict-eng-ita/metadata.xml b/app-dicts/freedict-eng-ita/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-eng-ita/metadata.xml
+++ b/app-dicts/freedict-eng-ita/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-dicts/freedict-eng-swe/metadata.xml b/app-dicts/freedict-eng-swe/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-eng-swe/metadata.xml
+++ b/app-dicts/freedict-eng-swe/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-dicts/freedict-fra-eng/metadata.xml b/app-dicts/freedict-fra-eng/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-fra-eng/metadata.xml
+++ b/app-dicts/freedict-fra-eng/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-dicts/freedict-ita-eng/metadata.xml b/app-dicts/freedict-ita-eng/metadata.xml
index 4538a68..ea83f71 100644
--- a/app-dicts/freedict-ita-eng/metadata.xml
+++ b/app-dicts/freedict-ita-eng/metadata.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-dicts/hunspell-kk/metadata.xml b/app-dicts/hunspell-kk/metadata.xml
index 86a2f54..5d321ae 100644
--- a/app-dicts/hunspell-kk/metadata.xml
+++ b/app-dicts/hunspell-kk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -10,4 +10,8 @@
 		<name>Galym Kerimbekov</name>
 		<description>Proxy maintainer, assign bugs to him</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kergalym/hunspell-kk</remote-id>
+		<remote-id type="sourceforge">hunspell</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-dicts/prime-dict/metadata.xml b/app-dicts/prime-dict/metadata.xml
index 2d5852c..ac1c4bb 100644
--- a/app-dicts/prime-dict/metadata.xml
+++ b/app-dicts/prime-dict/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="sourceforge-jp">prime</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml
index 10a4d1c..97772ba 100644
--- a/app-doc/root-docs/metadata.xml
+++ b/app-doc/root-docs/metadata.xml
@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gentoo.org</email>
-  <name>Andrew Savchenko</name>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+  <maintainer>
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <herd>sci-physics</herd>
+  <longdescription lang="en">
   This package contains the automatically generated ROOT class
   documentation.
-</longdescription>
-<use>
-  <flag name="api">Generate html API documentation</flag>
-  <flag name="http">Build HttpServer documentation</flag>
-  <flag name="math">Provide all math related documentation</flag>
-  <flag name="metric">Default to A4 paper size and metric measurement. Letter will be used otherwise</flag>
-</use>
+  </longdescription>
+  <use>
+    <flag name="api">Generate html API documentation</flag>
+    <flag name="http">Build HttpServer documentation</flag>
+    <flag name="math">Provide all math related documentation</flag>
+    <flag name="metric">Default to A4 paper size and metric measurement. Letter will be used otherwise</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">tmva</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index bfcec72..75d09ad 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -12,5 +12,6 @@
   <upstream>
     <remote-id type="sourceforge">retext</remote-id>
     <remote-id type="github">retext-project/retext</remote-id>
+    <remote-id type="pypi">ReText</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/app-emacs/doctest-mode/metadata.xml b/app-emacs/doctest-mode/metadata.xml
index bc306fe..2178ad6 100644
--- a/app-emacs/doctest-mode/metadata.xml
+++ b/app-emacs/doctest-mode/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+	<herd>emacs</herd>
+	<upstream>
+		<remote-id type="sourceforge">python-mode.svn</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-emacs/mmm-mode/metadata.xml b/app-emacs/mmm-mode/metadata.xml
index 54383fb..d4be75b 100644
--- a/app-emacs/mmm-mode/metadata.xml
+++ b/app-emacs/mmm-mode/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
-<upstream>
-  <remote-id type="sourceforge">mmm-mode</remote-id>
-</upstream>
+  <herd>emacs</herd>
+  <upstream>
+    <remote-id type="sourceforge">mmm-mode</remote-id>
+    <remote-id type="github">purcell/mmm-mode</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 6a110ec..d6f8bf6 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<use>
-  <flag name='xfconf'>Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag>
-  <flag name='gconf'>Enable GConf support</flag>
-  <flag name='gtk3'>Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
-</use>
+  <herd>cjk</herd>
+  <use>
+    <flag name="xfconf">Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag>
+    <flag name="gconf">Enable GConf support</flag>
+    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+  </use>
+  <upstream>
+    <remote-id type="bitbucket">tagoh/imsettings</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-i18n/transifex-client/metadata.xml b/app-i18n/transifex-client/metadata.xml
index 16bf12b..efd35c6 100644
--- a/app-i18n/transifex-client/metadata.xml
+++ b/app-i18n/transifex-client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">transifex-client</remote-id>
+		<remote-id type="github">transifex/transifex-client</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/app-leechcraft/liblaretz/metadata.xml b/app-leechcraft/liblaretz/metadata.xml
index 2c857dd..94bc46f 100644
--- a/app-leechcraft/liblaretz/metadata.xml
+++ b/app-leechcraft/liblaretz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>leechcraft</herd>
+	<upstream>
+		<remote-id type="github">0xd34df00d/laretz</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-misc/dateutils/metadata.xml b/app-misc/dateutils/metadata.xml
index 157326a..087199e 100644
--- a/app-misc/dateutils/metadata.xml
+++ b/app-misc/dateutils/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>
 	<maintainer>
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">hroptatyr/dateutils</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-misc/sleepyhead/metadata.xml b/app-misc/sleepyhead/metadata.xml
index b65fdaa..2d0751e 100644
--- a/app-misc/sleepyhead/metadata.xml
+++ b/app-misc/sleepyhead/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>
-<maintainer>
-	<email>rich0@gentoo.org</email>
-</maintainer>
-<longdescription>QT-based application used to analyze data from various CPAP machines.</longdescription>
+	<maintainer>
+		<email>rich0@gentoo.org</email>
+	</maintainer>
+	<longdescription>QT-based application used to analyze data from various CPAP machines.</longdescription>
+	<upstream>
+		<remote-id type="github">rich0/rich0-sleepyhead</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index e3c5a07..aad9899 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>me@bearsh.org</email>
     <name>Martin Gysel</name>
-    <description>Proxy maintainer. Assign bugs to him.</description>    
+    <description>Proxy maintainer. Assign bugs to him.</description>
   </maintainer>
   <maintainer>
     <email>bauman.aaron@gmail.com</email>
@@ -21,4 +21,7 @@
     <flag name="linguas_gsw">Language support for gsw.</flag>
     <flag name="linguas_hr_HR">Language support for hr_HR.</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">bearsh/bearshlay</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml
index a88ed84..8813ec2 100644
--- a/app-misc/tmux/metadata.xml
+++ b/app-misc/tmux/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>shell-tools</herd>
@@ -12,4 +12,7 @@
 		tmux is intended to be a simple, modern, BSD-licensed alternative to
 		programs such as <pkg>app-misc/screen</pkg>.
 	</longdescription>
+  <upstream>
+    <remote-id type="github">tmux/tmux</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-mobilephone/freesmee/metadata.xml b/app-mobilephone/freesmee/metadata.xml
index 5f8f148..e430c1a 100644
--- a/app-mobilephone/freesmee/metadata.xml
+++ b/app-mobilephone/freesmee/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>
 	<maintainer>
 		<email>ago@gentoo.org</email>
 		<name>Agostino Sarubbo</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freesmee/freesmee-desktop</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-office/unoconv/metadata.xml b/app-office/unoconv/metadata.xml
index f3559f1..2a8b409 100644
--- a/app-office/unoconv/metadata.xml
+++ b/app-office/unoconv/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>office</herd>
   <maintainer>
     <email>graaff@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">dagwieers/unoconv</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml
index 9fefdeb..f372a0d 100644
--- a/app-text/calibre/metadata.xml
+++ b/app-text/calibre/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -10,4 +10,7 @@
   <maintainer>
     <email>yngwin@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">calibre</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-text/liblangtag/metadata.xml b/app-text/liblangtag/metadata.xml
index 972fa41..d882101 100644
--- a/app-text/liblangtag/metadata.xml
+++ b/app-text/liblangtag/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>office</herd>
   <use>
     <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">tagoh/liblangtag</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-text/lodgeit/metadata.xml b/app-text/lodgeit/metadata.xml
index 4b46940..c7fc072 100644
--- a/app-text/lodgeit/metadata.xml
+++ b/app-text/lodgeit/metadata.xml
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>qnikst@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='vim'>
+    <flag name="vim">
       Install a vim plugin allowing to paste and download from within vim
     </flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">skrattaren/lodgeit-script-gentoo</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
index 8e976c4..091263a 100644
--- a/app-text/pdf2djvu/metadata.xml
+++ b/app-text/pdf2djvu/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>printing</herd>
   <use>
-    <flag name='graphicsmagick'>Enable <pkg>media-gfx/graphicsmagick</pkg> support</flag>
+    <flag name="graphicsmagick">Enable <pkg>media-gfx/graphicsmagick</pkg> support</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">jwilk/pdf2djvu</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-vim/cctree/metadata.xml b/app-vim/cctree/metadata.xml
index d221a8d..7508b26 100644
--- a/app-vim/cctree/metadata.xml
+++ b/app-vim/cctree/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/CCTree</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-vim/colorv/metadata.xml b/app-vim/colorv/metadata.xml
index d221a8d..386ec8b 100644
--- a/app-vim/colorv/metadata.xml
+++ b/app-vim/colorv/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/ColorV</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-vim/neocomplcache/metadata.xml b/app-vim/neocomplcache/metadata.xml
index 71d3191..dd4d5e6 100644
--- a/app-vim/neocomplcache/metadata.xml
+++ b/app-vim/neocomplcache/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>vim</herd>
+  <upstream>
+    <remote-id type="github">vim-scripts/neocomplcache</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-vim/perl-support/metadata.xml b/app-vim/perl-support/metadata.xml
index d221a8d..f149eed 100644
--- a/app-vim/perl-support/metadata.xml
+++ b/app-vim/perl-support/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/perl-support.vim</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-vim/slimv/metadata.xml b/app-vim/slimv/metadata.xml
index 6e78b9a..46c8b91 100644
--- a/app-vim/slimv/metadata.xml
+++ b/app-vim/slimv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
@@ -19,4 +19,7 @@
 		The script also supports a number of other features provided by SLIME
 		including profiling, paredit mode, and hyperspec lookups.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">kovisoft/slimv</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-vim/vimclojure/metadata.xml b/app-vim/vimclojure/metadata.xml
index b97972b..3f30c04 100644
--- a/app-vim/vimclojure/metadata.xml
+++ b/app-vim/vimclojure/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>java</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/VimClojure</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-vim/vimpress/metadata.xml b/app-vim/vimpress/metadata.xml
index d221a8d..2325539 100644
--- a/app-vim/vimpress/metadata.xml
+++ b/app-vim/vimpress/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/VimRepress</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index a631f99..cae7269 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci</herd>
@@ -10,4 +10,7 @@
 		OpenGL apps, spreadsheets and other office apps, etc. Eigen is dedicated to
 		providing optimal speed with GCC.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">eigen/eigen</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-db/barman/metadata.xml b/dev-db/barman/metadata.xml
index 24cbb90..0d7a928 100644
--- a/dev-db/barman/metadata.xml
+++ b/dev-db/barman/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>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-db/mycli/metadata.xml b/dev-db/mycli/metadata.xml
index 9516a92..e975a30 100644
--- a/dev-db/mycli/metadata.xml
+++ b/dev-db/mycli/metadata.xml
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
-</use>
+	<use>
+	</use>
 	<maintainer>
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">dbcli/mycli</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-db/mysql-udf-ipv6/metadata.xml b/dev-db/mysql-udf-ipv6/metadata.xml
index 91f4e72..6569081 100644
--- a/dev-db/mysql-udf-ipv6/metadata.xml
+++ b/dev-db/mysql-udf-ipv6/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">watchmouse/mysql-udf-ipv6</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-embedded/sunxi-tools/metadata.xml b/dev-embedded/sunxi-tools/metadata.xml
index 971a1f4..c086d3f 100644
--- a/dev-embedded/sunxi-tools/metadata.xml
+++ b/dev-embedded/sunxi-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>embedded</herd>
@@ -6,4 +6,7 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">linux-sunxi/sunxi-tools</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 21b446f..938db89 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -11,4 +11,7 @@
     <flag name="memleak">Enable memory-leaks detector (only for developers)</flag>
     <flag name="static">Link against static version of C and C++ runtimes</flag>
   </use>
+  <upstream>
+    <remote-id type="github">aseprite/aseprite</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index c9f8ae7..8791c3d 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>games</herd>
@@ -72,19 +72,22 @@ Exporters
     * Wings3D (meshes)
     * VRML97 (meshes)
     * Maya (meshes)
-</longdescription>
+  </longdescription>
   <use>
     <flag name="boost">enable boost support</flag>
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="double-precision">more precise calculations at the expense of speed</flag>
-	<flag name="freeimage">support images via freeimage</flag>
-	<flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
-	<flag name="gles2">build OpenGL ES 2.x RenderSystem</flag>
-	<flag name="gles3">Enable OpenGL ES 3.x Features</flag>
+    <flag name="freeimage">support images via freeimage</flag>
+    <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
+    <flag name="gles2">build OpenGL ES 2.x RenderSystem</flag>
+    <flag name="gles3">Enable OpenGL ES 3.x Features</flag>
     <flag name="ois">pull in Object-oriented Input System library for samples</flag>
     <flag name="poco">when USE=threads, use poco for threading</flag>
     <flag name="tbb">when USE=threads, use tbb for threading</flag>
     <flag name="tools">build+install helper tools</flag>
     <flag name="zip">support zip archives</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">sinbad/ogre</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/dev-java/jansi/metadata.xml b/dev-java/jansi/metadata.xml
index 95667b0..faca085 100644
--- a/dev-java/jansi/metadata.xml
+++ b/dev-java/jansi/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>java</herd>
 	<longdescription>
 	Jansi is a small java library that allows you to use ANSI escape sequences to format your console output which works even on windows.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">fusesource/jansi</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-lang/ats/metadata.xml b/dev-lang/ats/metadata.xml
index 6719fcd..b68ddd1 100644
--- a/dev-lang/ats/metadata.xml
+++ b/dev-lang/ats/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>
   <maintainer>
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">downloads</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/dev-lang/crystal/metadata.xml b/dev-lang/crystal/metadata.xml
index 95201e8..a0e7647 100644
--- a/dev-lang/crystal/metadata.xml
+++ b/dev-lang/crystal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -21,4 +21,7 @@
 			module
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">manastech/crystal</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-lang/lazarus/metadata.xml b/dev-lang/lazarus/metadata.xml
index c12176f..642a64e 100644
--- a/dev-lang/lazarus/metadata.xml
+++ b/dev-lang/lazarus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>lang-misc</herd>
@@ -7,8 +7,10 @@
 		Uses the free pascal compiler.
 	</longdescription>
 	<use>
-		<flag name='minimal'>Don't build extra packages from the
+		<flag name="minimal">Don't build extra packages from the
 			bigide component</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
-

diff --git a/dev-libs/libRocket/metadata.xml b/dev-libs/libRocket/metadata.xml
index 1649dd2..751ccdc 100644
--- a/dev-libs/libRocket/metadata.xml
+++ b/dev-libs/libRocket/metadata.xml
@@ -1,11 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='samples'>Build samples</flag>
+		<flag name="samples">Build samples</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">libRocket/libRocket</remote-id>
+	</upstream>
 </pkgmetadata>
-

diff --git a/dev-libs/libdbh/metadata.xml b/dev-libs/libdbh/metadata.xml
index fcc6fe9..7043867 100644
--- a/dev-libs/libdbh/metadata.xml
+++ b/dev-libs/libdbh/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>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dbh</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 38eb6ac..44f1627 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -20,4 +20,7 @@
 			Enables liblogging's core component (think of it as a the next version of the syslog(3) API).
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">rsyslog/liblogging</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libtubo/metadata.xml b/dev-libs/libtubo/metadata.xml
index fcc6fe9..a4f8b1f 100644
--- a/dev-libs/libtubo/metadata.xml
+++ b/dev-libs/libtubo/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>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xffm</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/qqwing/metadata.xml b/dev-libs/qqwing/metadata.xml
index da6fd63..8005424 100644
--- a/dev-libs/qqwing/metadata.xml
+++ b/dev-libs/qqwing/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<upstream>
+		<remote-id type="github">stephenostermiller/qqwing</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/camlimages/metadata.xml b/dev-ml/camlimages/metadata.xml
index 2193d77..429e62b 100644
--- a/dev-ml/camlimages/metadata.xml
+++ b/dev-ml/camlimages/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+	<herd>ml</herd>
+	<upstream>
+		<remote-id type="bitbucket">camlspotter/camlimages</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/ocamldap/metadata.xml b/dev-ml/ocamldap/metadata.xml
index b3e9b27..413ab23 100644
--- a/dev-ml/ocamldap/metadata.xml
+++ b/dev-ml/ocamldap/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+	<herd>ml</herd>
 	<longdescription lang="en">
 Ocamldap is an implementation of the Light Weight Directory Access Protocol,
 and a set of useful tools built around it. It includes high level libraries
@@ -18,4 +18,7 @@ unlike a search filter you can also ask ocamldap to MAKE an object satisfy its
 conditions. This can be really useful in distributed managment applications.
 Needless to say, more on this in the Documentation section.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">deplai_j/ocamldap</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/castellan/metadata.xml b/dev-python/castellan/metadata.xml
index d5dfd32..59f281a 100644
--- a/dev-python/castellan/metadata.xml
+++ b/dev-python/castellan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">castellan</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/doc8/metadata.xml b/dev-python/doc8/metadata.xml
index d5dfd32..26fee01 100644
--- a/dev-python/doc8/metadata.xml
+++ b/dev-python/doc8/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">doc8</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/enzyme/metadata.xml b/dev-python/enzyme/metadata.xml
index 83efd62..b8785a0 100644
--- a/dev-python/enzyme/metadata.xml
+++ b/dev-python/enzyme/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
@@ -9,5 +9,6 @@
   <upstream>
     <remote-id type="pypi">enzyme</remote-id>
     <remote-id type="github">Diaoul/enzyme</remote-id>
+    <remote-id type="sourceforge">downloads</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-python/logutils/metadata.xml b/dev-python/logutils/metadata.xml
index d5dfd32..49aeb89 100644
--- a/dev-python/logutils/metadata.xml
+++ b/dev-python/logutils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,8 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">vinay.sajip/logutils</remote-id>
+		<remote-id type="pypi">logutils</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mamba/metadata.xml b/dev-python/mamba/metadata.xml
index 308165e..a637f3f 100644
--- a/dev-python/mamba/metadata.xml
+++ b/dev-python/mamba/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -9,5 +9,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="pypi">mamba</remote-id>
+    <remote-id type="github">nestorsalceda/mamba</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-python/os-brick/metadata.xml b/dev-python/os-brick/metadata.xml
index d5dfd32..3b21234 100644
--- a/dev-python/os-brick/metadata.xml
+++ b/dev-python/os-brick/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,8 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="github">openstack/cinder</remote-id>
+		<remote-id type="pypi">os-brick</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/oslo-reports/metadata.xml b/dev-python/oslo-reports/metadata.xml
index d5dfd32..d9ab41f 100644
--- a/dev-python/oslo-reports/metadata.xml
+++ b/dev-python/oslo-reports/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">oslo.reports</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/oslo-versionedobjects/metadata.xml b/dev-python/oslo-versionedobjects/metadata.xml
index d5dfd32..1cdf074 100644
--- a/dev-python/oslo-versionedobjects/metadata.xml
+++ b/dev-python/oslo-versionedobjects/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">oslo.versionedobjects</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pecan/metadata.xml b/dev-python/pecan/metadata.xml
index d5dfd32..bb366ec 100644
--- a/dev-python/pecan/metadata.xml
+++ b/dev-python/pecan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pecan</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
index d643b33..0decdfd 100644
--- a/dev-python/ply/metadata.xml
+++ b/dev-python/ply/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -10,9 +10,12 @@ the overall flavor of the implementation is more closely modeled after
 the C version of lex and yacc. The other significant feature of PLY is
 that it provides extensive input validation and error reporting--much
 more so than other Python parsing tools.
-</longdescription>
+	</longdescription>
 	<longdescription lang="ja">
 PLYはLexとYaccの有名なコンパイラ・コンストラクション・ツールのPython言語実装です
 。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を&gt;提供する点です。 -- その二点は他のPython言語パーサーより優れています。
-</longdescription>
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">ply</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pycollada/metadata.xml b/dev-python/pycollada/metadata.xml
index 5b80fb9..1ba6038 100644
--- a/dev-python/pycollada/metadata.xml
+++ b/dev-python/pycollada/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>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pycollada/pycollada</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pycurl/metadata.xml b/dev-python/pycurl/metadata.xml
index b7630d2..3f682ae 100644
--- a/dev-python/pycurl/metadata.xml
+++ b/dev-python/pycurl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
@@ -7,11 +7,12 @@ PycURL is a Python interface to libcurl. PycURL can be used to fetch
 objects identified by a URL from a Python program, similar to the urllib
 Python module. All the functionality provided by libcurl can used through
 the pycurl interface.
-</longdescription>
+  </longdescription>
   <longdescription lang="ja">
 PycURLはLibcurlへのパイソン・インターフェイスです。PycURLはPython言語モジュール&gt;の様に、Python言語プログラムからURLで指定されたオブジェクトをダウンロードするに&gt;も使えます。Libcurlで利用できる機能全てはPycURLインターフェイスを通して利用でき&gt;ます。
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="github">pycurl/pycurl</remote-id>
+    <remote-id type="sourceforge">pycurl</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
index 91a6942..10b24d2 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
 	<longdescription>Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats.</longdescription>
 	<upstream>
 		<remote-id type="pypi">Pygments</remote-id>
+		<remote-id type="bitbucket">birkenfeld/pygments-main</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml
index feca656..86eeefa 100644
--- a/dev-python/pypy-bin/metadata.xml
+++ b/dev-python/pypy-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -9,4 +9,7 @@
 	<use>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pypy/metadata.xml b/dev-python/pypy/metadata.xml
index a90c29e..fbcef58 100644
--- a/dev-python/pypy/metadata.xml
+++ b/dev-python/pypy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -14,4 +14,7 @@
 		<flag name="sandbox">Enable sandboxing functionality</flag>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pypy3-bin/metadata.xml b/dev-python/pypy3-bin/metadata.xml
index feca656..86eeefa 100644
--- a/dev-python/pypy3-bin/metadata.xml
+++ b/dev-python/pypy3-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -9,4 +9,7 @@
 	<use>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
index 00d869b..932940b 100644
--- a/dev-python/pypy3/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@@ -11,4 +11,7 @@
 		<flag name="sandbox">Enable sandboxing functionality</flag>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-editor/metadata.xml b/dev-python/python-editor/metadata.xml
index d5dfd32..98a6524 100644
--- a/dev-python/python-editor/metadata.xml
+++ b/dev-python/python-editor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,8 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="github">fmoo/python-editor</remote-id>
+		<remote-id type="pypi">python-editor</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/restructuredtext-lint/metadata.xml b/dev-python/restructuredtext-lint/metadata.xml
index d5dfd32..a49b91e 100644
--- a/dev-python/restructuredtext-lint/metadata.xml
+++ b/dev-python/restructuredtext-lint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">restructuredtext_lint</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ryu/metadata.xml b/dev-python/ryu/metadata.xml
index d5dfd32..9e34a18 100644
--- a/dev-python/ryu/metadata.xml
+++ b/dev-python/ryu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">ryu</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/uhashring/metadata.xml b/dev-python/uhashring/metadata.xml
index faafe4d..955ac96 100644
--- a/dev-python/uhashring/metadata.xml
+++ b/dev-python/uhashring/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">uhashring</remote-id>
+		<remote-id type="github">ultrabug/uhashring</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ros/actionlib/metadata.xml b/dev-ros/actionlib/metadata.xml
index c42ea5b..088b4e8 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 c42ea5b..2d3b5cc 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 c42ea5b..38abe1f 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 c42ea5b..8694432 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 c42ea5b..7c93259 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 c42ea5b..11ebb41 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 c42ea5b..11ebb41 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 c42ea5b..11ebb41 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 c42ea5b..8694432 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 c42ea5b..500c8eb 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 c42ea5b..500c8eb 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 c42ea5b..500c8eb 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 c42ea5b..11ffa23 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 c42ea5b..11ffa23 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 c42ea5b..11ffa23 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 c42ea5b..11ffa23 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 c42ea5b..90c35a2 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 c42ea5b..b01f287 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 c42ea5b..b01f287 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 c42ea5b..8694432 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 c42ea5b..9c5e3a9 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 c42ea5b..8694432 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 c42ea5b..9ceae0a 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 c42ea5b..b2ab0e6 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 c42ea5b..b2ab0e6 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 c42ea5b..97c7091 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 c42ea5b..97c7091 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 c42ea5b..da1d5da 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 c42ea5b..82c7f05 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 c42ea5b..2b50e8a 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 c42ea5b..2b50e8a 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 c42ea5b..2b50e8a 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 c42ea5b..2b50e8a 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 c42ea5b..6d15438 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 c42ea5b..8694432 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 c42ea5b..d41b871 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 c42ea5b..266dc38 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 c42ea5b..90c35a2 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 c42ea5b..7403d8e 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 c42ea5b..7403d8e 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 c42ea5b..7403d8e 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 c42ea5b..2d3b5cc 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 c42ea5b..7403d8e 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 c42ea5b..9e7fdee 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 c42ea5b..8694432 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 c42ea5b..6d2512b 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 c42ea5b..2d8e130 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 c42ea5b..62e93bb 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 c42ea5b..8694432 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 c42ea5b..8d40320 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 c42ea5b..2cda806 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 c42ea5b..2cda806 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 c42ea5b..2cda806 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 c42ea5b..2cda806 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 c42ea5b..9576306 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 c42ea5b..38009a3 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 c42ea5b..f031905 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 c42ea5b..9e675a2 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 c42ea5b..a588e78 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 c42ea5b..15ed56b 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 c42ea5b..15ed56b 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 c42ea5b..520964c 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 c42ea5b..2d3b5cc 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 c42ea5b..8694432 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 c42ea5b..2787121 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 c42ea5b..2b50e8a 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..017b917 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 c42ea5b..017b917 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 c42ea5b..d3cf71e 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 c42ea5b..d3cf71e 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 c42ea5b..11ffa23 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 c42ea5b..266dc38 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 c42ea5b..90c35a2 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 c42ea5b..90c35a2 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 c42ea5b..b01f287 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 c42ea5b..90c35a2 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 c42ea5b..59d1d9e 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 c42ea5b..59d1d9e 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 c42ea5b..e1ee206 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 c42ea5b..06342c0 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 c42ea5b..11ffa23 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 c42ea5b..01a9af4 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 c42ea5b..2b50e8a 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 c42ea5b..b2ab0e6 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 c42ea5b..11ffa23 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 c42ea5b..2d8e130 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 c42ea5b..b2ab0e6 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 c42ea5b..3dbf9bf 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 c42ea5b..11ffa23 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 c42ea5b..a51d14a 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 c42ea5b..46f29be 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 c42ea5b..e1ee206 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 c42ea5b..8a5ed02 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 c42ea5b..8694432 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 c42ea5b..bcf2b81 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 c42ea5b..bf725cc 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 c42ea5b..f821157 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 c42ea5b..017b917 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 c42ea5b..d0c10cf 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 c42ea5b..11ffa23 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 c42ea5b..8694432 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 c42ea5b..8a5ed02 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 c42ea5b..8694432 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 c42ea5b..9e33b27 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 c42ea5b..8694432 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 c42ea5b..2d3b5cc 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 c42ea5b..8694432 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 c42ea5b..33bcb0c 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 c42ea5b..33bcb0c 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 c42ea5b..38abe1f 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 c42ea5b..eb59c0a 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 c42ea5b..4be018a 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 c42ea5b..9d69b3c 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 c42ea5b..266dc38 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 c42ea5b..266dc38 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 c42ea5b..c248b96 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 c42ea5b..b19e363 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 c42ea5b..a765a41 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 c42ea5b..3fbdb8f 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 c42ea5b..2d4844b 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 c42ea5b..38abe1f 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 c42ea5b..73f0102 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 c42ea5b..b01f287 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 c42ea5b..88a4cd6 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 c42ea5b..88a4cd6 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 c42ea5b..88a4cd6 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 c42ea5b..88a4cd6 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 c42ea5b..51aa73b 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 c42ea5b..2d88111 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 c42ea5b..2d88111 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 c42ea5b..2d88111 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 c42ea5b..2d88111 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 c42ea5b..2d88111 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 c42ea5b..9eecefd 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 c42ea5b..1b54833 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 c42ea5b..5469bd6 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 c42ea5b..8694432 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 c42ea5b..1d107f4 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 c42ea5b..d548185 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 c42ea5b..ade7f22 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 265847d..c75640d 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 c42ea5b..bcf2b81 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 c42ea5b..d0c10cf 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 c42ea5b..d0c10cf 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 c42ea5b..d548185 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 c42ea5b..d548185 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 c42ea5b..d0c10cf 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 c42ea5b..d0c10cf 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 deb6fce..d8ccd39 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 c42ea5b..f90c61a 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 c42ea5b..bcf2b81 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 c42ea5b..d41b871 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 c42ea5b..d41b871 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 c42ea5b..1360d75 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 c42ea5b..d0c10cf 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 c42ea5b..bcf2b81 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 c42ea5b..d101ce6 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 c42ea5b..d0c10cf 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 c42ea5b..bcf2b81 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 c42ea5b..d0c10cf 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 c42ea5b..3605109 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 c42ea5b..10cafb5 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 c42ea5b..bcf2b81 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 c42ea5b..d0c10cf 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..34042c3 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..1360d75 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 c42ea5b..853c4a1 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 c42ea5b..853c4a1 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 c42ea5b..853c4a1 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 c42ea5b..853c4a1 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 c42ea5b..853c4a1 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 c42ea5b..853c4a1 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 c42ea5b..853c4a1 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 c42ea5b..853c4a1 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..d41b871 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 c42ea5b..bcf2b81 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 c42ea5b..d0c10cf 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 c42ea5b..bcf2b81 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 c42ea5b..8694432 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..2b50e8a 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..1274b6f 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 c42ea5b..1274b6f 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 c42ea5b..1274b6f 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..28fc5ef 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 c42ea5b..36b263a 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 c42ea5b..28fc5ef 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 c42ea5b..36b263a 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 c42ea5b..28fc5ef 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..28fc5ef 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 c42ea5b..28fc5ef 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 c42ea5b..28fc5ef 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 c42ea5b..28fc5ef 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 c42ea5b..28fc5ef 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..28fc5ef 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..36b263a 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 c42ea5b..a54bf17 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 c42ea5b..e1ee206 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 c42ea5b..e1ee206 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 c42ea5b..7403d8e 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 c42ea5b..2d3b5cc 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 c42ea5b..11ffa23 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 c42ea5b..2d3b5cc 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 c42ea5b..df9f6c9 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 c42ea5b..df9f6c9 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 c42ea5b..df9f6c9 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 c42ea5b..500c8eb 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 c42ea5b..11ebb41 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 c42ea5b..c5c1aaa 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 c42ea5b..f81a27a 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 c42ea5b..d101ce6 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 c42ea5b..90c35a2 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 c42ea5b..2d3b5cc 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 c42ea5b..500c8eb 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 c42ea5b..7403d8e 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 c42ea5b..33bcb0c 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 c42ea5b..33bcb0c 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..bcf2b81 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 c42ea5b..51f204d 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 c42ea5b..2d8e130 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 c42ea5b..51f204d 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 c42ea5b..51f204d 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 c42ea5b..51f204d 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 c42ea5b..51f204d 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 c42ea5b..51f204d 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 c42ea5b..51f204d 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 c42ea5b..51f204d 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 c42ea5b..51f204d 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 c42ea5b..51f204d 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 c42ea5b..2d8e130 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 c42ea5b..97c7091 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 c42ea5b..9e7fdee 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 c42ea5b..bcf2b81 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 c42ea5b..2d3b5cc 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 c42ea5b..2b50e8a 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 c42ea5b..38abe1f 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 c42ea5b..c02c459 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 c42ea5b..c02c459 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 c42ea5b..1360d75 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 c42ea5b..b274068 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 c42ea5b..b2ab0e6 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 c42ea5b..b2ab0e6 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 c42ea5b..1d606bf 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 c42ea5b..b274068 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 c42ea5b..f279d19 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 c42ea5b..f279d19 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 c42ea5b..f279d19 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 c42ea5b..f279d19 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 c42ea5b..f279d19 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 c42ea5b..e1ee206 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 c42ea5b..2d3b5cc 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 c42ea5b..8694432 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 c42ea5b..fe41d21 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 c42ea5b..bcf2b81 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>

diff --git a/dev-ruby/actionpack/metadata.xml b/dev-ruby/actionpack/metadata.xml
index 51451fb..069495c 100644
--- a/dev-ruby/actionpack/metadata.xml
+++ b/dev-ruby/actionpack/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">actionpack</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/activerecord/metadata.xml b/dev-ruby/activerecord/metadata.xml
index d4135e2..069495c 100644
--- a/dev-ruby/activerecord/metadata.xml
+++ b/dev-ruby/activerecord/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">activerecord</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/activeresource/metadata.xml b/dev-ruby/activeresource/metadata.xml
index d9d67be..4c1d4a4 100644
--- a/dev-ruby/activeresource/metadata.xml
+++ b/dev-ruby/activeresource/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">activeresource</remote-id>
+    <remote-id type="github">rails/activeresource</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/activesupport/metadata.xml b/dev-ruby/activesupport/metadata.xml
index 1b3fcc4..069495c 100644
--- a/dev-ruby/activesupport/metadata.xml
+++ b/dev-ruby/activesupport/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">activesupport</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/archive-tar-minitar/metadata.xml b/dev-ruby/archive-tar-minitar/metadata.xml
index 344693a..75effc9 100644
--- a/dev-ruby/archive-tar-minitar/metadata.xml
+++ b/dev-ruby/archive-tar-minitar/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">ruwiki</remote-id>
     <remote-id type="github">halostatue/minitar</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/aws-s3/metadata.xml b/dev-ruby/aws-s3/metadata.xml
index 6b75efc..9d6e8da 100644
--- a/dev-ruby/aws-s3/metadata.xml
+++ b/dev-ruby/aws-s3/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">amazon</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/builder/metadata.xml b/dev-ruby/builder/metadata.xml
index 583958e..9d6e8da 100644
--- a/dev-ruby/builder/metadata.xml
+++ b/dev-ruby/builder/metadata.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">builder</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/classifier/metadata.xml b/dev-ruby/classifier/metadata.xml
index 62a6fbf..0999615 100644
--- a/dev-ruby/classifier/metadata.xml
+++ b/dev-ruby/classifier/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">cardmagic/classifier</remote-id>
-    <remote-id type="rubyforge">classifier</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/color/metadata.xml b/dev-ruby/color/metadata.xml
index 0ab52d6..373f091 100644
--- a/dev-ruby/color/metadata.xml
+++ b/dev-ruby/color/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">halostatue/color</remote-id>
-    <remote-id type="rubyforge">color</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/curb/metadata.xml b/dev-ruby/curb/metadata.xml
index 730d6f3..7947344 100644
--- a/dev-ruby/curb/metadata.xml
+++ b/dev-ruby/curb/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">taf2/curb</remote-id>
-    <remote-id type="rubyforge">curb</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/deprecated/metadata.xml b/dev-ruby/deprecated/metadata.xml
index dbbea9b..d4c7ea6 100644
--- a/dev-ruby/deprecated/metadata.xml
+++ b/dev-ruby/deprecated/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">deprecated</remote-id>
     <remote-id type="github">erikh/deprecated</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/diff-lcs/metadata.xml b/dev-ruby/diff-lcs/metadata.xml
index 1f94fcd..bbd6743 100644
--- a/dev-ruby/diff-lcs/metadata.xml
+++ b/dev-ruby/diff-lcs/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">ruwiki</remote-id>
     <remote-id type="github">halostatue/diff-lcs</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/dnsruby/metadata.xml b/dev-ruby/dnsruby/metadata.xml
index 4cb7af5..8d8dd58 100644
--- a/dev-ruby/dnsruby/metadata.xml
+++ b/dev-ruby/dnsruby/metadata.xml
@@ -5,7 +5,4 @@
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
-	<upstream>
-		<remote-id type="rubyforge">dnsruby</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/dust/metadata.xml b/dev-ruby/dust/metadata.xml
index 58f8530..9d6e8da 100644
--- a/dev-ruby/dust/metadata.xml
+++ b/dev-ruby/dust/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">dust</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/extlib/metadata.xml b/dev-ruby/extlib/metadata.xml
index 0a0c1c5..9d6e8da 100644
--- a/dev-ruby/extlib/metadata.xml
+++ b/dev-ruby/extlib/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">extlib</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/fattr/metadata.xml b/dev-ruby/fattr/metadata.xml
index 5e66b0f..9d6e8da 100644
--- a/dev-ruby/fattr/metadata.xml
+++ b/dev-ruby/fattr/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">codeforpeople</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/gnuplot/metadata.xml b/dev-ruby/gnuplot/metadata.xml
index 6bba9c4..9d6e8da 100644
--- a/dev-ruby/gnuplot/metadata.xml
+++ b/dev-ruby/gnuplot/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">rgplot</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/gruff/metadata.xml b/dev-ruby/gruff/metadata.xml
index 9fce92c..7283890 100644
--- a/dev-ruby/gruff/metadata.xml
+++ b/dev-ruby/gruff/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">gruff</remote-id>
     <remote-id type="github">topfunky/gruff</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/highline/metadata.xml b/dev-ruby/highline/metadata.xml
index c93aec2..2f8d5b7 100644
--- a/dev-ruby/highline/metadata.xml
+++ b/dev-ruby/highline/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">JEG2/highline</remote-id>
-    <remote-id type="rubyforge">highline</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/hoe-seattlerb/metadata.xml b/dev-ruby/hoe-seattlerb/metadata.xml
index d9dbac1..9d6e8da 100644
--- a/dev-ruby/hoe-seattlerb/metadata.xml
+++ b/dev-ruby/hoe-seattlerb/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">seattlerb</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/hoe/metadata.xml b/dev-ruby/hoe/metadata.xml
index d9dbac1..9d6e8da 100644
--- a/dev-ruby/hoe/metadata.xml
+++ b/dev-ruby/hoe/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">seattlerb</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/htmlentities/metadata.xml b/dev-ruby/htmlentities/metadata.xml
index e3eedb5..2e6df8f 100644
--- a/dev-ruby/htmlentities/metadata.xml
+++ b/dev-ruby/htmlentities/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">threedaymonk/htmlentities</remote-id>
-    <remote-id type="rubyforge">htmlentities</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/imagesize/metadata.xml b/dev-ruby/imagesize/metadata.xml
index 83be560..4827a9a 100644
--- a/dev-ruby/imagesize/metadata.xml
+++ b/dev-ruby/imagesize/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">mattheworiordan/imagesize</remote-id>
-    <remote-id type="rubyforge">imagesize</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/jruby-openssl/metadata.xml b/dev-ruby/jruby-openssl/metadata.xml
index dd7e40e..ac30777 100644
--- a/dev-ruby/jruby-openssl/metadata.xml
+++ b/dev-ruby/jruby-openssl/metadata.xml
@@ -3,7 +3,4 @@
 <pkgmetadata>
 	<herd>ruby</herd>
 	<herd>java</herd>
-	<upstream>
-		<remote-id type="rubyforge">jruby-extras</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/json/metadata.xml b/dev-ruby/json/metadata.xml
index fc5dfdc..59e5723 100644
--- a/dev-ruby/json/metadata.xml
+++ b/dev-ruby/json/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">flori/json</remote-id>
-    <remote-id type="rubyforge">json</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/kramdown/metadata.xml b/dev-ruby/kramdown/metadata.xml
index a5ef716..9d6e8da 100644
--- a/dev-ruby/kramdown/metadata.xml
+++ b/dev-ruby/kramdown/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">kramdown</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/launchy/metadata.xml b/dev-ruby/launchy/metadata.xml
index 180939d..9d6e8da 100644
--- a/dev-ruby/launchy/metadata.xml
+++ b/dev-ruby/launchy/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">copiousfreetime</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/mocha/metadata.xml b/dev-ruby/mocha/metadata.xml
index 843b959..9d6e8da 100644
--- a/dev-ruby/mocha/metadata.xml
+++ b/dev-ruby/mocha/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">mocha</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/narray/metadata.xml b/dev-ruby/narray/metadata.xml
index d8ddaad..25d79cd 100644
--- a/dev-ruby/narray/metadata.xml
+++ b/dev-ruby/narray/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">narray</remote-id>
     <remote-id type="github">masa16/narray</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/net-scp/metadata.xml b/dev-ruby/net-scp/metadata.xml
index d0875fc..c4ec636 100644
--- a/dev-ruby/net-scp/metadata.xml
+++ b/dev-ruby/net-scp/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-scp</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/net-sftp/metadata.xml b/dev-ruby/net-sftp/metadata.xml
index fc1a3bc..2b68926 100644
--- a/dev-ruby/net-sftp/metadata.xml
+++ b/dev-ruby/net-sftp/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-sftp</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/net-ssh-gateway/metadata.xml b/dev-ruby/net-ssh-gateway/metadata.xml
index b22a074..4df31c1 100644
--- a/dev-ruby/net-ssh-gateway/metadata.xml
+++ b/dev-ruby/net-ssh-gateway/metadata.xml
@@ -4,6 +4,5 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="github">net-ssh/net-scp</remote-id>
-		<remote-id type="rubyforge">net-ssh</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/net-ssh-multi/metadata.xml b/dev-ruby/net-ssh-multi/metadata.xml
index 8fae3fb..1a9d505 100644
--- a/dev-ruby/net-ssh-multi/metadata.xml
+++ b/dev-ruby/net-ssh-multi/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-ssh-multi</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/net-ssh/metadata.xml b/dev-ruby/net-ssh/metadata.xml
index 210d64b..051e681 100644
--- a/dev-ruby/net-ssh/metadata.xml
+++ b/dev-ruby/net-ssh/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-ssh</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/oauth/metadata.xml b/dev-ruby/oauth/metadata.xml
index 55451e9..9d6e8da 100644
--- a/dev-ruby/oauth/metadata.xml
+++ b/dev-ruby/oauth/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">oauth</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/open4/metadata.xml b/dev-ruby/open4/metadata.xml
index 169e364..6c1c587 100644
--- a/dev-ruby/open4/metadata.xml
+++ b/dev-ruby/open4/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">ahoward/open4</remote-id>
-    <remote-id type="rubyforge">codeforpeople</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/plist/metadata.xml b/dev-ruby/plist/metadata.xml
index d2fa239..9d6e8da 100644
--- a/dev-ruby/plist/metadata.xml
+++ b/dev-ruby/plist/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">plist</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/png/metadata.xml b/dev-ruby/png/metadata.xml
index d9dbac1..9d6e8da 100644
--- a/dev-ruby/png/metadata.xml
+++ b/dev-ruby/png/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">seattlerb</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/podcast/metadata.xml b/dev-ruby/podcast/metadata.xml
index d48a826..9d6e8da 100644
--- a/dev-ruby/podcast/metadata.xml
+++ b/dev-ruby/podcast/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">podcast</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/polyglot/metadata.xml b/dev-ruby/polyglot/metadata.xml
index 2b40b25..e14a9aa 100644
--- a/dev-ruby/polyglot/metadata.xml
+++ b/dev-ruby/polyglot/metadata.xml
@@ -7,7 +7,4 @@ Polyglot provides support for fully-custom DSLs by providing a
 registry of file types that can be loaded by its improved version of
 'require', using a custom loader for each file type.
 	</longdescription>
-	<upstream>
-		<remote-id type="rubyforge">polyglot</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rack-cache/metadata.xml b/dev-ruby/rack-cache/metadata.xml
index 8521361..d49eb15 100644
--- a/dev-ruby/rack-cache/metadata.xml
+++ b/dev-ruby/rack-cache/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+	<herd>ruby</herd>
+	<upstream>
+		<remote-id type="github">rtomayko/rack-cache</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rack/metadata.xml b/dev-ruby/rack/metadata.xml
index 3522a5c..d2c4f9b 100644
--- a/dev-ruby/rack/metadata.xml
+++ b/dev-ruby/rack/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
 	<longdescription>Rack provides a common API for connecting web frameworks, web servers and layers
 of software inbetween.</longdescription>
-	<upstream>
-		<remote-id type="rubyforge">rack</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/radius/metadata.xml b/dev-ruby/radius/metadata.xml
index 5dff5c3..a9cecbe 100644
--- a/dev-ruby/radius/metadata.xml
+++ b/dev-ruby/radius/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">jlong/radius</remote-id>
-    <remote-id type="rubyforge">radius</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rake/metadata.xml b/dev-ruby/rake/metadata.xml
index 76282fc..bac1a67 100644
--- a/dev-ruby/rake/metadata.xml
+++ b/dev-ruby/rake/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">rake</remote-id>
     <remote-id type="github">jimweirich/rake</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rdoc/metadata.xml b/dev-ruby/rdoc/metadata.xml
index b3c153f..d01a316 100644
--- a/dev-ruby/rdoc/metadata.xml
+++ b/dev-ruby/rdoc/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">rdoc</remote-id>
     <remote-id type="github">rdoc/rdoc</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/right_http_connection/metadata.xml b/dev-ruby/right_http_connection/metadata.xml
index f537d5d..207ffe4 100644
--- a/dev-ruby/right_http_connection/metadata.xml
+++ b/dev-ruby/right_http_connection/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rightscale/right_http_connection</remote-id>
-    <remote-id type="rubyforge">rightscale</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rjb/metadata.xml b/dev-ruby/rjb/metadata.xml
index 5c5b2a1..3258f09 100644
--- a/dev-ruby/rjb/metadata.xml
+++ b/dev-ruby/rjb/metadata.xml
@@ -8,7 +8,4 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
-	<upstream>
-		<remote-id type="rubyforge">rjb</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rmagick/metadata.xml b/dev-ruby/rmagick/metadata.xml
index 7001688..2a02d2b 100644
--- a/dev-ruby/rmagick/metadata.xml
+++ b/dev-ruby/rmagick/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">rmagick</remote-id>
     <remote-id type="github">gemhome/rmagick</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rspec-core/metadata.xml b/dev-ruby/rspec-core/metadata.xml
index 2e6e407..9a6e369 100644
--- a/dev-ruby/rspec-core/metadata.xml
+++ b/dev-ruby/rspec-core/metadata.xml
@@ -9,6 +9,5 @@
   </use>
   <upstream>
     <remote-id type="github">rspec/rspec-core</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rspec-expectations/metadata.xml b/dev-ruby/rspec-expectations/metadata.xml
index f3bf51d..5f0e700 100644
--- a/dev-ruby/rspec-expectations/metadata.xml
+++ b/dev-ruby/rspec-expectations/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rspec/rspec-expectations</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rspec-mocks/metadata.xml b/dev-ruby/rspec-mocks/metadata.xml
index ef4bd6c..38e759d 100644
--- a/dev-ruby/rspec-mocks/metadata.xml
+++ b/dev-ruby/rspec-mocks/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rspec/rspec-mocks</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rspec/metadata.xml b/dev-ruby/rspec/metadata.xml
index 835164d..f420278 100644
--- a/dev-ruby/rspec/metadata.xml
+++ b/dev-ruby/rspec/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rspec/rspec</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-atk/metadata.xml b/dev-ruby/ruby-atk/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-atk/metadata.xml
+++ b/dev-ruby/ruby-atk/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-cairo-gobject/metadata.xml b/dev-ruby/ruby-cairo-gobject/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-cairo-gobject/metadata.xml
+++ b/dev-ruby/ruby-cairo-gobject/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-clutter-gstreamer/metadata.xml b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-clutter-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-clutter-gtk/metadata.xml b/dev-ruby/ruby-clutter-gtk/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-clutter-gtk/metadata.xml
+++ b/dev-ruby/ruby-clutter-gtk/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-clutter/metadata.xml b/dev-ruby/ruby-clutter/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-clutter/metadata.xml
+++ b/dev-ruby/ruby-clutter/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-elf/metadata.xml b/dev-ruby/ruby-elf/metadata.xml
index c022b45..ea071df 100644
--- a/dev-ruby/ruby-elf/metadata.xml
+++ b/dev-ruby/ruby-elf/metadata.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="rubyforge">ruby-elf</remote-id>
 		<remote-id type="github">Flameeyes/ruby-elf</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-filemagic/metadata.xml b/dev-ruby/ruby-filemagic/metadata.xml
index cc9fcb2..fbb8276 100644
--- a/dev-ruby/ruby-filemagic/metadata.xml
+++ b/dev-ruby/ruby-filemagic/metadata.xml
@@ -4,6 +4,5 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="github">blackwinter/ruby-filemagic</remote-id>
-		<remote-id type="rubyforge">ruby-filemagic</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-gdk3/metadata.xml b/dev-ruby/ruby-gdk3/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gdk3/metadata.xml
+++ b/dev-ruby/ruby-gdk3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-gdkpixbuf2/metadata.xml b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gdkpixbuf2/metadata.xml
+++ b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-gio2/metadata.xml b/dev-ruby/ruby-gio2/metadata.xml
index a43ed6d..1fba4d7 100644
--- a/dev-ruby/ruby-gio2/metadata.xml
+++ b/dev-ruby/ruby-gio2/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+    <remote-id type="sourceforge">ruby-gnome2</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-glib2/metadata.xml b/dev-ruby/ruby-glib2/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-glib2/metadata.xml
+++ b/dev-ruby/ruby-glib2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-gobject-introspection/metadata.xml b/dev-ruby/ruby-gobject-introspection/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gobject-introspection/metadata.xml
+++ b/dev-ruby/ruby-gobject-introspection/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-gstreamer/metadata.xml b/dev-ruby/ruby-gstreamer/metadata.xml
index 8e07607..c0e279a 100644
--- a/dev-ruby/ruby-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-gstreamer/metadata.xml
@@ -5,5 +5,6 @@
 	<herd>gstreamer</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-gtk2/metadata.xml b/dev-ruby/ruby-gtk2/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gtk2/metadata.xml
+++ b/dev-ruby/ruby-gtk2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-gtk3/metadata.xml b/dev-ruby/ruby-gtk3/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gtk3/metadata.xml
+++ b/dev-ruby/ruby-gtk3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-gtksourceview/metadata.xml b/dev-ruby/ruby-gtksourceview/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gtksourceview/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-gtksourceview3/metadata.xml b/dev-ruby/ruby-gtksourceview3/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-gtksourceview3/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-hmac/metadata.xml b/dev-ruby/ruby-hmac/metadata.xml
index 4a97db6..9d6e8da 100644
--- a/dev-ruby/ruby-hmac/metadata.xml
+++ b/dev-ruby/ruby-hmac/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">ruby-hmac</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-mp3info/metadata.xml b/dev-ruby/ruby-mp3info/metadata.xml
index ee34f22..fd993e7 100644
--- a/dev-ruby/ruby-mp3info/metadata.xml
+++ b/dev-ruby/ruby-mp3info/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">moumar/ruby-mp3info</remote-id>
-    <remote-id type="rubyforge">ruby-mp3info</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-oci8/metadata.xml b/dev-ruby/ruby-oci8/metadata.xml
index 54219f5..cace519 100644
--- a/dev-ruby/ruby-oci8/metadata.xml
+++ b/dev-ruby/ruby-oci8/metadata.xml
@@ -9,7 +9,6 @@
 	</maintainer>
 	<longdescription>Oracle Interface for Ruby, compatible with oracle 8, 9i, 10g and 11g.</longdescription>
 	<upstream>
-		<remote-id type="rubyforge">ruby-oci8</remote-id>
 		<remote-id type="rubygems">ruby-oci8</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-opengl/metadata.xml b/dev-ruby/ruby-opengl/metadata.xml
index dbee9a6..bbd5d2d 100644
--- a/dev-ruby/ruby-opengl/metadata.xml
+++ b/dev-ruby/ruby-opengl/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">larskanis/opengl</remote-id>
-    <remote-id type="rubyforge">ruby-opengl</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-openid/metadata.xml b/dev-ruby/ruby-openid/metadata.xml
index f2d1da7..dc0e5b7 100644
--- a/dev-ruby/ruby-openid/metadata.xml
+++ b/dev-ruby/ruby-openid/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">openid/ruby-openid</remote-id>
-    <remote-id type="rubyforge">ruby-openid</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-pango/metadata.xml b/dev-ruby/ruby-pango/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-pango/metadata.xml
+++ b/dev-ruby/ruby-pango/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-poppler/metadata.xml b/dev-ruby/ruby-poppler/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-poppler/metadata.xml
+++ b/dev-ruby/ruby-poppler/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-rsvg/metadata.xml b/dev-ruby/ruby-rsvg/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-rsvg/metadata.xml
+++ b/dev-ruby/ruby-rsvg/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-vte/metadata.xml b/dev-ruby/ruby-vte/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-vte/metadata.xml
+++ b/dev-ruby/ruby-vte/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-vte3/metadata.xml b/dev-ruby/ruby-vte3/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-vte3/metadata.xml
+++ b/dev-ruby/ruby-vte3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-webkit-gtk/metadata.xml b/dev-ruby/ruby-webkit-gtk/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-webkit-gtk/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-webkit-gtk2/metadata.xml b/dev-ruby/ruby-webkit-gtk2/metadata.xml
index 988f164..cb6c355 100644
--- a/dev-ruby/ruby-webkit-gtk2/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby-yadis/metadata.xml b/dev-ruby/ruby-yadis/metadata.xml
index 878f692..9d6e8da 100644
--- a/dev-ruby/ruby-yadis/metadata.xml
+++ b/dev-ruby/ruby-yadis/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">yadis</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/ruby2ruby/metadata.xml b/dev-ruby/ruby2ruby/metadata.xml
index db24fab..d82e96c 100644
--- a/dev-ruby/ruby2ruby/metadata.xml
+++ b/dev-ruby/ruby2ruby/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">seattlerb/ruby2ruby</remote-id>
-    <remote-id type="rubyforge">seattlerb</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/rubygems/metadata.xml b/dev-ruby/rubygems/metadata.xml
index 90fadbc..bc82c8b 100644
--- a/dev-ruby/rubygems/metadata.xml
+++ b/dev-ruby/rubygems/metadata.xml
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
 	<use>
 		<flag name="server">Install support for the rubygems server</flag>
 	</use>
-	<upstream>
-		<remote-id type="rubyforge">rubygems</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/serialport/metadata.xml b/dev-ruby/serialport/metadata.xml
index a1ec012..9d6e8da 100644
--- a/dev-ruby/serialport/metadata.xml
+++ b/dev-ruby/serialport/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">ruby-serialport</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/shorturl/metadata.xml b/dev-ruby/shorturl/metadata.xml
index 4c3096d..9d6e8da 100644
--- a/dev-ruby/shorturl/metadata.xml
+++ b/dev-ruby/shorturl/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">shorturl</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/simple-rss/metadata.xml b/dev-ruby/simple-rss/metadata.xml
index 0ddfcce..9d6e8da 100644
--- a/dev-ruby/simple-rss/metadata.xml
+++ b/dev-ruby/simple-rss/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">simple-rss</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/snmplib/metadata.xml b/dev-ruby/snmplib/metadata.xml
index 19f35fd..9d6e8da 100644
--- a/dev-ruby/snmplib/metadata.xml
+++ b/dev-ruby/snmplib/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">snmplib</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/sparklines/metadata.xml b/dev-ruby/sparklines/metadata.xml
index 1d55234..9d6e8da 100644
--- a/dev-ruby/sparklines/metadata.xml
+++ b/dev-ruby/sparklines/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">sparklines</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/sqlite3/metadata.xml b/dev-ruby/sqlite3/metadata.xml
index 09d1903..0b4c472 100644
--- a/dev-ruby/sqlite3/metadata.xml
+++ b/dev-ruby/sqlite3/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>ruby</herd>
 	<upstream>
-		<remote-id type="rubyforge">sqlite-ruby</remote-id>
+		<remote-id type="github">sparklemotion/sqlite3-ruby</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/syntax/metadata.xml b/dev-ruby/syntax/metadata.xml
index 430138b..689bf30 100644
--- a/dev-ruby/syntax/metadata.xml
+++ b/dev-ruby/syntax/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">dblock/syntax</remote-id>
-    <remote-id type="rubyforge">syntax</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/term-ansicolor/metadata.xml b/dev-ruby/term-ansicolor/metadata.xml
index 4689c98..9d6e8da 100644
--- a/dev-ruby/term-ansicolor/metadata.xml
+++ b/dev-ruby/term-ansicolor/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">term-ansicolor</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/termcolor/metadata.xml b/dev-ruby/termcolor/metadata.xml
index 967f31e..321af5d 100644
--- a/dev-ruby/termcolor/metadata.xml
+++ b/dev-ruby/termcolor/metadata.xml
@@ -5,7 +5,4 @@
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
-  <upstream>
-    <remote-id type="rubyforge">termcolor</remote-id>
-  </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/test-unit-rr/metadata.xml b/dev-ruby/test-unit-rr/metadata.xml
index 21809b8..9d6e8da 100644
--- a/dev-ruby/test-unit-rr/metadata.xml
+++ b/dev-ruby/test-unit-rr/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">test-unit</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/test-unit/metadata.xml b/dev-ruby/test-unit/metadata.xml
index 43e8895..82492cf 100644
--- a/dev-ruby/test-unit/metadata.xml
+++ b/dev-ruby/test-unit/metadata.xml
@@ -7,7 +7,6 @@
     1.8, compatible with Ruby 1.9.
   </longdescription>
   <upstream>
-    <remote-id type="rubyforge">test-unit</remote-id>
     <remote-id type="rubygems">test-unit</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/text-hyphen/metadata.xml b/dev-ruby/text-hyphen/metadata.xml
index eefcbeb..9d6e8da 100644
--- a/dev-ruby/text-hyphen/metadata.xml
+++ b/dev-ruby/text-hyphen/metadata.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">text-format</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/textpow/metadata.xml b/dev-ruby/textpow/metadata.xml
index 43286cb..fb4d26d 100644
--- a/dev-ruby/textpow/metadata.xml
+++ b/dev-ruby/textpow/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">grosser/textpow</remote-id>
-    <remote-id type="rubyforge">textpow</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/treetop/metadata.xml b/dev-ruby/treetop/metadata.xml
index 02e83a7..c236da7 100644
--- a/dev-ruby/treetop/metadata.xml
+++ b/dev-ruby/treetop/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">cjheath/treetop</remote-id>
-    <remote-id type="rubyforge">treetop</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-ruby/trollop/metadata.xml b/dev-ruby/trollop/metadata.xml
index 55e039a..9d6e8da 100644
--- a/dev-ruby/trollop/metadata.xml
+++ b/dev-ruby/trollop/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">trollop</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/tzinfo/metadata.xml b/dev-ruby/tzinfo/metadata.xml
index 8a04fea1..9d6e8da 100644
--- a/dev-ruby/tzinfo/metadata.xml
+++ b/dev-ruby/tzinfo/metadata.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">tzinfo</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-ruby/uuidtools/metadata.xml b/dev-ruby/uuidtools/metadata.xml
index 3bb0bd7..0dca07e 100644
--- a/dev-ruby/uuidtools/metadata.xml
+++ b/dev-ruby/uuidtools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
@@ -6,7 +6,6 @@
     time-based or random data. It conforms to RFC 4122 whenever
     possible.</longdescription>
   <upstream>
-    <remote-id type="rubyforge">uuidtools</remote-id>
     <remote-id type="github">sporkmonger/uuidtools</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/dev-util/abi-compliance-checker/metadata.xml b/dev-util/abi-compliance-checker/metadata.xml
index 5cb9324..7e74674 100644
--- a/dev-util/abi-compliance-checker/metadata.xml
+++ b/dev-util/abi-compliance-checker/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>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">lvc/abi-compliance-checker</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-util/cligh/metadata.xml b/dev-util/cligh/metadata.xml
index 4f7e9b2..6440345 100644
--- a/dev-util/cligh/metadata.xml
+++ b/dev-util/cligh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -9,4 +9,7 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">CMB/cligh</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
index 059917e..b924cd9 100644
--- a/dev-util/sysdig/metadata.xml
+++ b/dev-util/sysdig/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -10,4 +10,7 @@
 			events. Disable this only if you intend to use sysdig purely
 			to work with dumpfiles.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">draios/sysdig</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-util/xdelta/metadata.xml b/dev-util/xdelta/metadata.xml
index b84ede9..9c72896 100644
--- a/dev-util/xdelta/metadata.xml
+++ b/dev-util/xdelta/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">xdelta</remote-id>
+		<remote-id type="github">jmacd/xdelta-devel</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/games-board/holdingnuts/metadata.xml b/games-board/holdingnuts/metadata.xml
index f72870c..5f0ceae 100644
--- a/games-board/holdingnuts/metadata.xml
+++ b/games-board/holdingnuts/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>games</herd>
+  <upstream>
+    <remote-id type="sourceforge">downloads</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml
index 41ce065..17c3f1f 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
-	<flag name="lto">Add support for link-time optimizations.</flag>
-</use>
-<longdescription lang="en">
+	<use>
+		<flag name="lto">Add support for link-time optimizations.</flag>
+	</use>
+	<longdescription lang="en">
 Dolphin is a Gamecube and Wii emulator. Most games run perfectly or with minor
 bugs. Games are playable at HD quality, with 1080p and more.
-</longdescription>
-    <maintainer>
-        <email>twitch153@gentoo.org</email>
-        <name>Devan Franchini</name>
-    </maintainer>
+	</longdescription>
+	<maintainer>
+		<email>twitch153@gentoo.org</email>
+		<name>Devan Franchini</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dolphin-emu/dolphin</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
index 5c66c09..c49fe3e 100644
--- a/games-strategy/freeorion/metadata.xml
+++ b/games-strategy/freeorion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -8,11 +8,14 @@
   <use>
     <flag name="cg">Add support for NVIDIA toolkit plugin</flag>
   </use>
-<longdescription lang="en">
+  <longdescription lang="en">
   FreeOrion is a free, open source, turn-based space empire and
   galactic conquest (4X) computer game being designed and built by the
   FreeOrion project. FreeOrion is inspired by the tradition of the
   Master of Orion games, but is not a clone or remake of that series
   or any other game.
-</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">freeorion/freeorion</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/games-util/xqf/metadata.xml b/games-util/xqf/metadata.xml
index 2d7c8b9..f309284 100644
--- a/games-util/xqf/metadata.xml
+++ b/games-util/xqf/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>
 	<upstream>
 		<remote-id type="sourceforge">xqf</remote-id>
+		<remote-id type="github">XQF/xqf</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/kde-misc/chromi/metadata.xml b/kde-misc/chromi/metadata.xml
index a23f444..313bf94 100644
--- a/kde-misc/chromi/metadata.xml
+++ b/kde-misc/chromi/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<upstream>
+		<remote-id type="github">jinliu/kwin-deco-chromi</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/kde-misc/systemd-kcm/metadata.xml b/kde-misc/systemd-kcm/metadata.xml
index cf728d3..7214bf9 100644
--- a/kde-misc/systemd-kcm/metadata.xml
+++ b/kde-misc/systemd-kcm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
@@ -10,5 +10,6 @@ KDE control module for systemd. Provides a graphical frontend for the systemd da
 			<email>rthomsen6@gmail.com</email>
 			<name>Ragnar Thomsen</name>
 		</maintainer>
+		<remote-id type="github">rthomsen/kcmsystemd</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/mail-filter/policyd/metadata.xml b/mail-filter/policyd/metadata.xml
index 1961344..6363b10 100644
--- a/mail-filter/policyd/metadata.xml
+++ b/mail-filter/policyd/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-mail</herd>
+  <upstream>
+    <remote-id type="sourceforge">policyd</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index c942b73..1e9d89e 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-mail</herd>
 	<use>
-		<flag name='dovecot-sasl'>Enable <pkg>net-mail/dovecot</pkg> protocol
+		<flag name="dovecot-sasl">Enable <pkg>net-mail/dovecot</pkg> protocol
 			version 1 (server only) SASL implementation</flag>
-		<flag name='eai'>Add support for SMTPUTF8</flag>
-		<flag name='ldap-bind'>Add support for binding to LDAP backend
+		<flag name="eai">Add support for SMTPUTF8</flag>
+		<flag name="ldap-bind">Add support for binding to LDAP backend
 			using <pkg>dev-libs/cyrus-sasl</pkg></flag>
-		<flag name='memcached'>Add support for using <pkg>net-misc/memcached</pkg>
+		<flag name="memcached">Add support for using <pkg>net-misc/memcached</pkg>
 		    for lookup tables</flag>
-		<flag name='lmdb'>Add support for using <pkg>dev-db/lmdb</pkg>
+		<flag name="lmdb">Add support for using <pkg>dev-db/lmdb</pkg>
 		    for lookup tables</flag>
-		<flag name='vda'>Add support for virtual delivery agent quota
+		<flag name="vda">Add support for virtual delivery agent quota
 			enforcing</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">vda</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/mail-mta/qpsmtpd/metadata.xml b/mail-mta/qpsmtpd/metadata.xml
index 3bf0de5..6a67d9c 100644
--- a/mail-mta/qpsmtpd/metadata.xml
+++ b/mail-mta/qpsmtpd/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>net-mail</herd>
-<use>
-        <flag name='postfix'>create user with permissions for proper postfix interaction</flag>
-</use>
+    <herd>net-mail</herd>
+    <use>
+        <flag name="postfix">create user with permissions for proper postfix interaction</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">smtpd/qpsmtpd</remote-id>
+    </upstream>
 </pkgmetadata>

diff --git a/media-fonts/eb-garamond/metadata.xml b/media-fonts/eb-garamond/metadata.xml
index c62efd4..526aedf 100644
--- a/media-fonts/eb-garamond/metadata.xml
+++ b/media-fonts/eb-garamond/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>fonts</herd>
+  <upstream>
+    <remote-id type="bitbucket">georgd/eb-garamond</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/media-libs/SoXt/metadata.xml b/media-libs/SoXt/metadata.xml
index 9aaf70c..ed3a075 100644
--- a/media-libs/SoXt/metadata.xml
+++ b/media-libs/SoXt/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<maintainer>
-  <email>sci-physics@gentoo.org</email>
-  <description>Feel free to maintain/fix</description>
-</maintainer>
-<longdescription lang='en'>
+  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <description>Feel free to maintain/fix</description>
+  </maintainer>
+  <longdescription lang="en">
   SoXt is an alternative to SGIs InventorXt library, which is a GUI
   binding for using Open Inventor with Xt/Motif. While SoXt has been developed
   for use with Coin, it is also possible to compile it against Open Inventor
   from SGI or TGS.
-</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="bitbucket">Coin3D/coin</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/media-libs/chromaprint/metadata.xml b/media-libs/chromaprint/metadata.xml
index 4cd6b6d..d9e8bed 100644
--- a/media-libs/chromaprint/metadata.xml
+++ b/media-libs/chromaprint/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>sound</herd>
   <use>
     <flag name="tools">Build and install fpcalc and fpcollect tools</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">acoustid/chromaprint</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 0bf556b..7c38669 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>enlightenment</herd>
- <longdescription>
+	<herd>enlightenment</herd>
+	<longdescription>
 Imlib 2 is the successor to Imlib. It is not just a newer version - it is a 
 completely new library. Imlib2 can be installed alongside Imlib 1.x without any 
 problems since they are effectively different libraries - but they Have very 
@@ -44,5 +44,8 @@ Imlib 2 can run without a display, so it can be easily used for background image
 processing for web sites or servers - it only requires the X libraries to be 
 installed - that is all - it does not require an XServer to run unless you wish 
 to display images.
- </longdescription>
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">enlightenment</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-libs/libyami/metadata.xml b/media-libs/libyami/metadata.xml
index 7e7aee6..f9490d9 100644
--- a/media-libs/libyami/metadata.xml
+++ b/media-libs/libyami/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>
@@ -6,12 +6,15 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-	  <flag name="v4l">Add support for V4L2 hardware codecs.</flag>
-	  <flag name="glx">Add support for OpenGL/GLX instead of EGL.</flag>
-	  <flag name="gles">Add suppport for GLES.</flag>
-	  <flag name="capi">Add a C API interface, in addition to the C++.</flag>
-	  <flag name="md5">Add support for generating md5 sums for each frame.</flag>
-	  <flag name="dmabuf">Enable dma_buf buffer sharing.</flag>
-	  <flag name="tools">Build and install command line tools. Useful for testing.</flag>
+    <flag name="v4l">Add support for V4L2 hardware codecs.</flag>
+    <flag name="glx">Add support for OpenGL/GLX instead of EGL.</flag>
+    <flag name="gles">Add suppport for GLES.</flag>
+    <flag name="capi">Add a C API interface, in addition to the C++.</flag>
+    <flag name="md5">Add support for generating md5 sums for each frame.</flag>
+    <flag name="dmabuf">Enable dma_buf buffer sharing.</flag>
+    <flag name="tools">Build and install command line tools. Useful for testing.</flag>
   </use>
+  <upstream>
+    <remote-id type="github">01org/libyami</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/media-libs/simage/metadata.xml b/media-libs/simage/metadata.xml
index b9d4405..f0f8dec 100644
--- a/media-libs/simage/metadata.xml
+++ b/media-libs/simage/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>reavertm@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>reavertm@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">Coin3D/coin</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index e450ba2..5b58a21 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>printing</herd>
+	<upstream>
+		<remote-id type="github">ukoethe/vigra</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 86339aa..7a6a91d 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>
@@ -6,9 +6,12 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-	  <flag name="10bit">Add support for producing 10bits HEVC.</flag>
-	  <flag name="12bit">Add support for producing 12bits HEVC.</flag>
-	  <flag name="numa">Build with support for NUMA nodes.</flag>
-	  <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
+    <flag name="10bit">Add support for producing 10bits HEVC.</flag>
+    <flag name="12bit">Add support for producing 12bits HEVC.</flag>
+    <flag name="numa">Build with support for NUMA nodes.</flag>
+    <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">multicoreware/x265</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index ea2cb0c..1901242 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-	<email>enlightenment@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="eet">Enable Eet image loader</flag>
-	<flag name="xcf">Enable XCF image loader</flag>
-</use>
-<longdescription>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>enlightenment@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="eet">Enable Eet image loader</flag>
+		<flag name="xcf">Enable XCF image loader</flag>
+	</use>
+	<longdescription>
 additional image library loaders for imlib2
-</longdescription>
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">enlightenment</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-plugins/quodlibet-plugins/metadata.xml b/media-plugins/quodlibet-plugins/metadata.xml
index 6f518c3..8b51913 100644
--- a/media-plugins/quodlibet-plugins/metadata.xml
+++ b/media-plugins/quodlibet-plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -8,5 +8,6 @@
 	<herd>sound</herd>
 	<upstream>
 		<remote-id type="github">quodlibet/quodlibet</remote-id>
+		<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-sound/podcatcher/metadata.xml b/media-sound/podcatcher/metadata.xml
index 076a31d..11f794c 100644
--- a/media-sound/podcatcher/metadata.xml
+++ b/media-sound/podcatcher/metadata.xml
@@ -7,7 +7,4 @@
   <use>
     <flag name="bittorrent">Enable support for bittorrent downloads</flag>
   </use>
-  <upstream>
-    <remote-id type="rubyforge">podcatcher</remote-id>
-  </upstream>
 </pkgmetadata>

diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
index c8928e9..54acacd 100644
--- a/media-sound/quodlibet/metadata.xml
+++ b/media-sound/quodlibet/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -16,5 +16,6 @@
 	<upstream>
 		<remote-id type="google-code">quodlibet</remote-id>
 		<remote-id type="github">quodlibet/quodlibet</remote-id>
+		<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-sound/shoutcast-search/metadata.xml b/media-sound/shoutcast-search/metadata.xml
index ae573a6..c85742a 100644
--- a/media-sound/shoutcast-search/metadata.xml
+++ b/media-sound/shoutcast-search/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>
+	<upstream>
+		<remote-id type="github">halhen/shoutcast-search</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 8cda002..154ca4b 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -1,25 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- 	<herd>proxy-maintainers</herd>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>wraeth@wraeth.id.au</email>
 		<name>Sam Jorna</name>
 		<description>Proxy maintaner, to be assugned to bugs</description>
 	</maintainer>
 	<use>
-		<flag name='capmt'>Enable support for capmt (dvbapi) protocol</flag>
-		<flag name='constcw'>Enable support for the constcw protocol</flag>
-		<flag name='cwc'>Enable support for the cwc (newcamd) protocol</flag>
-		<flag name='epoll'>Enable epoll Linux system call</flag>
-		<flag name='hdhomerun'>Enable support for the HDHomeRun device</flag>
-		<flag name='iptv'>Enable support for Internet Protocol TV</flag>
-		<flag name='satip'>Enable support for IP-based Satellite TV</flag>
-		<flag name='timeshift'>Enable TimeShift support</flag>
-		<flag name='xmltv'>Use <pkg>media-tv/xmltv</pkg></flag>
-		<flag name='ccache'>Use <pkg>dev-util/ccache</pkg></flag>
-		<flag name='dvbscan'>Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
-		<flag name='imagecache'>Enable support for image caching</flag>
-		<flag name='uriparser'>Use <pkg>dev-libs/uriparser</pkg></flag>
+		<flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
+		<flag name="constcw">Enable support for the constcw protocol</flag>
+		<flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
+		<flag name="epoll">Enable epoll Linux system call</flag>
+		<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
+		<flag name="iptv">Enable support for Internet Protocol TV</flag>
+		<flag name="satip">Enable support for IP-based Satellite TV</flag>
+		<flag name="timeshift">Enable TimeShift support</flag>
+		<flag name="xmltv">Use <pkg>media-tv/xmltv</pkg></flag>
+		<flag name="ccache">Use <pkg>dev-util/ccache</pkg></flag>
+		<flag name="dvbscan">Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
+		<flag name="imagecache">Enable support for image caching</flag>
+		<flag name="uriparser">Use <pkg>dev-libs/uriparser</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">tvheadend/tvheadend</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-video/atomicparsley-wez/metadata.xml b/media-video/atomicparsley-wez/metadata.xml
index ad84b7a..ddfe6ea 100644
--- a/media-video/atomicparsley-wez/metadata.xml
+++ b/media-video/atomicparsley-wez/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">wez/atomicparsley</remote-id>
+		<remote-id type="bitbucket">wez/atomicparsley</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-video/harvid/metadata.xml b/media-video/harvid/metadata.xml
index c572c7d..4102580 100644
--- a/media-video/harvid/metadata.xml
+++ b/media-video/harvid/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>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">x42/harvid</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/media-video/mkclean/metadata.xml b/media-video/mkclean/metadata.xml
index 2982397..4a87588 100644
--- a/media-video/mkclean/metadata.xml
+++ b/media-video/mkclean/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>video</herd>
 	<longdescription lang="en">
 		mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed. It reorders the elements with the Cues at the front, so your Matroska files are ready to be streamed efficiently over the web. It also removes elements not found in the Matroska specs and the extra Meta Seek list of Clusters that some program add to their file. It can also optionally remux the Cluster blocks to start each boundary with a keyframe and the matching audio/subtitle blocks for that keyframe.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-video/mkvalidator/metadata.xml b/media-video/mkvalidator/metadata.xml
index 7c38ace..aed7ede 100644
--- a/media-video/mkvalidator/metadata.xml
+++ b/media-video/mkvalidator/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>video</herd>
 	<longdescription lang="en">
 		mkvalidator is a simple command line tool to verify Matroska and WebM files for spec conformance. It checks the various bogus or missing key elements against the EBML DocType version of the file and reports the errors/warnings in the command line.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index 43ff754..f55cac0 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>
+  <upstream>
+    <remote-id type="github">fail2ban/fail2ban</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml
index eef2163..273bfa6 100644
--- a/net-analyzer/icinga-web/metadata.xml
+++ b/net-analyzer/icinga-web/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -13,5 +13,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">icinga</remote-id>
+		<remote-id type="github">icinga/icinga-web</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index 3f16cd2..1eb8333 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -1,13 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>prometheanfire@gentoo.org</email>
-<name>Matthew Thode</name>
-</maintainer>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
 	<use>
 		<flag name="classicui">Adds support for the old interface</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Icinga/icinga2</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml
index 6252f40..a28ee98 100644
--- a/net-analyzer/sancp/metadata.xml
+++ b/net-analyzer/sancp/metadata.xml
@@ -1,6 +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>netmon</herd>
-<use><flag name='sguil'>Enable sguil (The Analyst Console for Network Security Monitoring) support</flag></use>
+	<herd>netmon</herd>
+	<use>
+		<flag name="sguil">Enable sguil (The Analyst Console for Network Security Monitoring) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sancp</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml
index b500834..6aca467 100644
--- a/net-analyzer/testssl/metadata.xml
+++ b/net-analyzer/testssl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,4 +7,7 @@
 	<use>
 		<flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">drwetter/testssl.sh</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index ab30633..9e9161b 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>mattm@gentoo.org</email>
-<name>Matthew Marlowe</name>
-</maintainer>
-<longdescription>
+	<maintainer>
+		<email>mattm@gentoo.org</email>
+		<name>Matthew Marlowe</name>
+	</maintainer>
+	<longdescription>
 ZABBIX is software for monitoring of your applications, network and servers.
 ZABBIX supports both polling and trapping techniques to collect data from
 monitored hosts. A flexible notification mechanism allows easy and quickly
 configure different types of notifications for pre-defined events.
-</longdescription>
-<use>
-	<flag name='agent'>Enable zabbix agent (for to-be-monitored machines)</flag>
-	<flag name='frontend'>Enable zabbix web frontend</flag>
-	<flag name='ipv6'>Turn on support of IPv6</flag>
-	<flag name='proxy'>Enable proxy support</flag>
-	<flag name='openipmi'>Enable openipmi things</flag>
-	<flag name='server'>Enable zabbix server</flag>
-	<flag name='ssh'>SSH v2 based checks</flag>
-	<flag name='odbc'>Enable Database Monitor and use UnixODBC Library by default</flag>
-	<flag name='static'>Build statically linked binaries</flag>
-	<flag name='java'>Enable Zabbix Java JMX Management Gateway</flag>
-	<flag name='libxml2'>Use libxml2 client library</flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="agent">Enable zabbix agent (for to-be-monitored machines)</flag>
+		<flag name="frontend">Enable zabbix web frontend</flag>
+		<flag name="ipv6">Turn on support of IPv6</flag>
+		<flag name="proxy">Enable proxy support</flag>
+		<flag name="openipmi">Enable openipmi things</flag>
+		<flag name="server">Enable zabbix server</flag>
+		<flag name="ssh">SSH v2 based checks</flag>
+		<flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
+		<flag name="static">Build statically linked binaries</flag>
+		<flag name="java">Enable Zabbix Java JMX Management Gateway</flag>
+		<flag name="libxml2">Use libxml2 client library</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">prdownloads</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index 8fbea40..4bf4325 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -14,11 +14,14 @@ of gigabit Ethernet.
 ZMap can be used to study protocol adoption over time, monitor service 
 availability, and help us better understand large systems distributed 
 across the Internet.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="redis">
 		Add support for storing in a redis DB via <pkg>dev-libs/hiredis</pkg>
 	</flag>
     <flag name="json">Add support to store results JSON based</flag>
   </use>
+  <upstream>
+    <remote-id type="github">zmap/zmap</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index 8fd09af..7c85892 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
-<use>
-	<flag name='autoipd'>Build and install the IPv4LL (RFC3927) network address
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name="autoipd">Build and install the IPv4LL (RFC3927) network address
 		configuration daemon</flag>
-	<flag name='bookmarks'>Install the avahi-bookmarks application (requires
+		<flag name="bookmarks">Install the avahi-bookmarks application (requires
 		<pkg>dev-python/twisted</pkg>)</flag>
-	<flag name='howl-compat'>Enable compat libraries for howl</flag>
-	<flag name="gtk3">Build the avahi-ui-gtk3 library, and use gtk3 for the
+		<flag name="howl-compat">Enable compat libraries for howl</flag>
+		<flag name="gtk3">Build the avahi-ui-gtk3 library, and use gtk3 for the
 		avahi utilities under USE=utils</flag>
-	<flag name='mdnsresponder-compat'>Enable compat libraries for
+		<flag name="mdnsresponder-compat">Enable compat libraries for
 		mDNSResponder</flag>
-	<flag name="utils">Install the avahi gtk+ utils avahi-discover, bssh, and
+		<flag name="utils">Install the avahi gtk+ utils avahi-discover, bssh, and
 		bvnc</flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="github">lathiat/avahi</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-dns/namecoin-qt/metadata.xml b/net-dns/namecoin-qt/metadata.xml
index 1e75873..836400d 100644
--- a/net-dns/namecoin-qt/metadata.xml
+++ b/net-dns/namecoin-qt/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>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">namecoinq/namecoinq</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-dns/namecoind/metadata.xml b/net-dns/namecoind/metadata.xml
index 1e75873..836400d 100644
--- a/net-dns/namecoind/metadata.xml
+++ b/net-dns/namecoind/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>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">namecoinq/namecoinq</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml
index b33579e..d374ec7 100644
--- a/net-fs/cvmfs/metadata.xml
+++ b/net-fs/cvmfs/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bicatali@gentoo.org</email>
-</maintainer>
-<longdescription lang='en'>
+  <maintainer>
+    <email>bicatali@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
   The CernVM File System is a client-server file system developed to
   deliver software stacks onto virtual machines in a fast, scalable,
   and reliable way. CernVM-FS is implemented as a FUSE module. It
@@ -14,9 +14,12 @@
   avoids most of the firewall issues of other network file systems. It
   transfers data file by file on demand, verifying the content by
   SHA-1 keys.
-</longdescription>
-<use>
-  <flag name='client'>Install the cvmfs client programs and init script</flag>
-  <flag name='server'>Install the cvmfsd program and init script</flag>
-</use>
+  </longdescription>
+  <use>
+    <flag name="client">Install the cvmfs client programs and init script</flag>
+    <flag name="server">Install the cvmfsd program and init script</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">cvmfs/cvmfs</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/net-libs/onion/metadata.xml b/net-libs/onion/metadata.xml
index 5d3e5aa..711ffd1 100644
--- a/net-libs/onion/metadata.xml
+++ b/net-libs/onion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -6,8 +6,11 @@
     <name>Alexis Ballier</name>
   </maintainer>
   <use>
-	  <flag name="libev">Use <pkg>dev-libs/libev</pkg> as thread poller instead of Linux's epoll.</flag>
-	  <flag name="libevent">Use <pkg>dev-libs/libevent</pkg> as thread poller instead of libev or Linux's epoll.</flag>
-	  <flag name="boehm-gc">Add <pkg>dev-libs/boehm-gc</pkg> support for memory allocations.</flag>
+    <flag name="libev">Use <pkg>dev-libs/libev</pkg> as thread poller instead of Linux's epoll.</flag>
+    <flag name="libevent">Use <pkg>dev-libs/libevent</pkg> as thread poller instead of libev or Linux's epoll.</flag>
+    <flag name="boehm-gc">Add <pkg>dev-libs/boehm-gc</pkg> support for memory allocations.</flag>
   </use>
+  <upstream>
+    <remote-id type="github">davidmoreno/onion</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index d2dfa92..4541491 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-mail</herd>
@@ -10,5 +10,6 @@ are looking for, assuming that you store your e-mails in Maildirs.  It also incl
 	</use>
 	<upstream>
 		<remote-id type="google-code">mu0</remote-id>
+		<remote-id type="github">djcb/mu</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-misc/hotot/metadata.xml b/net-misc/hotot/metadata.xml
index a518f0d..efce513 100644
--- a/net-misc/hotot/metadata.xml
+++ b/net-misc/hotot/metadata.xml
@@ -1,9 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-<use><flag name="chrome">Build chrome browser extension</flag></use>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="chrome">Build chrome browser extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">lyricat/Hotot</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index 183d454..f71e2c5 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>base-system</herd>
@@ -17,5 +17,6 @@
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
+    <remote-id type="github">iputils/iputils</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/net-misc/libteam/metadata.xml b/net-misc/libteam/metadata.xml
index eb53daa..76d26db 100644
--- a/net-misc/libteam/metadata.xml
+++ b/net-misc/libteam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -13,6 +13,9 @@
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
 	<use>
-		<flag name='zmq'>Build witch <pkg>net-libs/zeromq</pkg> support</flag>
+		<flag name="zmq">Build witch <pkg>net-libs/zeromq</pkg> support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jpirko/libteam</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-misc/sparkleshare/metadata.xml b/net-misc/sparkleshare/metadata.xml
index da6fd63..f58e21d 100644
--- a/net-misc/sparkleshare/metadata.xml
+++ b/net-misc/sparkleshare/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<upstream>
+		<remote-id type="bitbucket">hbons/sparkleshare</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
index 860e12f..6bf16cf 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>trizenx@gmail.com</email>
-		</maintainer>
-		<bugs-to>https://github.com/trizen/youtube-viewer/issues</bugs-to>
-	</upstream>
-	<longdescription lang="en">
-		Youtube Viewer is a CLI application dedicated for searching and streaming
-		Youtube Videos with MPlayer. It has been written in Perl and plays videos
-		from Youtube at the best quality available without using a flash player. 
-	</longdescription>
-</pkgmetadata>
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>trizenx@gmail.com</email>
+		</maintainer>
+		<bugs-to>https://github.com/trizen/youtube-viewer/issues</bugs-to>
+		<remote-id type="github">trizen/youtube-viewer</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Youtube Viewer is a CLI application dedicated for searching and streaming
+		Youtube Videos with MPlayer. It has been written in Perl and plays videos
+		from Youtube at the best quality available without using a flash player. 
+	</longdescription>
+</pkgmetadata>

diff --git a/net-news/liferea/metadata.xml b/net-news/liferea/metadata.xml
index b817f6a..57b2fcb 100644
--- a/net-news/liferea/metadata.xml
+++ b/net-news/liferea/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -21,5 +21,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">liferea</remote-id>
+		<remote-id type="github">lwindolf/liferea</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-p2p/bitcoinxtd/metadata.xml b/net-p2p/bitcoinxtd/metadata.xml
index a4c7c61..0dda46d 100644
--- a/net-p2p/bitcoinxtd/metadata.xml
+++ b/net-p2p/bitcoinxtd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -11,9 +11,12 @@
 		<name>Ron OHara</name>
 	</maintainer>
 	<use>
-		<flag name='doc'> Include documentatio</flag>
-		<flag name='logrotate'>Use app-admin/logrotate for rotating logs</flag>
-		<flag name='upnp'>Enable Universal Plug and Play</flag>
-		<flag name='wallet'>Enable wallet support</flag>
+		<flag name="doc"> Include documentatio</flag>
+		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
+		<flag name="upnp">Enable Universal Plug and Play</flag>
+		<flag name="wallet">Enable wallet support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">bitcoinxt/bitcoinxt</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-p2p/vuze-coreplugins/metadata.xml b/net-p2p/vuze-coreplugins/metadata.xml
index e82f7ae..79fe2fe 100644
--- a/net-p2p/vuze-coreplugins/metadata.xml
+++ b/net-p2p/vuze-coreplugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
@@ -6,4 +6,7 @@
 		<email>rhill@gentoo.org</email>
 		<name>Ryan Hill</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">azureus</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/audio_common/metadata.xml b/ros-meta/audio_common/metadata.xml
index c42ea5b..11ebb41 100644
--- a/ros-meta/audio_common/metadata.xml
+++ b/ros-meta/audio_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-drivers/audio_common</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/bond_core/metadata.xml b/ros-meta/bond_core/metadata.xml
index c42ea5b..500c8eb 100644
--- a/ros-meta/bond_core/metadata.xml
+++ b/ros-meta/bond_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/bond_core</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/calibration/metadata.xml b/ros-meta/calibration/metadata.xml
index c42ea5b..11ffa23 100644
--- a/ros-meta/calibration/metadata.xml
+++ b/ros-meta/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/calibration</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/common_msgs/metadata.xml b/ros-meta/common_msgs/metadata.xml
index c42ea5b..2d3b5cc 100644
--- a/ros-meta/common_msgs/metadata.xml
+++ b/ros-meta/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/common_msgs</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/common_tutorials/metadata.xml b/ros-meta/common_tutorials/metadata.xml
index c42ea5b..38abe1f 100644
--- a/ros-meta/common_tutorials/metadata.xml
+++ b/ros-meta/common_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/ros-meta/desktop/metadata.xml b/ros-meta/desktop/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/desktop/metadata.xml
+++ b/ros-meta/desktop/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/desktop_full/metadata.xml b/ros-meta/desktop_full/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/desktop_full/metadata.xml
+++ b/ros-meta/desktop_full/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/diagnostics/metadata.xml b/ros-meta/diagnostics/metadata.xml
index c42ea5b..7403d8e 100644
--- a/ros-meta/diagnostics/metadata.xml
+++ b/ros-meta/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/ros-meta/driver_common/metadata.xml b/ros-meta/driver_common/metadata.xml
index c42ea5b..9e7fdee 100644
--- a/ros-meta/driver_common/metadata.xml
+++ b/ros-meta/driver_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-drivers/driver_common</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/executive_smach/metadata.xml b/ros-meta/executive_smach/metadata.xml
index c42ea5b..df9f6c9 100644
--- a/ros-meta/executive_smach/metadata.xml
+++ b/ros-meta/executive_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/ros-meta/gazebo_ros_pkgs/metadata.xml b/ros-meta/gazebo_ros_pkgs/metadata.xml
index c42ea5b..2cda806 100644
--- a/ros-meta/gazebo_ros_pkgs/metadata.xml
+++ b/ros-meta/gazebo_ros_pkgs/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/geographic_info/metadata.xml b/ros-meta/geographic_info/metadata.xml
index c42ea5b..15ed56b 100644
--- a/ros-meta/geographic_info/metadata.xml
+++ b/ros-meta/geographic_info/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/geometry/metadata.xml b/ros-meta/geometry/metadata.xml
index c42ea5b..2d8e130 100644
--- a/ros-meta/geometry/metadata.xml
+++ b/ros-meta/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/geometry</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/geometry_experimental/metadata.xml b/ros-meta/geometry_experimental/metadata.xml
index c42ea5b..51f204d 100644
--- a/ros-meta/geometry_experimental/metadata.xml
+++ b/ros-meta/geometry_experimental/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/geometry_tutorials/metadata.xml b/ros-meta/geometry_tutorials/metadata.xml
index c42ea5b..c02c459 100644
--- a/ros-meta/geometry_tutorials/metadata.xml
+++ b/ros-meta/geometry_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/geometry_tutorials</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/hector_localization/metadata.xml b/ros-meta/hector_localization/metadata.xml
index c42ea5b..017b917 100644
--- a/ros-meta/hector_localization/metadata.xml
+++ b/ros-meta/hector_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">tu-darmstadt-ros-pkg/hector_localization</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/hector_slam/metadata.xml b/ros-meta/hector_slam/metadata.xml
index c42ea5b..d3cf71e 100644
--- a/ros-meta/hector_slam/metadata.xml
+++ b/ros-meta/hector_slam/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='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/ros-meta/image_common/metadata.xml b/ros-meta/image_common/metadata.xml
index c42ea5b..b01f287 100644
--- a/ros-meta/image_common/metadata.xml
+++ b/ros-meta/image_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-perception/image_common</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/image_pipeline/metadata.xml b/ros-meta/image_pipeline/metadata.xml
index c42ea5b..90c35a2 100644
--- a/ros-meta/image_pipeline/metadata.xml
+++ b/ros-meta/image_pipeline/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/image_transport_plugins/metadata.xml b/ros-meta/image_transport_plugins/metadata.xml
index c42ea5b..97c7091 100644
--- a/ros-meta/image_transport_plugins/metadata.xml
+++ b/ros-meta/image_transport_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-perception/image_transport_plugins</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/imu_pipeline/metadata.xml b/ros-meta/imu_pipeline/metadata.xml
index c42ea5b..59d1d9e 100644
--- a/ros-meta/imu_pipeline/metadata.xml
+++ b/ros-meta/imu_pipeline/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/laser_pipeline/metadata.xml b/ros-meta/laser_pipeline/metadata.xml
index c42ea5b..41b326c 100644
--- a/ros-meta/laser_pipeline/metadata.xml
+++ b/ros-meta/laser_pipeline/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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_pipeline</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/navigation/metadata.xml b/ros-meta/navigation/metadata.xml
index c42ea5b..8694432 100644
--- a/ros-meta/navigation/metadata.xml
+++ b/ros-meta/navigation/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/nodelet_core/metadata.xml b/ros-meta/nodelet_core/metadata.xml
index c42ea5b..33bcb0c 100644
--- a/ros-meta/nodelet_core/metadata.xml
+++ b/ros-meta/nodelet_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/nodelet_core</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/perception/metadata.xml b/ros-meta/perception/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/perception/metadata.xml
+++ b/ros-meta/perception/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/perception_pcl/metadata.xml b/ros-meta/perception_pcl/metadata.xml
index c42ea5b..3fbdb8f 100644
--- a/ros-meta/perception_pcl/metadata.xml
+++ b/ros-meta/perception_pcl/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/pr2_common/metadata.xml b/ros-meta/pr2_common/metadata.xml
index c42ea5b..88a4cd6 100644
--- a/ros-meta/pr2_common/metadata.xml
+++ b/ros-meta/pr2_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">pr2/pr2_common</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/qt_gui_core/metadata.xml b/ros-meta/qt_gui_core/metadata.xml
index c42ea5b..2d88111 100644
--- a/ros-meta/qt_gui_core/metadata.xml
+++ b/ros-meta/qt_gui_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-visualization/qt_gui_core</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/robot/metadata.xml b/ros-meta/robot/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/robot/metadata.xml
+++ b/ros-meta/robot/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/robot_model/metadata.xml b/ros-meta/robot_model/metadata.xml
index c42ea5b..b2ab0e6 100644
--- a/ros-meta/robot_model/metadata.xml
+++ b/ros-meta/robot_model/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/ros/metadata.xml b/ros-meta/ros/metadata.xml
index c42ea5b..d0c10cf 100644
--- a/ros-meta/ros/metadata.xml
+++ b/ros-meta/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/ros</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/ros_base/metadata.xml b/ros-meta/ros_base/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/ros_base/metadata.xml
+++ b/ros-meta/ros_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/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/ros_comm/metadata.xml b/ros-meta/ros_comm/metadata.xml
index c42ea5b..bcf2b81 100644
--- a/ros-meta/ros_comm/metadata.xml
+++ b/ros-meta/ros_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/ros-meta/ros_control/metadata.xml b/ros-meta/ros_control/metadata.xml
index c42ea5b..2b50e8a 100644
--- a/ros-meta/ros_control/metadata.xml
+++ b/ros-meta/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-controls/ros_control</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/ros_core/metadata.xml b/ros-meta/ros_core/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/ros_core/metadata.xml
+++ b/ros-meta/ros_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/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/ros_tutorials/metadata.xml b/ros-meta/ros_tutorials/metadata.xml
index c42ea5b..1360d75 100644
--- a/ros-meta/ros_tutorials/metadata.xml
+++ b/ros-meta/ros_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/ros-meta/rosbridge_suite/metadata.xml b/ros-meta/rosbridge_suite/metadata.xml
index c42ea5b..d548185 100644
--- a/ros-meta/rosbridge_suite/metadata.xml
+++ b/ros-meta/rosbridge_suite/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='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/ros-meta/roscpp_core/metadata.xml b/ros-meta/roscpp_core/metadata.xml
index c42ea5b..d41b871 100644
--- a/ros-meta/roscpp_core/metadata.xml
+++ b/ros-meta/roscpp_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/roscpp_core</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/rosserial/metadata.xml b/ros-meta/rosserial/metadata.xml
index c42ea5b..853c4a1 100644
--- a/ros-meta/rosserial/metadata.xml
+++ b/ros-meta/rosserial/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/rqt/metadata.xml b/ros-meta/rqt/metadata.xml
index c42ea5b..1274b6f 100644
--- a/ros-meta/rqt/metadata.xml
+++ b/ros-meta/rqt/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/rqt_common_plugins/metadata.xml b/ros-meta/rqt_common_plugins/metadata.xml
index c42ea5b..36b263a 100644
--- a/ros-meta/rqt_common_plugins/metadata.xml
+++ b/ros-meta/rqt_common_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/ros-meta/rqt_robot_plugins/metadata.xml b/ros-meta/rqt_robot_plugins/metadata.xml
index c42ea5b..28fc5ef 100644
--- a/ros-meta/rqt_robot_plugins/metadata.xml
+++ b/ros-meta/rqt_robot_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_robot_plugins</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/simulators/metadata.xml b/ros-meta/simulators/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/simulators/metadata.xml
+++ b/ros-meta/simulators/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/ros-meta/slam_gmapping/metadata.xml b/ros-meta/slam_gmapping/metadata.xml
index c42ea5b..2787121 100644
--- a/ros-meta/slam_gmapping/metadata.xml
+++ b/ros-meta/slam_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/ros-meta/unique_identifier/metadata.xml b/ros-meta/unique_identifier/metadata.xml
index c42ea5b..b274068 100644
--- a/ros-meta/unique_identifier/metadata.xml
+++ b/ros-meta/unique_identifier/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/vision_opencv/metadata.xml b/ros-meta/vision_opencv/metadata.xml
index c42ea5b..266dc38 100644
--- a/ros-meta/vision_opencv/metadata.xml
+++ b/ros-meta/vision_opencv/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-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/ros-meta/vision_visp/metadata.xml b/ros-meta/vision_visp/metadata.xml
index c42ea5b..f279d19 100644
--- a/ros-meta/vision_visp/metadata.xml
+++ b/ros-meta/vision_visp/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='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/ros-meta/visualization_tutorials/metadata.xml b/ros-meta/visualization_tutorials/metadata.xml
index c42ea5b..e1ee206 100644
--- a/ros-meta/visualization_tutorials/metadata.xml
+++ b/ros-meta/visualization_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/ros-meta/viz/metadata.xml b/ros-meta/viz/metadata.xml
index c42ea5b..8a1e01b 100644
--- a/ros-meta/viz/metadata.xml
+++ b/ros-meta/viz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ros</herd>
+	<herd>ros</herd>
+	<upstream>
+		<remote-id type="github">ros/metapackages</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/sci-biology/gatk/metadata.xml b/sci-biology/gatk/metadata.xml
index f17a827..989cb76 100644
--- a/sci-biology/gatk/metadata.xml
+++ b/sci-biology/gatk/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>
+  <upstream>
+    <remote-id type="github">broadgsa/gatk</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/sci-chemistry/prody/metadata.xml b/sci-chemistry/prody/metadata.xml
index ae9ec7c..3ef4331 100644
--- a/sci-chemistry/prody/metadata.xml
+++ b/sci-chemistry/prody/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>sci-chemistry</herd>
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">prody/ProDy</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index a7bc076..1f9259f 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>
@@ -7,11 +7,12 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='gromacs'>Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
-		<flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
-		<flag name='extras'>Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
+		<flag name="gromacs">Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
+		<flag name="system-boost">Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
+		<flag name="extras">Pull in extra applications from <pkg>sci-chemistry/votca-csg-apps</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">votca</remote-id>
+		<remote-id type="github">votca/csg-tutorials</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/sci-chemistry/votca-csgapps/metadata.xml b/sci-chemistry/votca-csgapps/metadata.xml
index 40959c8..b902a03 100644
--- a/sci-chemistry/votca-csgapps/metadata.xml
+++ b/sci-chemistry/votca-csgapps/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">votca</remote-id>
+		<remote-id type="github">votca/csgapps</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
index 1292191..03b5eab 100644
--- a/sci-geosciences/mapnik/metadata.xml
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -1,13 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<longdescription>Mapnik is a toolkit for developing both web and desktop
+    <herd>sci-geosciences</herd>
+    <longdescription>Mapnik is a toolkit for developing both web and desktop
     mapping applications.  The core libraries are written in C++, with
     optional Python bindings.
-</longdescription>
-<use>
-  <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> library support</flag>
-  <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
-</use>
+    </longdescription>
+    <use>
+        <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+        <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">downloads/mapnik</remote-id>
+    </upstream>
 </pkgmetadata>

diff --git a/sci-geosciences/osm2pgsql/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml
index abf1114..7d0c03d 100644
--- a/sci-geosciences/osm2pgsql/metadata.xml
+++ b/sci-geosciences/osm2pgsql/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>sci-geosciences</herd>
@@ -13,4 +13,7 @@
             Add support for importing the new "Protocolbuffer Binary Format"
         </flag>
     </use>
+    <upstream>
+        <remote-id type="github">openstreetmap/osm2pgsql</remote-id>
+    </upstream>
 </pkgmetadata>

diff --git a/sci-libs/ignition-math/metadata.xml b/sci-libs/ignition-math/metadata.xml
index e7dd05f..d3079ed 100644
--- a/sci-libs/ignition-math/metadata.xml
+++ b/sci-libs/ignition-math/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>
-<maintainer>
-<email>aballier@gentoo.org</email>
-<name>Alexis Ballier</name>
-</maintainer>
+	<maintainer>
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">ignitionrobotics/ign-math</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/sci-libs/netcdf-cxx/metadata.xml b/sci-libs/netcdf-cxx/metadata.xml
index 5703447..e565992 100644
--- a/sci-libs/netcdf-cxx/metadata.xml
+++ b/sci-libs/netcdf-cxx/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   NetCDF (network Common Data Form) is an interface for scientific
   data access and a freely-distributed software library that provides an
   implementation of the interface.  The netCDF library also defines a
@@ -10,5 +10,8 @@
   Together, the interface, library, and format support the creation,
   access, and sharing of scientific data.
   This is the C++ library which links to the C library.
-</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">Unidata/netcdf-cxx4</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/sci-libs/openfoam/metadata.xml b/sci-libs/openfoam/metadata.xml
index a7d86f1..fbc54b0 100644
--- a/sci-libs/openfoam/metadata.xml
+++ b/sci-libs/openfoam/metadata.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
-  <email>patrick@gentoo.org</email>
-  <name>Patrick Lauer</name>
- </maintainer>
- <maintainer>
-  <email>oli.borm@web.de</email>
-  <name>Oliver Borm</name>
- </maintainer>
-	<use>
-		<flag name="opendx"> Install opendx visualisation tool</flag>
-		<flag name="src"> Install source files</flag>
-		<flag name="paraview">Enable support for paraview library</flag>
-	</use>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <maintainer>
+    <email>oli.borm@web.de</email>
+    <name>Oliver Borm</name>
+  </maintainer>
+  <use>
+    <flag name="opendx"> Install opendx visualisation tool</flag>
+    <flag name="src"> Install source files</flag>
+    <flag name="paraview">Enable support for paraview library</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">downloads</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/sci-libs/scikits_learn/metadata.xml b/sci-libs/scikits_learn/metadata.xml
index 7b42750..e393de4 100644
--- a/sci-libs/scikits_learn/metadata.xml
+++ b/sci-libs/scikits_learn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>
@@ -6,8 +6,9 @@
   scikits.learn is a python library for machine learning. It aims to
   implement classic machine learning algorithms while remaining simple
   and efficient.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="pypi">scikit-learn</remote-id>
+    <remote-id type="sourceforge">scikit-learn</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index aaf7c9f..2a848f5 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>
@@ -7,9 +7,10 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
+		<flag name="system-boost">Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">votca</remote-id>
+		<remote-id type="github">votca/tools</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/sci-physics/espresso++/metadata.xml b/sci-physics/espresso++/metadata.xml
index ee9feac..2f202fc 100644
--- a/sci-physics/espresso++/metadata.xml
+++ b/sci-physics/espresso++/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-physics</herd>
@@ -6,4 +6,7 @@
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">espressopp/espressopp</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/sci-physics/hoomd-blue/metadata.xml b/sci-physics/hoomd-blue/metadata.xml
index 8dd7ec6..89ca638 100644
--- a/sci-physics/hoomd-blue/metadata.xml
+++ b/sci-physics/hoomd-blue/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>
@@ -9,4 +9,7 @@
   <use>
     <flag name="cuda">Enable cuda non-bonded kernels</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">glotzer/hoomd-blue</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/sci-physics/sassena/metadata.xml b/sci-physics/sassena/metadata.xml
index 277a062..fb807da 100644
--- a/sci-physics/sassena/metadata.xml
+++ b/sci-physics/sassena/metadata.xml
@@ -1,9 +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>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">benlabs/sassena</remote-id>
+	</upstream>
 </pkgmetadata>
-

diff --git a/sys-devel/bin86/metadata.xml b/sys-devel/bin86/metadata.xml
index 746b4d9..0e95eb6 100644
--- a/sys-devel/bin86/metadata.xml
+++ b/sys-devel/bin86/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
@@ -6,4 +6,7 @@
 		If anyone from base-system wants to be secondary, by all means just add
 		yourself, and send me (boo) a mail telling me that you've done so.
 	-->
+	<upstream>
+		<remote-id type="github">lkundrak/dev86</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index a181266..29330fe 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>toolchain</herd>
@@ -28,5 +28,6 @@
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:gnu:gcc</remote-id>
+    <remote-id type="sourceforge">dgcc</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/sys-fs/bcache-tools/metadata.xml b/sys-fs/bcache-tools/metadata.xml
index 4a00a64..3441f18 100644
--- a/sys-fs/bcache-tools/metadata.xml
+++ b/sys-fs/bcache-tools/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">g2p/bcache-tools</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/www-apache/mod_slotlimit/metadata.xml b/www-apache/mod_slotlimit/metadata.xml
index bddc8a2..491315d 100644
--- a/www-apache/mod_slotlimit/metadata.xml
+++ b/www-apache/mod_slotlimit/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/www-apache/modsec-flameeyes/metadata.xml b/www-apache/modsec-flameeyes/metadata.xml
index 7503e01..0da5fd9 100644
--- a/www-apache/modsec-flameeyes/metadata.xml
+++ b/www-apache/modsec-flameeyes/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>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
     <name>Diego E. Pettenò</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">Flameeyes/modsec-flameeyes</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/www-apache/passenger/metadata.xml b/www-apache/passenger/metadata.xml
index 599a126..ea0ec8e 100644
--- a/www-apache/passenger/metadata.xml
+++ b/www-apache/passenger/metadata.xml
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-	  <email>graaff@gentoo.org</email>
+		<email>graaff@gentoo.org</email>
 	</maintainer>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">passenger</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/www-apps/novnc/metadata.xml b/www-apps/novnc/metadata.xml
index 9cf505a..dbdca42 100644
--- a/www-apps/novnc/metadata.xml
+++ b/www-apps/novnc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -10,4 +10,7 @@
   <use>
     <flag name="nova">Installs Openstack Nova for it's libraries</flag>
   </use>
+  <upstream>
+    <remote-id type="github">kanaka/noVNC</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/www-client/otter/metadata.xml b/www-client/otter/metadata.xml
index ef0483f..dba01c3 100644
--- a/www-client/otter/metadata.xml
+++ b/www-client/otter/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>
-<maintainer>
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Emdek/otter</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/www-client/phantomjs/metadata.xml b/www-client/phantomjs/metadata.xml
index cd80b9a..1cf1aa6 100644
--- a/www-client/phantomjs/metadata.xml
+++ b/www-client/phantomjs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">phantomjs</remote-id>
+		<remote-id type="bitbucket">ariya/phantomjs</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/www-misc/fcgiwrap/metadata.xml b/www-misc/fcgiwrap/metadata.xml
index 464137e..64a2484 100644
--- a/www-misc/fcgiwrap/metadata.xml
+++ b/www-misc/fcgiwrap/metadata.xml
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>nikoli@gmx.us</email>
-	<name>Nikoli</name>
-</maintainer>
-<longdescription lang="en">
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>nikoli@gmx.us</email>
+		<name>Nikoli</name>
+	</maintainer>
+	<longdescription lang="en">
 	fcgiwrap is a simple server for running CGI applications over FastCGI. It
 	hopes to provide clean CGI support to Nginx (and other web servers that may
-	need it). 
-</longdescription>
+	need it).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">gnosek/fcgiwrap</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/www-plugins/pipelight/metadata.xml b/www-plugins/pipelight/metadata.xml
index e72ebc4..72db370 100644
--- a/www-plugins/pipelight/metadata.xml
+++ b/www-plugins/pipelight/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">pipelight</remote-id>
+		<remote-id type="bitbucket">mmueller2012/pipelight</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 1ecde8f..ba59838 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
@@ -24,6 +24,7 @@
   </use>
   <upstream>
     <changelog>http://nginx.org/en/CHANGES</changelog>
-    <remote-id type="github">yaoweibin/nginx_ajp_module</remote-id>
+    <remote-id type="github">openresty/memc-nginx-module</remote-id>
+    <remote-id type="bitbucket">nginx-goodies/nginx-sticky-module-ng</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/www-servers/tornado/metadata.xml b/www-servers/tornado/metadata.xml
index 62d0060..b110d73 100644
--- a/www-servers/tornado/metadata.xml
+++ b/www-servers/tornado/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">tornado</remote-id>
+    <remote-id type="github">tornadoweb/tornado</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml
index e51c982..79a6bda 100644
--- a/x11-libs/libgxim/metadata.xml
+++ b/x11-libs/libgxim/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>
 	<upstream>
 		<remote-id type="google-code">libgxim</remote-id>
+		<remote-id type="bitbucket">tagoh/libgxim</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/x11-libs/librfm/metadata.xml b/x11-libs/librfm/metadata.xml
index fcc6fe9..a4f8b1f 100644
--- a/x11-libs/librfm/metadata.xml
+++ b/x11-libs/librfm/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>
 	<maintainer>
 		<email>angelos@gentoo.org</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xffm</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/x11-misc/autocutsel/metadata.xml b/x11-misc/autocutsel/metadata.xml
index eafac49..373a239 100644
--- a/x11-misc/autocutsel/metadata.xml
+++ b/x11-misc/autocutsel/metadata.xml
@@ -1,6 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
 	<longdescription>autocutsel synchronizes the two copy/paste buffers mainly used by X applications. It unifies "clipboards" between VNC servers and Windows.</longdescription>
+	<upstream>
+		<remote-id type="github">sigmike/autocutsel</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/x11-misc/fireflies/metadata.xml b/x11-misc/fireflies/metadata.xml
index 2518313..ec03305 100644
--- a/x11-misc/fireflies/metadata.xml
+++ b/x11-misc/fireflies/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <herd>desktop-misc</herd>
+    <herd>desktop-misc</herd>
+    <upstream>
+        <remote-id type="github">mpcomplete/fireflies</remote-id>
+    </upstream>
 </pkgmetadata>

diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml
index 3ec7e75..2e19c0f 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<upstream>
-<maintainer status="active">
-<email>mimasgpc@free.fr</email>
-</maintainer>
-<doc lang="en">http://mimasgpc.free.fr/openbox-menu_en.html</doc>
-</upstream>
-<use>
-<flag name='icons'>Enable support for icons in menus</flag>
-<flag name='svg'>Support SVG icons</flag>
-</use>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<maintainer status="active">
+			<email>mimasgpc@free.fr</email>
+		</maintainer>
+		<doc lang="en">http://mimasgpc.free.fr/openbox-menu_en.html</doc>
+		<remote-id type="bitbucket">fabriceT/openbox-menu</remote-id>
+	</upstream>
+	<use>
+		<flag name="icons">Enable support for icons in menus</flag>
+		<flag name="svg">Support SVG icons</flag>
+	</use>
 </pkgmetadata>
-

diff --git a/x11-misc/screengrab/metadata.xml b/x11-misc/screengrab/metadata.xml
index 89e086c..8b08170 100644
--- a/x11-misc/screengrab/metadata.xml
+++ b/x11-misc/screengrab/metadata.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
 	<upstream>
 		<remote-id type="google-code">screengrab-qt</remote-id>
+		<remote-id type="github">DOOMer/screengrab</remote-id>
+	</upstream>
+	<upstream>
+		<maintainer status="active">
+			<email>doomer3d@gmail.com</email>
+			<name>Artem Galichkin</name>
+		</maintainer>
 	</upstream>
-<upstream>
-	<maintainer status="active">
-	<email>doomer3d@gmail.com</email>
-	<name>Artem Galichkin</name>
-	</maintainer>
-</upstream>
 </pkgmetadata>

diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index 65577dd..ab3d805 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -19,5 +19,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">libvncserver</remote-id>
+		<remote-id type="github">LibVNC/x11vnc</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/x11-themes/clearlooks-phenix/metadata.xml b/x11-themes/clearlooks-phenix/metadata.xml
index e62de96..7c4df9f 100644
--- a/x11-themes/clearlooks-phenix/metadata.xml
+++ b/x11-themes/clearlooks-phenix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -10,6 +10,8 @@
 		<email>geert.braekmans@gmail.com</email>
 		<name>Geert Braekmans</name>
 		<description>Proxy maintainer</description>
-        </maintainer>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jpfleury/clearlooks-phenix</remote-id>
+	</upstream>
 </pkgmetadata>
-

diff --git a/x11-themes/experience/metadata.xml b/x11-themes/experience/metadata.xml
index da6fd63..3c39be2 100644
--- a/x11-themes/experience/metadata.xml
+++ b/x11-themes/experience/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<upstream>
+		<remote-id type="freshmeat">experience</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/x11-themes/gtk-engines-quartz/metadata.xml b/x11-themes/gtk-engines-quartz/metadata.xml
index 4561e55..dfd678b 100644
--- a/x11-themes/gtk-engines-quartz/metadata.xml
+++ b/x11-themes/gtk-engines-quartz/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>prefix</herd>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/x11-wm/notion/metadata.xml b/x11-wm/notion/metadata.xml
index 23d00fd..cb09576 100644
--- a/x11-wm/notion/metadata.xml
+++ b/x11-wm/notion/metadata.xml
@@ -11,5 +11,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">notion</remote-id>
+		<remote-id type="github">raboof/notion</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
index 9b985df..8be5c16 100644
--- a/x11-wm/stumpwm/metadata.xml
+++ b/x11-wm/stumpwm/metadata.xml
@@ -1,11 +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>
-<maintainer>
-  <email>nimiux@gentoo.org</email>
-  <name>Chema Alonso</name>
-</maintainer>
-<longdescription>
+  <maintainer>
+    <email>nimiux@gentoo.org</email>
+    <name>Chema Alonso</name>
+  </maintainer>
+  <longdescription>
   Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp.
 
   If you're tired of flipping through themes like channel-surfing, and going from one perfect-except-for-just-one-thing
@@ -19,12 +19,15 @@
     * customize your window manager 
 
   while it's running. That's right. With a 100% Common Lisp window manager there's no stopping the hacks. Just re-eval and GO!
-</longdescription>
-<use>
-  <flag name="doc">Include documentation</flag>
-  <flag name="emacs">Add support for GNU Emacs</flag>
-  <flag name="clisp">Use CLISP for the runtime</flag>
-  <flag name="ecl">Use SCL for the runtime</flag>
-  <flag name="sbcl">Use SBCL for the runtime</flag>
-</use>
+  </longdescription>
+  <use>
+    <flag name="doc">Include documentation</flag>
+    <flag name="emacs">Add support for GNU Emacs</flag>
+    <flag name="clisp">Use CLISP for the runtime</flag>
+    <flag name="ecl">Use SCL for the runtime</flag>
+    <flag name="sbcl">Use SBCL for the runtime</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">stumpwm/stumpwm</remote-id>
+  </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-10-16 13:32 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-16 13:31 [gentoo-commits] repo/gentoo:master commit in: dev-ruby/test-unit/, dev-ros/test_rospy/, dev-ros/timestamp_tools/, Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox