Updating liguros repo

55 files changed, 42 insertions, 52 deletions

diff --git a/ros-meta/ament_cmake/metadata.xml b/ros-meta/ament_cmake/metadata.xml
index 307331cf586a..d1baaf5c70f1 100644
--- a/ros-meta/ament_cmake/metadata.xml
+++ b/ros-meta/ament_cmake/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ament/ament_cmake</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/audio_common/metadata.xml b/ros-meta/audio_common/metadata.xml
index 9a1844a3f066..73c3483f9803 100644
--- a/ros-meta/audio_common/metadata.xml
+++ b/ros-meta/audio_common/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-drivers/audio_common</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/bond_core/metadata.xml b/ros-meta/bond_core/metadata.xml
index 92d56999b89f..d6d84c80ecc4 100644
--- a/ros-meta/bond_core/metadata.xml
+++ b/ros-meta/bond_core/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/bond_core</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/calibration/metadata.xml b/ros-meta/calibration/metadata.xml
index 36adda60364e..660014a7883d 100644
--- a/ros-meta/calibration/metadata.xml
+++ b/ros-meta/calibration/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-perception/calibration</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/common_msgs/metadata.xml b/ros-meta/common_msgs/metadata.xml
index 8a5b25834c0d..22d077d4b85a 100644
--- a/ros-meta/common_msgs/metadata.xml
+++ b/ros-meta/common_msgs/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/common_msgs</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/common_tutorials/metadata.xml b/ros-meta/common_tutorials/metadata.xml
index 0f0e279221bc..ac14dc3adf6f 100644
--- a/ros-meta/common_tutorials/metadata.xml
+++ b/ros-meta/common_tutorials/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/common_tutorials</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/desktop/metadata.xml b/ros-meta/desktop/metadata.xml
index 6c27c20dab66..32d254e09bd2 100644
--- a/ros-meta/desktop/metadata.xml
+++ b/ros-meta/desktop/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/desktop_full/metadata.xml b/ros-meta/desktop_full/metadata.xml
index 6c27c20dab66..32d254e09bd2 100644
--- a/ros-meta/desktop_full/metadata.xml
+++ b/ros-meta/desktop_full/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/diagnostics/metadata.xml b/ros-meta/diagnostics/metadata.xml
index 28ddb9ddc086..6cc2de656785 100644
--- a/ros-meta/diagnostics/metadata.xml
+++ b/ros-meta/diagnostics/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/diagnostics</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/driver_common/metadata.xml b/ros-meta/driver_common/metadata.xml
index 57b56b7a6e42..e4029ce25b8b 100644
--- a/ros-meta/driver_common/metadata.xml
+++ b/ros-meta/driver_common/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-drivers/driver_common</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/executive_smach/metadata.xml b/ros-meta/executive_smach/metadata.xml
index d25bfe98c4e3..d2fce8b37504 100644
--- a/ros-meta/executive_smach/metadata.xml
+++ b/ros-meta/executive_smach/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/executive_smach</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/gazebo_ros_pkgs/metadata.xml b/ros-meta/gazebo_ros_pkgs/metadata.xml
index c92a76c59009..ca1574a351fc 100644
--- a/ros-meta/gazebo_ros_pkgs/metadata.xml
+++ b/ros-meta/gazebo_ros_pkgs/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/geographic_info/metadata.xml b/ros-meta/geographic_info/metadata.xml
index 079a9b59c3f8..ef3ec24a24af 100644
--- a/ros-meta/geographic_info/metadata.xml
+++ b/ros-meta/geographic_info/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-geographic-info/geographic_info</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/geometry/metadata.xml b/ros-meta/geometry/metadata.xml
index a47179b588e5..f41d91d6a75e 100644
--- a/ros-meta/geometry/metadata.xml
+++ b/ros-meta/geometry/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/geometry</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/geometry2/metadata.xml b/ros-meta/geometry2/metadata.xml
index 6e9fcf22fc5d..03f74b7656e7 100644
--- a/ros-meta/geometry2/metadata.xml
+++ b/ros-meta/geometry2/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/geometry_tutorials/metadata.xml b/ros-meta/geometry_tutorials/metadata.xml
index a6ad0e7c02fe..88fc1a276f76 100644
--- a/ros-meta/geometry_tutorials/metadata.xml
+++ b/ros-meta/geometry_tutorials/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/geometry_tutorials</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/hector_localization/metadata.xml b/ros-meta/hector_localization/metadata.xml
index fa98ac251642..ee6ea29b2d58 100644
--- a/ros-meta/hector_localization/metadata.xml
+++ b/ros-meta/hector_localization/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_localization</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/hector_slam/metadata.xml b/ros-meta/hector_slam/metadata.xml
index 45f9abd32a1b..29147f0be960 100644
--- a/ros-meta/hector_slam/metadata.xml
+++ b/ros-meta/hector_slam/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">tu-darmstadt-ros-pkg/hector_slam</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/image_common/metadata.xml b/ros-meta/image_common/metadata.xml
index d161a10d5206..27784f938aa4 100644
--- a/ros-meta/image_common/metadata.xml
+++ b/ros-meta/image_common/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-perception/image_common</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/image_pipeline/metadata.xml b/ros-meta/image_pipeline/metadata.xml
index a6cdf2b3eb6f..7536ca01cdf7 100644
--- a/ros-meta/image_pipeline/metadata.xml
+++ b/ros-meta/image_pipeline/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-perception/image_pipeline</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/image_transport_plugins/metadata.xml b/ros-meta/image_transport_plugins/metadata.xml
index 8d302f028cbe..feed05c03f5b 100644
--- a/ros-meta/image_transport_plugins/metadata.xml
+++ b/ros-meta/image_transport_plugins/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-perception/image_transport_plugins</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/imu_pipeline/metadata.xml b/ros-meta/imu_pipeline/metadata.xml
index dc5d1d94de69..4fa31f58d6b4 100644
--- a/ros-meta/imu_pipeline/metadata.xml
+++ b/ros-meta/imu_pipeline/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-perception/imu_pipeline</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/imu_tools/metadata.xml b/ros-meta/imu_tools/metadata.xml
index 66ea4051a85a..0be33667fd34 100644
--- a/ros-meta/imu_tools/metadata.xml
+++ b/ros-meta/imu_tools/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ccny-ros-pkg/imu_tools</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/laser_pipeline/metadata.xml b/ros-meta/laser_pipeline/metadata.xml
index 2cf05df841cb..ffddad54b0c7 100644
--- a/ros-meta/laser_pipeline/metadata.xml
+++ b/ros-meta/laser_pipeline/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-perception/laser_pipeline</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/mavros/mavros-1.5.2.ebuild b/ros-meta/mavros/mavros-1.5.2.ebuild
new file mode 100644
index 000000000000..f6781e007847
--- /dev/null
+++ b/ros-meta/mavros/mavros-1.5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Metapackage for mavros packages"
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+HOMEPAGE="https://wiki.ros.org/mavros"
+
+RDEPEND="
+	dev-ros/mavros_msgs
+	dev-ros/libmavconn
+	dev-ros/mavros
+	dev-ros/mavros_extras
+"
+DEPEND="${RDEPEND}"
+[ "${PV}" = "9999" ] || KEYWORDS="~amd64 ~arm"
diff --git a/ros-meta/mavros/metadata.xml b/ros-meta/mavros/metadata.xml
index ddd537924057..74ced8bea005 100644
--- a/ros-meta/mavros/metadata.xml
+++ b/ros-meta/mavros/metadata.xml
@@ -5,5 +5,4 @@
 		<email>ros@gentoo.org</email>
 		<name>Gentoo ROS Project</name>
 	</maintainer>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/navigation/metadata.xml b/ros-meta/navigation/metadata.xml
index efbe8b77ad67..7408fdf7047f 100644
--- a/ros-meta/navigation/metadata.xml
+++ b/ros-meta/navigation/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-planning/navigation</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/nodelet_core/Manifest b/ros-meta/nodelet_core/Manifest
index bed3532c7b19..d05dd4f1f67c 100644
--- a/ros-meta/nodelet_core/Manifest
+++ b/ros-meta/nodelet_core/Manifest
@@ -1 +1,2 @@
 DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
+DIST nodelet_core-1.10.1.tar.gz 45409 BLAKE2B e27fa3075bcdfe9f309758a7c2930d73d760236eb5f68c83206314f8001e2aecd5e164ffaf5a27be7dbc6353042119415772db138478b3e2112f00cbf3f380d1 SHA512 2ab86a350692afeb6ec4861eb1dbc33a58a6ea662238223d8f0be74dba4c96323dabc176b77171e2b3affb6447dfd0ec11ca49346f03d33e8aa13d8b9599e260
diff --git a/ros-meta/nodelet_core/metadata.xml b/ros-meta/nodelet_core/metadata.xml
index 700fa33330b3..a7a0cb47eaf7 100644
--- a/ros-meta/nodelet_core/metadata.xml
+++ b/ros-meta/nodelet_core/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/nodelet_core</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/nodelet_core/nodelet_core-1.10.1.ebuild b/ros-meta/nodelet_core/nodelet_core-1.10.1.ebuild
new file mode 100644
index 000000000000..a16f7bc8e212
--- /dev/null
+++ b/ros-meta/nodelet_core/nodelet_core-1.10.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelet Core Metapackage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/nodelet
+	dev-ros/nodelet_topic_tools
+	dev-ros/test_nodelet
+	dev-ros/test_nodelet_topic_tools
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception/metadata.xml b/ros-meta/perception/metadata.xml
index 6c27c20dab66..32d254e09bd2 100644
--- a/ros-meta/perception/metadata.xml
+++ b/ros-meta/perception/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/perception_pcl/metadata.xml b/ros-meta/perception_pcl/metadata.xml
index c49d70a47f7b..ac11a600be35 100644
--- a/ros-meta/perception_pcl/metadata.xml
+++ b/ros-meta/perception_pcl/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-perception/perception_pcl</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/pr2_common/metadata.xml b/ros-meta/pr2_common/metadata.xml
index ce29f97cafd1..f90f426b538b 100644
--- a/ros-meta/pr2_common/metadata.xml
+++ b/ros-meta/pr2_common/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">pr2/pr2_common</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/qt_gui_core/metadata.xml b/ros-meta/qt_gui_core/metadata.xml
index 21e5f649d06c..bd9f89f114ce 100644
--- a/ros-meta/qt_gui_core/metadata.xml
+++ b/ros-meta/qt_gui_core/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-visualization/qt_gui_core</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/robot/metadata.xml b/ros-meta/robot/metadata.xml
index 6c27c20dab66..32d254e09bd2 100644
--- a/ros-meta/robot/metadata.xml
+++ b/ros-meta/robot/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/robot_model/metadata.xml b/ros-meta/robot_model/metadata.xml
index 10440dea007e..ceef7c794c18 100644
--- a/ros-meta/robot_model/metadata.xml
+++ b/ros-meta/robot_model/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/robot_model</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/ros/metadata.xml b/ros-meta/ros/metadata.xml
index e4000d2ee8e1..c51d37d7cf5c 100644
--- a/ros-meta/ros/metadata.xml
+++ b/ros-meta/ros/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/ros</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/ros_base/metadata.xml b/ros-meta/ros_base/metadata.xml
index 6c27c20dab66..32d254e09bd2 100644
--- a/ros-meta/ros_base/metadata.xml
+++ b/ros-meta/ros_base/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/ros_comm/metadata.xml b/ros-meta/ros_comm/metadata.xml
index a41ca1fd91f4..21df0d03b028 100644
--- a/ros-meta/ros_comm/metadata.xml
+++ b/ros-meta/ros_comm/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/ros_comm</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/ros_control/metadata.xml b/ros-meta/ros_control/metadata.xml
index ddf108916600..3c25465fb298 100644
--- a/ros-meta/ros_control/metadata.xml
+++ b/ros-meta/ros_control/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-controls/ros_control</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/ros_core/metadata.xml b/ros-meta/ros_core/metadata.xml
index 6c27c20dab66..32d254e09bd2 100644
--- a/ros-meta/ros_core/metadata.xml
+++ b/ros-meta/ros_core/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/ros_tutorials/metadata.xml b/ros-meta/ros_tutorials/metadata.xml
index 843a85f938bc..c30a797d7c1e 100644
--- a/ros-meta/ros_tutorials/metadata.xml
+++ b/ros-meta/ros_tutorials/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/ros_tutorials</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/rosbridge_suite/metadata.xml b/ros-meta/rosbridge_suite/metadata.xml
index 877f4193c894..b99398ddaaba 100644
--- a/ros-meta/rosbridge_suite/metadata.xml
+++ b/ros-meta/rosbridge_suite/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">RobotWebTools/rosbridge_suite</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/roscpp_core/metadata.xml b/ros-meta/roscpp_core/metadata.xml
index 6e0112b796ad..72934e2c6755 100644
--- a/ros-meta/roscpp_core/metadata.xml
+++ b/ros-meta/roscpp_core/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/roscpp_core</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/rosserial/metadata.xml b/ros-meta/rosserial/metadata.xml
index b166e47677b7..2a78cffb085c 100644
--- a/ros-meta/rosserial/metadata.xml
+++ b/ros-meta/rosserial/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-drivers/rosserial</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/rqt/metadata.xml b/ros-meta/rqt/metadata.xml
index 90a767bd4807..a016c2096bc5 100644
--- a/ros-meta/rqt/metadata.xml
+++ b/ros-meta/rqt/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/rqt_common_plugins/metadata.xml b/ros-meta/rqt_common_plugins/metadata.xml
index df6c3b9d0b9d..cb473d142b8e 100644
--- a/ros-meta/rqt_common_plugins/metadata.xml
+++ b/ros-meta/rqt_common_plugins/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_common_plugins</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/rqt_robot_plugins/metadata.xml b/ros-meta/rqt_robot_plugins/metadata.xml
index 1befe6a4f83f..70d1993e2855 100644
--- a/ros-meta/rqt_robot_plugins/metadata.xml
+++ b/ros-meta/rqt_robot_plugins/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/simulators/metadata.xml b/ros-meta/simulators/metadata.xml
index 6c27c20dab66..32d254e09bd2 100644
--- a/ros-meta/simulators/metadata.xml
+++ b/ros-meta/simulators/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/slam_gmapping/metadata.xml b/ros-meta/slam_gmapping/metadata.xml
index 4d93494abeed..a45ed347785d 100644
--- a/ros-meta/slam_gmapping/metadata.xml
+++ b/ros-meta/slam_gmapping/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-perception/slam_gmapping</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/unique_identifier/metadata.xml b/ros-meta/unique_identifier/metadata.xml
index c4595ca8025a..07abf56c1b23 100644
--- a/ros-meta/unique_identifier/metadata.xml
+++ b/ros-meta/unique_identifier/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-geographic-info/unique_identifier</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/vision_opencv/metadata.xml b/ros-meta/vision_opencv/metadata.xml
index 1577bb519b1e..1c2493de8791 100644
--- a/ros-meta/vision_opencv/metadata.xml
+++ b/ros-meta/vision_opencv/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-perception/vision_opencv</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/vision_visp/metadata.xml b/ros-meta/vision_visp/metadata.xml
index 6e3e928843bc..1b7d80220614 100644
--- a/ros-meta/vision_visp/metadata.xml
+++ b/ros-meta/vision_visp/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">lagadic/vision_visp</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/visualization_tutorials/metadata.xml b/ros-meta/visualization_tutorials/metadata.xml
index 6e102d9207b7..59c938e49d79 100644
--- a/ros-meta/visualization_tutorials/metadata.xml
+++ b/ros-meta/visualization_tutorials/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros-visualization/visualization_tutorials</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/ros-meta/viz/metadata.xml b/ros-meta/viz/metadata.xml
index 6c27c20dab66..32d254e09bd2 100644
--- a/ros-meta/viz/metadata.xml
+++ b/ros-meta/viz/metadata.xml
@@ -8,5 +8,4 @@
 	<upstream>
 		<remote-id type="github">ros/metapackages</remote-id>
 	</upstream>
-	<origin>gentoo-staging</origin>
 </pkgmetadata>